changelogs/178.txt

jameshnsears · Sep 10, 2024 · 4c74952 · 4c74952
1 parent 4f7de6c
commit 4c74952
Show file tree

Hide file tree

Showing 139 changed files with 364 additions and 449 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/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
diff --git a/.kotlin/errors/errors-1725522677335.log b/.kotlin/errors/errors-1725522677335.log
@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+
diff --git a/QuoteUnquote.cloudLib b/QuoteUnquote.cloudLib
diff --git a/QuoteUnquote.utilsLib b/QuoteUnquote.utilsLib
diff --git a/README.md b/README.md
@@ -21,26 +21,14 @@
 
 ---
 
-## 2. High Level Design
-
-### 2.1. Deployment Diagram
-
-![Deployment Diagram](https://github.com/jameshnsears/QuoteUnquote/blob/main/docs/uml/Deployment%20Diagram.jpg?raw=true)
-
-### 2.2. androidTest ROOM Class Diagram
-
-![androidTest ROOM Class Diagram](https://github.com/jameshnsears/QuoteUnquote/blob/main/docs/uml/androidTest%20ROOM%20Class%20Diagram.jpg?raw=true)
-
----
-
-## 3. Build Instructions
+## 2. Build Instructions
 
 After cloning extract .gpg files - BuildConfig / GitHub Action Secrets values.
 
 The app can be built on Windows 11 but the ./bin folder contains bash scripts (that work with git
 bash; some require gh cli).
 
-### 3.1. CLI
+### 2.1. CLI
 
 ```text
 git clone https://github.com/jameshnsears/QuoteUnquote
@@ -50,7 +38,7 @@ git submodule foreach git pull origin main
 git submodule
 ```
 
-### 3.2. Android Studio
+### 2.2. Android Studio
 
 ```text
 Android Studio > Get from Version Control
@@ -75,7 +63,7 @@ Choose a Build Variant
  > run a Run/Debug Configuration
 ```
 
-### 3.3. PyCharm
+### 2.3. PyCharm
 
 ```text
 After a clone...

diff --git a/app/build.gradle b/app/build.gradle
@@ -47,9 +47,9 @@ android {
         applicationId "com.github.jameshnsears.quoteunquote"
 
         // changelog version | min sdk | target sdk
-        versionCode 1772434
+        versionCode 1782435
         // semantic versioning
-        versionName "4.43.1"
+        versionName "4.44.0"
 
         vectorDrawables.useSupportLibrary = true
 
@@ -156,6 +156,8 @@ android {
         androidTest {
             assets.srcDirs += files("$projectDir/schemas".toString())
             assets.srcDirs += 'src/androidTest/assets/'
+            java.srcDirs += 'src/androidTest/java'
+            java.srcDirs += 'src/androidTest/kotlin'
         }
         fdroid {
             assets.srcDirs = ['src/main/assets']
@@ -231,13 +233,13 @@ dependencies {
 
     annotationProcessor 'androidx.room:room-compiler:2.6.1'
 
-    debugImplementation 'androidx.fragment:fragment-testing:1.8.2'
+    debugImplementation 'androidx.fragment:fragment-testing:1.8.3'
     debugImplementation 'androidx.test:core-ktx:1.6.1'
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
     googleplayImplementation platform('com.google.firebase:firebase-bom:33.2.0')
 
-    implementation 'androidx.activity:activity-ktx:1.9.1'
+    implementation 'androidx.activity:activity-ktx:1.9.2'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -257,15 +259,15 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
-    implementation 'net.pwall.json:json-kotlin-schema:0.48'
+    implementation 'net.pwall.json:json-kotlin-schema:0.50'
     implementation 'org.apache.commons:commons-csv:1.11.0'
     implementation 'org.jsoup:jsoup:1.18.1'
     implementation 'androidx.work:work-runtime-ktx:2.9.1'
     implementation 'androidx.work:work-runtime:2.9.1'
     implementation project(path: ':cloudLib')
     implementation project(path: ':utilsLib')
 
-    implementation platform('androidx.compose:compose-bom:2024.08.00')
+    implementation platform('androidx.compose:compose-bom:2024.09.00')
     debugImplementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.activity:activity-compose'
     implementation 'androidx.compose.material3:material3'
@@ -280,7 +282,7 @@ dependencies {
     testImplementation 'androidx.test:core-ktx:1.6.1'
     testImplementation 'androidx.test.ext:junit:1.2.1'
     testImplementation 'androidx.test:rules:1.6.1'
-    testImplementation 'ch.qos.logback:logback-classic:1.5.7'
+    testImplementation 'ch.qos.logback:logback-classic:1.5.8'
     testImplementation 'com.google.guava:guava:33.3.0-jre'
     testImplementation 'io.mockk:mockk:1.13.12'
     testImplementation 'junit:junit:4.13.2'

diff --git a/...eshnsears/quoteunquote/BuildConfigTest.kt → ...eshnsears/quoteunquote/BuildConfigTest.kt b/...eshnsears/quoteunquote/BuildConfigTest.kt → ...eshnsears/quoteunquote/BuildConfigTest.kt
diff --git a/...quoteunquote/QuoteUnquoteModelDouble.java → ...quoteunquote/QuoteUnquoteModelDouble.java b/...quoteunquote/QuoteUnquoteModelDouble.java → ...quoteunquote/QuoteUnquoteModelDouble.java
diff --git a/...ars/quoteunquote/QuoteUnquoteModelTest.kt → ...ars/quoteunquote/QuoteUnquoteModelTest.kt b/...ars/quoteunquote/QuoteUnquoteModelTest.kt → ...ars/quoteunquote/QuoteUnquoteModelTest.kt
diff --git a/.../quoteunquote/QuoteUnquoteModelUtility.kt → .../quoteunquote/QuoteUnquoteModelUtility.kt b/.../quoteunquote/QuoteUnquoteModelUtility.kt → .../quoteunquote/QuoteUnquoteModelUtility.kt
diff --git a/...hnsears/quoteunquote/WidgetDeletedTest.kt → ...hnsears/quoteunquote/WidgetDeletedTest.kt b/...hnsears/quoteunquote/WidgetDeletedTest.kt → ...hnsears/quoteunquote/WidgetDeletedTest.kt
diff --git a/...nsears/quoteunquote/WidgetDisabledTest.kt → ...nsears/quoteunquote/WidgetDisabledTest.kt b/...nsears/quoteunquote/WidgetDisabledTest.kt → ...nsears/quoteunquote/WidgetDisabledTest.kt
diff --git a/...ars/quoteunquote/WidgetHeartColourTest.kt → ...ars/quoteunquote/WidgetHeartColourTest.kt b/...ars/quoteunquote/WidgetHeartColourTest.kt → ...ars/quoteunquote/WidgetHeartColourTest.kt
diff --git a/...hnsears/quoteunquote/WidgetScraperTest.kt → ...hnsears/quoteunquote/WidgetScraperTest.kt b/...hnsears/quoteunquote/WidgetScraperTest.kt → ...hnsears/quoteunquote/WidgetScraperTest.kt
diff --git a/...uoteunquote/WidgetToolbarFavouriteTest.kt → ...uoteunquote/WidgetToolbarFavouriteTest.kt b/...uoteunquote/WidgetToolbarFavouriteTest.kt → ...uoteunquote/WidgetToolbarFavouriteTest.kt
diff --git a/...rs/quoteunquote/WidgetToolbarFirstTest.kt → ...rs/quoteunquote/WidgetToolbarFirstTest.kt b/...rs/quoteunquote/WidgetToolbarFirstTest.kt → ...rs/quoteunquote/WidgetToolbarFirstTest.kt
diff --git a/...ars/quoteunquote/WidgetToolbarJumpTest.kt → ...ars/quoteunquote/WidgetToolbarJumpTest.kt b/...ars/quoteunquote/WidgetToolbarJumpTest.kt → ...ars/quoteunquote/WidgetToolbarJumpTest.kt
diff --git a/...ars/quoteunquote/WidgetToolbarNextTest.kt → ...ars/quoteunquote/WidgetToolbarNextTest.kt b/...ars/quoteunquote/WidgetToolbarNextTest.kt → ...ars/quoteunquote/WidgetToolbarNextTest.kt
diff --git a/...quoteunquote/WidgetToolbarPreviousTest.kt → ...quoteunquote/WidgetToolbarPreviousTest.kt b/...quoteunquote/WidgetToolbarPreviousTest.kt → ...quoteunquote/WidgetToolbarPreviousTest.kt
diff --git a/...unquote/WidgetToolbarRandomizationTest.kt → ...unquote/WidgetToolbarRandomizationTest.kt b/...unquote/WidgetToolbarRandomizationTest.kt → ...unquote/WidgetToolbarRandomizationTest.kt
diff --git a/...rs/quoteunquote/WidgetToolbarShareTest.kt → ...rs/quoteunquote/WidgetToolbarShareTest.kt b/...rs/quoteunquote/WidgetToolbarShareTest.kt → ...rs/quoteunquote/WidgetToolbarShareTest.kt
diff --git a/...eunquote/cloud/transfer/GsonTestHelper.kt → ...eunquote/cloud/transfer/GsonTestHelper.kt b/...eunquote/cloud/transfer/GsonTestHelper.kt → ...eunquote/cloud/transfer/GsonTestHelper.kt
diff --git a/...nsfer/backup/TransferBackupCurrentTest.kt → ...nsfer/backup/TransferBackupCurrentTest.kt b/...nsfer/backup/TransferBackupCurrentTest.kt → ...nsfer/backup/TransferBackupCurrentTest.kt
diff --git a/...fer/backup/TransferBackupFavouriteTest.kt → ...fer/backup/TransferBackupFavouriteTest.kt b/...fer/backup/TransferBackupFavouriteTest.kt → ...fer/backup/TransferBackupFavouriteTest.kt
diff --git a/...sfer/backup/TransferBackupPreviousTest.kt → ...sfer/backup/TransferBackupPreviousTest.kt b/...sfer/backup/TransferBackupPreviousTest.kt → ...sfer/backup/TransferBackupPreviousTest.kt
diff --git a/...sfer/backup/TransferBackupSettingsTest.kt → ...sfer/backup/TransferBackupSettingsTest.kt b/...sfer/backup/TransferBackupSettingsTest.kt → ...sfer/backup/TransferBackupSettingsTest.kt
diff --git a/...oud/transfer/backup/TransferBackupTest.kt → ...oud/transfer/backup/TransferBackupTest.kt b/...oud/transfer/backup/TransferBackupTest.kt → ...oud/transfer/backup/TransferBackupTest.kt
diff --git a/...d/transfer/restore/RestoreExternalTest.kt → ...d/transfer/restore/RestoreExternalTest.kt b/...d/transfer/restore/RestoreExternalTest.kt → ...d/transfer/restore/RestoreExternalTest.kt
@@ -2,6 +2,7 @@ package com.github.jameshnsears.quoteunquote.cloud.transfer.restore
 
 import com.github.jameshnsears.quoteunquote.cloud.transfer.TransferUtility
 import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.TransferBackup
+import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.restore.TransferRestore
 import io.mockk.every
 import io.mockk.mockkObject
 import org.junit.Assert.assertTrue

diff --git a/.../transfer/restore/RestoreOneWidgetTest.kt → .../transfer/restore/RestoreOneWidgetTest.kt b/.../transfer/restore/RestoreOneWidgetTest.kt → .../transfer/restore/RestoreOneWidgetTest.kt
@@ -2,6 +2,7 @@ package com.github.jameshnsears.quoteunquote.cloud.transfer.restore
 
 import android.os.Build
 import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.TransferBackup
+import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.restore.TransferRestore
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue

diff --git a/...transfer/restore/RestoreTwoWidgetsTest.kt → ...transfer/restore/RestoreTwoWidgetsTest.kt b/...transfer/restore/RestoreTwoWidgetsTest.kt → ...transfer/restore/RestoreTwoWidgetsTest.kt
@@ -3,6 +3,7 @@ package com.github.jameshnsears.quoteunquote.cloud.transfer.restore
 import com.github.jameshnsears.quoteunquote.cloud.transfer.Transfer
 import com.github.jameshnsears.quoteunquote.cloud.transfer.TransferUtility
 import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.TransferBackup
+import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.restore.TransferRestore
 import com.github.jameshnsears.quoteunquote.database.quotation.QuotationEntity
 import io.mockk.every
 import io.mockk.mockkObject

diff --git a/...ransfer/restore/TransferRestoreUtility.kt → ...ransfer/restore/TransferRestoreUtility.kt b/...ransfer/restore/TransferRestoreUtility.kt → ...ransfer/restore/TransferRestoreUtility.kt
diff --git a/...AppearanceTextFamilySpinnerAdapterTest.kt → ...AppearanceTextFamilySpinnerAdapterTest.kt b/...AppearanceTextFamilySpinnerAdapterTest.kt → ...AppearanceTextFamilySpinnerAdapterTest.kt
diff --git a/.../AppearanceTextStyleSpinnerAdapterTest.kt → .../AppearanceTextStyleSpinnerAdapterTest.kt b/.../AppearanceTextStyleSpinnerAdapterTest.kt → .../AppearanceTextStyleSpinnerAdapterTest.kt
diff --git a/...er/AddDisplayedResultToPreviousAllTest.kt → ...er/AddDisplayedResultToPreviousAllTest.kt b/...er/AddDisplayedResultToPreviousAllTest.kt → ...er/AddDisplayedResultToPreviousAllTest.kt
diff --git a/...tations/tabs/filter/ExclusionCountTest.kt → ...tations/tabs/filter/ExclusionCountTest.kt b/...tations/tabs/filter/ExclusionCountTest.kt → ...tations/tabs/filter/ExclusionCountTest.kt
diff --git a/...otations/tabs/filter/ExclusionNextTest.kt → ...otations/tabs/filter/ExclusionNextTest.kt b/...otations/tabs/filter/ExclusionNextTest.kt → ...otations/tabs/filter/ExclusionNextTest.kt
diff --git a/...ions/tabs/filter/browse/PaginationTest.kt → ...ions/tabs/filter/browse/PaginationTest.kt b/...ions/tabs/filter/browse/PaginationTest.kt → ...ions/tabs/filter/browse/PaginationTest.kt
diff --git a/...ment/sync/SyncJsonSchemaValidationTest.kt → ...ment/sync/SyncJsonSchemaValidationTest.kt b/...ment/sync/SyncJsonSchemaValidationTest.kt → ...ment/sync/SyncJsonSchemaValidationTest.kt
@@ -2,6 +2,7 @@ package com.github.jameshnsears.quoteunquote.configure.fragment.sync
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.platform.app.InstrumentationRegistry
+import com.github.jameshnsears.quoteunquote.sync.SyncJsonSchemaValidation
 import com.github.jameshnsears.quoteunquote.utils.logging.MethodLineLoggingTree
 import org.junit.Assert.assertTrue
 import org.junit.Test

diff --git a/...atabase/AlignHistoryWithQuotationsTest.kt → ...atabase/AlignHistoryWithQuotationsTest.kt b/...atabase/AlignHistoryWithQuotationsTest.kt → ...atabase/AlignHistoryWithQuotationsTest.kt
diff --git a/...te/database/DatabaseRepositoryDouble.java → ...te/database/DatabaseRepositoryDouble.java b/...te/database/DatabaseRepositoryDouble.java → ...te/database/DatabaseRepositoryDouble.java
diff --git a/...unquote/database/DatabaseSelectionTest.kt → ...unquote/database/DatabaseSelectionTest.kt b/...unquote/database/DatabaseSelectionTest.kt → ...unquote/database/DatabaseSelectionTest.kt
diff --git a/...oteunquote/database/DatabaseTestHelper.kt → ...oteunquote/database/DatabaseTestHelper.kt b/...oteunquote/database/DatabaseTestHelper.kt → ...oteunquote/database/DatabaseTestHelper.kt
diff --git a/...unquote/database/QuotationPositionTest.kt → ...unquote/database/QuotationPositionTest.kt b/...unquote/database/QuotationPositionTest.kt → ...unquote/database/QuotationPositionTest.kt
diff --git a/...quoteunquote/database/SearchBrowseTest.kt → ...quoteunquote/database/SearchBrowseTest.kt b/...quoteunquote/database/SearchBrowseTest.kt → ...quoteunquote/database/SearchBrowseTest.kt
diff --git a/.../quoteunquote/database/SearchCountTest.kt → .../quoteunquote/database/SearchCountTest.kt b/.../quoteunquote/database/SearchCountTest.kt → .../quoteunquote/database/SearchCountTest.kt
diff --git a/...rs/quoteunquote/utils/ImportHelperTest.kt → ...rs/quoteunquote/utils/ImportHelperTest.kt b/...rs/quoteunquote/utils/ImportHelperTest.kt → ...rs/quoteunquote/utils/ImportHelperTest.kt
diff --git a/...ficationsCustomisableIntervalAlarmTest.kt → ...ficationsCustomisableIntervalAlarmTest.kt b/...ficationsCustomisableIntervalAlarmTest.kt → ...ficationsCustomisableIntervalAlarmTest.kt
diff --git a/...ava/espresso/EspressoConfigurationTest.kt → ...lin/espresso/EspressoConfigurationTest.kt b/...ava/espresso/EspressoConfigurationTest.kt → ...lin/espresso/EspressoConfigurationTest.kt
diff --git a/app/src/main/java/com/github/jameshnsears/quoteunquote/QuoteUnquoteModel.java b/app/src/main/java/com/github/jameshnsears/quoteunquote/QuoteUnquoteModel.java
@@ -15,13 +15,13 @@
 import com.github.jameshnsears.quoteunquote.database.history.FavouriteEntity;
 import com.github.jameshnsears.quoteunquote.database.quotation.AuthorPOJO;
 import com.github.jameshnsears.quoteunquote.database.quotation.QuotationEntity;
+import com.github.jameshnsears.quoteunquote.scraper.Scraper;
+import com.github.jameshnsears.quoteunquote.scraper.ScraperData;
+import com.github.jameshnsears.quoteunquote.scraper.ScraperQuotationException;
+import com.github.jameshnsears.quoteunquote.scraper.ScraperSourceException;
+import com.github.jameshnsears.quoteunquote.scraper.ScraperUrlException;
 import com.github.jameshnsears.quoteunquote.utils.ContentSelection;
 import com.github.jameshnsears.quoteunquote.utils.ImportHelper;
-import com.github.jameshnsears.quoteunquote.utils.scraper.Scraper;
-import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperData;
-import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperQuotationException;
-import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperSourceException;
-import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperUrlException;
 
 import org.jsoup.nodes.Document;
 

diff --git a/app/src/main/java/com/github/jameshnsears/quoteunquote/QuoteUnquoteWidget.java b/app/src/main/java/com/github/jameshnsears/quoteunquote/QuoteUnquoteWidget.java
@@ -33,6 +33,7 @@
 import com.github.jameshnsears.quoteunquote.configure.fragment.quotations.QuotationsPreferences;
 import com.github.jameshnsears.quoteunquote.database.quotation.QuotationEntity;
 import com.github.jameshnsears.quoteunquote.listview.ListViewService;
+import com.github.jameshnsears.quoteunquote.scraper.ScraperData;
 import com.github.jameshnsears.quoteunquote.utils.ContentSelection;
 import com.github.jameshnsears.quoteunquote.utils.ImportHelper;
 import com.github.jameshnsears.quoteunquote.utils.IntentFactoryHelper;
@@ -44,7 +45,6 @@
 import com.github.jameshnsears.quoteunquote.utils.notification.NotificationsDailyAlarm;
 import com.github.jameshnsears.quoteunquote.utils.preference.PreferencesFacade;
 import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperAlarm;
-import com.github.jameshnsears.quoteunquote.utils.scraper.ScraperData;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.util.concurrent.ExecutorService;

diff --git a/app/src/main/java/com/github/jameshnsears/quoteunquote/cloud/CloudServiceRestore.java b/app/src/main/java/com/github/jameshnsears/quoteunquote/cloud/CloudServiceRestore.java
@@ -10,7 +10,7 @@
 import com.github.jameshnsears.quoteunquote.R;
 import com.github.jameshnsears.quoteunquote.cloud.transfer.Transfer;
 import com.github.jameshnsears.quoteunquote.cloud.transfer.TransferRestoreResponse;
-import com.github.jameshnsears.quoteunquote.cloud.transfer.restore.TransferRestore;
+import com.github.jameshnsears.quoteunquote.cloud.transfer.backup.restore.TransferRestore;
 import com.github.jameshnsears.quoteunquote.configure.fragment.sync.SyncFragment;
 import com.github.jameshnsears.quoteunquote.configure.fragment.sync.SyncPreferences;
 import com.github.jameshnsears.quoteunquote.database.DatabaseRepository;
+22 −0		.idea/other.xml
+1 −1		build.gradle
+0 −0		cloudLib/src/test/kotlin/com/github/jameshnsears/quoteunquote/cloud/InternetConnectivityTest.kt
+0 −0		cloudLib/src/test/kotlin/com/github/jameshnsears/quoteunquote/cloud/RemoteCodeTest.kt
+0 −0		cloudLib/src/test/kotlin/com/github/jameshnsears/quoteunquote/cloud/transfer/TransferTest.kt