Merge pull request #88 from mubeen1519/work

fix the graph zooming issue
Crazy-Marvin · Jul 28, 2024 · 9135afc · 9135afc
2 parents eaf4085 + db1f9a4
commit 9135afc
Show file tree

Hide file tree

Showing 131 changed files with 24 additions and 346 deletions.
diff --git a/android/FucksGiven/.gitignore b/android/FucksGiven/.gitignore
diff --git a/android/FucksGiven/gradlew b/android/FucksGiven/gradlew
diff --git a/android/FucksGiven/gradlew.bat b/android/FucksGiven/gradlew.bat
diff --git a/android/app-release.aab b/android/app-release.aab
diff --git a/android/FucksGiven/app/.gitignore → android/app/.gitignore b/android/FucksGiven/app/.gitignore → android/app/.gitignore
diff --git a/android/FucksGiven/app/build.gradle.kts → android/app/build.gradle.kts b/android/FucksGiven/app/build.gradle.kts → android/app/build.gradle.kts
diff --git a/android/FucksGiven/app/lint.xml → android/app/lint.xml b/android/FucksGiven/app/lint.xml → android/app/lint.xml
diff --git a/android/FucksGiven/app/proguard-rules.pro → android/app/proguard-rules.pro b/android/FucksGiven/app/proguard-rules.pro → android/app/proguard-rules.pro
diff --git a/...id/FucksGiven/app/release/app-release.aab → android/app/release/app-release.aab b/...id/FucksGiven/app/release/app-release.aab → android/app/release/app-release.aab
diff --git a/...nal/fucksgiven/ExampleInstrumentedTest.kt → ...nal/fucksgiven/ExampleInstrumentedTest.kt b/...nal/fucksgiven/ExampleInstrumentedTest.kt → ...nal/fucksgiven/ExampleInstrumentedTest.kt
diff --git a/...cksGiven/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml b/...cksGiven/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml
diff --git a/...en/app/src/main/ic_launcher-playstore.png → ...id/app/src/main/ic_launcher-playstore.png b/...en/app/src/main/ic_launcher-playstore.png → ...id/app/src/main/ic_launcher-playstore.png
diff --git a/...urnal/fucksgiven/FucksGivenApplication.kt → ...urnal/fucksgiven/FucksGivenApplication.kt b/...urnal/fucksgiven/FucksGivenApplication.kt → ...urnal/fucksgiven/FucksGivenApplication.kt
diff --git a/...ks/poopjournal/fucksgiven/MainActivity.kt → ...ks/poopjournal/fucksgiven/MainActivity.kt b/...ks/poopjournal/fucksgiven/MainActivity.kt → ...ks/poopjournal/fucksgiven/MainActivity.kt
@@ -3,6 +3,7 @@ package rocks.poopjournal.fucksgiven
 import android.app.LocaleConfig
 import android.app.LocaleManager
 import android.os.Build
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.os.LocaleList
 import androidx.activity.ComponentActivity
