Skip to content

Commit 1e25ae3

Browse files
Sutemi67Sutemi67
authored
Merge pull request #5 from Sutemi67/develop
Develop
2 parents da3a55f + 8d2a213 commit 1e25ae3

27 files changed

Lines changed: 360 additions & 225 deletions

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/markdown.xml‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ android {
2222
minSdk = 24
2323
targetSdk = 36
2424

25-
//изменение от 10 октября 2025
26-
versionCode = 5
27-
versionName = "1.0.4"
25+
// изменение от 08 декабря 2025
26+
versionCode = 6
27+
versionName = "1.0.5"
2828

2929
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3030
}
@@ -90,7 +90,7 @@ dependencies {
9090
implementation(libs.ktor.serialization.kotlinx.json)
9191
implementation(libs.ktor.client.auth)
9292
// Security
93-
implementation(libs.androidx.security.crypto)
93+
// implementation(libs.androidx.security.crypto)
9494
//Gson
9595
implementation(libs.gson)
9696
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:theme="@style/Theme.KotlinJC_FriendsActivity_app">
2323

2424
<service
25-
android:name=".domain.StepCounterService"
25+
android:name=".services.StepCounterService"
2626
android:enabled="true"
2727
android:exported="false"
2828
android:foregroundServiceType="dataSync" />

‎app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/MainViewModel.kt‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package apc.appcradle.kotlinjc_friendsactivity_app
22

3+
import android.app.ActivityManager
34
import android.content.Context
45
import android.content.Intent
56
import android.util.Log
@@ -9,16 +10,16 @@ import androidx.lifecycle.viewModelScope
910
import androidx.work.WorkManager
1011
import apc.appcradle.kotlinjc_friendsactivity_app.data.StatsRepository
1112
import apc.appcradle.kotlinjc_friendsactivity_app.data.TokenRepositoryImpl
12-
import apc.appcradle.kotlinjc_friendsactivity_app.data.WORKER_TAG
13-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.NetworkClient
13+
import apc.appcradle.kotlinjc_friendsactivity_app.services.WORKER_TAG
14+
import apc.appcradle.kotlinjc_friendsactivity_app.data.NetworkClient
1415
import apc.appcradle.kotlinjc_friendsactivity_app.domain.SettingsRepository
15-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.SharedPreferencesData
16+
import apc.appcradle.kotlinjc_friendsactivity_app.data.SharedPreferencesData
1617
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.AppState
1718
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.AppThemes
1819
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.DataTransferState
1920
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.PlayersListSyncData
20-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.PermissionManager
21-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.StepCounterService
21+
import apc.appcradle.kotlinjc_friendsactivity_app.services.PermissionManager
22+
import apc.appcradle.kotlinjc_friendsactivity_app.services.StepCounterService
2223
import kotlinx.coroutines.Dispatchers
2324
import kotlinx.coroutines.flow.MutableStateFlow
2425
import kotlinx.coroutines.flow.StateFlow
@@ -95,11 +96,28 @@ class MainViewModel(
9596

9697
private fun isServiceRunning(context: Context, serviceClass: Class<*>): Boolean {
9798
val manager =
98-
context.getSystemService(Context.ACTIVITY_SERVICE) as android.app.ActivityManager
99+
context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
99100
return manager.getRunningServices(Integer.MAX_VALUE)
100101
.any { it.service.className == serviceClass.name }
101102
}
102103

104+
// fun triggerServiceRestartCheck() {
105+
// viewModelScope.launch {
106+
// try {
107+
// // Cancel any existing restart requests to avoid duplicates
108+
// workManager.cancelAllWorkByTag(SERVICE_RESTART_TAG)
109+
//
110+
// // Schedule a new restart check
111+
// val restartRequest = createServiceRestartRequest(delayMillis = 5_000L) // 5 seconds delay
112+
// workManager.enqueue(restartRequest)
113+
//
114+
// Log.i("service", "Manual service restart check triggered")
115+
// } catch (e: Exception) {
116+
// Log.e("service", "Failed to trigger service restart check: ${e.message}")
117+
// }
118+
// }
119+
// }
120+
103121
//endregion
104122

105123
//region Authentification

app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/domain/model/Distances.kt renamed to app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/Distances.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package apc.appcradle.kotlinjc_friendsactivity_app.domain.model
1+
package apc.appcradle.kotlinjc_friendsactivity_app.data
22

33
import apc.appcradle.kotlinjc_friendsactivity_app.R
44

app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/domain/NetworkClient.kt renamed to app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/NetworkClient.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package apc.appcradle.kotlinjc_friendsactivity_app.domain
1+
package apc.appcradle.kotlinjc_friendsactivity_app.data
22

3-
import apc.appcradle.kotlinjc_friendsactivity_app.data.TokenRepositoryImpl
43
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.DataTransferState
54
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.requests.LoginChangeRequest
65
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.requests.LoginRequest

‎app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/SettingsRepositoryImpl.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.content.SharedPreferences
44
import android.util.Log
55
import androidx.core.content.edit
66
import apc.appcradle.kotlinjc_friendsactivity_app.domain.SettingsRepository
7-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.SharedPreferencesData
87
import com.google.gson.Gson
98

109
class SettingsRepositoryImpl(
@@ -28,8 +27,7 @@ class SettingsRepositoryImpl(
2827
return if (json != null) {
2928
Log.i("theme", "loaded:\n$json")
3029
gson.fromJson(json, SharedPreferencesData::class.java)
31-
}
32-
else
30+
} else
3331
SharedPreferencesData()
3432
}
3533

app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/domain/model/SharedPreferencesData.kt renamed to app/src/main/java/apc/appcradle/kotlinjc_friendsactivity_app/data/SharedPreferencesData.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
package apc.appcradle.kotlinjc_friendsactivity_app.domain.model
1+
package apc.appcradle.kotlinjc_friendsactivity_app.data
2+
3+
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.AppThemes
24

35
data class SharedPreferencesData(
46
val savedTheme: AppThemes = AppThemes.System,
57
val savedUserStep: Double = 0.65,
68
val savedScale: Float = 1.0f,
79
val savedIsServiceEnabled: Boolean = false
8-
)
10+
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.content.SharedPreferences
44
import android.util.Log
55
import androidx.core.content.edit
66
import androidx.work.WorkManager
7-
import apc.appcradle.kotlinjc_friendsactivity_app.domain.NetworkClient
87
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.PlayerActivityData
98
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.PlayersListSyncData
109
import apc.appcradle.kotlinjc_friendsactivity_app.domain.model.network.Steps
10+
import apc.appcradle.kotlinjc_friendsactivity_app.services.trancateStepsRequest
1111
import apc.appcradle.kotlinjc_friendsactivity_app.utils.USER_STEP_DEFAULT
1212
import apc.appcradle.kotlinjc_friendsactivity_app.utils.whenNextMonday
1313
import kotlinx.coroutines.flow.MutableStateFlow
@@ -49,7 +49,7 @@ class StatsRepository(
4949
weeklySteps = weeklySteps
5050
)
5151
val newPlayersList = mutableListOf<PlayerActivityData>()
52-
data.friendsList.forEach { it ->
52+
data.friendsList.forEach {
5353
newPlayersList.add(
5454
PlayerActivityData(
5555
login = it.login,

0 commit comments

Comments
 (0)