updating commons with some new theming

This commit is contained in:
tibbi
2022-07-08 14:53:27 +02:00
parent 9dafec1db2
commit 0b05f316f0
16 changed files with 363 additions and 358 deletions

View File

@ -1,25 +1,19 @@
package com.simplemobiletools.keyboard.dialogs
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatEditText
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.keyboard.R
import com.simplemobiletools.keyboard.helpers.ClipsHelper
import com.simplemobiletools.keyboard.models.Clip
import kotlinx.android.synthetic.main.dialog_add_or_edit_clip.view.*
class AddOrEditClipDialog(val activity: BaseSimpleActivity, val originalClip: Clip?, val callback: () -> Unit) {
init {
val layoutId = if (activity.baseConfig.isUsingSystemTheme) {
R.layout.dialog_add_or_edit_clip_material
} else {
R.layout.dialog_add_or_edit_clip
}
val view = activity.layoutInflater.inflate(layoutId, null).apply {
val view = activity.layoutInflater.inflate(R.layout.dialog_add_or_edit_clip, null).apply {
if (originalClip != null) {
findViewById<AppCompatEditText>(R.id.add_clip_value).setText(originalClip.value)
add_clip_value.setText(originalClip.value)
}
}
@ -28,9 +22,9 @@ class AddOrEditClipDialog(val activity: BaseSimpleActivity, val originalClip: Cl
.setNegativeButton(R.string.cancel, null)
.apply {
activity.setupDialogStuff(view, this) { alertDialog ->
alertDialog.showKeyboard(view.findViewById(R.id.add_clip_value))
alertDialog.showKeyboard(view.add_clip_value)
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val clipValue = view.findViewById<AppCompatEditText>(R.id.add_clip_value).value
val clipValue = view.add_clip_value.value
if (clipValue.isEmpty()) {
activity.toast(R.string.value_cannot_be_empty)
return@setOnClickListener

View File

@ -1,7 +1,6 @@
package com.simplemobiletools.keyboard.dialogs
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatEditText
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog
@ -11,8 +10,7 @@ import com.simplemobiletools.keyboard.extensions.config
import kotlinx.android.synthetic.main.dialog_export_clips.view.*
class ExportClipsDialog(
val activity: BaseSimpleActivity, path: String, val hidePath: Boolean,
callback: (path: String, filename: String) -> Unit
val activity: BaseSimpleActivity, path: String, val hidePath: Boolean, callback: (path: String, filename: String) -> Unit
) {
init {
var folder = if (path.isNotEmpty() && activity.getDoesFilePathExist(path)) {
@ -21,14 +19,8 @@ class ExportClipsDialog(
activity.internalStoragePath
}
val layoutId = if (activity.baseConfig.isUsingSystemTheme) {
R.layout.dialog_export_clips_material
} else {
R.layout.dialog_export_clips
}
val view = activity.layoutInflater.inflate(layoutId, null).apply {
findViewById<AppCompatEditText>(R.id.export_clips_filename).setText("${activity.getString(R.string.app_launcher_name)}_${activity.getCurrentFormattedDateTime()}")
val view = activity.layoutInflater.inflate(R.layout.dialog_export_clips, null).apply {
export_clips_filename.setText("${activity.getString(R.string.app_launcher_name)}_${activity.getCurrentFormattedDateTime()}")
if (hidePath) {
export_clips_path_label.beGone()
@ -49,9 +41,9 @@ class ExportClipsDialog(
.setNegativeButton(R.string.cancel, null)
.apply {
activity.setupDialogStuff(view, this, R.string.export_clipboard_items) { alertDialog ->
alertDialog.showKeyboard(view.findViewById(R.id.export_clips_filename))
alertDialog.showKeyboard(view.export_clips_filename)
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val filename = view.findViewById<AppCompatEditText>(R.id.export_clips_filename).value
val filename = view.export_clips_filename.value
if (filename.isEmpty()) {
activity.toast(R.string.filename_cannot_be_empty)
return@setOnClickListener