add new compression formats to compression dialog

Author: fatihergin

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt

@@ -1,15 +1,21 @@
 package com.simplemobiletools.filemanager.pro.dialogs
 
 import android.view.View
+import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.filemanager.pro.R
 import com.simplemobiletools.filemanager.pro.databinding.DialogCompressAsBinding
 import com.simplemobiletools.filemanager.pro.extensions.config
+import com.simplemobiletools.filemanager.pro.helpers.CompressionFormat
 
-class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String, password: String?) -> Unit) {
+class CompressAsDialog(
+    val activity: BaseSimpleActivity,
+    val path: String,
+    val callback: (destination: String, compressionFormat: CompressionFormat, password: String?) -> Unit
+) {
     private val binding = DialogCompressAsBinding.inflate(activity.layoutInflater)
 
     init {
@@ -29,6 +35,21 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
                 }
             }
 
+            compressionFormatValue.apply {
+                setOnClickListener {
+                    activity.hideKeyboard(filenameValue)
+                }
+                val adapter = ArrayAdapter(activity, android.R.layout.simple_dropdown_item_1line, CompressionFormat.values().map { it.extension })
+                setAdapter(adapter)
+                setText(adapter.getItem(0), false)
+
+                setOnItemClickListener { _, _, i, _ ->
+                    val compressionFormat = CompressionFormat.entries[i]
+                    filenameHint.hint = String.format(activity.getString(R.string.filename_without_extension), compressionFormat.extension)
+                    passwordProtect.beVisibleIf(compressionFormat.canCreateEncryptedArchive)
+                    enterPasswordHint.beVisibleIf(compressionFormat.canCreateEncryptedArchive && passwordProtect.isChecked)
+                }
+            }
             passwordProtect.setOnCheckedChangeListener { _, _ ->
                 enterPasswordHint.beVisibleIf(passwordProtect.isChecked)
             }
@@ -53,14 +74,14 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
                         when {
                             name.isEmpty() -> activity.toast(R.string.empty_name)
                             name.isAValidFilename() -> {
-                                val newPath = "$realPath/$name.zip"
+                                val newPath = "$realPath/$name${getSelectedCompressionFormat().extension}"
                                 if (activity.getDoesFilePathExist(newPath)) {
                                     activity.toast(R.string.name_taken)
                                     return@OnClickListener
                                 }
 
                                 alertDialog.dismiss()
-                                callback(newPath, password)
+                                callback(newPath, getSelectedCompressionFormat(), password)
                             }
 
                             else -> activity.toast(R.string.invalid_name)
@@ -69,4 +90,6 @@ class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val c
                 }
             }
     }
+
+    private fun getSelectedCompressionFormat() = CompressionFormat.fromExtension(binding.compressionFormatValue.text.toString())
 }

app/src/main/res/layout/dialog_compress_as.xml

@@ -24,10 +24,28 @@
     </com.simplemobiletools.commons.views.MyTextInputLayout>
 
     <com.simplemobiletools.commons.views.MyTextInputLayout
-        android:id="@+id/filename_hint"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+        android:id="@+id/compression_format_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/folder_hint"
+        android:layout_marginBottom="@dimen/activity_margin"
+        android:hint="@string/compression_format">
+
+        <AutoCompleteTextView
+            android:id="@+id/compression_format_value"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="none"
+            android:textSize="@dimen/bigger_text_size" />
+
+    </com.simplemobiletools.commons.views.MyTextInputLayout>
+
+    <com.simplemobiletools.commons.views.MyTextInputLayout
+        android:id="@+id/filename_hint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/compression_format_hint"
         android:hint="@string/filename_without_zip">
 
         <com.google.android.material.textfield.TextInputEditText

app/src/main/res/values/strings.xml

@@ -35,6 +35,10 @@
     <string name="decompression_successful">Decompression successful</string>
     <string name="compressing_failed">Compressing failed</string>
     <string name="decompressing_failed">Decompressing failed</string>
+    <!--    TODO: add missing translations-->
+    <string name="compression_format">Compression format</string>
+    <!--    TODO: move to commons-->
+    <string name="filename_without_extension">Filename (without %s)</string>
 
     <!-- Favorites -->
     <string name="manage_favorites">Manage favorites</string>