-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into 12074-woo-pos-move-floating-toolbar-to-the-…
…home-screen-from-the-root
- Loading branch information
Showing
17 changed files
with
319 additions
and
166 deletions.
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
65 changes: 0 additions & 65 deletions
65
...in/kotlin/com/woocommerce/android/ui/common/exitawarewebview/ExitAwareWebViewViewModel.kt
This file was deleted.
Oops, something went wrong.
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
82 changes: 82 additions & 0 deletions
82
...tlin/com/woocommerce/android/ui/google/ads/success/GoogleAdsCampaignSuccessBottomSheet.kt
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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package com.woocommerce.android.ui.google.ads.success | ||
|
|
||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.height | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material.MaterialTheme | ||
| import androidx.compose.material.Surface | ||
| import androidx.compose.material.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.dimensionResource | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.unit.dp | ||
| import com.woocommerce.android.R.dimen | ||
| import com.woocommerce.android.R.drawable | ||
| import com.woocommerce.android.R.string | ||
| import com.woocommerce.android.ui.compose.component.BottomSheetHandle | ||
| import com.woocommerce.android.ui.compose.component.WCColoredButton | ||
| import com.woocommerce.android.ui.compose.preview.LightDarkThemePreviews | ||
|
|
||
| @Composable | ||
| fun GoogleAdsCampaignSuccessBottomSheet( | ||
| onDoneTapped: () -> Unit, | ||
| modifier: Modifier = Modifier | ||
| ) { | ||
| Surface( | ||
| shape = RoundedCornerShape( | ||
| topStart = dimensionResource(id = dimen.minor_100), | ||
| topEnd = dimensionResource(id = dimen.minor_100) | ||
| ) | ||
| ) { | ||
| Column( | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| .padding(horizontal = 16.dp), | ||
| horizontalAlignment = Alignment.CenterHorizontally, | ||
| ) { | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| BottomSheetHandle(Modifier.align(Alignment.CenterHorizontally)) | ||
| Spacer(modifier = Modifier.height(30.dp)) | ||
| Image( | ||
| painter = painterResource(id = drawable.blaze_campaign_created_success), | ||
| contentDescription = "" | ||
| ) | ||
| Spacer(modifier = Modifier.height(24.dp)) | ||
| Text( | ||
| text = stringResource(id = string.google_ads_campaign_created_success_title), | ||
| style = MaterialTheme.typography.h6, | ||
| color = MaterialTheme.colors.onSurface | ||
| ) | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| Text( | ||
| modifier = Modifier.padding(horizontal = 20.dp), | ||
| text = stringResource(id = string.google_ads_campaign_created_success_description), | ||
| style = MaterialTheme.typography.body1, | ||
| textAlign = TextAlign.Center, | ||
| color = MaterialTheme.colors.onSurface | ||
| ) | ||
| Spacer(modifier = Modifier.height(32.dp)) | ||
| WCColoredButton( | ||
| onClick = onDoneTapped, | ||
| modifier = Modifier.fillMaxWidth() | ||
| ) { | ||
| Text(text = stringResource(id = string.blaze_campaign_created_success_done_button)) | ||
| } | ||
| Spacer(modifier = Modifier.height(16.dp)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @LightDarkThemePreviews | ||
| @Composable | ||
| private fun GoogleAdsCampaignSuccessBottomSheetPreview() { | ||
| GoogleAdsCampaignSuccessBottomSheet(onDoneTapped = {}) | ||
| } |
22 changes: 22 additions & 0 deletions
22
.../woocommerce/android/ui/google/ads/success/GoogleAdsCampaignSuccessBottomSheetFragment.kt
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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.woocommerce.android.ui.google.ads.success | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import com.woocommerce.android.ui.compose.composeView | ||
| import com.woocommerce.android.widgets.WCBottomSheetDialogFragment | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class GoogleAdsCampaignSuccessBottomSheetFragment : WCBottomSheetDialogFragment() { | ||
| override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { | ||
| return composeView { | ||
| GoogleAdsCampaignSuccessBottomSheet(::onDoneClicked) | ||
| } | ||
| } | ||
|
|
||
| private fun onDoneClicked() { | ||
| dismiss() | ||
| } | ||
| } |
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
Oops, something went wrong.