From 19e6e045c5d96ac744ded45904883adb2ecb01c6 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 24 May 2020 23:52:36 +0200 Subject: [PATCH] updating commons, kotlin, gradle --- app/build.gradle | 2 +- .../res/layout/activity_bright_display.xml | 7 +++---- app/src/main/res/layout/activity_main.xml | 13 ++++++------ app/src/main/res/layout/activity_settings.xml | 21 +++++++++---------- app/src/main/res/layout/widget.xml | 5 ++--- app/src/main/res/layout/widget_config.xml | 15 +++++++------ build.gradle | 4 ++-- 7 files changed, 31 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc880a5..0db7aad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.23.8' + implementation 'com.simplemobiletools:commons:5.28.23' implementation 'com.squareup:otto:1.3.8' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' } diff --git a/app/src/main/res/layout/activity_bright_display.xml b/app/src/main/res/layout/activity_bright_display.xml index b81a52d..0552071 100644 --- a/app/src/main/res/layout/activity_bright_display.xml +++ b/app/src/main/res/layout/activity_bright_display.xml @@ -1,6 +1,5 @@ - @@ -9,7 +8,7 @@ android:id="@+id/bright_display" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white"/> + android:background="@android:color/white" /> + android:textSize="@dimen/big_text_size" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 55daaf6..f08f84d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,6 +1,5 @@ - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/flashlight_btn" /> + app:layout_constraintTop_toBottomOf="@+id/bright_display_btn" /> + app:layout_constraintTop_toBottomOf="@+id/sos_btn" /> + app:layout_constraintTop_toBottomOf="@+id/stroboscope_btn" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 557c2cc..5245ffb 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/purchase_simple_thank_you" /> @@ -50,7 +49,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:text="@string/customize_colors"/> + android:text="@string/customize_colors" /> @@ -71,7 +70,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingStart="@dimen/medium_margin" - android:text="@string/customize_widget_colors"/> + android:text="@string/customize_widget_colors" /> @@ -94,7 +93,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/use_english_language" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> @@ -117,7 +116,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/turn_flashlight_on" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> @@ -140,7 +139,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/bright_display" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> @@ -163,7 +162,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/show_sos" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> @@ -186,7 +185,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/show_stroboscope" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> @@ -209,7 +208,7 @@ android:clickable="false" android:paddingStart="@dimen/medium_margin" android:text="@string/force_portrait_mode" - app:switchPadding="@dimen/medium_margin"/> + app:switchPadding="@dimen/medium_margin" /> diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml index d61288e..17b746c 100644 --- a/app/src/main/res/layout/widget.xml +++ b/app/src/main/res/layout/widget.xml @@ -1,7 +1,6 @@ - + android:layout_margin="5dp" /> diff --git a/app/src/main/res/layout/widget_config.xml b/app/src/main/res/layout/widget_config.xml index b5cf44b..17bb81a 100644 --- a/app/src/main/res/layout/widget_config.xml +++ b/app/src/main/res/layout/widget_config.xml @@ -1,6 +1,5 @@ - + android:background="@drawable/ic_flashlight" /> + android:layout_above="@+id/config_save" /> @@ -42,21 +41,21 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:paddingLeft="@dimen/activity_margin" - android:paddingRight="@dimen/activity_margin"/> + android:paddingRight="@dimen/activity_margin" />