Skip to content

Commit 03fcdfc

Browse files
tjohnson009frett
tjohnson009
and
frett
authored
GT-2979 Country Settings Confirmation Overlay (#4372)
* Bring in svg country settings icon from figma * Modify clickable to call the new overlay to confirm country selection * Add country settings overlay string resources with format args * Build country settings confirmation overlay with new string resources and icon * Make country displayName nullable for better null handling * Show the selected country isoCode is displayName is null * Refine text resource strings names * Implenet @color/tintable fill color - awaiting icon changes * Switch basicAlertDialog composable to alertDialog composable * replace the country confirmation dialog icon * Lint fix on the settings layout * Lint fix for PR --------- Co-authored-by: Daniel Frett <daniel.frett@cru.org>
1 parent 47bc5a9 commit 03fcdfc

4 files changed

Lines changed: 91 additions & 1 deletion

File tree

‎app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsConfirmationOverlay.kt‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
package org.cru.godtools.ui.languages.country
2+
3+
import androidx.compose.material3.AlertDialog
4+
import androidx.compose.material3.ExperimentalMaterial3Api
5+
import androidx.compose.material3.Icon
6+
import androidx.compose.material3.MaterialTheme
7+
import androidx.compose.material3.Text
8+
import androidx.compose.material3.TextButton
9+
import androidx.compose.runtime.Composable
10+
import androidx.compose.ui.res.painterResource
11+
import androidx.compose.ui.res.stringResource
12+
import androidx.compose.ui.text.SpanStyle
13+
import androidx.compose.ui.text.buildAnnotatedString
14+
import androidx.compose.ui.text.withStyle
15+
import com.slack.circuit.overlay.Overlay
16+
import com.slack.circuit.overlay.OverlayNavigator
17+
import org.ccci.gto.android.common.androidx.compose.ui.text.res.annotatedStringResource
18+
import org.cru.godtools.R
19+
20+
class CountrySettingsConfirmationOverlay(val countryName: String) : Overlay<Boolean> {
21+
@OptIn(ExperimentalMaterial3Api::class)
22+
@Composable
23+
override fun Content(navigator: OverlayNavigator<Boolean>) {
24+
AlertDialog(
25+
onDismissRequest = { navigator.finish(false) },
26+
iconContentColor = MaterialTheme.colorScheme.primary,
27+
icon = {
28+
Icon(
29+
painter = painterResource(R.drawable.ic_settings_country_globe),
30+
contentDescription = null,
31+
)
32+
},
33+
text = {
34+
Text(
35+
annotatedStringResource(
36+
R.string.country_settings_confirm_description,
37+
buildAnnotatedString {
38+
withStyle(SpanStyle(color = MaterialTheme.colorScheme.primary)) {
39+
append(countryName)
40+
}
41+
}
42+
)
43+
)
44+
},
45+
confirmButton = {
46+
TextButton(onClick = { navigator.finish(true) }) {
47+
Text(stringResource(R.string.country_settings_confirm_action_continue))
48+
}
49+
},
50+
dismissButton = {
51+
TextButton(onClick = { navigator.finish(false) }) {
52+
Text(stringResource(R.string.country_settings_confirm_action_dismiss))
53+
}
54+
},
55+
)
56+
}
57+
}

‎app/src/main/kotlin/org/cru/godtools/ui/languages/country/CountrySettingsLayout.kt‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.material3.Surface
2828
import androidx.compose.material3.Text
2929
import androidx.compose.runtime.Composable
3030
import androidx.compose.runtime.getValue
31+
import androidx.compose.runtime.rememberCoroutineScope
3132
import androidx.compose.runtime.rememberUpdatedState
3233
import androidx.compose.runtime.setValue
3334
import androidx.compose.ui.Alignment
@@ -37,7 +38,9 @@ import androidx.compose.ui.res.stringResource
3738
import androidx.compose.ui.text.font.FontWeight
3839
import androidx.compose.ui.unit.dp
3940
import com.slack.circuit.codegen.annotations.CircuitInject
41+
import com.slack.circuit.overlay.LocalOverlayHost
4042
import dagger.hilt.components.SingletonComponent
43+
import kotlinx.coroutines.launch
4144
import org.ccci.gto.android.common.androidx.compose.foundation.layout.padding
4245
import org.cru.godtools.R
4346
import org.cru.godtools.base.ui.theme.GodToolsTheme
@@ -58,6 +61,8 @@ private fun CountryName(country: CountrySettingsPresenter.CountryItem, modifier:
5861
@CircuitInject(CountrySettingsScreen::class, SingletonComponent::class)
5962
internal fun CountrySettingsLayout(state: UiState, modifier: Modifier = Modifier) {
6063
val eventSink by rememberUpdatedState(state.eventSink)
64+
val overlayHost = LocalOverlayHost.current
65+
val coroutineScope = rememberCoroutineScope()
6166
var query by state.query
6267

6368
Scaffold(
@@ -143,7 +148,18 @@ internal fun CountrySettingsLayout(state: UiState, modifier: Modifier = Modifier
143148
Icon(Icons.Filled.Check, null, tint = MaterialTheme.colorScheme.primary)
144149
}
145150
},
146-
modifier = Modifier.clickable { eventSink(UiEvent.SelectCountry(country.isoCode)) },
151+
modifier = Modifier.clickable {
152+
coroutineScope.launch {
153+
val confirmCountrySelection = overlayHost.show(
154+
CountrySettingsConfirmationOverlay(
155+
country.displayName ?: country.isoCode,
156+
),
157+
)
158+
if (confirmCountrySelection) {
159+
eventSink(UiEvent.SelectCountry(country.isoCode))
160+
}
161+
}
162+
},
147163
)
148164
}
149165
}

