diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bf3c95a3..d81301d1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="top" - android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin" /> + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 92ed82b7..8c75c6f9 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,6 +1,5 @@ - + android:text="@string/customize_colors" /> @@ -39,9 +38,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -64,7 +63,7 @@ android:layout_marginTop="@dimen/activity_margin" android:text="@string/text" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + app:switchPadding="@dimen/medium_margin" /> @@ -95,9 +94,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -118,9 +117,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -141,9 +140,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -164,9 +163,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -187,9 +186,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" + android:text="@string/font_size" /> + android:clickable="false" /> @@ -219,9 +218,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + android:paddingStart="@dimen/medium_margin" + android:paddingEnd="@dimen/medium_margin" + android:text="@string/alignment" /> + android:clickable="false" /> @@ -253,7 +252,7 @@ android:layout_marginTop="@dimen/activity_margin" android:text="@string/startup" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + app:switchPadding="@dimen/medium_margin" /> @@ -284,9 +283,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -307,9 +306,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -330,9 +329,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -355,7 +354,7 @@ android:layout_marginTop="@dimen/activity_margin" android:text="@string/saving_label" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + app:switchPadding="@dimen/medium_margin" /> @@ -386,9 +385,9 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/medium_margin" android:background="?attr/selectableItemBackground" - android:paddingLeft="@dimen/normal_margin" + android:paddingStart="@dimen/normal_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/normal_margin" + android:paddingEnd="@dimen/normal_margin" android:paddingBottom="@dimen/activity_margin"> + app:switchPadding="@dimen/medium_margin" /> @@ -411,7 +410,7 @@ android:layout_marginTop="@dimen/activity_margin" android:text="@string/widgets" android:textAllCaps="true" - android:textSize="@dimen/smaller_text_size"/> + android:textSize="@dimen/smaller_text_size" /> + android:text="@string/customize_widget_colors" /> diff --git a/app/src/main/res/layout/dialog_delete_note.xml b/app/src/main/res/layout/dialog_delete_note.xml index b240b2ba..1d484246 100644 --- a/app/src/main/res/layout/dialog_delete_note.xml +++ b/app/src/main/res/layout/dialog_delete_note.xml @@ -1,6 +1,5 @@ - + android:textSize="@dimen/bigger_text_size" /> + android:visibility="gone" /> diff --git a/app/src/main/res/layout/dialog_export_file.xml b/app/src/main/res/layout/dialog_export_file.xml index c2571b76..f251b918 100644 --- a/app/src/main/res/layout/dialog_export_file.xml +++ b/app/src/main/res/layout/dialog_export_file.xml @@ -1,6 +1,5 @@ - + android:textSize="@dimen/smaller_text_size" /> + android:paddingStart="@dimen/normal_margin" + android:paddingTop="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" + android:paddingBottom="@dimen/activity_margin" /> + android:textSize="@dimen/smaller_text_size" /> + android:textSize="@dimen/normal_text_size" /> + android:textSize="@dimen/smaller_text_size" /> + android:textSize="@dimen/normal_text_size" /> diff --git a/app/src/main/res/layout/dialog_export_files.xml b/app/src/main/res/layout/dialog_export_files.xml index aa6e23c4..0782e6c5 100644 --- a/app/src/main/res/layout/dialog_export_files.xml +++ b/app/src/main/res/layout/dialog_export_files.xml @@ -1,6 +1,5 @@ - + android:textSize="@dimen/smaller_text_size" /> + android:paddingStart="@dimen/normal_margin" + android:paddingTop="@dimen/small_margin" + android:paddingEnd="@dimen/small_margin" + android:paddingBottom="@dimen/activity_margin" /> + android:textSize="@dimen/smaller_text_size" /> + android:textSize="@dimen/normal_text_size" /> diff --git a/app/src/main/res/layout/dialog_import_folder.xml b/app/src/main/res/layout/dialog_import_folder.xml index ab434c9e..61c73d31 100644 --- a/app/src/main/res/layout/dialog_import_folder.xml +++ b/app/src/main/res/layout/dialog_import_folder.xml @@ -1,31 +1,30 @@ - + android:paddingEnd="@dimen/activity_margin"> + android:textSize="@dimen/smaller_text_size" /> + android:paddingEnd="@dimen/small_margin" + tools:text="myfile.txt" /> + android:text="@string/update_file_at_note" /> + android:text="@string/only_import_file_content" /> diff --git a/app/src/main/res/layout/dialog_new_checklist_item.xml b/app/src/main/res/layout/dialog_new_checklist_item.xml index 535da69d..e8be88db 100644 --- a/app/src/main/res/layout/dialog_new_checklist_item.xml +++ b/app/src/main/res/layout/dialog_new_checklist_item.xml @@ -4,9 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingLeft="@dimen/activity_margin" + android:paddingStart="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin"> + android:paddingEnd="@dimen/activity_margin"> - + android:paddingEnd="@dimen/activity_margin"> + android:textSize="@dimen/normal_text_size" /> + android:text="@string/new_note_type" /> + android:text="@string/text_note" /> + android:text="@string/checklist" /> diff --git a/app/src/main/res/layout/dialog_open_file.xml b/app/src/main/res/layout/dialog_open_file.xml index f0154297..f7a53206 100644 --- a/app/src/main/res/layout/dialog_open_file.xml +++ b/app/src/main/res/layout/dialog_open_file.xml @@ -1,29 +1,28 @@ - + android:paddingEnd="@dimen/activity_margin"> + android:textSize="@dimen/smaller_text_size" /> + android:paddingEnd="@dimen/small_margin" /> + android:text="@string/update_file_at_note" /> + android:text="@string/only_import_file_content" /> diff --git a/app/src/main/res/layout/dialog_open_note.xml b/app/src/main/res/layout/dialog_open_note.xml index 7085c174..f8958efc 100644 --- a/app/src/main/res/layout/dialog_open_note.xml +++ b/app/src/main/res/layout/dialog_open_note.xml @@ -1,6 +1,5 @@ - diff --git a/app/src/main/res/layout/dialog_rename_checklist_item.xml b/app/src/main/res/layout/dialog_rename_checklist_item.xml index 78d319f4..8b248645 100644 --- a/app/src/main/res/layout/dialog_rename_checklist_item.xml +++ b/app/src/main/res/layout/dialog_rename_checklist_item.xml @@ -1,13 +1,12 @@ - + android:paddingEnd="@dimen/activity_margin"> + android:textSize="@dimen/bigger_text_size" /> diff --git a/app/src/main/res/layout/dialog_rename_note.xml b/app/src/main/res/layout/dialog_rename_note.xml index 9b9b4d4c..fcf82e8f 100644 --- a/app/src/main/res/layout/dialog_rename_note.xml +++ b/app/src/main/res/layout/dialog_rename_note.xml @@ -1,6 +1,5 @@ - + android:textSize="@dimen/normal_text_size" /> + diff --git a/app/src/main/res/layout/fragment_text.xml b/app/src/main/res/layout/fragment_text.xml index f3a3b6e6..c88bd861 100644 --- a/app/src/main/res/layout/fragment_text.xml +++ b/app/src/main/res/layout/fragment_text.xml @@ -1,6 +1,5 @@ - + tools:text="123" /> + diff --git a/app/src/main/res/layout/item_checklist.xml b/app/src/main/res/layout/item_checklist.xml index f6c7cc88..daf88a2e 100644 --- a/app/src/main/res/layout/item_checklist.xml +++ b/app/src/main/res/layout/item_checklist.xml @@ -1,6 +1,5 @@ - - - + android:textCursorDrawable="@null" /> diff --git a/app/src/main/res/layout/open_note_item.xml b/app/src/main/res/layout/open_note_item.xml index 9ec51d28..e76e7176 100644 --- a/app/src/main/res/layout/open_note_item.xml +++ b/app/src/main/res/layout/open_note_item.xml @@ -1,6 +1,5 @@ - + android:layout_toStartOf="@+id/open_note_item_icon" /> + android:src="@drawable/ic_attach_file_vector" /> diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml index f0345362..67692bfe 100644 --- a/app/src/main/res/layout/widget_config.xml +++ b/app/src/main/res/layout/widget_config.xml @@ -1,6 +1,5 @@ - + android:text="@string/note_shown_widget" /> + android:text="@string/general_note" /> @@ -42,7 +41,7 @@ android:background="@null" android:gravity="top" android:padding="@dimen/activity_margin" - android:text="@string/widget_config"/> + android:text="@string/widget_config" /> + app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" /> + android:layout_above="@+id/config_text_color" /> + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" /> + android:layout_alignParentBottom="true" />