-
Notifications
You must be signed in to change notification settings - Fork 590
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Added Compose Previews for NFC, Onboarding & Companion Views #4239
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
a8bec51
Feature/compose previews (#1)
vieck fa77652
Using phone view for preview
vieck efc37df
Using premade preview entities
vieck 3114731
Merge branch 'home-assistant:master' into master
vieck 43367db
Renamed preview logs
vieck 03c1f8f
Review comments
jpelgrom File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
package io.homeassistant.companion.android.onboarding.manual | ||
|
||
import android.content.res.Configuration | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.padding | ||
|
@@ -11,6 +12,9 @@ import androidx.compose.material.Button | |
import androidx.compose.material.Text | ||
import androidx.compose.material.TextField | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.MutableState | ||
import androidx.compose.runtime.mutableStateOf | ||
import androidx.compose.runtime.remember | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.ExperimentalComposeUiApi | ||
import androidx.compose.ui.Modifier | ||
|
@@ -19,6 +23,7 @@ import androidx.compose.ui.res.stringResource | |
import androidx.compose.ui.text.input.ImeAction | ||
import androidx.compose.ui.text.input.KeyboardType | ||
import androidx.compose.ui.text.style.TextAlign | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial | ||
import io.homeassistant.companion.android.common.R as commonR | ||
|
@@ -30,6 +35,16 @@ import io.homeassistant.companion.android.onboarding.OnboardingViewModel | |
fun ManualSetupView( | ||
onboardingViewModel: OnboardingViewModel, | ||
connectedClicked: () -> Unit | ||
) { | ||
ManualSetupView(onboardingViewModel.manualUrl, onboardingViewModel::onManualUrlUpdated, onboardingViewModel.manualContinueEnabled, connectedClicked) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why keep this around? You can update the fragment to use the 'new'/updated function. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. See #4239 (comment) |
||
|
||
@Composable | ||
fun ManualSetupView( | ||
manualUrl: MutableState<String>, | ||
onManualUrlUpdated: (String) -> Unit, | ||
manualContinueEnabled: Boolean, | ||
connectedClicked: () -> Unit | ||
) { | ||
val scrollState = rememberScrollState() | ||
val keyboardController = LocalSoftwareKeyboardController.current | ||
|
@@ -54,8 +69,8 @@ fun ManualSetupView( | |
) | ||
|
||
TextField( | ||
value = onboardingViewModel.manualUrl.value, | ||
onValueChange = { onboardingViewModel.onManualUrlUpdated(it) }, | ||
value = manualUrl.value, | ||
onValueChange = { onManualUrlUpdated(it) }, | ||
modifier = Modifier.align(Alignment.CenterHorizontally), | ||
label = { Text(stringResource(id = commonR.string.input_url)) }, | ||
singleLine = true, | ||
|
@@ -69,7 +84,7 @@ fun ManualSetupView( | |
) | ||
|
||
Button( | ||
enabled = onboardingViewModel.manualContinueEnabled, | ||
enabled = manualContinueEnabled, | ||
onClick = connectedClicked, | ||
modifier = Modifier | ||
.align(Alignment.CenterHorizontally) | ||
|
@@ -79,3 +94,17 @@ fun ManualSetupView( | |
} | ||
} | ||
} | ||
|
||
@Preview(showSystemUi = true) | ||
vieck marked this conversation as resolved.
Show resolved
Hide resolved
|
||
@Preview(showSystemUi = true, uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
@Composable | ||
fun ManualSetupViewPreview() { | ||
ManualSetupView( | ||
manualUrl = remember { | ||
mutableStateOf("test") | ||
}, | ||
onManualUrlUpdated = {}, | ||
manualContinueEnabled = true, | ||
connectedClicked = {} | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why keep this around? You can update the fragment to use the 'new'/updated function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jpelgrom This is only for compose previews. Basically, if we use the second one we need to expand the parameters of un DiscoveryView(
onboardingViewModel: OnboardingViewModel,
manualSetupClicked: () -> Unit,
instanceClicked: (instance: HomeAssistantInstance) -> Unit
) {
to include everything that we use in onboardingViewModel
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jpelgrom Read here real quick https://developer.android.com/jetpack/compose/tooling/previews#preview-viewmodel
"If you want to preview a composable that uses a ViewModel, you should create another composable with the parameters from ViewModel passed as arguments of the composable. This way, you don't need to preview the composable that uses the ViewModel."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand this is required for the Compose previews. My point was: if this is what we need, why keep the other function that uses a ViewModel as well instead of switching it to use this new constructor? I see little to no advantage, and with these changes you need to update both functions anyway.
You don't, as you've already proven with the function you've added. For
DiscoveryView
, you only need/useonboardingViewModel.foundInstances
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update this as requested (or give more arguments to convince why not :)) to proceed.