-
Notifications
You must be signed in to change notification settings - Fork 134
[WOOMOB-1028][Woo POS][Settings] Add Help section with product info dialog #14466
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
104b88c
Add Help category to WooPos settings
kidinov a79cd12
Rename hardware settings files and view model for consistency
kidinov efd9090
Improve Help buttons visual design
kidinov 445adb6
Merge branch 'woomob-1023-woo-possettings-2-pane-layout-based-on-the-…
kidinov 50d4096
Extract reusable settings menu item component
kidinov 8cac34b
Make product info dialog display full screen in WooPos settings
kidinov abc336d
Add documentation URL for Woo Mobile App POS mode
kidinov 4920b91
Fixed formatting
kidinov c7116ae
Merge branch 'trunk' into woomob-1028-woo-possettings-add-help-section
kidinov f9da1cb
Fixed unit tests
kidinov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
1 change: 1 addition & 0 deletions
1
WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/data/WooPosAppUrls.kt
This file contains hidden or 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,3 +1,4 @@ | ||
package com.woocommerce.android.ui.woopos.common.data | ||
|
||
const val WOO_POS_BARCODE_DOC_URL = "https://woocommerce.com/document/barcode-and-qr-code-scanner/" | ||
const val WOO_POS_DOCUMENTATION_URL = "https://woocommerce.com/document/woo-mobile-app-point-of-sale-mode/" |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
68 changes: 68 additions & 0 deletions
68
...otlin/com/woocommerce/android/ui/woopos/settings/details/WooPosSettingsDetailsMenuItem.kt
This file contains hidden or 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 |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package com.woocommerce.android.ui.woopos.settings.details | ||
|
||
import androidx.compose.foundation.clickable | ||
import androidx.compose.foundation.interaction.MutableInteractionSource | ||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Row | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.layout.size | ||
import androidx.compose.material3.Icon | ||
import androidx.compose.material3.MaterialTheme | ||
import androidx.compose.material3.ripple | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.runtime.remember | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.graphics.vector.ImageVector | ||
import androidx.compose.ui.unit.dp | ||
import com.woocommerce.android.ui.woopos.common.composeui.component.WooPosText | ||
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosSpacing | ||
import com.woocommerce.android.ui.woopos.common.composeui.designsystem.WooPosTypography | ||
|
||
@Composable | ||
fun WooPosSettingsDetailsMenuItem( | ||
icon: ImageVector, | ||
title: String, | ||
subtitle: String, | ||
onClick: () -> Unit, | ||
modifier: Modifier = Modifier | ||
) { | ||
Row( | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.clickable( | ||
interactionSource = remember { MutableInteractionSource() }, | ||
indication = ripple() | ||
) { onClick() } | ||
.padding(WooPosSpacing.Medium.value), | ||
verticalAlignment = Alignment.CenterVertically, | ||
horizontalArrangement = Arrangement.Start | ||
) { | ||
Icon( | ||
imageVector = icon, | ||
contentDescription = null, | ||
tint = MaterialTheme.colorScheme.onSurface, | ||
modifier = Modifier.size(28.dp) | ||
) | ||
|
||
Column( | ||
modifier = Modifier | ||
.weight(1f) | ||
.padding(start = WooPosSpacing.Medium.value) | ||
) { | ||
WooPosText( | ||
text = title, | ||
style = WooPosTypography.BodyLarge, | ||
color = MaterialTheme.colorScheme.onSurface | ||
) | ||
WooPosText( | ||
text = subtitle, | ||
style = WooPosTypography.BodySmall, | ||
color = MaterialTheme.colorScheme.outline, | ||
modifier = Modifier.padding(top = WooPosSpacing.XSmall.value) | ||
) | ||
} | ||
} | ||
} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.