Füge Unterstützung für TTR-Änderungen hinzu: Erweitere Benachrichtigungseinstellungen und implementiere Push-Benachrichtigungen für TTR-Wertänderungen.

2026-09-08 14:54:20 +02:00
parent 5ca4253b44
commit 9bc9501219
12 changed files with 117 additions and 22 deletions
--- a/android-app/app/src/main/java/de/harheimertc/data/ApiService.kt
+++ b/android-app/app/src/main/java/de/harheimertc/data/ApiService.kt
@@ -269,6 +269,7 @@ data class NotificationSettingsDto(
    val birthdays: Boolean = false,
    val newContactRequest: Boolean = false,
    val newUserRegistration: Boolean = false,
+    val ownTtrChanges: Boolean = false,
    val selectedTeamSlugs: List<String> = emptyList(),
    val selectedTeamSeason: String? = null,
    val notificationTime: String = "09:00",
@@ -302,6 +303,7 @@ data class QttrRowDto(
    val playerName: String = "",
    val clubName: String = "",
    val currentQttr: Int? = null,
+    val currentTtr: Int? = null,
    val previousQttr: Int? = null,
    val birthdate: String? = null,
 )
--- a/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt
+++ b/android-app/app/src/main/java/de/harheimertc/repositories/NotificationPreferencesRepository.kt
@@ -19,6 +19,7 @@ data class NotificationPreferences(
    val birthdays: Boolean = false,
    val newContactRequest: Boolean = false,
    val newUserRegistration: Boolean = false,
+    val ownTtrChanges: Boolean = false,
    val selectedTeamSlugs: Set<String> = emptySet(),
    val selectedTeamSeason: String? = null,
    val notificationTime: String = DEFAULT_NOTIFICATION_TIME,
@@ -43,6 +44,7 @@ class NotificationPreferencesRepository @Inject constructor(
        birthdays = preferences.getBoolean(KEY_BIRTHDAYS, false),
        newContactRequest = preferences.getBoolean(KEY_NEW_CONTACT_REQUEST, false),
        newUserRegistration = preferences.getBoolean(KEY_NEW_USER_REGISTRATION, false),
+        ownTtrChanges = preferences.getBoolean(KEY_OWN_TTR_CHANGES, false),
        selectedTeamSlugs = preferences.getStringSet(KEY_SELECTED_TEAM_SLUGS, emptySet()).orEmpty(),
        selectedTeamSeason = preferences.getString(KEY_SELECTED_TEAM_SEASON, null)?.takeIf { it.isNotBlank() },
        notificationTime = preferences.getString(KEY_NOTIFICATION_TIME, DEFAULT_NOTIFICATION_TIME) ?: DEFAULT_NOTIFICATION_TIME,
@@ -69,6 +71,7 @@ class NotificationPreferencesRepository @Inject constructor(
            .putBoolean(KEY_BIRTHDAYS, settings.birthdays)
            .putBoolean(KEY_NEW_CONTACT_REQUEST, settings.newContactRequest)
            .putBoolean(KEY_NEW_USER_REGISTRATION, settings.newUserRegistration)
+            .putBoolean(KEY_OWN_TTR_CHANGES, settings.ownTtrChanges)
            .putStringSet(KEY_SELECTED_TEAM_SLUGS, settings.selectedTeamSlugs)
            .putString(KEY_SELECTED_TEAM_SEASON, settings.selectedTeamSeason)
            .putString(KEY_NOTIFICATION_TIME, settings.notificationTime)
@@ -98,6 +101,7 @@ class NotificationPreferencesRepository @Inject constructor(
        const val KEY_BIRTHDAYS = "birthdays"
        const val KEY_NEW_CONTACT_REQUEST = "new_contact_request"
        const val KEY_NEW_USER_REGISTRATION = "new_user_registration"
+        const val KEY_OWN_TTR_CHANGES = "own_ttr_changes"
        const val KEY_SELECTED_TEAM_SLUGS = "selected_team_slugs"
        const val KEY_SELECTED_TEAM_SEASON = "selected_team_season"
        const val KEY_NOTIFICATION_TIME = "notification_time"
@@ -114,6 +118,7 @@ private fun NotificationSettingsDto.toPreferences(): NotificationPreferences = N
    birthdays = birthdays,
    newContactRequest = newContactRequest,
    newUserRegistration = newUserRegistration,
+    ownTtrChanges = ownTtrChanges,
    selectedTeamSlugs = selectedTeamSlugs.toSet(),
    selectedTeamSeason = selectedTeamSeason,
    notificationTime = notificationTime,
@@ -129,6 +134,7 @@ private fun NotificationPreferences.toDto(): NotificationSettingsDto = Notificat
    birthdays = birthdays,
    newContactRequest = newContactRequest,
    newUserRegistration = newUserRegistration,
+    ownTtrChanges = ownTtrChanges,
    selectedTeamSlugs = selectedTeamSlugs.toList(),
    selectedTeamSeason = selectedTeamSeason,
    notificationTime = notificationTime,
--- a/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt
+++ b/android-app/app/src/main/java/de/harheimertc/ui/components/AppNavigationHeader.kt
@@ -472,7 +472,7 @@ private fun submenu(section: MenuSection?, state: NavigationUiState): List<MenuT
    MenuSection.INTERN -> buildList {
        add(MenuTarget("Übersicht", Destinations.MemberArea.route))
        add(MenuTarget("Mitgliederliste", Destinations.Members.route))
-        add(MenuTarget("QTTR", Destinations.Qttr.route))
+        add(MenuTarget("TTR / QTTR", Destinations.Qttr.route))
        add(MenuTarget("News", Destinations.MemberNews.route))
        add(MenuTarget("Mein Profil", Destinations.Profile.route))
        add(MenuTarget("Benachrichtigungen", Destinations.NotificationSettings.route))
--- a/android-app/app/src/main/java/de/harheimertc/ui/screens/memberarea/MemberAreaDetailScreens.kt
+++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/memberarea/MemberAreaDetailScreens.kt
@@ -28,7 +28,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalUriHandler
 import android.util.Log
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -248,18 +247,7 @@ fun QttrScreen(
    viewModel: QttrViewModel = hiltViewModel(),
 ) {
    val state by viewModel.state.collectAsState()
-    val uriHandler = LocalUriHandler.current
-    val externalUrl = "https://www.mytischtennis.de/rankings/andro-rangliste?continent=all&country=Deutschland&all-players=on&as=DE.WE.R4.07&di=DE.WE.R4.07.04&area=DE.WE.R4.07.04.43&clubnr-search=Harheimer+TC&clubnr=43030&fednickname=HeTTV&gender=all&current-ranking=yes&ttr-range=100%3B3000&birth-range=1926%3B2021"
-
-    MemberAreaPage(navController, showBackNavigation, "QTTR-Werte", "Aus technischen Gründen sind nur die QTTR-Werte verfügbar.") {
-        item {
-            Surface(color = Primary100, shape = RoundedCornerShape(12.dp)) {
-                Column(Modifier.fillMaxWidth().padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                    Text("Für TTR bitte die myTischtennis-Rangliste verwenden.", color = Primary900)
-                    TextButton(onClick = { uriHandler.openUri(externalUrl) }) { Text("myTischtennis öffnen") }
-                }
-            }
-        }
+    MemberAreaPage(navController, showBackNavigation, "TTR- und QTTR-Werte", "Aktuelle Werte der Vereinsmitglieder aus myTischtennis.") {
        item {
            Surface(color = Color.White, shape = RoundedCornerShape(14.dp), shadowElevation = 3.dp) {
                Column(Modifier.fillMaxWidth().padding(18.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
@@ -269,9 +257,9 @@ fun QttrScreen(
            }
        }
        when {
-            state.loading -> item { LoadingState("QTTR-Werte werden geladen...") }
+            state.loading -> item { LoadingState("TTR- und QTTR-Werte werden geladen...") }
            state.error != null -> item { ErrorCard(state.error.orEmpty(), viewModel::load) }
-            state.rows.isEmpty() -> item { Text("Keine QTTR-Werte gefunden.", color = Accent700) }
+            state.rows.isEmpty() -> item { Text("Keine TTR- oder QTTR-Werte gefunden.", color = Accent700) }
            else -> items(state.rows.size) { index -> QttrRowCard(state.rows[index], isOwnRow(state.rows[index].playerName, state.currentUserName)) }
        }
    }
@@ -388,7 +376,10 @@ private fun QttrRowCard(row: QttrRowDto, highlighted: Boolean) {
                )
                Text(row.clubName.ifBlank { "Harheimer TC" }, color = qttrNameColor(row.gender, isMinor(row.birthdate)).copy(alpha = 0.88f))
            }
-            Text(row.currentQttr?.toString() ?: "-", color = Primary600, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
+            Column(horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(3.dp)) {
+                Text("TTR ${row.currentTtr?.toString() ?: "-"}", color = Accent700, style = MaterialTheme.typography.labelLarge)
+                Text("QTTR ${row.currentQttr?.toString() ?: "-"}", color = Primary600, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
+            }
        }
    }
 }
--- a/android-app/app/src/main/java/de/harheimertc/ui/screens/memberarea/MemberAreaScreen.kt
+++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/memberarea/MemberAreaScreen.kt
@@ -121,9 +121,9 @@ private fun MemberAreaCardGrid(navController: NavController) {
            onClick = { navController.navigate(Destinations.MemberNews.route) },
        )
        MemberAreaCard(
-            title = "QTTR",
-            description = "Aktuelle QTTR-Werte der Vereinsmitglieder",
-            marker = "Q",
+            title = "TTR / QTTR",
+            description = "Aktuelle TTR- und QTTR-Werte der Vereinsmitglieder",
+            marker = "T",
            onClick = { navController.navigate(Destinations.Qttr.route) },
        )
    }
--- a/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt
+++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/notifications/NotificationSettingsScreen.kt
@@ -162,6 +162,9 @@ fun NotificationSettingsScreen(
                    ToggleRow("Geburtstage", state.settings.birthdays) {
                        viewModel.update(state.settings.copy(birthdays = it))
                    }
+                    ToggleRow("Änderung meines TTR-Werts", state.settings.ownTtrChanges) {
+                        viewModel.update(state.settings.copy(ownTtrChanges = it))
+                    }
                }
            }

--- a/android-app/gradle.properties
+++ b/android-app/gradle.properties
@@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/
 PRODUCTION_API_BASE_URL=https://harheimertc.de/

 # Android app versioning for Play Store uploads
-ANDROID_VERSION_CODE=32
-ANDROID_VERSION_NAME=0.9.27
+ANDROID_VERSION_CODE=33
+ANDROID_VERSION_NAME=0.9.28

 # Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping.
 RELEASE_MINIFY_ENABLED=false