From 3e5d10d817042ce6eca2da9c53a5b92f43d14b86 Mon Sep 17 00:00:00 2001 From: Avior Date: Tue, 5 Jul 2022 18:04:29 +0200 Subject: [PATCH] misc: some changes --- README.md | 2 +- app/build.gradle | 49 +- .../java/com/dzeio/openhealth/MainActivity.kt | 39 +- .../dzeio/openhealth/extensions/GoogleFit.kt | 2 +- .../openhealth/services/StepCountService.kt | 2 + .../ui/extension/ExtensionFragment.kt | 1 + .../dzeio/openhealth/ui/home/HomeFragment.kt | 52 +- .../openhealth/ui/weight/AddWeightDialog.kt | 2 +- .../dzeio/openhealth/utils/NavigationUtils.kt | 12 - .../ic_baseline_directions_walk_24.xml | 6 + .../res/drawable/ic_baseline_height_24.xml | 5 + .../drawable/ic_baseline_square_foot_24.xml | 5 + app/src/main/res/drawable/ic_menu_camera.xml | 12 - app/src/main/res/drawable/ic_menu_gallery.xml | 9 - .../main/res/drawable/ic_menu_slideshow.xml | 9 - .../res/drawable/ic_outline_blender_24.xml | 6 + .../res/drawable/ic_outline_fastfood_24.xml | 5 + .../res/drawable/ic_outline_favorite_24.xml | 5 + app/src/main/res/drawable/shape_circle.xml | 5 + app/src/main/res/drawable/shape_rounded.xml | 5 - app/src/main/res/drawable/side_nav_bar.xml | 9 - .../main/res/drawable/vector_elipse_empty.xml | 12 - app/src/main/res/layout/activity_main.xml | 22 +- app/src/main/res/layout/fragment_about.xml | 10 + app/src/main/res/layout/fragment_activity.xml | 64 +- app/src/main/res/layout/fragment_browse.xml | 633 ++++++++++-------- app/src/main/res/menu/bottom_menu.xml | 8 +- app/src/main/res/menu/main.xml | 8 +- .../main/res/navigation/mobile_navigation.xml | 77 +-- build.gradle | 7 +- gradle.properties | 3 +- gradle/wrapper/gradle-wrapper.properties | 12 +- 32 files changed, 523 insertions(+), 575 deletions(-) delete mode 100644 app/src/main/java/com/dzeio/openhealth/utils/NavigationUtils.kt create mode 100644 app/src/main/res/drawable/ic_baseline_directions_walk_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_height_24.xml create mode 100644 app/src/main/res/drawable/ic_baseline_square_foot_24.xml delete mode 100644 app/src/main/res/drawable/ic_menu_camera.xml delete mode 100644 app/src/main/res/drawable/ic_menu_gallery.xml delete mode 100644 app/src/main/res/drawable/ic_menu_slideshow.xml create mode 100644 app/src/main/res/drawable/ic_outline_blender_24.xml create mode 100644 app/src/main/res/drawable/ic_outline_fastfood_24.xml create mode 100644 app/src/main/res/drawable/ic_outline_favorite_24.xml create mode 100644 app/src/main/res/drawable/shape_circle.xml delete mode 100644 app/src/main/res/drawable/shape_rounded.xml delete mode 100644 app/src/main/res/drawable/side_nav_bar.xml delete mode 100644 app/src/main/res/drawable/vector_elipse_empty.xml diff --git a/README.md b/README.md index 8abe0ce..2642012 100644 --- a/README.md +++ b/README.md @@ -51,4 +51,4 @@ TL::DR ## License -This project is licensed under the IT License. A copy of the license is available at [LICENSE.md](https://github.com/dzeiocom/OpenHealth/blob/master/LICENSE.md) +This project is licensed under the MIT License. A copy of the license is available at [LICENSE.md](https://github.com/dzeiocom/OpenHealth/blob/master/LICENSE.md) diff --git a/app/build.gradle b/app/build.gradle index 674b073..83ae9ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,12 +28,10 @@ android { keyAlias keystoreProperties["keyAlias"] storeFile file(keystoreProperties["storeFile"]) } - } - } - compileSdk 31 + compileSdk 33 defaultConfig { // App ID @@ -43,12 +41,11 @@ android { minSdk 21 // Android 12 - targetSdk 31 - - versionCode 1 + targetSdk 33 // Semantic Versioning versionName "1.0.0" + versionCode 1 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -62,6 +59,7 @@ android { buildTypes { release { + // Slimmer version minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release @@ -79,9 +77,9 @@ android { // Optimization Level renderscriptOptimLevel 0 } - } + // Compile using JAVA 8 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -91,31 +89,32 @@ android { jvmTarget = '1.8' } + // Enable View Binding and Data Binding buildFeatures { viewBinding true dataBinding true } - } dependencies { - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.0' + // Core dependencies + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'javax.inject:javax.inject:1' - implementation 'com.google.android.material:material:1.6.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0' + implementation 'com.google.android.material:material:1.7.0-alpha02' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0' // Settings - implementation "androidx.preference:preference-ktx:1.1.1" + implementation "androidx.preference:preference-ktx:1.2.0" // DataStore implementation "androidx.datastore:datastore:1.0.0" // Navigation - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.navigation:navigation-fragment-ktx:2.5.0' + implementation 'androidx.navigation:navigation-ui-ktx:2.5.0' // Services implementation 'androidx.work:work-runtime-ktx:2.7.1' @@ -133,20 +132,16 @@ dependencies { kapt "com.google.dagger:hilt-compiler:2.40.5" // Google Fit - implementation "com.google.android.gms:play-services-fitness:21.0.0" - implementation "com.google.android.gms:play-services-auth:20.0.0" + implementation "com.google.android.gms:play-services-fitness:21.1.0" + implementation "com.google.android.gms:play-services-auth:20.2.0" // Samsung Health implementation files('libs/samsung-health-data-1.5.0.aar') implementation "com.google.code.gson:gson:2.8.9" // ROOM - def room_version = "2.4.0" - - implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" - implementation "androidx.room:room-ktx:$room_version" - testImplementation "androidx.room:room-testing:$room_version" - - + implementation "androidx.room:room-runtime:2.4.2" + kapt "androidx.room:room-compiler:2.4.2" + implementation "androidx.room:room-ktx:2.4.2" + testImplementation "androidx.room:room-testing:2.4.2" } diff --git a/app/src/main/java/com/dzeio/openhealth/MainActivity.kt b/app/src/main/java/com/dzeio/openhealth/MainActivity.kt index 888d0aa..760a4c2 100644 --- a/app/src/main/java/com/dzeio/openhealth/MainActivity.kt +++ b/app/src/main/java/com/dzeio/openhealth/MainActivity.kt @@ -12,9 +12,7 @@ import android.view.Menu import android.view.MenuItem import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment -import androidx.navigation.ui.AppBarConfiguration -import androidx.navigation.ui.navigateUp -import androidx.navigation.ui.setupActionBarWithNavController +import androidx.navigation.ui.* import androidx.work.WorkManager import com.dzeio.openhealth.core.BaseActivity import com.dzeio.openhealth.databinding.ActivityMainBinding @@ -45,12 +43,17 @@ class MainActivity : BaseActivity() { appBarConfiguration = AppBarConfiguration( setOf( - R.id.nav_home + R.id.nav_home, + R.id.nav_browse, + R.id.nav_activity, + R.id.nav_extensions ) ) setupActionBarWithNavController(navController, appBarConfiguration) + binding.bottomNav.setupWithNavController(navController) + // binding.bottomNav.setOnItemSelectedListener { // val currentFragment = supportFragmentManager.fragments.last() // // currentFragment.javaClass.canonicalName @@ -69,6 +72,7 @@ class MainActivity : BaseActivity() { } override fun onCreateOptionsMenu(menu: Menu): Boolean { + super.onCreateOptionsMenu(menu) menuInflater.inflate(R.menu.main, menu) return true } @@ -76,6 +80,9 @@ class MainActivity : BaseActivity() { override fun onSupportNavigateUp(): Boolean = navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp() + override fun onOptionsItemSelected(item: MenuItem): Boolean = + NavigationUI.onNavDestinationSelected(item, navController) || super.onOptionsItemSelected(item) + override fun onRequestPermissionsResult( requestCode: Int, permissions: Array, @@ -88,6 +95,7 @@ class MainActivity : BaseActivity() { } } + @Deprecated("Deprecated in Java") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) Log.d("MainActivity", "onActivityResult $requestCode $resultCode") @@ -118,27 +126,4 @@ class MainActivity : BaseActivity() { } } - override fun onOptionsItemSelected(item: MenuItem): Boolean { - return when (item.itemId) { - R.id.action_settings -> { - navController.navigate( - HomeFragmentDirections.actionNavHomeToNavSettings() - ) - true - } - R.id.action_extensions -> { - navController.navigate( - HomeFragmentDirections.actionNavHomeToNavExtensions() - ) - true - } - R.id.action_about -> { - navController.navigate( - HomeFragmentDirections.actionNavHomeToAboutFragment() - ) - true - } - else -> super.onOptionsItemSelected(item) - } - } } diff --git a/app/src/main/java/com/dzeio/openhealth/extensions/GoogleFit.kt b/app/src/main/java/com/dzeio/openhealth/extensions/GoogleFit.kt index e8aeae8..3df4c13 100644 --- a/app/src/main/java/com/dzeio/openhealth/extensions/GoogleFit.kt +++ b/app/src/main/java/com/dzeio/openhealth/extensions/GoogleFit.kt @@ -171,7 +171,7 @@ class GoogleFit() : Extension() { for (dataSet in response.dataSets) { Log.i( TAG, - "Data returned for Data type: ${dataSet.dataType.name} ${dataSet.dataPoints.size} ${dataSet.dataSource.toDebugString()}" + "Data returned for Data type: ${dataSet.dataType.name} ${dataSet.dataPoints.size} ${dataSet.dataSource}" ) dataSet.dataPoints.forEach { dp -> diff --git a/app/src/main/java/com/dzeio/openhealth/services/StepCountService.kt b/app/src/main/java/com/dzeio/openhealth/services/StepCountService.kt index 856d081..6c3c5a5 100644 --- a/app/src/main/java/com/dzeio/openhealth/services/StepCountService.kt +++ b/app/src/main/java/com/dzeio/openhealth/services/StepCountService.kt @@ -1,5 +1,6 @@ package com.dzeio.openhealth.services +import android.annotation.SuppressLint import android.app.job.JobParameters import android.app.job.JobService import android.content.Context @@ -9,6 +10,7 @@ import android.hardware.SensorEventListener import android.hardware.SensorManager import android.util.Log +@SuppressLint("SpecifyJobSchedulerIdRange") class StepCountService : JobService(), SensorEventListener { override fun onStartJob(params: JobParameters?): Boolean { Log.d("StepCountService", "Service Started") diff --git a/app/src/main/java/com/dzeio/openhealth/ui/extension/ExtensionFragment.kt b/app/src/main/java/com/dzeio/openhealth/ui/extension/ExtensionFragment.kt index 718f120..be363b9 100644 --- a/app/src/main/java/com/dzeio/openhealth/ui/extension/ExtensionFragment.kt +++ b/app/src/main/java/com/dzeio/openhealth/ui/extension/ExtensionFragment.kt @@ -29,6 +29,7 @@ class ExtensionFragment : val extension = ExtensionFactory.getExtension(args.extension) ?: throw Exception("No Extension found!") + requireActivity().actionBar?.title = extension.name extension.init(requireActivity()) diff --git a/app/src/main/java/com/dzeio/openhealth/ui/home/HomeFragment.kt b/app/src/main/java/com/dzeio/openhealth/ui/home/HomeFragment.kt index dc460c4..8f9df22 100644 --- a/app/src/main/java/com/dzeio/openhealth/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/dzeio/openhealth/ui/home/HomeFragment.kt @@ -26,6 +26,7 @@ import com.google.android.material.color.MaterialColors import dagger.hilt.android.AndroidEntryPoint import kotlin.math.min import kotlinx.coroutines.flow.collectLatest +import kotlin.math.max @AndroidEntryPoint class HomeFragment : BaseFragment(HomeViewModel::class.java) { @@ -126,19 +127,21 @@ class HomeFragment : BaseFragment(HomeViewMo viewModel.fetchWeights().collectLatest { updateGraph(it) } - updateWater(0, 1) + updateWater(0) } viewModel.water.observe(viewLifecycleOwner) { if (it != null) { - updateWater(0, it.value) + updateWater(it.value) } else { - updateWater(0, 1) + updateWater(0) } } } - private fun updateWater(oldValue: Int, newValue: Int) { + private var oldValue = 0f + + private fun updateWater(newValue: Int) { val waterUnit = UnitFactory.volume(settings.getString("water_unit", "milliliter") ?: "Milliliter") @@ -158,7 +161,6 @@ class HomeFragment : BaseFragment(HomeViewMo } val graph = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888) - Log.d("Test2", "$width $height") val canvas = Canvas(graph) val rect = RectF( @@ -194,27 +196,29 @@ class HomeFragment : BaseFragment(HomeViewMo 3f ) - ValueAnimator.ofInt( - min(oldValue, viewModel.dailyWaterIntake), + val animator = ValueAnimator.ofInt( + min(this.oldValue, viewModel.dailyWaterIntake.toFloat()).toInt(), min(newValue, viewModel.dailyWaterIntake) - ).apply { - duration = 300 - addUpdateListener { + ) + animator.duration = 300 // ms + animator.addUpdateListener { - DrawUtils.drawArc( - canvas, - 100 * it.animatedValue as Int / viewModel.dailyWaterIntake.toFloat(), - rect, - MaterialColors.getColor( - requireView(), - com.google.android.material.R.attr.colorPrimary - ), - 6f - ) - canvas.save() - binding.background.setImageBitmap(graph) - } - start() + this.oldValue = 100 * it.animatedValue as Int / viewModel.dailyWaterIntake.toFloat() + Log.d("Test2", "${this.oldValue}") + + DrawUtils.drawArc( + canvas, + max(this.oldValue, 1f), + rect, + MaterialColors.getColor( + requireView(), + com.google.android.material.R.attr.colorPrimary + ), + 6f + ) + canvas.save() + binding.background.setImageBitmap(graph) } + animator.start() } } diff --git a/app/src/main/java/com/dzeio/openhealth/ui/weight/AddWeightDialog.kt b/app/src/main/java/com/dzeio/openhealth/ui/weight/AddWeightDialog.kt index c010e5d..a2200dc 100644 --- a/app/src/main/java/com/dzeio/openhealth/ui/weight/AddWeightDialog.kt +++ b/app/src/main/java/com/dzeio/openhealth/ui/weight/AddWeightDialog.kt @@ -23,7 +23,7 @@ class AddWeightDialog : BaseDialog(HomeVi builder.apply { setTitle("Add your weight (kg)") setIcon(activity?.let { ContextCompat.getDrawable(it, R.drawable.ic_outline_timeline_24) }) - setPositiveButton("Validate") { dialog, _ -> + setPositiveButton("Validate") { _, _ -> save() } setNegativeButton("Cancel") { dialog, _ -> diff --git a/app/src/main/java/com/dzeio/openhealth/utils/NavigationUtils.kt b/app/src/main/java/com/dzeio/openhealth/utils/NavigationUtils.kt deleted file mode 100644 index f169eb2..0000000 --- a/app/src/main/java/com/dzeio/openhealth/utils/NavigationUtils.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.dzeio.openhealth.utils - -import androidx.fragment.app.Fragment - -object NavigationUtils { - - fun navigation(fragment: Fragment) { - - - - } -} diff --git a/app/src/main/res/drawable/ic_baseline_directions_walk_24.xml b/app/src/main/res/drawable/ic_baseline_directions_walk_24.xml new file mode 100644 index 0000000..bebc72e --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_directions_walk_24.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_height_24.xml b/app/src/main/res/drawable/ic_baseline_height_24.xml new file mode 100644 index 0000000..659c632 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_height_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_square_foot_24.xml b/app/src/main/res/drawable/ic_baseline_square_foot_24.xml new file mode 100644 index 0000000..0bf33c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_square_foot_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_menu_camera.xml b/app/src/main/res/drawable/ic_menu_camera.xml deleted file mode 100644 index 634fe92..0000000 --- a/app/src/main/res/drawable/ic_menu_camera.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_menu_gallery.xml b/app/src/main/res/drawable/ic_menu_gallery.xml deleted file mode 100644 index 03c7709..0000000 --- a/app/src/main/res/drawable/ic_menu_gallery.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_menu_slideshow.xml b/app/src/main/res/drawable/ic_menu_slideshow.xml deleted file mode 100644 index 5e9e163..0000000 --- a/app/src/main/res/drawable/ic_menu_slideshow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_outline_blender_24.xml b/app/src/main/res/drawable/ic_outline_blender_24.xml new file mode 100644 index 0000000..b483815 --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_blender_24.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_outline_fastfood_24.xml b/app/src/main/res/drawable/ic_outline_fastfood_24.xml new file mode 100644 index 0000000..5dbd33c --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_fastfood_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_outline_favorite_24.xml b/app/src/main/res/drawable/ic_outline_favorite_24.xml new file mode 100644 index 0000000..46fe959 --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_favorite_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/shape_circle.xml b/app/src/main/res/drawable/shape_circle.xml new file mode 100644 index 0000000..22d48ab --- /dev/null +++ b/app/src/main/res/drawable/shape_circle.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_rounded.xml b/app/src/main/res/drawable/shape_rounded.xml deleted file mode 100644 index 3e4a250..0000000 --- a/app/src/main/res/drawable/shape_rounded.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml deleted file mode 100644 index 6d81870..0000000 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/vector_elipse_empty.xml b/app/src/main/res/drawable/vector_elipse_empty.xml deleted file mode 100644 index 01e2efd..0000000 --- a/app/src/main/res/drawable/vector_elipse_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 68f3ed0..a6ac584 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,17 +1,19 @@ - + android:layout_height="match_parent"> @@ -55,13 +56,20 @@ + + diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 327d53f..b3a3bdc 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/tagline" + android:paddingBottom="16dp" android:textAlignment="center" /> - - - - - - - - - - - - - - - - - - - - - - - - - + /> diff --git a/app/src/main/res/layout/fragment_browse.xml b/app/src/main/res/layout/fragment_browse.xml index c3489ca..4e81a1b 100644 --- a/app/src/main/res/layout/fragment_browse.xml +++ b/app/src/main/res/layout/fragment_browse.xml @@ -1,308 +1,355 @@ - - + android:orientation="vertical" + android:layout_margin="16dp"> + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml index 0b67177..788f5aa 100644 --- a/app/src/main/res/menu/bottom_menu.xml +++ b/app/src/main/res/menu/bottom_menu.xml @@ -3,21 +3,21 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 78653f5..bc3c19c 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -10,15 +10,11 @@ app:showAsAction="ifRoom" /> - diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index a308ccb..ee80a64 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -3,13 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/mobile_navigation" + android:label="@string/app_name" app:startDestination="@+id/nav_home"> + tools:layout="@layout/fragment_home"> - - - - - + android:label="@string/menu_extensions" + tools:layout="@layout/fragment_extensions"> @@ -66,7 +44,7 @@ android:id="@+id/nav_list_weight" android:name="com.dzeio.openhealth.ui.weight.ListWeightFragment" android:label="@string/weight" - tools:layout="@layout/fragment_list_weight" > + tools:layout="@layout/fragment_list_weight"> + app:popExitAnim="@android:anim/slide_out_right" /> + app:popExitAnim="@android:anim/slide_out_right" + tools:layout="@layout/dialog_water_size_selector"> + app:popExitAnim="@android:anim/slide_out_right" + tools:layout="@layout/dialog_water_size_selector"> + app:popExitAnim="@android:anim/slide_out_right" + tools:layout="@layout/dialog_water_edit_water"> + app:popExitAnim="@android:anim/slide_out_right" + tools:layout="@layout/fragment_extension"> + android:label="@string/about" + tools:layout="@layout/fragment_about" /> + android:label="@string/menu_browse" + tools:layout="@layout/fragment_browse"> + + + diff --git a/build.gradle b/build.gradle index 820862a..f373b5c 100644 --- a/build.gradle +++ b/build.gradle @@ -3,15 +3,14 @@ buildscript { dependencies { classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40.5' - // Safe Navigation - classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" + classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2' } } plugins { - id 'com.android.application' version '7.1.0-rc01' apply false - id 'com.android.library' version '7.1.0-rc01' apply false + id 'com.android.application' version '7.2.1' apply false + id 'com.android.library' version '7.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.6.10' apply false } diff --git a/gradle.properties b/gradle.properties index e1c4e18..da302c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,4 +22,5 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=false +org.gradle.unsafe.configuration-cache=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ed8f76f..aba1826 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 09 22:53:42 CET 2021 -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME +#Thu Jun 30 12:02:06 CEST 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME