Skip to content

Commit 8145a47

Browse files
tibbitibbi
committed
updating commons, gradle, kotlin
1 parent ce0d2ad commit 8145a47

File tree

7 files changed

+26
-64
lines changed

7 files changed

+26
-64
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation 'com.simplemobiletools:commons:5.0.14'
44+
implementation 'com.simplemobiletools:commons:5.11.3'
4545
implementation 'com.squareup:otto:1.3.8'
46-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
46+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
4747
}
4848

4949
Properties props = new Properties()

‎app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ class MainActivity : SimpleActivity() {
136136
val faqItems = arrayListOf(
137137
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
138138
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
139-
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
139+
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
140+
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
140141
)
141142

142143
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)

‎app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class SettingsActivity : SimpleActivity() {
2525
setupCustomizeColors()
2626
setupCustomizeWidgetColors()
2727
setupUseEnglish()
28-
setupAvoidWhatsNew()
2928
setupTurnFlashlightOn()
3029
setupBrightDisplay()
3130
setupStroboscope()
@@ -65,14 +64,6 @@ class SettingsActivity : SimpleActivity() {
6564
}
6665
}
6766

68-
private fun setupAvoidWhatsNew() {
69-
settings_avoid_whats_new.isChecked = config.avoidWhatsNew
70-
settings_avoid_whats_new_holder.setOnClickListener {
71-
settings_avoid_whats_new.toggle()
72-
config.avoidWhatsNew = settings_avoid_whats_new.isChecked
73-
}
74-
}
75-
7667
private fun setupTurnFlashlightOn() {
7768
settings_turn_flashlight_on.isChecked = config.turnFlashlightOn
7869
settings_turn_flashlight_on_holder.setOnClickListener {

‎app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import android.content.Intent
44
import com.simplemobiletools.commons.activities.BaseSplashActivity
55

66
class SplashActivity : BaseSplashActivity() {
7+
override fun getAppPackageName() = packageName
8+
79
override fun initActivity() {
810
startActivity(Intent(this, MainActivity::class.java))
911
finish()

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
android:layout_height="wrap_content"
1919
android:layout_marginTop="@dimen/medium_margin"
2020
android:background="?attr/selectableItemBackground"
21-
android:paddingBottom="@dimen/activity_margin"
2221
android:paddingLeft="@dimen/normal_margin"
22+
android:paddingTop="@dimen/activity_margin"
2323
android:paddingRight="@dimen/normal_margin"
24-
android:paddingTop="@dimen/activity_margin">
24+
android:paddingBottom="@dimen/activity_margin">
2525

2626
<com.simplemobiletools.commons.views.MyTextView
2727
android:id="@+id/settings_purchase_thank_you"
2828
android:layout_width="wrap_content"
2929
android:layout_height="wrap_content"
3030
android:layout_centerVertical="true"
31-
android:paddingLeft="@dimen/medium_margin"
3231
android:paddingStart="@dimen/medium_margin"
3332
android:text="@string/purchase_simple_thank_you"/>
3433

@@ -40,17 +39,16 @@
4039
android:layout_height="wrap_content"
4140
android:layout_marginTop="@dimen/medium_margin"
4241
android:background="?attr/selectableItemBackground"
43-
android:paddingBottom="@dimen/activity_margin"
4442
android:paddingLeft="@dimen/normal_margin"
43+
android:paddingTop="@dimen/activity_margin"
4544
android:paddingRight="@dimen/normal_margin"
46-
android:paddingTop="@dimen/activity_margin">
45+
android:paddingBottom="@dimen/activity_margin">
4746

4847
<com.simplemobiletools.commons.views.MyTextView
4948
android:id="@+id/settings_customize_colors"
5049
android:layout_width="wrap_content"
5150
android:layout_height="wrap_content"
5251
android:layout_centerVertical="true"
53-
android:paddingLeft="@dimen/medium_margin"
5452
android:paddingStart="@dimen/medium_margin"
5553
android:text="@string/customize_colors"/>
5654

@@ -62,17 +60,16 @@
6260
android:layout_height="wrap_content"
6361
android:layout_marginTop="@dimen/medium_margin"
6462
android:background="?attr/selectableItemBackground"
65-
android:paddingBottom="@dimen/activity_margin"
6663
android:paddingLeft="@dimen/normal_margin"
64+
android:paddingTop="@dimen/activity_margin"
6765
android:paddingRight="@dimen/normal_margin"
68-
android:paddingTop="@dimen/activity_margin">
66+
android:paddingBottom="@dimen/activity_margin">
6967

7068
<com.simplemobiletools.commons.views.MyTextView
7169
android:id="@+id/settings_customize_widget_colors_label"
7270
android:layout_width="wrap_content"
7371
android:layout_height="wrap_content"
7472
android:layout_centerVertical="true"
75-
android:paddingLeft="@dimen/medium_margin"
7673
android:paddingStart="@dimen/medium_margin"
7774
android:text="@string/customize_widget_colors"/>
7875

@@ -84,66 +81,40 @@
8481
android:layout_height="wrap_content"
8582
android:layout_marginTop="@dimen/medium_margin"
8683
android:background="?attr/selectableItemBackground"
87-
android:paddingBottom="@dimen/activity_margin"
8884
android:paddingLeft="@dimen/normal_margin"
85+
android:paddingTop="@dimen/activity_margin"
8986
android:paddingRight="@dimen/normal_margin"
90-
android:paddingTop="@dimen/activity_margin">
87+
android:paddingBottom="@dimen/activity_margin">
9188

9289
<com.simplemobiletools.commons.views.MySwitchCompat
9390
android:id="@+id/settings_use_english"
9491
android:layout_width="match_parent"
9592
android:layout_height="wrap_content"
9693
android:background="@null"
9794
android:clickable="false"
98-
android:paddingLeft="@dimen/medium_margin"
9995
android:paddingStart="@dimen/medium_margin"
10096
android:text="@string/use_english_language"
10197
app:switchPadding="@dimen/medium_margin"/>
10298

10399
</RelativeLayout>
104100

105-
<RelativeLayout
106-
android:id="@+id/settings_avoid_whats_new_holder"
107-
android:layout_width="match_parent"
108-
android:layout_height="wrap_content"
109-
android:layout_marginTop="@dimen/medium_margin"
110-
android:background="?attr/selectableItemBackground"
111-
android:paddingBottom="@dimen/activity_margin"
112-
android:paddingLeft="@dimen/normal_margin"
113-
android:paddingRight="@dimen/normal_margin"
114-
android:paddingTop="@dimen/activity_margin">
115-
116-
<com.simplemobiletools.commons.views.MySwitchCompat
117-
android:id="@+id/settings_avoid_whats_new"
118-
android:layout_width="match_parent"
119-
android:layout_height="wrap_content"
120-
android:background="@null"
121-
android:clickable="false"
122-
android:paddingLeft="@dimen/medium_margin"
123-
android:paddingStart="@dimen/medium_margin"
124-
android:text="@string/avoid_whats_new"
125-
app:switchPadding="@dimen/medium_margin"/>
126-
127-
</RelativeLayout>
128-
129101
<RelativeLayout
130102
android:id="@+id/settings_turn_flashlight_on_holder"
131103
android:layout_width="match_parent"
132104
android:layout_height="wrap_content"
133105
android:layout_marginTop="@dimen/medium_margin"
134106
android:background="?attr/selectableItemBackground"
135-
android:paddingBottom="@dimen/activity_margin"
136107
android:paddingLeft="@dimen/normal_margin"
108+
android:paddingTop="@dimen/activity_margin"
137109
android:paddingRight="@dimen/normal_margin"
138-
android:paddingTop="@dimen/activity_margin">
110+
android:paddingBottom="@dimen/activity_margin">
139111

140112
<com.simplemobiletools.commons.views.MySwitchCompat
141113
android:id="@+id/settings_turn_flashlight_on"
142114
android:layout_width="match_parent"
143115
android:layout_height="wrap_content"
144116
android:background="@null"
145117
android:clickable="false"
146-
android:paddingLeft="@dimen/medium_margin"
147118
android:paddingStart="@dimen/medium_margin"
148119
android:text="@string/turn_flashlight_on"
149120
app:switchPadding="@dimen/medium_margin"/>
@@ -156,18 +127,17 @@
156127
android:layout_height="wrap_content"
157128
android:layout_marginTop="@dimen/medium_margin"
158129
android:background="?attr/selectableItemBackground"
159-
android:paddingBottom="@dimen/activity_margin"
160130
android:paddingLeft="@dimen/normal_margin"
131+
android:paddingTop="@dimen/activity_margin"
161132
android:paddingRight="@dimen/normal_margin"
162-
android:paddingTop="@dimen/activity_margin">
133+
android:paddingBottom="@dimen/activity_margin">
163134

164135
<com.simplemobiletools.commons.views.MySwitchCompat
165136
android:id="@+id/settings_bright_display"
166137
android:layout_width="match_parent"
167138
android:layout_height="wrap_content"
168139
android:background="@null"
169140
android:clickable="false"
170-
android:paddingLeft="@dimen/medium_margin"
171141
android:paddingStart="@dimen/medium_margin"
172142
android:text="@string/bright_display"
173143
app:switchPadding="@dimen/medium_margin"/>
@@ -180,18 +150,17 @@
180150
android:layout_height="wrap_content"
181151
android:layout_marginTop="@dimen/medium_margin"
182152
android:background="?attr/selectableItemBackground"
183-
android:paddingBottom="@dimen/activity_margin"
184153
android:paddingLeft="@dimen/normal_margin"
154+
android:paddingTop="@dimen/activity_margin"
185155
android:paddingRight="@dimen/normal_margin"
186-
android:paddingTop="@dimen/activity_margin">
156+
android:paddingBottom="@dimen/activity_margin">
187157

188158
<com.simplemobiletools.commons.views.MySwitchCompat
189159
android:id="@+id/settings_stroboscope"
190160
android:layout_width="match_parent"
191161
android:layout_height="wrap_content"
192162
android:background="@null"
193163
android:clickable="false"
194-
android:paddingLeft="@dimen/medium_margin"
195164
android:paddingStart="@dimen/medium_margin"
196165
android:text="@string/show_stroboscope"
197166
app:switchPadding="@dimen/medium_margin"/>
@@ -204,18 +173,17 @@
204173
android:layout_height="wrap_content"
205174
android:layout_marginTop="@dimen/medium_margin"
206175
android:background="?attr/selectableItemBackground"
207-
android:paddingBottom="@dimen/activity_margin"
208176
android:paddingLeft="@dimen/normal_margin"
177+
android:paddingTop="@dimen/activity_margin"
209178
android:paddingRight="@dimen/normal_margin"
210-
android:paddingTop="@dimen/activity_margin">
179+
android:paddingBottom="@dimen/activity_margin">
211180

212181
<com.simplemobiletools.commons.views.MySwitchCompat
213182
android:id="@+id/settings_force_portrait"
214183
android:layout_width="match_parent"
215184
android:layout_height="wrap_content"
216185
android:background="@null"
217186
android:clickable="false"
218-
android:paddingLeft="@dimen/medium_margin"
219187
android:paddingStart="@dimen/medium_margin"
220188
android:text="@string/force_portrait_mode"
221189
app:switchPadding="@dimen/medium_margin"/>

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.71'
4+
ext.kotlin_version = '1.3.21'
55

66
repositories {
77
google()
88
jcenter()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.2.1'
12+
classpath 'com.android.tools.build:gradle:3.3.2'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Oct 03 14:53:12 CEST 2018
1+
#Mon Apr 08 10:15:05 CEST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

0 commit comments

Comments
 (0)