Compare commits

...
7 Commits
Author SHA1 Message Date
robin f161db3345 Merge pull request 'fix: show app icon' (#35) from fix/splashscreen-light into main
Reviewed-on: robin/WeekFocus#35
2026-10-30 11:26:47 +00:00
robin 32ae274da3 fix: show app icon 2026-10-30 12:26:14 +01:00
robin 431f61e683 CHANGELOG update
Build & Release Android App / build (push) Successful in 14m33s
2026-10-29 18:11:33 +01:00
robin 2cadfa8972 Merge pull request 'style: dark mode support on splash screen' (#33) from style/splash-screen into main
Reviewed-on: robin/WeekFocus#33
2026-10-29 17:10:17 +00:00
robin 77bcaddc55 style: dark mode support on splash screen 2026-10-29 18:09:55 +01:00
robin a2d049e280 Merge pull request 'chore(l10n): add translations' (#31) from chore(l10n)/translation into main
Build & Release Android App / build (push) Successful in 8m24s
Reviewed-on: robin/WeekFocus#31
2026-10-29 16:41:08 +00:00
robin a393624d03 chore(l10n): add translations 2026-10-29 17:40:35 +01:00
10 changed files with 45 additions and 13 deletions

No files matched your search

+4 -1
View File
@@ -1,9 +1,12 @@
# Changelog
## [1.2.12] - 2026-10-29
### New
* dark mode support on the splash screen
## [1.2.11] - 2026-10-29
### New
* ability to edit words (with swiping to the left)
### Changed
* delete words with swiping to the right (instead of pressing the button)
+1
View File
@@ -93,4 +93,5 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.test.manifest)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.material.icons.extended)
implementation("androidx.core:core-splashscreen:1.0.1")
}
+1 -1
View File
@@ -17,7 +17,7 @@
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.WeekFocus"
android:theme="@style/Theme.WeekFocus.Splash"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -20,11 +20,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.stringResource
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import de.schanbro.weekfocus.screens.WordListScreen
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
installSplashScreen()
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
@@ -130,13 +130,13 @@ fun DeleteWordDialog(
AlertDialog(
onDismissRequest = onDismiss,
icon = { Icon(Icons.Default.Delete, contentDescription = null) },
title = { Text("Wort löschen?") },
text = { Text("„$word“ wird dauerhaft entfernt.") },
title = { Text(stringResource(R.string.dialog_delete_title)) },
text = { Text(stringResource(R.string.dialog_delete_message, word)) },
confirmButton = {
TextButton(onClick = onConfirm) { Text("Löschen") }
TextButton(onClick = onConfirm) { Text(stringResource(R.string.action_delete)) }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text("Abbrechen") }
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
}
)
}
@@ -152,7 +152,7 @@ fun EditWordDialog(
AlertDialog(
onDismissRequest = onDismiss,
icon = { Icon(Icons.Default.Edit, contentDescription = null) },
title = { Text("Wort bearbeiten") },
title = { Text(stringResource(R.string.dialog_edit_title)) },
text = {
OutlinedTextField(
value = text,
@@ -166,10 +166,10 @@ fun EditWordDialog(
TextButton(
onClick = { onSave(text) },
enabled = text.isNotBlank()
) { Text("Speichern") }
) { Text(stringResource(R.string.action_save)) }
},
dismissButton = {
TextButton(onClick = onDismiss) { Text("Abbrechen") }
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
}
)
}
+10 -2
View File
@@ -1,11 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="hint_new_word">Enter new Word</string>
<string name="hint_new_word">Enter new word</string>
<string name="hint_add_word">Add word</string>
<string name="msg_no_words_yet">No words yet.</string>
<string name="msg_no_words">No words</string>
<string name="title_weekly_focus">Weekly Focus</string>
<string name="title_weekly_focus">Weekly focus</string>
<string name="title_settings">Settings</string>
<string name="title_words">Words</string>
<string name="title_home">Home</string>
<string name="action_delete">Delete</string>
<string name="action_cancel">Cancel</string>
<string name="action_save">Save</string>
<string name="dialog_delete_title">Delete word?</string>
<string name="dialog_delete_message">“%1$s” will be permanently removed.</string>
<string name="dialog_edit_title">Edit word</string>
</resources>
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="splash_background">#121212</color>
</resources>
+1
View File
@@ -7,4 +7,5 @@
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="splash_background">#FFFFFF</color>
</resources>
+10
View File
@@ -9,4 +9,14 @@
<string name="title_settings">Einstellungen</string>
<string name="title_words">Wörter</string>
<string name="title_home">Start</string>
<!-- Aktionen -->
<string name="action_delete">Löschen</string>
<string name="action_cancel">Abbrechen</string>
<string name="action_save">Speichern</string>
<!-- Dialoge -->
<string name="dialog_delete_title">Wort löschen?</string>
<string name="dialog_delete_message">„%1$s“ wird dauerhaft entfernt.</string>
<string name="dialog_edit_title">Wort bearbeiten</string>
</resources>
+5 -1
View File
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.WeekFocus" parent="android:Theme.Material.Light.NoActionBar" />
<style name="Theme.WeekFocus.Splash" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">@color/splash_background</item>
<item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
<item name="postSplashScreenTheme">@style/Theme.WeekFocus</item>
</style>
</resources>