Skip to content

Commit 9f47822

Browse files
committed
feat: further improve the advanced triggers screen
1 parent 858a57e commit 9f47822

File tree

6 files changed

+14
-191
lines changed

6 files changed

+14
-191
lines changed

app/src/main/java/io/github/sds100/keymapper/trigger/AdvancedTriggersBottomSheet.kt

Lines changed: 0 additions & 183 deletions
This file was deleted.

app/src/main/java/io/github/sds100/keymapper/trigger/AdvancedTriggersScreenFoss.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@ fun AdvancedTriggersScreenFoss(
5656
IconButton(onClick = onBack) {
5757
Icon(
5858
Icons.AutoMirrored.Filled.ArrowBack,
59-
contentDescription = stringResource(R.string.bottom_app_bar_back_content_description)
59+
contentDescription = stringResource(R.string.bottom_app_bar_back_content_description),
6060
)
6161
}
6262
},
6363
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
64-
containerColor = MaterialTheme.colorScheme.primaryContainer
65-
)
64+
containerColor = MaterialTheme.colorScheme.primaryContainer,
65+
),
6666
)
67-
}
67+
},
6868
) { contentPadding ->
6969
Column(
7070
modifier = Modifier
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
package io.github.sds100.keymapper.base.utils.navigation
22

3-
data class NavigateEvent(val key: String, val destination: NavDestination<*>)
3+
import androidx.navigation.NavOptions
4+
5+
data class NavigateEvent(
6+
val key: String,
7+
val destination: NavDestination<*>,
8+
val navOptions: NavOptions? = null
9+
)

base/src/main/java/io/github/sds100/keymapper/base/utils/navigation/NavigationProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ fun SetupNavigation(
240240
?.savedStateHandle
241241
?.set("request_key", navEvent.key)
242242

243-
navController.navigate(navEvent.destination)
243+
navController.navigate(navEvent.destination, navOptions = navEvent.navOptions)
244244

245245
navigationProvider.handledNavigateRequest()
246246
}

base/src/main/res/values-pt/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ Deixe em branco se alguma rede Wi-Fi precisar ser correspondida.</string>
10161016
<string name="trigger_error_product_verification_failed">A compra não pode ser verificada. Você tem conexão com a internet?</string>
10171017
<!-- Purchasing -->
10181018
<string name="unlock_product_button">Desbloquear (%s)</string>
1019-
<string name="use_product_button">Usar</string>
1019+
<string name="purchased_product_button">Usar</string>
10201020
<string name="loading_product_button">Carregando…</string>
10211021
<string name="purchased_product_label">Comprado!</string>
10221022
<string name="retry_loading_price_button">Tentar buscar o preço novamente</string>

base/src/main/res/values-tr/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1018,7 +1018,7 @@ Kaydedilmiş ses dosyalarını ayarlardan silebilirsiniz.</string>
10181018
<string name="trigger_error_product_verification_failed">Satın alma doğrulanamıyor. İnternet bağlantınız var mı?</string>
10191019
<!-- Purchasing -->
10201020
<string name="unlock_product_button">Kilidi aç (%s)</string>
1021-
<string name="use_product_button">Kullan</string>
1021+
<string name="purchased_product_button">Kullan</string>
10221022
<string name="loading_product_button">Yükleniyor…</string>
10231023
<string name="purchased_product_label">Satın alındı!</string>
10241024
<string name="retry_loading_price_button">Fiyatı tekrar almayı dene</string>

0 commit comments

Comments
 (0)