From a0cbedd54d8e0d8ab9511ac857b8f58326956144 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 12 Jul 2022 10:46:57 +0200 Subject: [PATCH] materializing the dialogs --- app/build.gradle | 2 +- .../notes/pro/activities/MainActivity.kt | 2 +- .../notes/pro/dialogs/ExportFileDialog.kt | 8 +- .../notes/pro/dialogs/ExportFilesDialog.kt | 10 +-- .../notes/pro/dialogs/ImportFolderDialog.kt | 2 +- .../pro/dialogs/NewChecklistItemDialog.kt | 10 ++- .../notes/pro/dialogs/OpenFileDialog.kt | 2 +- .../main/res/layout/dialog_export_file.xml | 82 +++++++++---------- .../main/res/layout/dialog_export_files.xml | 56 ++++++------- .../main/res/layout/dialog_import_folder.xml | 25 +++--- .../res/layout/dialog_new_checklist_item.xml | 2 +- app/src/main/res/layout/dialog_new_note.xml | 20 +++-- app/src/main/res/layout/dialog_open_file.xml | 23 +++--- .../layout/dialog_rename_checklist_item.xml | 21 +++-- .../main/res/layout/dialog_rename_note.xml | 19 +++-- 15 files changed, 151 insertions(+), 133 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 804de00b..2c27cec1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,7 +63,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:4f9c2f94ff' + implementation 'com.github.SimpleMobileTools:Simple-Commons:5d40d6640c' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.documentfile:documentfile:1.0.1' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 53e27f38..edcbecf4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -442,8 +442,8 @@ class MainActivity : SimpleActivity() { .forEach(::removeProtection) mNotes = notes - refreshMenuItems() mCurrentNote = mNotes[0] + refreshMenuItems() mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, this) view_pager.apply { adapter = mAdapter diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt index 81c54dda..990deb05 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFileDialog.kt @@ -15,13 +15,13 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac init { var realPath = File(note.path).parent ?: activity.config.lastUsedSavePath val view = activity.layoutInflater.inflate(R.layout.dialog_export_file, null).apply { - file_path.text = activity.humanizePath(realPath) + file_path.setText(activity.humanizePath(realPath)) file_name.setText(note.title) - file_extension.setText(activity.config.lastUsedExtension) + extension.setText(activity.config.lastUsedExtension) file_path.setOnClickListener { FilePickerDialog(activity, realPath, false, false, true, true) { - file_path.text = activity.humanizePath(it) + file_path.setText(activity.humanizePath(it)) realPath = it } } @@ -35,7 +35,7 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac alertDialog.showKeyboard(view.file_name) alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { val filename = view.file_name.value - val extension = view.file_extension.value + val extension = view.extension.value if (filename.isEmpty()) { activity.toast(R.string.filename_cannot_be_empty) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt index bd8896fa..69e6b202 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ExportFilesDialog.kt @@ -13,12 +13,12 @@ class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList init { var realPath = activity.config.lastUsedSavePath val view = activity.layoutInflater.inflate(R.layout.dialog_export_files, null).apply { - folder_path.text = activity.humanizePath(realPath) + folder_path.setText(activity.humanizePath(realPath)) - file_extension.setText(activity.config.lastUsedExtension) + extension.setText(activity.config.lastUsedExtension) folder_path.setOnClickListener { FilePickerDialog(activity, realPath, false, false, true, true) { - folder_path.text = activity.humanizePath(it) + folder_path.setText(activity.humanizePath(it)) realPath = it } } @@ -29,10 +29,10 @@ class ExportFilesDialog(val activity: SimpleActivity, val notes: ArrayList .setNegativeButton(R.string.cancel, null) .apply { activity.setupDialogStuff(view, this, R.string.export_as_file) { alertDialog -> - alertDialog.showKeyboard(view.file_extension) + alertDialog.showKeyboard(view.extension) alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener { activity.handleSAFDialog(realPath) { - val extension = view.file_extension.value + val extension = view.extension.value activity.config.lastUsedExtension = extension activity.config.lastUsedSavePath = realPath callback(realPath, extension) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt index f722c5a0..5438e7f4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/ImportFolderDialog.kt @@ -20,7 +20,7 @@ class ImportFolderDialog(val activity: SimpleActivity, val path: String, val cal init { val view = (activity.layoutInflater.inflate(R.layout.dialog_import_folder, null) as ViewGroup).apply { - open_file_filename.text = activity.humanizePath(path) + open_file_filename.setText(activity.humanizePath(path)) } activity.getAlertDialogBuilder() diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt index 28cd499f..1d3165b7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt @@ -8,6 +8,7 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import androidx.appcompat.widget.AppCompatEditText import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.DARK_GREY import com.simplemobiletools.notes.pro.R import kotlinx.android.synthetic.main.dialog_new_checklist_item.view.* import kotlinx.android.synthetic.main.item_add_checklist.view.* @@ -19,9 +20,14 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis init { addNewEditText() + val plusTextColor = if (activity.isWhiteTheme()) { + DARK_GREY + } else { + activity.getProperPrimaryColor().getContrastColor() + } + view.apply { - add_item.applyColorFilter(activity.getProperPrimaryColor()) - add_item.background.applyColorFilter(textColor) + add_item.applyColorFilter(plusTextColor) add_item.setOnClickListener { addNewEditText() } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt index b610da99..eeb5ddb8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/OpenFileDialog.kt @@ -19,7 +19,7 @@ class OpenFileDialog(val activity: SimpleActivity, val path: String, val callbac init { val view = (activity.layoutInflater.inflate(R.layout.dialog_open_file, null) as ViewGroup).apply { - open_file_filename.text = activity.humanizePath(path) + open_file_filename.setText(activity.humanizePath(path)) } activity.getAlertDialogBuilder() diff --git a/app/src/main/res/layout/dialog_export_file.xml b/app/src/main/res/layout/dialog_export_file.xml index f251b918..c3fd9b9d 100644 --- a/app/src/main/res/layout/dialog_export_file.xml +++ b/app/src/main/res/layout/dialog_export_file.xml @@ -6,56 +6,52 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - - - - - - + android:hint="@string/path"> - + - + + + android:hint="@string/filename"> + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_export_files.xml b/app/src/main/res/layout/dialog_export_files.xml index 0782e6c5..fe95dd23 100644 --- a/app/src/main/res/layout/dialog_export_files.xml +++ b/app/src/main/res/layout/dialog_export_files.xml @@ -6,38 +6,34 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - - - - - - - + android:hint="@string/path"> + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_import_folder.xml b/app/src/main/res/layout/dialog_import_folder.xml index 61c73d31..8475f95f 100644 --- a/app/src/main/res/layout/dialog_import_folder.xml +++ b/app/src/main/res/layout/dialog_import_folder.xml @@ -1,6 +1,5 @@ - - - + android:hint="@string/folder"> + + + + - + android:hint="@string/label"> + + + + - - - + android:hint="@string/path"> + + + + - + android:layout_marginBottom="@dimen/activity_margin" + android:hint="@string/label"> + + + diff --git a/app/src/main/res/layout/dialog_rename_note.xml b/app/src/main/res/layout/dialog_rename_note.xml index fcf82e8f..b8d1a37c 100644 --- a/app/src/main/res/layout/dialog_rename_note.xml +++ b/app/src/main/res/layout/dialog_rename_note.xml @@ -6,14 +6,21 @@ android:orientation="vertical" android:padding="@dimen/activity_margin"> - + android:hint="@string/title"> + + +