Merge pull request #79 from Arctosoft/develop

Version 1.10.0
Arctosoft · Aug 13, 2024 · 4618c0c · 4618c0c
2 parents 23182d2 + d501305
commit 4618c0c
Show file tree

Hide file tree

Showing 34 changed files with 662 additions and 270 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "se.arctosoft.vault"
         minSdk 28
         targetSdk 34
-        versionCode 27
-        versionName "1.9.0"
+        versionCode 28
+        versionName "1.10.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -43,21 +43,21 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.7.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.security:security-crypto:1.0.0'
-    implementation 'androidx.media3:media3-exoplayer:1.3.1'
-    implementation 'androidx.media3:media3-ui:1.3.1'
+    implementation 'androidx.media3:media3-exoplayer:1.4.0'
+    implementation 'androidx.media3:media3-ui:1.4.0'
 
-    implementation 'com.github.bumptech.glide:glide:4.15.1'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
     implementation 'com.mikepenz:aboutlibraries-core-android:10.10.0'
     implementation('com.mikepenz:aboutlibraries:10.10.0') {

diff --git a/app/src/main/java/se/arctosoft/vault/GalleryActivity.java b/app/src/main/java/se/arctosoft/vault/GalleryActivity.java
@@ -203,9 +203,38 @@ private void setClickListeners() {
             FileStuff.pickVideoFiles(activityLauncher, result -> onImportImagesOrVideos(result.getData()));
             showImportOverlay(false);
         });
+        binding.btnImportTextWrite.setOnClickListener(v -> {
+            Dialogs.showImportTextDialog(this, null, false, text -> {
+                if (text != null && !text.isBlank()) {
+                    importText(text);
+                }
+            });
+            showImportOverlay(false);
+        });
         binding.importChooseOverlay.setOnClickListener(v -> showImportOverlay(false));
     }
 
+    private void importText(@NonNull String text) {
+        Dialogs.showImportTextChooseDestinationDialog(this, settings, new Dialogs.IOnDirectorySelected() {
+            @Override
+            public void onDirectorySelected(@NonNull DocumentFile directory, boolean deleteOriginal) {
+                DocumentFile createdFile = Encryption.importTextToDirectory(GalleryActivity.this, text, null, directory, settings);
+                if (createdFile != null) {
+                    Toaster.getInstance(GalleryActivity.this).showLong(getString(R.string.gallery_importing_done, 1));
+                } else {
+                    Toaster.getInstance(GalleryActivity.this).showLong(getString(R.string.gallery_importing_error));
+                }
+            }
+
+            @Override
+            public void onOtherDirectory() {
+                viewModel.setTextToImport(text);
+                binding.btnAddFolder.performClick();
+            }
+        });
+
+    }
+
     private void onImportImagesOrVideos(@Nullable Intent data) {
         if (data != null) {
             List<DocumentFile> documentFiles = FileStuff.getDocumentsFromDirectoryResult(this, data);
@@ -245,6 +274,9 @@ public void onAlreadyExists(boolean isRootDir) {
                 if (viewModel.getFilesToAdd() != null) {
                     importFiles(viewModel.getFilesToAdd());
                 }
+                if (viewModel.getTextToImport() != null) {
+                    importText(viewModel.getTextToImport());
+                }
             }
         } else if (result.getResultCode() == Activity.RESULT_CANCELED) {
             viewModel.setFilesToAdd(null);