@@ -29,15 +30,16 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
-            val localeManager = applicationContext
-                .getSystemService(LocaleManager::class.java)
-            localeManager.overrideLocaleConfig = LocaleConfig(
-                LocaleList.forLanguageTags("en-US,de,ur,fr")
-            )
-
-            val overrideLocaleConfig = localeManager.overrideLocaleConfig
-            val supportedLocales = overrideLocaleConfig?.supportedLocales
+            if (SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                val localeManager = applicationContext
+                    .getSystemService(LocaleManager::class.java)
+                localeManager.overrideLocaleConfig = LocaleConfig(
+                    LocaleList.forLanguageTags("en-US,de,ur,fr")
+                )
 
+                val overrideLocaleConfig = localeManager.overrideLocaleConfig
+                val supportedLocales = overrideLocaleConfig?.supportedLocales
+            }
             val theme = themeSetting.themeFlow.collectAsState()
             val useDarkColors = when (theme.value) {
                 AppTheme.LIGHT -> false

diff --git a/...journal/fucksgiven/data/DatabaseBackup.kt → ...journal/fucksgiven/data/DatabaseBackup.kt b/...journal/fucksgiven/data/DatabaseBackup.kt → ...journal/fucksgiven/data/DatabaseBackup.kt
diff --git a/...ks/poopjournal/fucksgiven/data/FuckDao.kt → ...ks/poopjournal/fucksgiven/data/FuckDao.kt b/...ks/poopjournal/fucksgiven/data/FuckDao.kt → ...ks/poopjournal/fucksgiven/data/FuckDao.kt
diff --git a/...s/poopjournal/fucksgiven/data/FuckData.kt → ...s/poopjournal/fucksgiven/data/FuckData.kt b/...s/poopjournal/fucksgiven/data/FuckData.kt → ...s/poopjournal/fucksgiven/data/FuckData.kt
diff --git a/...opjournal/fucksgiven/data/FuckDatabase.kt → ...opjournal/fucksgiven/data/FuckDatabase.kt b/...opjournal/fucksgiven/data/FuckDatabase.kt → ...opjournal/fucksgiven/data/FuckDatabase.kt
diff --git a/...journal/fucksgiven/data/FuckRepository.kt → ...journal/fucksgiven/data/FuckRepository.kt b/...journal/fucksgiven/data/FuckRepository.kt → ...journal/fucksgiven/data/FuckRepository.kt
diff --git a/...al/fucksgiven/data/ThemeRepositoryImpl.kt → ...al/fucksgiven/data/ThemeRepositoryImpl.kt b/...al/fucksgiven/data/ThemeRepositoryImpl.kt → ...al/fucksgiven/data/ThemeRepositoryImpl.kt
diff --git a/...ks/poopjournal/fucksgiven/di/AppModule.kt → ...ks/poopjournal/fucksgiven/di/AppModule.kt b/...ks/poopjournal/fucksgiven/di/AppModule.kt → ...ks/poopjournal/fucksgiven/di/AppModule.kt
diff --git a/...oopjournal/fucksgiven/di/SettingModule.kt → ...oopjournal/fucksgiven/di/SettingModule.kt b/...oopjournal/fucksgiven/di/SettingModule.kt → ...oopjournal/fucksgiven/di/SettingModule.kt
diff --git a/...given/presentation/component/BottomBar.kt → ...given/presentation/component/BottomBar.kt b/...given/presentation/component/BottomBar.kt → ...given/presentation/component/BottomBar.kt
diff --git a/...ucksgiven/presentation/component/Chart.kt → ...ucksgiven/presentation/component/Chart.kt b/...ucksgiven/presentation/component/Chart.kt → ...ucksgiven/presentation/component/Chart.kt
@@ -71,6 +71,8 @@ fun LineChartComposable(
                     setCircleColor(FuckGreen.toArgb())
                     setDrawValues(false)
                     setPinchZoom(false)
+                    setScaleMinima(2f, 2f)
+
                 }
 
                 val lineData = LineData(dataSet)
@@ -88,6 +90,7 @@ fun LineChartComposable(
                 xAxis.typeface = tf
 
 
+
                 axisRight.valueFormatter = object : ValueFormatter() {
                     override fun getFormattedValue(value: Float): String {
                         return value.toInt().toString()
@@ -142,7 +145,10 @@ fun LineChartComposable(
 //            chart.axisRight.axisMaximum = 10f
             chart.axisRight.isGranularityEnabled = true
             chart.notifyDataSetChanged()
-
+            chart.fitScreen()
+            chart.viewPortHandler.setMaximumScaleX(2f);
+            chart.viewPortHandler.setMaximumScaleY(2f);
+            chart.isDoubleTapToZoomEnabled = false
             chart.invalidate() // Refresh the chart
         }
     )

diff --git a/...resentation/component/Horizontal Pager.kt → ...resentation/component/Horizontal Pager.kt b/...resentation/component/Horizontal Pager.kt → ...resentation/component/Horizontal Pager.kt
diff --git a/...esentation/component/ThemeChangeDialog.kt → ...esentation/component/ThemeChangeDialog.kt b/...esentation/component/ThemeChangeDialog.kt → ...esentation/component/ThemeChangeDialog.kt
@@ -104,8 +104,8 @@ private fun RadioGroupItems(
         Spacer(modifier = modifier.width(5.dp))
         Text(
             text = items.name,
-            color = MaterialTheme.colorScheme.onSurface,
-            style = MaterialTheme.typography.bodySmall
+            color = MaterialTheme.colorScheme.onBackground,
+            style = MaterialTheme.typography.bodyLarge
         )
     }
 }
diff --git a/...given/presentation/component/TopAppBar.kt → ...given/presentation/component/TopAppBar.kt b/...given/presentation/component/TopAppBar.kt → ...given/presentation/component/TopAppBar.kt
diff --git a/...iven/presentation/navigation/AppRoutes.kt → ...iven/presentation/navigation/AppRoutes.kt b/...iven/presentation/navigation/AppRoutes.kt → ...iven/presentation/navigation/AppRoutes.kt
diff --git a/...given/presentation/navigation/NavGraph.kt → ...given/presentation/navigation/NavGraph.kt b/...given/presentation/navigation/NavGraph.kt → ...given/presentation/navigation/NavGraph.kt