Skip to content

Commit fa72813

Browse files
author
Jan Guegel
committed
add save as in menu
rename saveText to saveAsText() add new save() without confirmation Signed-off-by: Jan Guegel <[email protected]>
1 parent 630d7b2 commit fa72813

File tree

3 files changed

+32
-3
lines changed

3 files changed

+32
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Fixed missing permission prompt on initial "Save as" launch ([#85])
1212
- Fixed printing text files containing a "#" ([#104])
1313

14+
### Changed
15+
- "Save as" moved to menu in Text Editor ([#224])
16+
1417
## [1.2.3] - 2025-09-15
1518
### Fixed
1619
- Fixed folders showing up incorrectly as files in some cases ([#80])
@@ -80,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8083
[#250]: https://github.com/FossifyOrg/File-Manager/issues/250
8184
[#85]: https://github.com/FossifyOrg/File-Manager/issues/85
8285
[#104]: https://github.com/FossifyOrg/File-Manager/issues/104
86+
[#224]: https://github.com/FossifyOrg/File-Manager/issues/224
8387

8488
[Unreleased]: https://github.com/FossifyOrg/File-Manager/compare/1.2.3...HEAD
8589
[1.2.3]: https://github.com/FossifyOrg/File-Manager/compare/1.2.2...1.2.3

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class ReadTextActivity : SimpleActivity() {
128128
lastSavePromptTS = System.currentTimeMillis()
129129
ConfirmationAdvancedDialog(this, "", R.string.save_before_closing, R.string.save, R.string.discard) {
130130
if (it) {
131-
saveText(true)
131+
saveAsText(true)
132132
} else {
133133
super.onBackPressed()
134134
}
@@ -144,6 +144,7 @@ class ReadTextActivity : SimpleActivity() {
144144
when (menuItem.itemId) {
145145
R.id.menu_search -> openSearch()
146146
R.id.menu_save -> saveText()
147+
R.id.menu_save_as -> saveAsText()
147148
R.id.menu_open_with -> openPath(intent.dataString!!, true)
148149
R.id.menu_print -> printText()
149150
else -> return@setOnMenuItemClickListener false
@@ -165,10 +166,14 @@ class ReadTextActivity : SimpleActivity() {
165166
}, 250)
166167
}
167168

168-
private fun saveText(shouldExitAfterSaving: Boolean = false) {
169+
private fun getFilePath(){
169170
if (filePath.isEmpty()) {
170171
filePath = getRealPathFromURI(intent.data!!) ?: ""
171172
}
173+
}
174+
175+
private fun saveAsText(shouldExitAfterSaving: Boolean = false) {
176+
getFilePath()
172177

173178
if (filePath.isEmpty()) {
174179
SaveAsDialog(this, filePath, true) { _, filename ->
@@ -182,6 +187,7 @@ class ReadTextActivity : SimpleActivity() {
182187
} else {
183188
SELECT_SAVE_FILE_INTENT
184189
}
190+
@Suppress("DEPRECATION")
185191
startActivityForResult(this, requestCode)
186192
}
187193
}
@@ -200,6 +206,20 @@ class ReadTextActivity : SimpleActivity() {
200206
}
201207
}
202208

209+
private fun saveText(shouldExitAfterSaving: Boolean = false) {
210+
getFilePath()
211+
212+
if (hasStoragePermission()) {
213+
val file = File(filePath)
214+
getFileOutputStream(file.toFileDirItem(this), true) {
215+
val shouldOverwriteOriginalText = true
216+
saveTextContent(it, shouldExitAfterSaving, shouldOverwriteOriginalText)
217+
}
218+
} else {
219+
toast(R.string.no_storage_permissions)
220+
}
221+
}
222+
203223
private fun saveTextContent(outputStream: OutputStream?, shouldExitAfterSaving: Boolean, shouldOverwriteOriginalText: Boolean) {
204224
if (outputStream != null) {
205225
val currentText = binding.readTextView.text.toString()

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,13 @@
1111
<item
1212
android:id="@+id/menu_save"
1313
android:icon="@drawable/ic_save_vector"
14-
android:title="@string/save_as"
14+
android:title="@string/save"
1515
app:showAsAction="always" />
16+
<item
17+
android:id="@+id/menu_save_as"
18+
android:icon="@drawable/ic_print_vector"
19+
android:title="@string/save_as"
20+
app:showAsAction="ifRoom" />
1621
<item
1722
android:id="@+id/menu_print"
1823
android:icon="@drawable/ic_print_vector"

0 commit comments

Comments
 (0)