Skip to content

Commit a9b409a

Browse files
committed
tweaking the edit dialog with Material theme
1 parent 2233150 commit a9b409a

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ android {
6565
}
6666

6767
dependencies {
68-
implementation 'com.github.SimpleMobileTools:Simple-Commons:c070dff787'
68+
implementation 'com.github.SimpleMobileTools:Simple-Commons:15387bc4a3'
6969

7070
kapt 'androidx.room:room-compiler:2.4.2'
7171
implementation 'androidx.room:room-runtime:2.4.2'

app/src/main/kotlin/com/simplemobiletools/keyboard/dialogs/AddOrEditClipDialog.kt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
package com.simplemobiletools.keyboard.dialogs
22

33
import androidx.appcompat.app.AlertDialog
4+
import androidx.appcompat.widget.AppCompatEditText
45
import com.simplemobiletools.commons.activities.BaseSimpleActivity
56
import com.simplemobiletools.commons.extensions.*
67
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
78
import com.simplemobiletools.keyboard.R
89
import com.simplemobiletools.keyboard.helpers.ClipsHelper
910
import com.simplemobiletools.keyboard.models.Clip
10-
import kotlinx.android.synthetic.main.dialog_add_or_edit_clip.view.*
1111

1212
class AddOrEditClipDialog(val activity: BaseSimpleActivity, val originalClip: Clip?, val callback: () -> Unit) {
1313
init {
14-
val view = activity.layoutInflater.inflate(R.layout.dialog_add_or_edit_clip, null).apply {
14+
val layoutId = if (activity.baseConfig.isUsingSystemTheme) {
15+
R.layout.dialog_add_or_edit_clip_material
16+
} else {
17+
R.layout.dialog_add_or_edit_clip
18+
}
19+
20+
val view = activity.layoutInflater.inflate(layoutId, null).apply {
1521
if (originalClip != null) {
16-
add_clip_value.setText(originalClip.value)
22+
findViewById<AppCompatEditText>(R.id.add_clip_value).setText(originalClip.value)
1723
}
1824
}
1925

@@ -22,9 +28,9 @@ class AddOrEditClipDialog(val activity: BaseSimpleActivity, val originalClip: Cl
2228
.setNegativeButton(R.string.cancel, null)
2329
.apply {
2430
activity.setupDialogStuff(view, this) { alertDialog ->
25-
alertDialog.showKeyboard(view.add_clip_value)
31+
alertDialog.showKeyboard(view.findViewById(R.id.add_clip_value))
2632
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
27-
val clipValue = view.add_clip_value.value
33+
val clipValue = view.findViewById<AppCompatEditText>(R.id.add_clip_value).value
2834
if (clipValue.isEmpty()) {
2935
activity.toast(R.string.value_cannot_be_empty)
3036
return@setOnClickListener
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/dialog_holder"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:paddingTop="@dimen/activity_margin">
7+
8+
<com.google.android.material.textfield.TextInputLayout
9+
android:id="@+id/add_clip_hint"
10+
android:layout_width="match_parent"
11+
android:layout_height="wrap_content"
12+
android:layout_marginStart="@dimen/activity_margin"
13+
android:layout_marginEnd="@dimen/activity_margin"
14+
android:hint="@string/clip_text">
15+
16+
<com.google.android.material.textfield.TextInputEditText
17+
android:id="@+id/add_clip_value"
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content"
20+
android:inputType="textCapSentences|textMultiLine"
21+
android:textSize="@dimen/bigger_text_size" />
22+
23+
</com.google.android.material.textfield.TextInputLayout>
24+
</RelativeLayout>

0 commit comments

Comments
 (0)