AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Rename NoDirFileDialog to NoDirFileOrEmptyDialog

Browse Source
This commit is contained in:
Julian Raufelder 2022-04-21 15:50:15 +02:00
parent a39e5698a9
commit 6bda0f7ab1
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
View File

@ -214,13 +214,13 @@ class BrowseFilesPresenter @Inject constructor( //
return return
} }
e is EmptyDirFileException -> { e is EmptyDirFileException -> {
view?.showNoDirFileDialog(e.dirName, e.filePath) view?.showNoDirFileOrEmptyDialog(e.dirName, e.filePath)
} }
e is SymLinkException -> { e is SymLinkException -> {
view?.showSymLinkDialog() view?.showSymLinkDialog()
} }
e is NoDirFileException -> { e is NoDirFileException -> {
view?.showNoDirFileDialog(e.cryptoFolderName, e.cloudFolderPath) view?.showNoDirFileOrEmptyDialog(e.cryptoFolderName, e.cloudFolderPath)
} }
else -> { else -> {
super.onError(e) super.onError(e)

8
presentation/src/main/java/org/cryptomator/presentation/ui/activity/BrowseFilesActivity.kt
View File

@ -45,7 +45,7 @@ import org.cryptomator.presentation.ui.dialog.CreateFolderDialog
import org.cryptomator.presentation.ui.dialog.ExportCloudFilesDialog import org.cryptomator.presentation.ui.dialog.ExportCloudFilesDialog
import org.cryptomator.presentation.ui.dialog.FileNameDialog import org.cryptomator.presentation.ui.dialog.FileNameDialog
import org.cryptomator.presentation.ui.dialog.FileTypeNotSupportedDialog import org.cryptomator.presentation.ui.dialog.FileTypeNotSupportedDialog
import org.cryptomator.presentation.ui.dialog.NoDirFileDialog import org.cryptomator.presentation.ui.dialog.NoDirFileOrEmptyDialog
import org.cryptomator.presentation.ui.dialog.ReplaceDialog import org.cryptomator.presentation.ui.dialog.ReplaceDialog
import org.cryptomator.presentation.ui.dialog.SymLinkDialog import org.cryptomator.presentation.ui.dialog.SymLinkDialog
import org.cryptomator.presentation.ui.dialog.UploadCloudFileDialog import org.cryptomator.presentation.ui.dialog.UploadCloudFileDialog
@ -64,7 +64,7 @@ class BrowseFilesActivity : BaseActivity(), //
UploadCloudFileDialog.Callback, UploadCloudFileDialog.Callback,
ExportCloudFilesDialog.Callback, ExportCloudFilesDialog.Callback,
SymLinkDialog.CallBack, SymLinkDialog.CallBack,
NoDirFileDialog.CallBack, NoDirFileOrEmptyDialog.CallBack,
SearchView.OnQueryTextListener, SearchView.OnQueryTextListener,
SearchView.OnCloseListener { SearchView.OnCloseListener {
@ -606,8 +606,8 @@ class BrowseFilesActivity : BaseActivity(), //
showDialog(SymLinkDialog.newInstance()) showDialog(SymLinkDialog.newInstance())
} }
override fun showNoDirFileDialog(cryptoFolderName: String, cloudFolderPath: String) { override fun showNoDirFileOrEmptyDialog(cryptoFolderName: String, cloudFolderPath: String) {
showDialog(NoDirFileDialog.newInstance(cryptoFolderName, cloudFolderPath)) showDialog(NoDirFileOrEmptyDialog.newInstance(cryptoFolderName, cloudFolderPath))
} }
override fun updateActiveFolderDueToAuthenticationProblem(folder: CloudFolderModel) { override fun updateActiveFolderDueToAuthenticationProblem(folder: CloudFolderModel) {

2
presentation/src/main/java/org/cryptomator/presentation/ui/activity/view/BrowseFilesView.kt
View File

@ -34,7 +34,7 @@ interface BrowseFilesView : View {
fun updateSelectionTitle(numberSelected: Int) fun updateSelectionTitle(numberSelected: Int)
fun disableSelectionMode() fun disableSelectionMode()
fun showSymLinkDialog() fun showSymLinkDialog()
fun showNoDirFileDialog(cryptoFolderName: String, cloudFolderPath: String) fun showNoDirFileOrEmptyDialog(cryptoFolderName: String, cloudFolderPath: String)
fun updateActiveFolderDueToAuthenticationProblem(folder: CloudFolderModel) fun updateActiveFolderDueToAuthenticationProblem(folder: CloudFolderModel)
} }

14
presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileDialog.kt → presentation/src/main/java/org/cryptomator/presentation/ui/dialog/NoDirFileOrEmptyDialog.kt
View File

@ -6,10 +6,10 @@ import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import org.cryptomator.generator.Dialog import org.cryptomator.generator.Dialog
import org.cryptomator.presentation.R import org.cryptomator.presentation.R
import kotlinx.android.synthetic.main.dialog_no_dir_file.tv_no_dir_file_info import kotlinx.android.synthetic.main.dialog_no_dir_file_or_empty.tv_no_dir_file_or_empty_info
@Dialog(R.layout.dialog_no_dir_file) @Dialog(R.layout.dialog_no_dir_file_or_empty)
class NoDirFileDialog : BaseDialog<NoDirFileDialog.CallBack>() { class NoDirFileOrEmptyDialog : BaseDialog<NoDirFileOrEmptyDialog.CallBack>() {
interface CallBack { interface CallBack {
@ -33,7 +33,7 @@ class NoDirFileDialog : BaseDialog<NoDirFileDialog.CallBack>() {
public override fun setupView() { public override fun setupView() {
val cryptoFolderName = requireArguments().getSerializable(ARG_CRYPTO_FOLDER_NAME) as String val cryptoFolderName = requireArguments().getSerializable(ARG_CRYPTO_FOLDER_NAME) as String
val cloudFolderPath = requireArguments().getSerializable(ARG_CLOUD_FOLDER_PATH) as String val cloudFolderPath = requireArguments().getSerializable(ARG_CLOUD_FOLDER_PATH) as String
tv_no_dir_file_info.text = String.format(getString(R.string.dialog_no_dir_file_message), cryptoFolderName, cloudFolderPath) tv_no_dir_file_or_empty_info.text = String.format(getString(R.string.dialog_no_dir_file_message), cryptoFolderName, cloudFolderPath)
} }
companion object { companion object {
@ -41,12 +41,12 @@ class NoDirFileDialog : BaseDialog<NoDirFileDialog.CallBack>() {
private const val ARG_CRYPTO_FOLDER_NAME = "argCryptoFolderName" private const val ARG_CRYPTO_FOLDER_NAME = "argCryptoFolderName"
private const val ARG_CLOUD_FOLDER_PATH = "argCloudFolderPath" private const val ARG_CLOUD_FOLDER_PATH = "argCloudFolderPath"
fun newInstance(cryptoFolderName: String, cloudFolderPath: String): DialogFragment { fun newInstance(cryptoFolderName: String, cloudFolderPath: String): DialogFragment {
val noDirFileDialog = NoDirFileDialog() val noDirFileOrEmptyDialog = NoDirFileOrEmptyDialog()
val args = Bundle() val args = Bundle()
args.putSerializable(ARG_CRYPTO_FOLDER_NAME, cryptoFolderName) args.putSerializable(ARG_CRYPTO_FOLDER_NAME, cryptoFolderName)
args.putSerializable(ARG_CLOUD_FOLDER_PATH, cloudFolderPath) args.putSerializable(ARG_CLOUD_FOLDER_PATH, cloudFolderPath)
noDirFileDialog.arguments = args noDirFileOrEmptyDialog.arguments = args
return noDirFileDialog return noDirFileOrEmptyDialog
} }
} }
} }

2
presentation/src/main/res/layout/dialog_no_dir_file.xml → presentation/src/main/res/layout/dialog_no_dir_file_or_empty.xml
View File

@ -9,7 +9,7 @@
android:padding="@dimen/activity_vertical_margin"> android:padding="@dimen/activity_vertical_margin">
<TextView <TextView
android:id="@+id/tv_no_dir_file_info" android:id="@+id/tv_no_dir_file_or_empty_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />