From 8642731427060189f4c8bf072e4fdd4252ce63e6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 10 Nov 2017 21:34:48 +0100 Subject: [PATCH] use normal_text_size at all dialogs --- .../com/simplemobiletools/notes/dialogs/NewNoteDialog.kt | 4 ++-- .../com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt | 4 ++-- app/src/main/res/layout/{new_note.xml => dialog_new_note.xml} | 3 ++- .../res/layout/{rename_note.xml => dialog_rename_note.xml} | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) rename app/src/main/res/layout/{new_note.xml => dialog_new_note.xml} (88%) rename app/src/main/res/layout/{rename_note.xml => dialog_rename_note.xml} (87%) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt index e96fb52d..23d6955e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt @@ -9,11 +9,11 @@ import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.notes.R import com.simplemobiletools.notes.helpers.DBHelper -import kotlinx.android.synthetic.main.new_note.view.* +import kotlinx.android.synthetic.main.dialog_new_note.view.* class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title: String) -> Unit) { init { - val view = activity.layoutInflater.inflate(R.layout.new_note, null) + val view = activity.layoutInflater.inflate(R.layout.dialog_new_note, null) AlertDialog.Builder(activity) .setPositiveButton(R.string.ok, null) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt index 7e5ebea3..931b1dfb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt @@ -8,13 +8,13 @@ import com.simplemobiletools.notes.R import com.simplemobiletools.notes.activities.SimpleActivity import com.simplemobiletools.notes.helpers.DBHelper import com.simplemobiletools.notes.models.Note -import kotlinx.android.synthetic.main.new_note.view.* +import kotlinx.android.synthetic.main.dialog_new_note.view.* import java.io.File class RenameNoteDialog(val activity: SimpleActivity, val db: DBHelper, val note: Note, callback: (note: Note) -> Unit) { init { - val view = activity.layoutInflater.inflate(R.layout.rename_note, null) + val view = activity.layoutInflater.inflate(R.layout.dialog_rename_note, null) view.note_name.setText(note.title) AlertDialog.Builder(activity) diff --git a/app/src/main/res/layout/new_note.xml b/app/src/main/res/layout/dialog_new_note.xml similarity index 88% rename from app/src/main/res/layout/new_note.xml rename to app/src/main/res/layout/dialog_new_note.xml index fd99eee1..b5757f33 100644 --- a/app/src/main/res/layout/new_note.xml +++ b/app/src/main/res/layout/dialog_new_note.xml @@ -15,5 +15,6 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/activity_margin" android:inputType="textCapSentences" - android:textCursorDrawable="@null"/> + android:textCursorDrawable="@null" + android:textSize="@dimen/normal_text_size"/> diff --git a/app/src/main/res/layout/rename_note.xml b/app/src/main/res/layout/dialog_rename_note.xml similarity index 87% rename from app/src/main/res/layout/rename_note.xml rename to app/src/main/res/layout/dialog_rename_note.xml index 4170f7e4..38dd658d 100644 --- a/app/src/main/res/layout/rename_note.xml +++ b/app/src/main/res/layout/dialog_rename_note.xml @@ -14,5 +14,6 @@ android:layout_marginBottom="@dimen/activity_margin" android:inputType="textCapSentences" android:singleLine="true" - android:textCursorDrawable="@null"/> + android:textCursorDrawable="@null" + android:textSize="@dimen/normal_text_size"/>