diff --git a/app/build.gradle b/app/build.gradle
index e4edce2..93820db 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,9 +41,9 @@ android {
}
dependencies {
- implementation 'com.simplemobiletools:commons:5.0.14'
+ implementation 'com.simplemobiletools:commons:5.11.3'
implementation 'com.squareup:otto:1.3.8'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
}
Properties props = new Properties()
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
index 0e8a388..3ff2100 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
@@ -136,7 +136,8 @@ class MainActivity : SimpleActivity() {
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
- FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
+ FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
+ FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
)
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
index c213dd0..8bfb91d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
@@ -25,7 +25,6 @@ class SettingsActivity : SimpleActivity() {
setupCustomizeColors()
setupCustomizeWidgetColors()
setupUseEnglish()
- setupAvoidWhatsNew()
setupTurnFlashlightOn()
setupBrightDisplay()
setupStroboscope()
@@ -65,14 +64,6 @@ class SettingsActivity : SimpleActivity() {
}
}
- private fun setupAvoidWhatsNew() {
- settings_avoid_whats_new.isChecked = config.avoidWhatsNew
- settings_avoid_whats_new_holder.setOnClickListener {
- settings_avoid_whats_new.toggle()
- config.avoidWhatsNew = settings_avoid_whats_new.isChecked
- }
- }
-
private fun setupTurnFlashlightOn() {
settings_turn_flashlight_on.isChecked = config.turnFlashlightOn
settings_turn_flashlight_on_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt
index 4ba4513..9b56512 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt
@@ -4,6 +4,8 @@ import android.content.Intent
import com.simplemobiletools.commons.activities.BaseSplashActivity
class SplashActivity : BaseSplashActivity() {
+ override fun getAppPackageName() = packageName
+
override fun initActivity() {
startActivity(Intent(this, MainActivity::class.java))
finish()
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 0b55c9e..b579bb9 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -18,17 +18,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
@@ -40,17 +39,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
@@ -62,17 +60,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
@@ -84,10 +81,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
-
-
-
-
-
-
+ android:paddingBottom="@dimen/activity_margin">
@@ -156,10 +127,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
@@ -180,10 +150,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
@@ -204,10 +173,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
- android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/normal_margin"
+ android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
- android:paddingTop="@dimen/activity_margin">
+ android:paddingBottom="@dimen/activity_margin">
diff --git a/build.gradle b/build.gradle
index 0b0dbc0..4131087 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.71'
+ ext.kotlin_version = '1.3.21'
repositories {
google()
@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b44174f..df8e078 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 03 14:53:12 CEST 2018
+#Mon Apr 08 10:15:05 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip