diff --git a/app/build.gradle b/app/build.gradle
index 72cf77ce..c910bff2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ android {
}
dependencies {
- implementation 'com.simplemobiletools:commons:4.3.31'
+ implementation 'com.simplemobiletools:commons:4.6.5'
implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.shawnlin:number-picker:2.4.6'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16d26280..9120d09d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,11 +25,6 @@
android:name=".activities.SplashActivity"
android:launchMode="singleTask"
android:theme="@style/SplashTheme">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
-
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
<intent-filter>
<action android:name="android.intent.action.SHOW_ALARMS"/>
@@ -121,19 +116,6 @@
</intent-filter>
</receiver>
- <!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
- <activity-alias
- android:name=".activities.SplashActivity"
- android:enabled="true"
- android:icon="@mipmap/ic_launcher"
- android:roundIcon="@mipmap/ic_launcher"
- android:targetActivity=".activities.SplashActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity-alias>
-
<activity-alias
android:name=".activities.SplashActivity.Red"
android:enabled="false"
@@ -316,6 +298,18 @@
</intent-filter>
</activity-alias>
+ <activity-alias
+ android:name=".activities.SplashActivity.Orange"
+ android:enabled="true"
+ android:icon="@mipmap/ic_launcher"
+ android:roundIcon="@mipmap/ic_launcher"
+ android:targetActivity=".activities.SplashActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
+ </intent-filter>
+ </activity-alias>
+
<activity-alias
android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false"
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
index 13c652c2..39fd4993 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/MainActivity.kt
@@ -179,6 +179,8 @@ class MainActivity : SimpleActivity() {
}
private fun launchAbout() {
+ val licenses = LICENSE_STETHO or LICENSE_NUMBER_PICKER
+
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title, R.string.faq_1_text),
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
@@ -186,6 +188,6 @@ class MainActivity : SimpleActivity() {
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
)
- startAboutActivity(R.string.app_name, LICENSE_STETHO or LICENSE_NUMBER_PICKER, BuildConfig.VERSION_NAME, faqItems)
+ startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
}
}
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e8c36883..409d2976 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_scrollview"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -52,7 +53,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/use_english_language"/>
+ android:text="@string/use_english_language"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -75,7 +77,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/avoid_whats_new"/>
+ android:text="@string/avoid_whats_new"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -98,7 +101,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/prevent_phone_from_sleeping"/>
+ android:text="@string/prevent_phone_from_sleeping"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -121,7 +125,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/use_24_hour_time_format"/>
+ android:text="@string/use_24_hour_time_format"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -144,7 +149,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/sunday_first"/>
+ android:text="@string/sunday_first"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -185,7 +191,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/show_seconds"/>
+ android:text="@string/show_seconds"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -261,7 +268,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/increase_volume_gradually"/>
+ android:text="@string/increase_volume_gradually"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -284,7 +292,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/use_same_snooze"/>
+ android:text="@string/use_same_snooze"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
@@ -360,7 +369,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/vibrate_on_button_press"/>
+ android:text="@string/vibrate_on_button_press"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
<View
@@ -453,7 +463,8 @@
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
- android:text="@string/use_text_shadow"/>
+ android:text="@string/use_text_shadow"
+ app:switchPadding="@dimen/medium_margin"/>
</RelativeLayout>
<RelativeLayout
diff --git a/build.gradle b/build.gradle
index 94d76296..b0005124 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.2.51'
+ ext.kotlin_version = '1.2.60'
repositories {
google()
@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.3'
+ classpath 'com.android.tools.build:gradle:3.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong