Merge pull request #55 from raheemadamboev/1.2.6

raheemadamboev · web-flow · commit 65f14758f5bb · 2025-06-06T22:33:15.000+05:00
1.2.6
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/deploymentTargetSelector.xml
+/.idea/appInsightsSettings.xml
 .DS_Store
 /build
 /captures
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = "xyz.teamgravity.todo"
         minSdk = libs.versions.sdk.min.get().toInt()
         targetSdk = libs.versions.sdk.target.get().toInt()
-        versionCode = 16
-        versionName = "1.2.5"
+        versionCode = 17
+        versionName = "1.2.6"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/component/topbar/TopBarMoreMenu.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/component/topbar/TopBarMoreMenu.kt
@@ -66,7 +66,7 @@ fun TopBarMoreMenu(
             label = R.string.delete_all_tasks,
             enabled = deleteAllEnabled
         )
-        if (BuildUtil.atLeastTiramisu()) {
+        if (BuildUtil.atLeast33()) {
             GDropdownMenuItem(
                 onDismiss = onDismiss,
                 onClick = onLanguageClick,
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/about/AboutLandscapeScreen.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/about/AboutLandscapeScreen.kt
@@ -1,7 +1,6 @@
 package xyz.teamgravity.todo.presentation.screen.about
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -22,15 +21,12 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import xyz.teamgravity.coresdkandroid.connect.ConnectUtil
 import xyz.teamgravity.coresdkcompose.button.IconButtonPlain
 import xyz.teamgravity.coresdkcompose.text.TextPlain
 import xyz.teamgravity.todo.BuildConfig
@@ -41,8 +37,6 @@ import xyz.teamgravity.todo.presentation.component.topbar.TopBar
 fun AboutLandscapeScreen(
     onBackButtonClick: () -> Unit
 ) {
-    val context = LocalContext.current
-
     Scaffold(
         topBar = {
             TopBar(
@@ -95,10 +89,7 @@ fun AboutLandscapeScreen(
                 Column(
                     horizontalAlignment = Alignment.CenterHorizontally,
                     verticalArrangement = Arrangement.spacedBy(5.dp),
-                    modifier = Modifier
-                        .clip(MaterialTheme.shapes.extraLarge)
-                        .clickable { ConnectUtil.viewGravityPlayStorePage(context) }
-                        .padding(horizontal = 10.dp, vertical = 5.dp)
+                    modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp)
                 ) {
                     Image(
                         painter = painterResource(id = R.drawable.gravity),
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/about/AboutPortraitScreen.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/about/AboutPortraitScreen.kt
@@ -1,7 +1,6 @@
 package xyz.teamgravity.todo.presentation.screen.about
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -21,16 +20,13 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import xyz.teamgravity.coresdkandroid.connect.ConnectUtil
 import xyz.teamgravity.coresdkcompose.button.IconButtonPlain
 import xyz.teamgravity.coresdkcompose.text.TextPlain
 import xyz.teamgravity.todo.BuildConfig
@@ -41,8 +37,6 @@ import xyz.teamgravity.todo.presentation.component.topbar.TopBar
 fun AboutPortraitScreen(
     onBackButtonClick: () -> Unit
 ) {
-    val context = LocalContext.current
-
     Scaffold(
         topBar = {
             TopBar(
@@ -103,10 +97,7 @@ fun AboutPortraitScreen(
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.spacedBy(5.dp),
-                modifier = Modifier
-                    .clip(MaterialTheme.shapes.extraLarge)
-                    .clickable { ConnectUtil.viewGravityPlayStorePage(context) }
-                    .padding(horizontal = 10.dp, vertical = 5.dp)
+                modifier = Modifier.padding(horizontal = 10.dp, vertical = 5.dp)
             ) {
                 Image(
                     painter = painterResource(id = R.drawable.gravity),
diff --git a/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListScreen.kt b/app/src/main/java/xyz/teamgravity/todo/presentation/screen/todo/list/TodoListScreen.kt
@@ -146,7 +146,7 @@ fun TodoListScreen(
                         deleteAllEnabled = deleteAllEnabled,
                         onDeleteAllClick = viewmodel::onDeleteAllShow,
                         onLanguageClick = {
-                            if (BuildUtil.atLeastTiramisu()) context.navigateAppLocaleSettings()
+                            if (BuildUtil.atLeast33()) context.navigateAppLocaleSettings()
                         },
                         onSupportClick = {
                             navigator.navigate(SupportScreenDestination)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,28 +1,28 @@
 [versions]
 
-compose = "2025.05.01"
+compose = "2025.06.00"
 compose-activity = "1.10.1"
-compose-lifecycle = "2.9.0"
-compose-viewmodel = "2.9.0"
+compose-lifecycle = "2.9.1"
+compose-viewmodel = "2.9.1"
 compose-hilt = "1.2.0"
 compose-paging = "3.3.6"
 core = "1.16.0"
 splash = "1.0.1"
 collections = "0.4.0"
-firebase = "33.14.0"
+firebase = "33.15.0"
 hilt = "2.56.2"
 coroutines = "1.10.2"
 room = "2.7.1"
 destinations = "2.2.0"
 timber = "5.0.1"
-gravity-core = "1.0.19"
-gravity-core-compose = "1.0.20"
+gravity-core = "1.0.24"
+gravity-core-compose = "1.0.22"
 
 android = "8.10.1"
 kotlin = "2.1.21"
 ksp = "2.1.21-2.0.1"
 gms = "4.4.2"
-crashlytics = "3.0.3"
+crashlytics = "3.0.4"
 
 sdk-min = "26"
 sdk-compile = "35"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 30 00:34:02 UZT 2025
+#Fri Jun 06 22:25:53 UZT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ fun TopBarMoreMenu(`
`66`	`66`	`label = R.string.delete_all_tasks,`
`67`	`67`	`enabled = deleteAllEnabled`
`68`	`68`	`)`
`69`		`- if (BuildUtil.atLeastTiramisu()) {`
	`69`	`+ if (BuildUtil.atLeast33()) {`
`70`	`70`	`GDropdownMenuItem(`
`71`	`71`	`onDismiss = onDismiss,`
`72`	`72`	`onClick = onLanguageClick,`