исправление отставания от лидера и обнуления счетчика шагов по понедельникам

Author: Sutemi67

app/build.gradle.kts

@@ -21,8 +21,10 @@ android {
         applicationId = "apc.appcradle.kotlinjc_friendsactivity_app"
         minSdk = 24
         targetSdk = 36
-        versionCode = 3
-        versionName = "1.0.2"
+
+        //изменение от 6 октября 2025
+        versionCode = 4
+        versionName = "1.0.3"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/SensorsManager.kt

@@ -99,6 +99,9 @@ class SensorsManager(
 
     fun trancate() {
         statsRepository.trancate()
+        currentSteps = 0
+        stepsWithoutChecking = 0
+        isFirstStart = true
         loadSteps()
     }
 
@@ -107,6 +110,7 @@ class SensorsManager(
         _allSteps.value = loadedSteps.allSteps
         _weeklySteps.value = loadedSteps.weeklySteps
         stepsInitialWeekly = loadedSteps.weeklySteps
+        currentSteps = loadedSteps.weeklySteps
     }
 
     override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) {}

app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/StatsRepository.kt

@@ -28,16 +28,16 @@ class StatsRepository(
 
     private fun percentageMax() {
         _syncStatus.update { true }
-        var maxSteps = 0
-        playersList.forEach { it ->
-            if (it.weeklySteps > maxSteps) maxSteps = it.weeklySteps
+        val maxSteps = playersList.maxOfOrNull { it.weeklySteps } ?: 0
+        playersList.forEach { player ->
+            player.percentage = if (maxSteps > 0) {
+                player.weeklySteps.toFloat() / maxSteps
+            } else 0f
         }
-        playersList.forEach { it ->
-            it.percentage = it.weeklySteps.toFloat() / maxSteps
-        }
-        playersList.sortByDescending { it.percentage }
+        // Sort by absolute weekly steps to ensure correct leader ordering
+        playersList.sortByDescending { it.weeklySteps }
         _syncStatus.update { false }
-        Log.d("dataTransfer", "StatsRepo sorted list $")
+        Log.d("dataTransfer", "StatsRepo sorted list")
     }
 
     suspend fun syncData(login: String, steps: Int, weeklySteps: Int): PlayersListSyncData {
@@ -83,23 +83,20 @@ class StatsRepository(
         var stepsSum = 0
         if (playersList.isNotEmpty()) {
             playersList.forEach { player ->
-                stepsSum += player.steps
+                stepsSum += player.weeklySteps
             }
         }
-        Log.e("dataTransfer", "summ of steps is $stepsSum")
+        Log.e("dataTransfer", "sum of weekly steps is $stepsSum")
         return stepsSum * USER_STEP_DEFAULT / 1000
     }
 
     private fun calcLeaderDiff(login: String?): Double {
-        var diff = 0.0
-
-        if (playersList.isNotEmpty()) {
-            val leader = playersList.first()
-            val player = playersList.first { it.login == login }
-            diff = (leader.weeklySteps - player.weeklySteps) * USER_STEP_DEFAULT / 1000
-            Log.e("difference", "$leader\n$player\n$diff")
-        }
-        return diff
+        if (playersList.isEmpty() || login.isNullOrBlank()) return 0.0
+        val leader = playersList.maxByOrNull { it.weeklySteps } ?: return 0.0
+        val player = playersList.firstOrNull { it.login == login } ?: return 0.0
+        val diffKm = (leader.weeklySteps - player.weeklySteps) * USER_STEP_DEFAULT / 1000
+        Log.e("difference", "$leader\n$player\n$diffKm")
+        return diffKm
     }
 
     init {