Merge branch 'main' into file-in-hidden-folder-shown-217

Author: jguegel

CHANGELOG.md

@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed printing text files containing a "#" ([#104])
 - Fixed files in hidden folders showing up in recent tab ([#217])
 
+### Added
+- Added a separate "Save as" option in the text editor ([#224])
+
+### Changed
+- Save button now overwrites files directly in the text editor ([#224])
+
 ## [1.2.3] - 2025-09-15
 ### Fixed
 - Fixed folders showing up incorrectly as files in some cases ([#80])
@@ -81,6 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#250]: https://github.com/FossifyOrg/File-Manager/issues/250
 [#85]: https://github.com/FossifyOrg/File-Manager/issues/85
 [#104]: https://github.com/FossifyOrg/File-Manager/issues/104
+[#224]: https://github.com/FossifyOrg/File-Manager/issues/224
 [#217]: https://github.com/FossifyOrg/File-Manager/issues/217
 
 [Unreleased]: https://github.com/FossifyOrg/File-Manager/compare/1.2.3...HEAD

app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt

@@ -144,6 +144,7 @@ class ReadTextActivity : SimpleActivity() {
             when (menuItem.itemId) {
                 R.id.menu_search -> openSearch()
                 R.id.menu_save -> saveText()
+                R.id.menu_save_as -> saveAsText()
                 R.id.menu_open_with -> openPath(intent.dataString!!, true)
                 R.id.menu_print -> printText()
                 else -> return@setOnMenuItemClickListener false
@@ -165,10 +166,14 @@ class ReadTextActivity : SimpleActivity() {
         }, 250)
     }
 
-    private fun saveText(shouldExitAfterSaving: Boolean = false) {
+    private fun updateFilePath() {
         if (filePath.isEmpty()) {
             filePath = getRealPathFromURI(intent.data!!) ?: ""
         }
+    }
+
+    private fun saveAsText(shouldExitAfterSaving: Boolean = false) {
+        updateFilePath()
 
         if (filePath.isEmpty()) {
             SaveAsDialog(this, filePath, true) { _, filename ->
@@ -182,6 +187,7 @@ class ReadTextActivity : SimpleActivity() {
                     } else {
                         SELECT_SAVE_FILE_INTENT
                     }
+                    @Suppress("DEPRECATION")
                     startActivityForResult(this, requestCode)
                 }
             }
@@ -200,6 +206,21 @@ class ReadTextActivity : SimpleActivity() {
         }
     }
 
+    private fun saveText(shouldExitAfterSaving: Boolean = false) {
+        updateFilePath()
+
+        if (filePath.isEmpty()) {
+            saveAsText(shouldExitAfterSaving)
+        } else if (hasStoragePermission()) {
+            val file = File(filePath)
+            getFileOutputStream(file.toFileDirItem(this), true) {
+                saveTextContent(it, shouldExitAfterSaving, true)
+            }
+        } else {
+            toast(R.string.no_storage_permissions)
+        }
+    }
+
     private fun saveTextContent(outputStream: OutputStream?, shouldExitAfterSaving: Boolean, shouldOverwriteOriginalText: Boolean) {
         if (outputStream != null) {
             val currentText = binding.readTextView.text.toString()

app/src/main/res/menu/menu_editor.xml

@@ -11,8 +11,13 @@
     <item
         android:id="@+id/menu_save"
         android:icon="@drawable/ic_save_vector"
-        android:title="@string/save_as"
+        android:title="@string/save"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/menu_save_as"
+        android:showAsAction="never"
+        android:title="@string/save_as"
+        app:showAsAction="never" />
     <item
         android:id="@+id/menu_print"
         android:icon="@drawable/ic_print_vector"

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ detektCompose = "0.4.27"
 androidx-swiperefreshlayout = "1.1.0"
 androidx-documentfile = "1.1.0"
 #Fossify
-commons = "5.1.1"
+commons = "5.2.0"
 #Other
 autofittextview = "0.2.1"
 gestureviews = "2.8.3"