Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the graph zooming issue #88

Merged
merged 1 commit into from
Jul 28, 2024
Merged

fix the graph zooming issue #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions android/FucksGiven/.gitignore
View file
Open in desktop

This file was deleted.

185 changes: 0 additions & 185 deletions android/FucksGiven/gradlew
View file
Open in desktop

This file was deleted.

89 changes: 0 additions & 89 deletions android/FucksGiven/gradlew.bat
View file
Open in desktop

This file was deleted.

Binary file removed android/app-release.aab
View file
Open in desktop
Binary file not shown.
0 android/FucksGiven/app/.gitignore → android/app/.gitignore
View file
Open in desktop
File renamed without changes.
0 android/FucksGiven/app/build.gradle.kts → android/app/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 android/FucksGiven/app/lint.xml → android/app/lint.xml
View file
Open in desktop
File renamed without changes.
0 android/FucksGiven/app/proguard-rules.pro → android/app/proguard-rules.pro
View file
Open in desktop
File renamed without changes.
0 ...id/FucksGiven/app/release/app-release.aab → android/app/release/app-release.aab
View file
Open in desktop
File renamed without changes.
0 ...nal/fucksgiven/ExampleInstrumentedTest.kt → ...nal/fucksgiven/ExampleInstrumentedTest.kt
View file
Open in desktop
File renamed without changes.
0 ...cksGiven/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml
View file
Open in desktop
File renamed without changes.
0 ...en/app/src/main/ic_launcher-playstore.png → ...id/app/src/main/ic_launcher-playstore.png
View file
Open in desktop
File renamed without changes
0 ...urnal/fucksgiven/FucksGivenApplication.kt → ...urnal/fucksgiven/FucksGivenApplication.kt
View file
Open in desktop
File renamed without changes.
18 changes: 10 additions & 8 deletions ...ks/poopjournal/fucksgiven/MainActivity.kt → ...ks/poopjournal/fucksgiven/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
0 ...journal/fucksgiven/data/DatabaseBackup.kt → ...journal/fucksgiven/data/DatabaseBackup.kt
View file
Open in desktop
File renamed without changes.
0 ...ks/poopjournal/fucksgiven/data/FuckDao.kt → ...ks/poopjournal/fucksgiven/data/FuckDao.kt
View file
Open in desktop
File renamed without changes.
0 ...s/poopjournal/fucksgiven/data/FuckData.kt → ...s/poopjournal/fucksgiven/data/FuckData.kt
View file
Open in desktop
File renamed without changes.
0 ...opjournal/fucksgiven/data/FuckDatabase.kt → ...opjournal/fucksgiven/data/FuckDatabase.kt
View file
Open in desktop
File renamed without changes.
0 ...journal/fucksgiven/data/FuckRepository.kt → ...journal/fucksgiven/data/FuckRepository.kt
View file
Open in desktop
File renamed without changes.
0 ...al/fucksgiven/data/ThemeRepositoryImpl.kt → ...al/fucksgiven/data/ThemeRepositoryImpl.kt
View file
Open in desktop
File renamed without changes.
0 ...ks/poopjournal/fucksgiven/di/AppModule.kt → ...ks/poopjournal/fucksgiven/di/AppModule.kt
View file
Open in desktop
File renamed without changes.
0 ...oopjournal/fucksgiven/di/SettingModule.kt → ...oopjournal/fucksgiven/di/SettingModule.kt
View file
Open in desktop
File renamed without changes.
0 ...given/presentation/component/BottomBar.kt → ...given/presentation/component/BottomBar.kt
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion ...ucksgiven/presentation/component/Chart.kt → ...ucksgiven/presentation/component/Chart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ fun LineChartComposable(
setCircleColor(FuckGreen.toArgb())
setDrawValues(false)
setPinchZoom(false)
setScaleMinima(2f, 2f)

}

val lineData = LineData(dataSet)
Expand All @@ -88,6 +90,7 @@ fun LineChartComposable(
xAxis.typeface = tf



axisRight.valueFormatter = object : ValueFormatter() {
override fun getFormattedValue(value: Float): String {
return value.toInt().toString()
Expand Down Expand Up @@ -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
}
)
Expand Down
0 ...resentation/component/Horizontal Pager.kt → ...resentation/component/Horizontal Pager.kt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...esentation/component/ThemeChangeDialog.kt → ...esentation/component/ThemeChangeDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
}
0 ...given/presentation/component/TopAppBar.kt → ...given/presentation/component/TopAppBar.kt
View file
Open in desktop
File renamed without changes.
0 ...iven/presentation/navigation/AppRoutes.kt → ...iven/presentation/navigation/AppRoutes.kt
View file
Open in desktop
File renamed without changes.
0 ...given/presentation/navigation/NavGraph.kt → ...given/presentation/navigation/NavGraph.kt
View file
Open in desktop
File renamed without changes.
Loading
Loading