changelogs/177.txt

jameshnsears · Aug 31, 2024 · 4f7de6c · 4f7de6c
1 parent f687095
commit 4f7de6c
Show file tree

Hide file tree

Showing 30 changed files with 1,453 additions and 1,008 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/.idea/runConfigurations/_app_androidTest.xml b/.idea/runConfigurations/_app_androidTest.xml
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
diff --git a/QuoteUnquote.cloudLib b/QuoteUnquote.cloudLib
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.diffplug.spotless'
+apply plugin: "org.jetbrains.kotlin.plugin.compose"
 
 apply from: '../jacoco.gradle'
 apply from: '../ktlint.gradle'
@@ -46,9 +47,9 @@ android {
         applicationId "com.github.jameshnsears.quoteunquote"
 
         // changelog version | min sdk | target sdk
-        versionCode 1762434
+        versionCode 1772434
         // semantic versioning
-        versionName "4.43.0"
+        versionName "4.43.1"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -63,6 +64,20 @@ android {
         }
     }
 
+    buildFeatures {
+        compose true
+    }
+
+    compose {
+        codeGeneration {
+            previewMode = PreviewMode.ON
+        }
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.5.1'
+    }
+
     packagingOptions {
         resources {
             excludes += [
@@ -227,7 +242,7 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core-ktx:1.13.1'
-    implementation 'androidx.databinding:databinding-runtime:8.5.2'
+    implementation 'androidx.databinding:databinding-runtime:8.6.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.room:room-guava:2.6.1'
     implementation 'androidx.room:room-runtime:2.6.1'
@@ -250,6 +265,16 @@ dependencies {
     implementation project(path: ':cloudLib')
     implementation project(path: ':utilsLib')
 
+    implementation platform('androidx.compose:compose-bom:2024.08.00')
+    debugImplementation 'androidx.compose.ui:ui-tooling-preview'
+    implementation 'androidx.activity:activity-compose'
+    implementation 'androidx.compose.material3:material3'
+    implementation 'androidx.compose.material:material'
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.ui:ui-tooling'
+    implementation 'androidx.core:core-ktx'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx'
+
     testImplementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation 'androidx.room:room-testing:2.6.1'
     testImplementation 'androidx.test:core-ktx:1.6.1'

diff --git a/app/src/androidTest/java/com/github/jameshnsears/quoteunquote/utils/ImportHelperTest.kt b/app/src/androidTest/java/com/github/jameshnsears/quoteunquote/utils/ImportHelperTest.kt
@@ -2,6 +2,7 @@ package com.github.jameshnsears.quoteunquote.utils
 
 import androidx.test.platform.app.InstrumentationRegistry
 import com.github.jameshnsears.quoteunquote.QuoteUnquoteModelUtility
+import com.github.jameshnsears.quoteunquote.utils.widget.WidgetIdHelper
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.fail
 import org.junit.Test
@@ -17,6 +18,13 @@ class ImportHelperTest : QuoteUnquoteModelUtility() {
         val quotationEntityLinkedHashSet = importHelper.csvImportDatabase(inputStream)
 
         assertEquals(762, quotationEntityLinkedHashSet.size)
+
+        quoteUnquoteModelDouble.insertQuotationsExternal(quotationEntityLinkedHashSet)
+        quoteUnquoteModelDouble.setDefault(WidgetIdHelper.WIDGET_ID_01, ContentSelection.ALL)
+        assertEquals(
+            "00000000",
+            quoteUnquoteModelDouble.databaseRepository!!.previous[0].digest,
+        )
     }
 
     @Test

diff --git a/...hub/jameshnsears/quoteunquote/configure/fragment/notifications/NotificationsFragment.java b/...hub/jameshnsears/quoteunquote/configure/fragment/notifications/NotificationsFragment.java
@@ -143,6 +143,7 @@ public void onViewCreated(
     private void handleSpecialPermissionForExactAlarm() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
 
+            fragmentNotificationsBinding.textViewExactTimeWarningDivider.setVisibility(VISIBLE);
             fragmentNotificationsBinding.textViewExactTimeWarningInfo.setVisibility(VISIBLE);
             fragmentNotificationsBinding.textViewExactTimeWarning.setVisibility(VISIBLE);
 
@@ -159,6 +160,7 @@ private void handleSpecialPermissionForExactAlarm() {
         } else {
             handleSpecialPermissionForExactAlarmCommon();
 
+            fragmentNotificationsBinding.textViewExactTimeWarningDivider.setVisibility(View.GONE);
             fragmentNotificationsBinding.textViewExactTimeWarningInfo.setVisibility(View.GONE);
             fragmentNotificationsBinding.textViewExactTimeWarning.setVisibility(View.GONE);
         }

diff --git a/...meshnsears/quoteunquote/configure/fragment/quotations/QuotationsFragmentStateAdapter.java b/...meshnsears/quoteunquote/configure/fragment/quotations/QuotationsFragmentStateAdapter.java
@@ -4,7 +4,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.github.jameshnsears.quoteunquote.configure.fragment.quotations.tabs.database.QuotationsDatabaseFragment;
+import com.github.jameshnsears.quoteunquote.configure.fragment.quotations.tabs.content.QuotationsContentFragment;
 import com.github.jameshnsears.quoteunquote.configure.fragment.quotations.tabs.filter.QuotationsFilterFragment;
 
 public class QuotationsFragmentStateAdapter extends FragmentStateAdapter {
@@ -24,7 +24,7 @@ public Fragment createFragment(final int pos) {
                 return quotationsFilterFragment = QuotationsFilterFragment.newInstance(widgetId);
 
             default:
-                return QuotationsDatabaseFragment.newInstance(widgetId);
+                return QuotationsContentFragment.newInstance(widgetId);
         }
     }