Skip to content

Commit dde4c7a

Browse files
committed
update commons to 4.6.5
1 parent 023db52 commit dde4c7a

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
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:4.0.22'
44+
implementation 'com.simplemobiletools:commons:4.6.5'
4545
implementation 'com.squareup:otto:1.3.8'
46-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
46+
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
4747
}
4848

4949
Properties props = new Properties()

app/src/main/AndroidManifest.xml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
android:name=".activities.SplashActivity"
3030
android:theme="@style/SplashTheme">
3131
<intent-filter>
32-
<action android:name="android.intent.action.MAIN"/>
3332
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
34-
35-
<category android:name="android.intent.category.LAUNCHER"/>
3633
</intent-filter>
3734
</activity>
3835

@@ -98,19 +95,6 @@
9895
</intent-filter>
9996
</service>
10097

101-
<!-- Do not append ".Orange" to the default alias "name", it would remove the old homescreen launcher of users at upgrade -->
102-
<activity-alias
103-
android:name=".activities.SplashActivity"
104-
android:enabled="true"
105-
android:icon="@mipmap/ic_launcher"
106-
android:roundIcon="@mipmap/ic_launcher"
107-
android:targetActivity=".activities.SplashActivity">
108-
<intent-filter>
109-
<action android:name="android.intent.action.MAIN"/>
110-
<category android:name="android.intent.category.LAUNCHER"/>
111-
</intent-filter>
112-
</activity-alias>
113-
11498
<activity-alias
11599
android:name=".activities.SplashActivity.Red"
116100
android:enabled="false"
@@ -293,6 +277,18 @@
293277
</intent-filter>
294278
</activity-alias>
295279

280+
<activity-alias
281+
android:name=".activities.SplashActivity.Orange"
282+
android:enabled="true"
283+
android:icon="@mipmap/ic_launcher"
284+
android:roundIcon="@mipmap/ic_launcher"
285+
android:targetActivity=".activities.SplashActivity">
286+
<intent-filter>
287+
<action android:name="android.intent.action.MAIN"/>
288+
<category android:name="android.intent.category.LAUNCHER"/>
289+
</intent-filter>
290+
</activity-alias>
291+
296292
<activity-alias
297293
android:name=".activities.SplashActivity.Deep_orange"
298294
android:enabled="false"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class MainActivity : SimpleActivity() {
5050
}
5151

5252
setupStroboscope()
53+
checkAppOnSDCard()
5354
}
5455

5556
override fun onResume() {
@@ -132,13 +133,15 @@ class MainActivity : SimpleActivity() {
132133
}
133134

134135
private fun launchAbout() {
136+
val licenses = LICENSE_OTTO
137+
135138
val faqItems = arrayListOf(
136139
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
137140
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
138141
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
139142
)
140143

141-
startAboutActivity(R.string.app_name, LICENSE_OTTO, BuildConfig.VERSION_NAME, faqItems)
144+
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
142145
}
143146

144147
private fun setupCameraImpl() {

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.41'
4+
ext.kotlin_version = '1.2.60'
55

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

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

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

0 commit comments

Comments
 (0)