diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f3d41e79..c90c74bb 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,4 +1,4 @@ -dontnote android.net.http.* -dontnote org.apache.http.** --keep class com.simplemobiletools.** { *; } --dontwarn com.simplemobiletools.** +-keep class org.fossify.** { *; } +-dontwarn org.fossify.** diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3df32b24..efcf3565 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,12 +12,12 @@ android:required="false" /> - - + + @@ -160,14 +160,14 @@ android:parentActivityName=".activities.MainActivity" /> (R.id.recents_fragment); - private fun getItemsFragment() = findViewById(R.id.items_fragment); - private fun getStorageFragment() = findViewById(R.id.storage_fragment); + private fun getRecentsFragment() = findViewById(R.id.recents_fragment) + private fun getItemsFragment() = findViewById(R.id.items_fragment) + private fun getStorageFragment() = findViewById(R.id.storage_fragment) private fun getAllFragments(): ArrayList?> = arrayListOf(getItemsFragment(), getRecentsFragment(), getStorageFragment()) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/MimeTypesActivity.kt similarity index 92% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/MimeTypesActivity.kt index 60c26b93..34c929c4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/MimeTypesActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.app.SearchManager import android.content.Context @@ -9,26 +9,26 @@ import android.view.MenuItem import androidx.appcompat.widget.SearchView import androidx.core.view.MenuItemCompat import androidx.recyclerview.widget.GridLayoutManager -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter -import com.simplemobiletools.filemanager.pro.databinding.ActivityMimetypesBinding -import com.simplemobiletools.filemanager.pro.dialogs.ChangeSortingDialog -import com.simplemobiletools.filemanager.pro.dialogs.ChangeViewTypeDialog -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.extensions.tryOpenPathIntent -import com.simplemobiletools.filemanager.pro.helpers.* -import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.VIEW_TYPE_GRID +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.models.RadioItem +import org.fossify.commons.views.MyGridLayoutManager +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.R +import org.fossify.filemanager.adapters.ItemsAdapter +import org.fossify.filemanager.databinding.ActivityMimetypesBinding +import org.fossify.filemanager.dialogs.ChangeSortingDialog +import org.fossify.filemanager.dialogs.ChangeViewTypeDialog +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.extensions.tryOpenPathIntent +import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.interfaces.ItemOperationsListener +import org.fossify.filemanager.models.ListItem import java.util.Locale class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { @@ -144,6 +144,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { mimetypesPlaceholder2.beGone() } } + searchText.length == 1 -> { binding.apply { mimetypesFastscroller.beGone() @@ -151,6 +152,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { mimetypesPlaceholder2.beVisible() } } + else -> { ensureBackgroundThread { if (lastSearchedText != searchText) { @@ -302,26 +304,31 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { fileDirItems.add(FileDirItem(path, name, false, 0, size, lastModified)) } } + VIDEOS -> { if (mimetype == "video") { fileDirItems.add(FileDirItem(path, name, false, 0, size, lastModified)) } } + AUDIO -> { if (mimetype == "audio" || extraAudioMimeTypes.contains(fullMimetype)) { fileDirItems.add(FileDirItem(path, name, false, 0, size, lastModified)) } } + DOCUMENTS -> { if (mimetype == "text" || extraDocumentMimeTypes.contains(fullMimetype)) { fileDirItems.add(FileDirItem(path, name, false, 0, size, lastModified)) } } + ARCHIVES -> { if (archiveMimeTypes.contains(fullMimetype)) { fileDirItems.add(FileDirItem(path, name, false, 0, size, lastModified)) } } + OTHERS -> { if (mimetype != "image" && mimetype != "video" && mimetype != "audio" && mimetype != "text" && !extraAudioMimeTypes.contains(fullMimetype) && !extraDocumentMimeTypes.contains(fullMimetype) && @@ -416,7 +423,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener { private fun setupGridLayoutManager() { val layoutManager = binding.mimetypesList.layoutManager as MyGridLayoutManager - layoutManager.spanCount = config.fileColumnCnt ?: 3 + layoutManager.spanCount = config.fileColumnCnt layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() { override fun getSpanSize(position: Int): Int { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/PDFViewerActivity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/PDFViewerActivity.kt index b414c712..4c9227ca 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/PDFViewerActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.content.Context import android.content.res.Configuration @@ -11,15 +11,15 @@ import android.view.WindowManager import android.widget.RelativeLayout import com.github.barteksc.pdfviewer.scroll.DefaultScrollHandle import com.shockwave.pdfium.PdfPasswordException -import com.simplemobiletools.commons.dialogs.EnterPasswordDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.REAL_FILE_PATH -import com.simplemobiletools.commons.helpers.isPiePlus -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.ActivityPdfViewerBinding -import com.simplemobiletools.filemanager.pro.extensions.hideSystemUI -import com.simplemobiletools.filemanager.pro.extensions.showSystemUI -import com.simplemobiletools.filemanager.pro.helpers.PdfDocumentAdapter +import org.fossify.commons.dialogs.EnterPasswordDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.REAL_FILE_PATH +import org.fossify.commons.helpers.isPiePlus +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.ActivityPdfViewerBinding +import org.fossify.filemanager.extensions.hideSystemUI +import org.fossify.filemanager.extensions.showSystemUI +import org.fossify.filemanager.helpers.PdfDocumentAdapter class PDFViewerActivity : SimpleActivity() { private val binding by viewBinding(ActivityPdfViewerBinding::inflate) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt index 3fb77e18..dbe9affe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/ReadTextActivity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.app.Activity import android.content.Context @@ -13,18 +13,18 @@ import android.webkit.WebView import android.webkit.WebViewClient import android.widget.ImageView import android.widget.TextView -import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.REAL_FILE_PATH -import com.simplemobiletools.commons.helpers.SAVE_DISCARD_PROMPT_INTERVAL -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.views.MyEditText -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.ActivityReadTextBinding -import com.simplemobiletools.filemanager.pro.dialogs.SaveAsDialog -import com.simplemobiletools.filemanager.pro.extensions.openPath -import com.simplemobiletools.filemanager.pro.views.GestureEditText +import org.fossify.commons.dialogs.ConfirmationAdvancedDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.REAL_FILE_PATH +import org.fossify.commons.helpers.SAVE_DISCARD_PROMPT_INTERVAL +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.views.MyEditText +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.ActivityReadTextBinding +import org.fossify.filemanager.dialogs.SaveAsDialog +import org.fossify.filemanager.extensions.openPath +import org.fossify.filemanager.views.GestureEditText import java.io.File import java.io.OutputStream @@ -125,6 +125,7 @@ class ReadTextActivity : SimpleActivity() { } } } + else -> super.onBackPressed() } } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SaveAsActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/SaveAsActivity.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SaveAsActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/SaveAsActivity.kt index e8a71348..3e678234 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SaveAsActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/SaveAsActivity.kt @@ -1,15 +1,15 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.content.Intent import android.net.Uri import android.os.Bundle -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.NavigationIcon -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.ActivitySaveAsBinding -import com.simplemobiletools.filemanager.pro.extensions.config +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.NavigationIcon +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.ActivitySaveAsBinding +import org.fossify.filemanager.extensions.config import java.io.File class SaveAsActivity : SimpleActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/SettingsActivity.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/SettingsActivity.kt index b7e1e136..234ccb2d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/SettingsActivity.kt @@ -1,19 +1,19 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.content.Intent import android.os.Bundle -import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.dialogs.SecurityDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.ActivitySettingsBinding -import com.simplemobiletools.filemanager.pro.dialogs.ManageVisibleTabsDialog -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.helpers.RootHelpers +import org.fossify.commons.dialogs.ChangeDateTimeFormatDialog +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.RadioGroupDialog +import org.fossify.commons.dialogs.SecurityDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.RadioItem +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.ActivitySettingsBinding +import org.fossify.filemanager.dialogs.ManageVisibleTabsDialog +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.helpers.RootHelpers import java.util.Locale import kotlin.system.exitProcess diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt similarity index 77% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt index 54f7733b..cfbf36fc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/SimpleActivity.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.annotation.SuppressLint import android.os.Environment -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.hasPermission -import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE -import com.simplemobiletools.commons.helpers.isRPlus -import com.simplemobiletools.filemanager.pro.R +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.hasPermission +import org.fossify.commons.helpers.PERMISSION_WRITE_STORAGE +import org.fossify.commons.helpers.isRPlus +import org.fossify.filemanager.R open class SimpleActivity : BaseSimpleActivity() { override fun getAppIconIDs() = arrayListOf( diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/SplashActivity.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt rename to app/src/main/kotlin/org/fossify/filemanager/activities/SplashActivity.kt index f772882b..727cfd43 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SplashActivity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/activities/SplashActivity.kt @@ -1,7 +1,7 @@ -package com.simplemobiletools.filemanager.pro.activities +package org.fossify.filemanager.activities import android.content.Intent -import com.simplemobiletools.commons.activities.BaseSplashActivity +import org.fossify.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { override fun initActivity() { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/adapters/DecompressItemsAdapter.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt rename to app/src/main/kotlin/org/fossify/filemanager/adapters/DecompressItemsAdapter.kt index 53ac45cc..df674163 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/DecompressItemsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/adapters/DecompressItemsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.adapters +package org.fossify.filemanager.adapters import android.content.pm.PackageManager import android.graphics.drawable.Drawable @@ -10,17 +10,18 @@ import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor -import com.simplemobiletools.commons.extensions.getTextSize -import com.simplemobiletools.commons.extensions.getTimeFormat -import com.simplemobiletools.commons.helpers.getFilePlaceholderDrawables -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.databinding.ItemDecompressionListFileDirBinding -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.getColoredDrawableWithColor +import org.fossify.commons.extensions.getTextSize +import org.fossify.commons.extensions.getTimeFormat +import org.fossify.commons.helpers.getFilePlaceholderDrawables +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.databinding.ItemDecompressionListFileDirBinding +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.models.ListItem +import java.util.Locale class DecompressItemsAdapter(activity: SimpleActivity, var listItems: MutableList, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { @@ -94,7 +95,7 @@ class DecompressItemsAdapter(activity: SimpleActivity, var listItems: MutableLis if (listItem.isDirectory) { itemIcon.setImageDrawable(folderDrawable) } else { - val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").toLowerCase(), { fileDrawable }) + val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").lowercase(Locale.getDefault()), { fileDrawable }) val options = RequestOptions() .signature(listItem.getKey()) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt similarity index 97% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt rename to app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt index 0c0932e1..c1b8b29e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/adapters/ItemsAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.adapters +package org.fossify.filemanager.adapters import android.annotation.SuppressLint import android.content.Intent @@ -27,22 +27,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.dialogs.* -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.models.RadioItem -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.activities.SplashActivity -import com.simplemobiletools.filemanager.pro.databinding.* -import com.simplemobiletools.filemanager.pro.dialogs.CompressAsDialog -import com.simplemobiletools.filemanager.pro.extensions.* -import com.simplemobiletools.filemanager.pro.helpers.* -import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener -import com.simplemobiletools.filemanager.pro.models.ListItem import com.stericson.RootTools.RootTools import net.lingala.zip4j.exception.ZipException import net.lingala.zip4j.io.inputstream.ZipInputStream @@ -50,10 +34,27 @@ import net.lingala.zip4j.io.outputstream.ZipOutputStream import net.lingala.zip4j.model.LocalFileHeader import net.lingala.zip4j.model.ZipParameters import net.lingala.zip4j.model.enums.EncryptionMethod +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.dialogs.* +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.models.RadioItem +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.activities.SplashActivity +import org.fossify.filemanager.databinding.* +import org.fossify.filemanager.dialogs.CompressAsDialog +import org.fossify.filemanager.extensions.* +import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.interfaces.ItemOperationsListener +import org.fossify.filemanager.models.ListItem import java.io.BufferedInputStream import java.io.Closeable import java.io.File -import java.util.* +import java.util.LinkedList +import java.util.Locale class ItemsAdapter( activity: SimpleActivity, var listItems: MutableList, val listener: ItemOperationsListener?, recyclerView: MyRecyclerView, @@ -320,7 +321,7 @@ class ItemsAdapter( drawable.findDrawableByLayerId(R.id.shortcut_folder_background).applyColorFilter(0) drawable.setDrawableByLayerId(R.id.shortcut_folder_image, bitmap) } catch (e: Exception) { - val fileIcon = fileDrawables.getOrElse(path.substringAfterLast(".").toLowerCase(), { fileDrawable }) + val fileIcon = fileDrawables.getOrElse(path.substringAfterLast(".").lowercase(Locale.getDefault()), { fileDrawable }) drawable.setDrawableByLayerId(R.id.shortcut_folder_image, fileIcon) } @@ -872,7 +873,7 @@ class ItemsAdapter( itemDate?.beVisible() itemDate?.text = listItem.modified.formatDate(activity, dateFormat, timeFormat) - val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").toLowerCase(), { fileDrawable }) + val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").lowercase(Locale.getDefault()), { fileDrawable }) val options = RequestOptions() .signature(listItem.getKey()) .diskCacheStrategy(DiskCacheStrategy.RESOURCE) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/adapters/ManageFavoritesAdapter.kt similarity index 83% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt rename to app/src/main/kotlin/org/fossify/filemanager/adapters/ManageFavoritesAdapter.kt index 804f31d7..3ef8129c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ManageFavoritesAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/adapters/ManageFavoritesAdapter.kt @@ -1,17 +1,17 @@ -package com.simplemobiletools.filemanager.pro.adapters +package org.fossify.filemanager.adapters import android.view.* import android.widget.PopupMenu -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.extensions.getPopupMenuTheme -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.setupViewBackground -import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.ItemManageFavoriteBinding -import com.simplemobiletools.filemanager.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.adapters.MyRecyclerViewAdapter +import org.fossify.commons.extensions.getPopupMenuTheme +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.setupViewBackground +import org.fossify.commons.interfaces.RefreshRecyclerViewListener +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.ItemManageFavoriteBinding +import org.fossify.filemanager.extensions.config class ManageFavoritesAdapter( activity: BaseSimpleActivity, var favorites: ArrayList, val listener: RefreshRecyclerViewListener?, @@ -68,7 +68,7 @@ class ManageFavoritesAdapter( setTextColor(activity.getProperTextColor()) } - manageFavoriteHolder?.isSelected = isSelected + manageFavoriteHolder.isSelected = isSelected overflowMenuIcon.drawable.apply { mutate() diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ViewPagerAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/adapters/ViewPagerAdapter.kt similarity index 82% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ViewPagerAdapter.kt rename to app/src/main/kotlin/org/fossify/filemanager/adapters/ViewPagerAdapter.kt index fb5b6211..66ce5fa5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ViewPagerAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/adapters/ViewPagerAdapter.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.filemanager.pro.adapters +package org.fossify.filemanager.adapters import android.content.Intent import android.media.RingtoneManager import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.helpers.TAB_FILES -import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES -import com.simplemobiletools.commons.helpers.TAB_STORAGE_ANALYSIS -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.fragments.MyViewPagerFragment +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.helpers.TAB_FILES +import org.fossify.commons.helpers.TAB_RECENT_FILES +import org.fossify.commons.helpers.TAB_STORAGE_ANALYSIS +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.fragments.MyViewPagerFragment class ViewPagerAdapter(val activity: SimpleActivity, val tabsToShow: ArrayList) : PagerAdapter() { override fun instantiateItem(container: ViewGroup, position: Int): Any { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeSortingDialog.kt similarity index 84% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeSortingDialog.kt index 1475a4e1..b1a65583 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeSortingDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeSortingDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.beVisibleIf -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.DialogChangeSortingBinding -import com.simplemobiletools.filemanager.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.beVisibleIf +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.* +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogChangeSortingBinding +import org.fossify.filemanager.extensions.config class ChangeSortingDialog(val activity: BaseSimpleActivity, val path: String = "", val callback: () -> Unit) { private var currSorting = 0 diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeViewTypeDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeViewTypeDialog.kt similarity index 74% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeViewTypeDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeViewTypeDialog.kt index ecc1414e..0bac2f17 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ChangeViewTypeDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ChangeViewTypeDialog.kt @@ -1,14 +1,14 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.DialogChangeViewTypeBinding -import com.simplemobiletools.filemanager.pro.extensions.config +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.VIEW_TYPE_GRID +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogChangeViewTypeBinding +import org.fossify.filemanager.extensions.config class ChangeViewTypeDialog(val activity: BaseSimpleActivity, val path: String = "", showFolderCheck: Boolean = true, val callback: () -> Unit) { private var binding: DialogChangeViewTypeBinding diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/CompressAsDialog.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/CompressAsDialog.kt index ce2c6972..c6688505 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/CompressAsDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs import android.view.View 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 org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogCompressAsBinding +import org.fossify.filemanager.extensions.config class CompressAsDialog(val activity: BaseSimpleActivity, val path: String, val callback: (destination: String, password: String?) -> Unit) { private val binding = DialogCompressAsBinding.inflate(activity.layoutInflater) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/CreateNewItemDialog.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/CreateNewItemDialog.kt index b0e0feca..e2aa6f52 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CreateNewItemDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/CreateNewItemDialog.kt @@ -1,13 +1,13 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs import android.view.View import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.isRPlus -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.databinding.DialogCreateNewBinding -import com.simplemobiletools.filemanager.pro.helpers.RootHelpers +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.isRPlus +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.databinding.DialogCreateNewBinding +import org.fossify.filemanager.helpers.RootHelpers import java.io.File import java.io.IOException @@ -66,6 +66,7 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca documentFile.createDirectory(path.getFilenameFromPath()) success(alertDialog) } + isRPlus() || path.startsWith(activity.internalStoragePath, true) -> { if (activity.isRestrictedSAFOnlyRoot(path)) { activity.handleAndroidSAFDialog(path) { @@ -87,6 +88,7 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca } } } + else -> { RootHelpers(activity).createFileFolder(path, false) { if (it) { @@ -141,6 +143,7 @@ class CreateNewItemDialog(val activity: SimpleActivity, val path: String, val ca success(alertDialog) } } + else -> { RootHelpers(activity).createFileFolder(path, true) { if (it) { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/InsertFilenameDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/InsertFilenameDialog.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/InsertFilenameDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/InsertFilenameDialog.kt index 42879c21..4243c408 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/InsertFilenameDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/InsertFilenameDialog.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.DialogInsertFilenameBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogInsertFilenameBinding class InsertFilenameDialog( val activity: BaseSimpleActivity, var path: String, val callback: (filename: String) -> Unit diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ManageVisibleTabsDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt similarity index 61% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ManageVisibleTabsDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt index 7f37ff7b..4040518d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/ManageVisibleTabsDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/ManageVisibleTabsDialog.kt @@ -1,18 +1,18 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.beGone -import com.simplemobiletools.commons.extensions.getAlertDialogBuilder -import com.simplemobiletools.commons.extensions.setupDialogStuff -import com.simplemobiletools.commons.helpers.TAB_FILES -import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES -import com.simplemobiletools.commons.helpers.TAB_STORAGE_ANALYSIS -import com.simplemobiletools.commons.helpers.isOreoPlus -import com.simplemobiletools.commons.views.MyAppCompatCheckbox -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.DialogManageVisibleTabsBinding -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.helpers.ALL_TABS_MASK +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.beGone +import org.fossify.commons.extensions.getAlertDialogBuilder +import org.fossify.commons.extensions.setupDialogStuff +import org.fossify.commons.helpers.TAB_FILES +import org.fossify.commons.helpers.TAB_RECENT_FILES +import org.fossify.commons.helpers.TAB_STORAGE_ANALYSIS +import org.fossify.commons.helpers.isOreoPlus +import org.fossify.commons.views.MyAppCompatCheckbox +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogManageVisibleTabsBinding +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.helpers.ALL_TABS_MASK class ManageVisibleTabsDialog(val activity: BaseSimpleActivity) { private val binding = DialogManageVisibleTabsBinding.inflate(activity.layoutInflater) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt b/app/src/main/kotlin/org/fossify/filemanager/dialogs/SaveAsDialog.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt rename to app/src/main/kotlin/org/fossify/filemanager/dialogs/SaveAsDialog.kt index e733b387..3ddd9350 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/SaveAsDialog.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/dialogs/SaveAsDialog.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.filemanager.pro.dialogs +package org.fossify.filemanager.dialogs import androidx.appcompat.app.AlertDialog -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.ConfirmationDialog -import com.simplemobiletools.commons.dialogs.FilePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.databinding.DialogSaveAsBinding +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.ConfirmationDialog +import org.fossify.commons.dialogs.FilePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.filemanager.R +import org.fossify.filemanager.databinding.DialogSaveAsBinding class SaveAsDialog( val activity: BaseSimpleActivity, var path: String, val hidePath: Boolean, diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt rename to app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt index c0a8042f..a8884e81 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/Activity.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.extensions +package org.fossify.filemanager.extensions import android.app.Activity import android.content.Intent @@ -6,11 +6,11 @@ import android.net.Uri import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.core.content.FileProvider -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.filemanager.pro.BuildConfig -import com.simplemobiletools.filemanager.pro.helpers.* +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.filemanager.BuildConfig +import org.fossify.filemanager.helpers.* import java.io.File fun Activity.sharePaths(paths: ArrayList) { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt similarity index 69% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt rename to app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt index 7c14deb9..1caee426 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Context.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/Context.kt @@ -1,12 +1,12 @@ -package com.simplemobiletools.filemanager.pro.extensions +package org.fossify.filemanager.extensions import android.content.Context import android.os.storage.StorageManager -import com.simplemobiletools.commons.extensions.isPathOnOTG -import com.simplemobiletools.commons.extensions.isPathOnSD -import com.simplemobiletools.commons.helpers.isNougatPlus -import com.simplemobiletools.filemanager.pro.helpers.Config -import com.simplemobiletools.filemanager.pro.helpers.PRIMARY_VOLUME_NAME +import org.fossify.commons.extensions.isPathOnOTG +import org.fossify.commons.extensions.isPathOnSD +import org.fossify.commons.helpers.isNougatPlus +import org.fossify.filemanager.helpers.Config +import org.fossify.filemanager.helpers.PRIMARY_VOLUME_NAME import java.util.Locale val Context.config: Config get() = Config.newInstance(applicationContext) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Long.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/Long.kt similarity index 87% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Long.kt rename to app/src/main/kotlin/org/fossify/filemanager/extensions/Long.kt index 61cee2fe..b3844440 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/extensions/Long.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/Long.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.extensions +package org.fossify.filemanager.extensions import java.text.DecimalFormat diff --git a/app/src/main/kotlin/org/fossify/filemanager/extensions/String.kt b/app/src/main/kotlin/org/fossify/filemanager/extensions/String.kt new file mode 100644 index 00000000..ef1eea11 --- /dev/null +++ b/app/src/main/kotlin/org/fossify/filemanager/extensions/String.kt @@ -0,0 +1,3 @@ +package org.fossify.filemanager.extensions + +fun String.isZipFile() = endsWith(".zip", true) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/ItemsFragment.kt similarity index 93% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt rename to app/src/main/kotlin/org/fossify/filemanager/fragments/ItemsFragment.kt index a1c89b49..5b469cd9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/ItemsFragment.kt @@ -1,30 +1,30 @@ -package com.simplemobiletools.filemanager.pro.fragments +package org.fossify.filemanager.fragments import android.annotation.SuppressLint import android.content.Context import android.os.Parcelable import android.util.AttributeSet import androidx.recyclerview.widget.GridLayoutManager -import com.simplemobiletools.commons.activities.BaseSimpleActivity -import com.simplemobiletools.commons.dialogs.StoragePickerDialog -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.views.Breadcrumbs -import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.MainActivity -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter -import com.simplemobiletools.filemanager.pro.databinding.ItemsFragmentBinding -import com.simplemobiletools.filemanager.pro.dialogs.CreateNewItemDialog -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.extensions.isPathOnRoot -import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT -import com.simplemobiletools.filemanager.pro.helpers.RootHelpers -import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.activities.BaseSimpleActivity +import org.fossify.commons.dialogs.StoragePickerDialog +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.views.Breadcrumbs +import org.fossify.commons.views.MyGridLayoutManager +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.MainActivity +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.adapters.ItemsAdapter +import org.fossify.filemanager.databinding.ItemsFragmentBinding +import org.fossify.filemanager.dialogs.CreateNewItemDialog +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.extensions.isPathOnRoot +import org.fossify.filemanager.helpers.MAX_COLUMN_COUNT +import org.fossify.filemanager.helpers.RootHelpers +import org.fossify.filemanager.interfaces.ItemOperationsListener +import org.fossify.filemanager.models.ListItem import java.io.File class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), @@ -145,7 +145,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF private fun addItems(items: ArrayList, forceRefresh: Boolean = false) { activity?.runOnUiThread { - binding.itemsSwipeRefresh?.isRefreshing = false + binding.itemsSwipeRefresh.isRefreshing = false binding.breadcrumbs.setBreadcrumb(currentPath) if (!forceRefresh && items.hashCode() == storedItems.hashCode()) { return@runOnUiThread diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/MyViewPagerFragment.kt similarity index 79% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt rename to app/src/main/kotlin/org/fossify/filemanager/fragments/MyViewPagerFragment.kt index 9b00be3b..993c8e45 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/MyViewPagerFragment.kt @@ -1,21 +1,21 @@ -package com.simplemobiletools.filemanager.pro.fragments +package org.fossify.filemanager.fragments import android.content.Context import android.util.AttributeSet import android.widget.RelativeLayout -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.views.MyFloatingActionButton -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.MainActivity -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.databinding.ItemsFragmentBinding -import com.simplemobiletools.filemanager.pro.databinding.RecentsFragmentBinding -import com.simplemobiletools.filemanager.pro.databinding.StorageFragmentBinding -import com.simplemobiletools.filemanager.pro.extensions.isPathOnRoot -import com.simplemobiletools.filemanager.pro.extensions.tryOpenPathIntent -import com.simplemobiletools.filemanager.pro.helpers.RootHelpers +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.views.MyFloatingActionButton +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.MainActivity +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.databinding.ItemsFragmentBinding +import org.fossify.filemanager.databinding.RecentsFragmentBinding +import org.fossify.filemanager.databinding.StorageFragmentBinding +import org.fossify.filemanager.extensions.isPathOnRoot +import org.fossify.filemanager.extensions.tryOpenPathIntent +import org.fossify.filemanager.helpers.RootHelpers abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) : RelativeLayout(context, attributeSet) { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt similarity index 88% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt rename to app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt index 413bada2..aab6e7c0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/RecentsFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.fragments +package org.fossify.filemanager.fragments import android.content.ContentResolver import android.content.Context @@ -6,22 +6,22 @@ import android.provider.MediaStore.Files import android.provider.MediaStore.Files.FileColumns import android.util.AttributeSet import androidx.core.os.bundleOf -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.VIEW_TYPE_GRID -import com.simplemobiletools.commons.helpers.VIEW_TYPE_LIST -import com.simplemobiletools.commons.helpers.ensureBackgroundThread -import com.simplemobiletools.commons.helpers.isOreoPlus -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.filemanager.pro.activities.MainActivity -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter -import com.simplemobiletools.filemanager.pro.databinding.RecentsFragmentBinding -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.helpers.MAX_COLUMN_COUNT -import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.VIEW_TYPE_GRID +import org.fossify.commons.helpers.VIEW_TYPE_LIST +import org.fossify.commons.helpers.ensureBackgroundThread +import org.fossify.commons.helpers.isOreoPlus +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.views.MyGridLayoutManager +import org.fossify.commons.views.MyRecyclerView +import org.fossify.filemanager.activities.MainActivity +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.adapters.ItemsAdapter +import org.fossify.filemanager.databinding.RecentsFragmentBinding +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.helpers.MAX_COLUMN_COUNT +import org.fossify.filemanager.interfaces.ItemOperationsListener +import org.fossify.filemanager.models.ListItem import java.io.File class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), @@ -51,7 +51,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage ensureBackgroundThread { getRecents { recents -> binding.apply { - recentsSwipeRefresh?.isRefreshing = false + recentsSwipeRefresh.isRefreshing = false recentsList.beVisibleIf(recents.isNotEmpty()) recentsPlaceholder.beVisibleIf(recents.isEmpty()) } diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt b/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt similarity index 94% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt rename to app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt index bd33401b..be57a140 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/StorageFragment.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/fragments/StorageFragment.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.fragments +package org.fossify.filemanager.fragments import android.annotation.SuppressLint import android.app.Activity @@ -17,24 +17,24 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.core.view.children import androidx.core.view.isVisible -import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.* -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.commons.views.MyGridLayoutManager -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.activities.MimeTypesActivity -import com.simplemobiletools.filemanager.pro.activities.SimpleActivity -import com.simplemobiletools.filemanager.pro.adapters.ItemsAdapter -import com.simplemobiletools.filemanager.pro.databinding.ItemStorageVolumeBinding -import com.simplemobiletools.filemanager.pro.databinding.StorageFragmentBinding -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.extensions.formatSizeThousand -import com.simplemobiletools.filemanager.pro.extensions.getAllVolumeNames -import com.simplemobiletools.filemanager.pro.helpers.* -import com.simplemobiletools.filemanager.pro.interfaces.ItemOperationsListener -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.extensions.* +import org.fossify.commons.helpers.* +import org.fossify.commons.models.FileDirItem +import org.fossify.commons.views.MyGridLayoutManager +import org.fossify.filemanager.R +import org.fossify.filemanager.activities.MimeTypesActivity +import org.fossify.filemanager.activities.SimpleActivity +import org.fossify.filemanager.adapters.ItemsAdapter +import org.fossify.filemanager.databinding.ItemStorageVolumeBinding +import org.fossify.filemanager.databinding.StorageFragmentBinding +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.extensions.formatSizeThousand +import org.fossify.filemanager.extensions.getAllVolumeNames +import org.fossify.filemanager.helpers.* +import org.fossify.filemanager.interfaces.ItemOperationsListener +import org.fossify.filemanager.models.ListItem import java.io.File -import java.util.* +import java.util.Locale class StorageFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), ItemOperationsListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt b/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt similarity index 89% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt rename to app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt index e3fb2338..9e9b3fd2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Config.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/helpers/Config.kt @@ -1,10 +1,11 @@ -package com.simplemobiletools.filemanager.pro.helpers +package org.fossify.filemanager.helpers import android.content.Context import android.content.res.Configuration -import com.simplemobiletools.commons.extensions.getInternalStoragePath -import com.simplemobiletools.commons.helpers.BaseConfig +import org.fossify.commons.extensions.getInternalStoragePath +import org.fossify.commons.helpers.BaseConfig import java.io.File +import java.util.Locale class Config(context: Context) : BaseConfig(context) { companion object { @@ -79,17 +80,17 @@ class Config(context: Context) : BaseConfig(context) { if (path.isEmpty()) { viewType = value } else { - prefs.edit().putInt(VIEW_TYPE_PREFIX + path.toLowerCase(), value).apply() + prefs.edit().putInt(VIEW_TYPE_PREFIX + path.lowercase(Locale.getDefault()), value).apply() } } - fun getFolderViewType(path: String) = prefs.getInt(VIEW_TYPE_PREFIX + path.toLowerCase(), viewType) + fun getFolderViewType(path: String) = prefs.getInt(VIEW_TYPE_PREFIX + path.lowercase(Locale.getDefault()), viewType) fun removeFolderViewType(path: String) { - prefs.edit().remove(VIEW_TYPE_PREFIX + path.toLowerCase()).apply() + prefs.edit().remove(VIEW_TYPE_PREFIX + path.lowercase(Locale.getDefault())).apply() } - fun hasCustomViewType(path: String) = prefs.contains(VIEW_TYPE_PREFIX + path.toLowerCase()) + fun hasCustomViewType(path: String) = prefs.contains(VIEW_TYPE_PREFIX + path.lowercase(Locale.getDefault())) var fileColumnCnt: Int get() = prefs.getInt(getFileColumnsField(), getDefaultFileColumnCount()) diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/filemanager/helpers/Constants.kt similarity index 86% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt rename to app/src/main/kotlin/org/fossify/filemanager/helpers/Constants.kt index 28e1ae40..6df79baf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/helpers/Constants.kt @@ -1,10 +1,10 @@ -package com.simplemobiletools.filemanager.pro.helpers +package org.fossify.filemanager.helpers -import com.simplemobiletools.commons.helpers.TAB_FILES -import com.simplemobiletools.commons.helpers.TAB_RECENT_FILES -import com.simplemobiletools.commons.helpers.TAB_STORAGE_ANALYSIS -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.filemanager.pro.models.ListItem +import org.fossify.commons.helpers.TAB_FILES +import org.fossify.commons.helpers.TAB_RECENT_FILES +import org.fossify.commons.helpers.TAB_STORAGE_ANALYSIS +import org.fossify.commons.models.FileDirItem +import org.fossify.filemanager.models.ListItem const val MAX_COLUMN_COUNT = 15 diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/PdfDocumentAdapter.kt b/app/src/main/kotlin/org/fossify/filemanager/helpers/PdfDocumentAdapter.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/PdfDocumentAdapter.kt rename to app/src/main/kotlin/org/fossify/filemanager/helpers/PdfDocumentAdapter.kt index 83202a61..bfc3d60a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/PdfDocumentAdapter.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/helpers/PdfDocumentAdapter.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.helpers +package org.fossify.filemanager.helpers import android.content.Context import android.os.Bundle @@ -8,7 +8,7 @@ import android.print.PageRange import android.print.PrintAttributes import android.print.PrintDocumentAdapter import android.print.PrintDocumentInfo -import com.simplemobiletools.commons.extensions.getFilenameFromPath +import org.fossify.commons.extensions.getFilenameFromPath import java.io.* // taken from https://github.com/HarshitaBambure/AndroidPDFPrint/blob/master/app/src/main/java/com/example/androidpdfprint/PdfDocumentAdapter.java diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt b/app/src/main/kotlin/org/fossify/filemanager/helpers/RootHelpers.kt similarity index 95% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt rename to app/src/main/kotlin/org/fossify/filemanager/helpers/RootHelpers.kt index 87f84cc4..e5844e9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/RootHelpers.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/helpers/RootHelpers.kt @@ -1,16 +1,16 @@ -package com.simplemobiletools.filemanager.pro.helpers +package org.fossify.filemanager.helpers import android.app.Activity -import com.simplemobiletools.commons.extensions.areDigitsOnly -import com.simplemobiletools.commons.extensions.showErrorToast -import com.simplemobiletools.commons.extensions.toast -import com.simplemobiletools.commons.helpers.SORT_BY_SIZE -import com.simplemobiletools.commons.models.FileDirItem -import com.simplemobiletools.filemanager.pro.R -import com.simplemobiletools.filemanager.pro.extensions.config -import com.simplemobiletools.filemanager.pro.models.ListItem import com.stericson.RootShell.execution.Command import com.stericson.RootTools.RootTools +import org.fossify.commons.extensions.areDigitsOnly +import org.fossify.commons.extensions.showErrorToast +import org.fossify.commons.extensions.toast +import org.fossify.commons.helpers.SORT_BY_SIZE +import org.fossify.commons.models.FileDirItem +import org.fossify.filemanager.R +import org.fossify.filemanager.extensions.config +import org.fossify.filemanager.models.ListItem import java.io.File class RootHelpers(val activity: Activity) { diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt b/app/src/main/kotlin/org/fossify/filemanager/interfaces/ItemOperationsListener.kt similarity index 73% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt rename to app/src/main/kotlin/org/fossify/filemanager/interfaces/ItemOperationsListener.kt index 55e599a0..2812527d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/interfaces/ItemOperationsListener.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/interfaces/ItemOperationsListener.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.filemanager.pro.interfaces +package org.fossify.filemanager.interfaces -import com.simplemobiletools.commons.models.FileDirItem +import org.fossify.commons.models.FileDirItem interface ItemOperationsListener { fun refreshFragment() diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/models/ListItem.kt b/app/src/main/kotlin/org/fossify/filemanager/models/ListItem.kt similarity index 78% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/models/ListItem.kt rename to app/src/main/kotlin/org/fossify/filemanager/models/ListItem.kt index 91be21a1..8bf14583 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/models/ListItem.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/models/ListItem.kt @@ -1,6 +1,6 @@ -package com.simplemobiletools.filemanager.pro.models +package org.fossify.filemanager.models -import com.simplemobiletools.commons.models.FileDirItem +import org.fossify.commons.models.FileDirItem // isSectionTitle is used only at search results for showing the current folders path data class ListItem( diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/views/GestureEditText.kt b/app/src/main/kotlin/org/fossify/filemanager/views/GestureEditText.kt similarity index 90% rename from app/src/main/kotlin/com/simplemobiletools/filemanager/pro/views/GestureEditText.kt rename to app/src/main/kotlin/org/fossify/filemanager/views/GestureEditText.kt index 73cc0ea2..cfd01785 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/views/GestureEditText.kt +++ b/app/src/main/kotlin/org/fossify/filemanager/views/GestureEditText.kt @@ -1,4 +1,4 @@ -package com.simplemobiletools.filemanager.pro.views +package org.fossify.filemanager.views import android.content.Context import android.util.AttributeSet @@ -8,10 +8,10 @@ import androidx.appcompat.widget.AppCompatEditText import com.alexvasilkov.gestures.GestureController import com.alexvasilkov.gestures.State import com.alexvasilkov.gestures.views.interfaces.GestureView -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor -import com.simplemobiletools.commons.extensions.onGlobalLayout -import com.simplemobiletools.filemanager.pro.extensions.config +import org.fossify.commons.extensions.getProperPrimaryColor +import org.fossify.commons.extensions.getProperTextColor +import org.fossify.commons.extensions.onGlobalLayout +import org.fossify.filemanager.extensions.config // inspired by // https://github.com/alexvasilkov/GestureViews/blob/f0a4c266e31dcad23bd0d9013531bc1c501b9c9f/sample/src/main/java/com/alexvasilkov/gestures/sample/ex/custom/text/GestureTextView.java diff --git a/app/src/main/res/layout/activity_decompress.xml b/app/src/main/res/layout/activity_decompress.xml index c9c8a333..8a4fa560 100644 --- a/app/src/main/res/layout/activity_decompress.xml +++ b/app/src/main/res/layout/activity_decompress.xml @@ -22,14 +22,14 @@ android:fillViewport="true" android:scrollbars="none"> - + app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" /> diff --git a/app/src/main/res/layout/activity_favorites.xml b/app/src/main/res/layout/activity_favorites.xml index 2beda03a..d0e5cf04 100644 --- a/app/src/main/res/layout/activity_favorites.xml +++ b/app/src/main/res/layout/activity_favorites.xml @@ -23,16 +23,16 @@ android:fillViewport="true" android:scrollbars="none"> - - - - @@ -16,7 +16,7 @@ android:layout_height="match_parent" android:layout_marginTop="?attr/actionBarSize"> - - - - + app:layoutManager="org.fossify.commons.views.MyGridLayoutManager" /> diff --git a/app/src/main/res/layout/activity_read_text.xml b/app/src/main/res/layout/activity_read_text.xml index 3e8905c0..ab1e87ec 100644 --- a/app/src/main/res/layout/activity_read_text.xml +++ b/app/src/main/res/layout/activity_read_text.xml @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:fillViewport="true"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - + android:visibility="gone" + app:passwordToggleEnabled="true"> - + diff --git a/app/src/main/res/layout/dialog_create_new.xml b/app/src/main/res/layout/dialog_create_new.xml index 6d92cd42..621d3ba3 100644 --- a/app/src/main/res/layout/dialog_create_new.xml +++ b/app/src/main/res/layout/dialog_create_new.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - + - - - - + - - + diff --git a/app/src/main/res/layout/dialog_manage_visible_tabs.xml b/app/src/main/res/layout/dialog_manage_visible_tabs.xml index 799ae011..469636e6 100644 --- a/app/src/main/res/layout/dialog_manage_visible_tabs.xml +++ b/app/src/main/res/layout/dialog_manage_visible_tabs.xml @@ -13,7 +13,7 @@ android:paddingTop="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin"> - - - - - + - - + - - + diff --git a/app/src/main/res/layout/item_file_grid.xml b/app/src/main/res/layout/item_file_grid.xml index 6aea7b18..2dea1d9e 100644 --- a/app/src/main/res/layout/item_file_grid.xml +++ b/app/src/main/res/layout/item_file_grid.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/normal_margin"> - - - - - - - - - - - - - - - - - - - - - - - + app:layoutManager="org.fossify.commons.views.MyGridLayoutManager" /> - - + diff --git a/app/src/main/res/layout/recents_fragment.xml b/app/src/main/res/layout/recents_fragment.xml index 34ed9171..b29c59b9 100644 --- a/app/src/main/res/layout/recents_fragment.xml +++ b/app/src/main/res/layout/recents_fragment.xml @@ -1,12 +1,12 @@ - - - + app:layoutManager="org.fossify.commons.views.MyGridLayoutManager" /> - + diff --git a/app/src/main/res/layout/storage_fragment.xml b/app/src/main/res/layout/storage_fragment.xml index 7a52a657..e8fc5606 100644 --- a/app/src/main/res/layout/storage_fragment.xml +++ b/app/src/main/res/layout/storage_fragment.xml @@ -1,5 +1,5 @@ - - - - + app:layoutManager="org.fossify.commons.views.MyGridLayoutManager" /> - + diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 150612bb..3279f927 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,6 +1,6 @@ - com.simplemobiletools.filemanager.pro + org.fossify.filemanager Allow toggling between list and grid view diff --git a/fastlane/Appfile b/fastlane/Appfile index 1f679e98..06bde554 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file("fastlane/fastlane.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one -package_name("com.simplemobiletools.filemanager.pro") # e.g. com.krausefx.app +package_name("org.fossify.filemanager") # e.g. com.krausefx.app diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7f67811e..c8237f9f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ app-build-minimumSDK = "23" app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning -app-version-appId = "com.simplemobiletools.filemanager.pro" +app-version-appId = "org.fossify.filemanager" app-version-versionCode = "1" app-version-versionName = "1.0.0" [libraries]