RC3

Author: vojta-horanek

.gitignore

@@ -4,9 +4,17 @@
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml
+/.idea/misc.xml
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/protocol/.idea/caches
+/protocol/.idea/libraries
+/protocol/.idea/modules.xml
+/protocol/.idea/misc.xml
+/protocol/.idea/workspace.xml
+/protocol/.idea/navEditor.xml
+/protocol/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
@@ -51,7 +59,6 @@ proguard/
 captures/
 
 # IntelliJ
-*.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
@@ -70,7 +77,6 @@ captures/
 #*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
 .cxx/
 
 # Google Services (e.g. APIs or Firebase)
@@ -98,3 +104,5 @@ lint/outputs/
 lint/tmp/
 # lint/reports/
 /app/schemas/eu.vojtechh.takeyourpill.database.PillDatabase/
+
+*.aux

.idea/codeStyles/codeStyleConfig.xml

@@ -14,8 +14,8 @@ android {
         applicationId "eu.vojtechh.takeyourpill"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 20210329
-        versionName "v1.5.rc2"
+        versionCode 20210413
+        versionName "v1.5.rc3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -60,7 +60,7 @@ kapt {
 }
 
 dependencies {
-    def nav_version = '2.3.4'
+    def nav_version = '2.3.5'
     def fragment_version = '1.3.2'
     def lifecycle_version = '2.3.1'
     def preference_version = "1.1.1"
@@ -70,7 +70,7 @@ dependencies {
 
     implementation "androidx.constraintlayout:constraintlayout:2.0.4"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.recyclerview:recyclerview:1.1.0"
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation "androidx.preference:preference-ktx:$preference_version"
     implementation "androidx.viewpager2:viewpager2:1.0.0"
 
@@ -87,9 +87,8 @@ dependencies {
     implementation "com.google.android.material:material:1.3.0"
 
     // Hilt
-    implementation 'com.google.dagger:hilt-android:2.33-beta'
-    kapt 'com.google.dagger:hilt-android-compiler:2.33-beta'
-    implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
+    implementation 'com.google.dagger:hilt-android:2.34-beta'
+    kapt 'com.google.dagger:hilt-android-compiler:2.34-beta'
     kapt 'androidx.hilt:hilt-compiler:1.0.0-beta01'
 
     // LifeCycle

app/build.gradle

@@ -61,9 +61,11 @@ class DetailsFragment : Fragment(R.layout.fragment_details) {
         if (pillId == -1L) pillId = args.pillId
 
         model.getPillById(pillId).observe(viewLifecycleOwner) { pill ->
-            model.pill = pill
-            initViews()
-            model.loadedData()
+            pill?.let {
+                model.pill = it
+                initViews()
+                model.loadedData()
+            }
         }
 
     }

app/src/main/java/eu/vojtechh/takeyourpill/fragment/DetailsFragment.kt

@@ -119,6 +119,9 @@ class HistoryViewDialog :
     private fun onItemOptionsClick(view: View, historyItem: BaseModel, position: Int) {
         if (historyItem is History) {
             popupMenu {
+                if (requireContext().isDarkThemeOn()) {
+                    style = R.style.Widget_MPM_Menu_Dark
+                }
                 section {
                     title = getString(R.string.edit)
                     if (historyItem.hasBeenConfirmed) {

app/src/main/java/eu/vojtechh/takeyourpill/fragment/dialog/HistoryViewDialog.kt

@@ -3,6 +3,8 @@ package eu.vojtechh.takeyourpill.klass
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.res.ColorStateList
+import android.content.res.Configuration
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.content.res.Resources.Theme
 import android.graphics.BlendMode
 import android.graphics.BlendModeColorFilter
@@ -129,8 +131,15 @@ fun Context.getAttrColor(res: Int): Int {
     return ContextCompat.getColor(this, typedValue.resourceId)
 }
 
+fun Context.isDarkThemeOn(): Boolean {
+    return resources.configuration.uiMode and
+            Configuration.UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
+}
+
 fun Any?.isNull() = this == null
 
+fun Any?.isNotNull() = this != null
+
 fun <T, VH : RecyclerView.ViewHolder> ListAdapter<T, VH>.getItemOrNull(position: Int): T? {
     return this.currentList.elementAtOrNull(position)
 }

app/src/main/java/eu/vojtechh/takeyourpill/klass/Extenstions.kt

@@ -7,6 +7,8 @@ import androidx.room.Embedded
 import androidx.room.Ignore
 import androidx.room.Relation
 import eu.vojtechh.takeyourpill.R
+import eu.vojtechh.takeyourpill.klass.isNotNull
+import eu.vojtechh.takeyourpill.klass.isNull
 
 data class Pill(
     @Embedded val pillEntity: PillEntity,
@@ -115,9 +117,20 @@ data class Pill(
 
     override fun isContentSame(newItem: BaseModel) =
         if (newItem is Pill) {
+            val isPhotoSame =
+                if (this.photo.isNull() && newItem.photo.isNotNull()) {
+                    false
+                } else if (this.photo.isNotNull() && newItem.photo.isNull()) {
+                    false
+                } else if (this.photo.isNotNull() && newItem.photo.isNotNull()) {
+                    this.photo?.sameAs(newItem.photo) ?: false
+                } else {
+                    true
+                }
+
             this.name == newItem.name &&
                     this.description == newItem.description &&
-                    this.photo?.sameAs(newItem.photo) ?: true &&
+                    isPhotoSame &&
                     this.color.resource == newItem.color.resource &&
                     this.deleted == newItem.deleted &&
                     this.options.isSame(newItem.options) &&

app/src/main/java/eu/vojtechh/takeyourpill/model/Pill.kt

@@ -0,0 +1,11 @@
+@Comment{$ biblatex control file $}
+@Comment{$ biblatex bcf format version 3.7 $}
+% Do not modify this file!
+%
+% This is an auxiliary file used by the 'biblatex' package.
+% This file may safely be deleted. It will be recreated as
+% required.
+
+@Control{biblatex-control,
+  options = {3.7:0:0:1:0:1:1:0:0:0:0:1:3:1:3:1:0:0:3:1:79:+:+:nty},
+}