‎app/src/main/res/drawable/ic_settings_country_globe.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="59dp"
3+
android:height="67dp"
4+
android:viewportWidth="59"
5+
android:viewportHeight="67">
6+
<group>
7+
<path
8+
android:pathData="M19.577,12.162C19.79,13.862 20.433,15.214 21.236,16.399C19.719,16.967 18.261,17.636 18.398,17.861C18.532,18.068 19.072,18.069 18.362,18.523C17.957,18.769 17.524,20.327 17.144,20.328C16.006,20.826 15.933,19.349 14.667,21.25L12.652,22.062C9.66,25.241 7.588,29.268 6.838,33.741C6.809,33.919 7.591,34.25 7.692,34.372C7.945,34.674 7.944,35.976 8.068,36.402C8.379,37.479 9.148,38.079 9.736,39.06C10.083,39.643 10.66,41.12 10.477,41.732C10.721,41.331 12.889,43.569 13.285,44.035C14.218,45.132 14.937,46.462 13.423,47.548C12.934,47.899 14.166,50.092 13.531,50.631L12.717,50.841C11.915,51.334 12.278,52.544 12.765,53.054C16.861,57.337 22.635,60.01 29.034,60.01C41.467,60.01 51.545,49.932 51.545,37.5C51.545,35.168 51.146,32.813 50.74,31.569C50.61,31.177 50.314,30.865 49.931,30.717C49.353,30.493 46.918,32.062 46.551,31.289C46.31,30.774 45.82,31.618 45.262,31.308C44.991,31.159 44.239,30.147 43.898,30.271C43.202,30.521 44.967,32.443 45.449,32.695C45.903,32.353 47.369,31.648 47.685,32.61C48.288,34.422 46.023,36.408 44.865,37.453C43.135,39.017 43.459,36.441 42.28,35.533C41.661,35.058 41.667,34.046 41.041,33.696C40.762,33.538 39.48,32.063 39.491,31.864L39.452,32.238C39.24,32.397 38.79,31.634 38.742,31.515C38.742,32.179 39.824,33.239 40.183,33.771C40.793,34.683 41.12,36.013 41.868,36.759C42.269,37.16 43.801,38.817 44.2,38.782C44.635,38.744 46.011,37.75 46.254,37.807C47.704,38.151 42.837,45.029 42.375,45.881C41.994,46.595 42.686,48.362 42.63,49.207C42.564,50.183 41.796,50.499 41.068,51.03C40.289,51.6 40.471,52.709 39.815,53.114C38.651,53.831 37.812,56.163 36.158,56.152C35.672,56.15 33.589,56.963 33.316,56.168C33.105,55.591 32.82,55.154 32.521,54.584C32.228,54.025 32.487,53.446 32.131,52.952C31.885,52.61 31.061,51.833 30.986,51.427C30.982,51.077 31.25,50.016 31.617,49.831C32.133,49.567 31.716,48.799 31.653,48.353C31.545,47.555 31.052,46.896 30.459,46.435C29.583,45.761 30.035,45.225 30.24,44.263C30.24,43.803 29.961,43.199 29.344,43.379C28.073,43.749 28.457,42.387 27.531,42.448C26.864,42.496 26.319,42.919 25.699,43.106C24.92,43.341 24.122,42.922 23.352,42.825C20.181,42.424 19.147,38.8 19.974,36.187C20.057,35.758 19.717,34.965 19.865,34.634C20.221,33.841 20.947,32.95 21.582,32.349C21.938,32.011 22.396,32.097 22.815,31.833C23.462,31.425 23.471,30.586 24.104,30.072C25.006,29.34 26.236,29.356 27.412,29.198C28.039,29.115 30.423,28.599 30.799,29.063C30.8,29.153 31.228,30.424 30.756,30.352C31.732,30.403 33.123,32.04 34.049,31.657C34.524,31.459 34.351,29.998 35.326,30.703C35.917,31.127 38.562,31.317 39.112,30.859C39.45,30.58 39.639,28.764 39.229,28.559C39.49,28.817 37.853,28.838 37.699,28.779C37.434,28.682 37.187,29.021 36.767,28.845C36.71,28.793 35.374,27.973 36.25,27.332C35.847,27.627 35.471,27.249 35.036,27.573C34.736,27.817 35.175,27.98 34.747,28.191C34.067,28.536 33.553,27.007 33.296,26.834C33.097,26.704 31.886,25.857 31.552,25.858C31.955,24.564 32.465,23.479 33.029,22.525C33.302,22.446 33.502,22.309 33.413,22.041C33.402,22.009 33.394,21.978 33.386,21.95C33.482,21.801 33.58,21.656 33.679,21.513C33.726,21.503 33.774,21.492 33.821,21.471C33.772,21.491 34.586,20.077 34.727,20.54C34.702,20.422 34.632,20.372 34.535,20.364C34.866,19.949 35.201,19.554 35.534,19.167C35.59,19.102 35.645,19.037 35.701,18.973C35.752,18.943 35.797,18.906 35.833,18.859C35.876,18.802 35.935,18.722 36,18.627C36.345,18.228 36.691,17.822 37.025,17.4C37.476,17.229 37.978,17.104 37.532,16.731C38.386,15.545 39.095,14.201 39.372,12.504C49.181,16.563 56.083,26.225 56.083,37.5C56.083,52.434 43.975,64.542 29.041,64.542C14.105,64.542 2,52.434 2,37.5C2,25.896 9.31,15.999 19.577,12.162ZM32.541,28.642C32.708,28.662 32.099,29.66 31.619,28.871C31.542,28.723 32.39,28.642 32.541,28.642ZM27.273,25.332C27.489,25.949 27.679,26.615 27.84,27.34C27.689,27.418 27.542,27.505 27.398,27.601L27.045,28.396C26.891,28.534 25.32,29.052 25.312,29.072C25.377,28.903 24.214,28.687 24.291,28.349C24.377,27.977 24.771,26.816 24.67,26.393C24.562,25.949 27.09,27.032 27.252,25.863C27.274,25.688 27.291,25.503 27.273,25.332ZM36.767,28.845C36.772,28.85 36.765,28.846 36.741,28.835C36.749,28.839 36.758,28.841 36.767,28.845ZM31.56,26.17L33.339,27.938C33.251,27.995 32.872,27.294 32.872,27.806C32.992,27.501 32.917,29.11 32.638,28.588C32.514,28.387 32.841,28.274 32.651,27.983C32.651,27.792 32.137,27.605 32.038,27.475C31.888,27.288 31.603,26.982 31.31,26.708C31.368,26.48 31.431,26.258 31.496,26.042C31.511,26.078 31.532,26.121 31.56,26.17ZM38.74,24.507C38.249,24.568 37.356,26.278 37.356,25.396C37.343,25.067 36.929,24.757 36.496,25.327C36.192,25.719 36.245,26.316 36.081,26.582C35.847,26.976 37.359,27.345 37.359,26.974C37.417,26.35 39.008,26.832 39.319,26.918C39.878,27.073 40.768,26.409 39.795,26.06C38.995,25.767 38.574,25.453 38.502,24.881C38.51,24.874 38.923,24.485 38.74,24.507ZM30.776,21.487C31.072,21.607 30.619,22.334 30.973,22.629C30.965,22.541 31.106,22.539 31.291,22.566C30.745,23.615 30.258,24.815 29.885,26.229C29.633,26.262 29.359,26.302 29.143,26.339C28.911,25.441 28.635,24.629 28.327,23.887C28.334,23.88 28.342,23.875 28.348,23.869C28.677,23.491 29.431,22.873 29.979,22.873C30.618,22.873 30.482,21.943 30.776,21.487ZM26.979,24.552C27.033,24.682 27.085,24.815 27.136,24.95C27.027,24.812 26.844,24.711 26.547,24.68C26.594,24.685 26.762,24.633 26.979,24.552ZM26.642,23.789C26.57,23.781 26.515,23.761 26.486,23.72C26.444,23.67 26.474,23.626 26.542,23.585C26.575,23.653 26.609,23.72 26.642,23.789ZM27.878,22.901C28.162,23.042 28.58,23.073 28.081,23.323C28.116,23.317 28.117,23.325 28.091,23.344C28.022,23.193 27.949,23.046 27.878,22.901ZM25.877,22.368C25.986,22.548 26.093,22.733 26.198,22.923C26.056,23.061 25.813,23.088 25.614,23.175C25.423,23.258 25.227,23.135 25.418,22.945L25.614,22.706L25.596,22.598L25.749,22.401L25.877,22.368ZM26.989,21.316C27.135,21.014 27.342,20.786 27.581,21.133L27.383,21.363C27.676,21.654 27.761,22.368 27.854,22.853C27.581,22.302 27.291,21.793 26.989,21.316ZM31.938,17.998C33.131,16.996 33.47,17.779 34.644,17.901C34.138,18.488 33.612,19.1 33.095,19.771C33.148,19.53 33.249,19.303 33.344,19.184C33.543,18.924 32.796,18.607 32.787,19.103C32.776,19.702 32.322,20.257 32.234,20.968C32.025,21.283 31.821,21.614 31.622,21.961C31.128,21.717 30.514,21.189 30.421,21.243C29.79,21.626 29.274,20.761 29.601,20.243C29.934,19.714 30.738,19.738 31.069,19.17C31.304,18.769 31.577,18.302 31.938,17.998ZM21.908,17.316C22.131,17.6 22.359,17.877 22.59,18.148C21.791,18.565 21.094,19.02 20.897,19.026C20.751,19.035 20.906,17.597 21.704,17.491C21.629,17.503 21.721,17.435 21.908,17.316ZM26.404,10.586C26.344,10.825 26.313,11.075 26.313,11.333C26.313,13.059 27.739,14.458 29.5,14.458C31.261,14.458 32.688,13.059 32.688,11.333C32.688,11.114 32.664,10.901 32.62,10.694C34.457,10.937 36.235,11.365 37.937,11.957C37.734,13.615 37.049,14.879 36.143,16.085C34.637,15.59 32.121,15.024 30.281,15.023C29.75,15.023 29.377,15.616 28.972,15.952C28.17,16.617 26.114,17.922 24.972,17.525C24.716,17.437 24.398,17.462 24.052,17.549C23.756,17.205 23.471,16.867 23.199,16.527C23.855,16.121 24.467,15.709 24.429,15.556C24.393,15.418 23.657,15.588 22.71,15.889C21.826,14.671 21.178,13.375 21.032,11.664C22.756,11.13 24.553,10.765 26.404,10.586Z"
9+
android:fillColor="@color/tintable"/>
10+
<path
11+
android:pathData="M29.5,3C25.04,3 21,6.545 21,10.919C21,17.422 27.776,18.109 29.5,28C31.224,18.109 38,17.422 38,10.919C38,6.545 33.961,3 29.5,3ZM29.5,14.458C27.739,14.458 26.313,13.059 26.313,11.333C26.313,9.607 27.738,8.208 29.5,8.208C31.262,8.208 32.688,9.607 32.688,11.333C32.688,13.059 31.261,14.458 29.5,14.458Z"
12+
android:fillColor="@color/tintable"/>
13+
</group>
14+
</vector>

‎app/src/main/res/values/strings_languages.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<string name="country_settings_title">Select a country</string>
2828
<string name="country_settings_subtitle_header">Select your localization</string>
2929
<string name="country_settings_subtitle_body">Choose a country below to set your localization and get prioritized content and recommendations based on your location.</string>
30+
<string name="country_settings_confirm_description">You have selected %1$s as your localization.\nWould you like to continue?</string>
31+
<string name="country_settings_confirm_action_continue">Continue</string>
32+
<string name="country_settings_confirm_action_dismiss">Edit Localization</string>
3033

3134
<!-- Downloadable Languages UI -->
3235
<eat-comment />

0 commit comments

Comments
 (0)