Compare commits
5
Commits
27d1a4b6ea
...
v1.2.12
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
431f61e683 | ||
|
|
2cadfa8972 | ||
|
|
77bcaddc55 | ||
|
|
a2d049e280 | ||
|
|
a393624d03 |
No files matched your search
+4
-1
@@ -1,9 +1,12 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.2.12] - 2026-10-29
|
||||||
|
### New
|
||||||
|
* dark mode support on the splash screen
|
||||||
|
|
||||||
## [1.2.11] - 2026-10-29
|
## [1.2.11] - 2026-10-29
|
||||||
### New
|
### New
|
||||||
* ability to edit words (with swiping to the left)
|
* ability to edit words (with swiping to the left)
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* delete words with swiping to the right (instead of pressing the button)
|
* delete words with swiping to the right (instead of pressing the button)
|
||||||
|
|
||||||
|
|||||||
@@ -93,4 +93,5 @@ dependencies {
|
|||||||
debugImplementation(libs.androidx.compose.ui.test.manifest)
|
debugImplementation(libs.androidx.compose.ui.test.manifest)
|
||||||
debugImplementation(libs.androidx.compose.ui.tooling)
|
debugImplementation(libs.androidx.compose.ui.tooling)
|
||||||
implementation(libs.androidx.material.icons.extended)
|
implementation(libs.androidx.material.icons.extended)
|
||||||
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/Theme.WeekFocus"
|
android:theme="@style/Theme.WeekFocus.Splash"
|
||||||
android:windowSoftInputMode="adjustResize">
|
android:windowSoftInputMode="adjustResize">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<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.input.nestedscroll.nestedScroll
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||||
|
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
|
||||||
import de.schanbro.weekfocus.screens.WordListScreen
|
import de.schanbro.weekfocus.screens.WordListScreen
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
installSplashScreen()
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
enableEdgeToEdge()
|
enableEdgeToEdge()
|
||||||
setContent {
|
setContent {
|
||||||
|
|||||||
@@ -130,13 +130,13 @@ fun DeleteWordDialog(
|
|||||||
AlertDialog(
|
AlertDialog(
|
||||||
onDismissRequest = onDismiss,
|
onDismissRequest = onDismiss,
|
||||||
icon = { Icon(Icons.Default.Delete, contentDescription = null) },
|
icon = { Icon(Icons.Default.Delete, contentDescription = null) },
|
||||||
title = { Text("Wort löschen?") },
|
title = { Text(stringResource(R.string.dialog_delete_title)) },
|
||||||
text = { Text("„$word“ wird dauerhaft entfernt.") },
|
text = { Text(stringResource(R.string.dialog_delete_message, word)) },
|
||||||
confirmButton = {
|
confirmButton = {
|
||||||
TextButton(onClick = onConfirm) { Text("Löschen") }
|
TextButton(onClick = onConfirm) { Text(stringResource(R.string.action_delete)) }
|
||||||
},
|
},
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
TextButton(onClick = onDismiss) { Text("Abbrechen") }
|
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ fun EditWordDialog(
|
|||||||
AlertDialog(
|
AlertDialog(
|
||||||
onDismissRequest = onDismiss,
|
onDismissRequest = onDismiss,
|
||||||
icon = { Icon(Icons.Default.Edit, contentDescription = null) },
|
icon = { Icon(Icons.Default.Edit, contentDescription = null) },
|
||||||
title = { Text("Wort bearbeiten") },
|
title = { Text(stringResource(R.string.dialog_edit_title)) },
|
||||||
text = {
|
text = {
|
||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = text,
|
value = text,
|
||||||
@@ -166,10 +166,10 @@ fun EditWordDialog(
|
|||||||
TextButton(
|
TextButton(
|
||||||
onClick = { onSave(text) },
|
onClick = { onSave(text) },
|
||||||
enabled = text.isNotBlank()
|
enabled = text.isNotBlank()
|
||||||
) { Text("Speichern") }
|
) { Text(stringResource(R.string.action_save)) }
|
||||||
},
|
},
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
TextButton(onClick = onDismiss) { Text("Abbrechen") }
|
TextButton(onClick = onDismiss) { Text(stringResource(R.string.action_cancel)) }
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,19 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<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="hint_add_word">Add word</string>
|
||||||
<string name="msg_no_words_yet">No words yet.</string>
|
<string name="msg_no_words_yet">No words yet.</string>
|
||||||
<string name="msg_no_words">No words</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_settings">Settings</string>
|
||||||
<string name="title_words">Words</string>
|
<string name="title_words">Words</string>
|
||||||
<string name="title_home">Home</string>
|
<string name="title_home">Home</string>
|
||||||
</resources>
|
|
||||||
|
<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>
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<color name="splash_background">#121212</color>
|
||||||
|
</resources>
|
||||||
@@ -7,4 +7,5 @@
|
|||||||
<color name="teal_700">#FF018786</color>
|
<color name="teal_700">#FF018786</color>
|
||||||
<color name="black">#FF000000</color>
|
<color name="black">#FF000000</color>
|
||||||
<color name="white">#FFFFFFFF</color>
|
<color name="white">#FFFFFFFF</color>
|
||||||
|
<color name="splash_background">#FFFFFF</color>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -9,4 +9,14 @@
|
|||||||
<string name="title_settings">Einstellungen</string>
|
<string name="title_settings">Einstellungen</string>
|
||||||
<string name="title_words">Wörter</string>
|
<string name="title_words">Wörter</string>
|
||||||
<string name="title_home">Start</string>
|
<string name="title_home">Start</string>
|
||||||
</resources>
|
|
||||||
|
<!-- 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>
|
||||||
@@ -1,5 +1,9 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="Theme.WeekFocus" parent="android:Theme.Material.Light.NoActionBar" />
|
<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">@drawable/ic_launcher_foreground</item>
|
||||||
|
<item name="postSplashScreenTheme">@style/Theme.WeekFocus</item>
|
||||||
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
Reference in new issue
Block a user