Skip to content

Commit ca0dab5

Browse files
im-indrajeetim-indrajeet
authored
Merge branch 'master' into master
2 parents 57a904d + 2181fee commit ca0dab5

File tree

66 files changed

+267
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+267
-187
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
==========
33

4+
Version 5.1.1 *(2020-05-25)*
5+
----------------------------
6+
7+
* Updated the app icon on lower Android versions
8+
* Added a Bright Display shortcut
9+
* Removed the Camera permission on Android 7+
10+
411
Version 5.1.0 *(2020-03-23)*
512
----------------------------
613

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId "com.simplemobiletools.flashlight"
1717
minSdkVersion 21
1818
targetSdkVersion 29
19-
versionCode 39
20-
versionName "5.1.0"
19+
versionCode 41
20+
versionName "5.1.1"
2121
setProperty("archivesBaseName", "flashlight")
2222
}
2323

@@ -56,7 +56,7 @@ android {
5656
}
5757

5858
dependencies {
59-
implementation 'com.simplemobiletools:commons:5.23.8'
60-
implementation 'com.squareup:otto:1.3.8'
59+
implementation 'com.simplemobiletools:commons:5.28.23'
60+
implementation 'org.greenrobot:eventbus:3.2.0'
6161
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
6262
}

‎app/proguard-rules.pro‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Otto
1+
# EventBus
22
-keepattributes *Annotation*
33
-keepclassmembers class ** {
4-
@com.squareup.otto.Subscribe public *;
5-
@com.squareup.otto.Produce public *;
4+
@org.greenrobot.eventbus.Subscribe <methods>;
65
}
6+
-keep enum org.greenrobot.eventbus.ThreadMode { *; }

‎app/src/main/AndroidManifest.xml‎

Lines changed: 59 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest
3-
xmlns:android="http://schemas.android.com/apk/res/android"
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
43
xmlns:tools="http://schemas.android.com/tools"
54
package="com.simplemobiletools.flashlight"
65
android:installLocation="auto">
76

8-
<uses-permission android:name="android.permission.CAMERA"/>
9-
<uses-permission android:name="android.permission.FLASHLIGHT"/>
7+
<uses-permission
8+
android:name="android.permission.CAMERA"
9+
android:maxSdkVersion="23" />
10+
11+
<uses-permission android:name="android.permission.FLASHLIGHT" />
1012

1113
<uses-permission
1214
android:name="android.permission.USE_FINGERPRINT"
13-
tools:node="remove"/>
15+
tools:node="remove" />
1416

1517
<uses-feature
1618
android:name="android.hardware.camera.flash"
17-
android:required="true"/>
19+
android:required="true" />
1820

1921
<application
2022
android:name=".App"
@@ -29,62 +31,63 @@
2931
android:name=".activities.SplashActivity"
3032
android:theme="@style/SplashTheme">
3133
<intent-filter>
32-
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
34+
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
3335
</intent-filter>
3436
</activity>
3537

3638
<activity
3739
android:name=".activities.MainActivity"
38-
android:theme="@style/AppTheme"/>
40+
android:theme="@style/AppTheme" />
3941

4042
<activity
4143
android:name=".activities.WidgetConfigureActivity"
4244
android:screenOrientation="portrait"
4345
android:theme="@style/MyWidgetConfigTheme">
4446
<intent-filter>
45-
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
47+
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
4648
</intent-filter>
4749
</activity>
4850

4951
<activity
5052
android:name=".activities.BrightDisplayActivity"
51-
android:theme="@style/FullScreenTheme"/>
53+
android:label="@string/bright_display"
54+
android:theme="@style/FullScreenTheme" />
5255

5356
<activity
5457
android:name=".activities.SettingsActivity"
5558
android:label="@string/settings"
56-
android:parentActivityName=".activities.MainActivity"/>
59+
android:parentActivityName=".activities.MainActivity" />
5760

5861
<activity
5962
android:name="com.simplemobiletools.commons.activities.AboutActivity"
6063
android:label="@string/about"
61-
android:parentActivityName=".activities.MainActivity"/>
64+
android:parentActivityName=".activities.MainActivity" />
6265

6366
<activity
6467
android:name="com.simplemobiletools.commons.activities.LicenseActivity"
6568
android:label="@string/third_party_licences"
66-
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
69+
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
6770

6871
<activity
6972
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
7073
android:label="@string/customize_colors"
71-
android:parentActivityName=".activities.SettingsActivity"/>
74+
android:parentActivityName=".activities.SettingsActivity" />
7275

7376
<activity
7477
android:name="com.simplemobiletools.commons.activities.FAQActivity"
7578
android:label="@string/frequently_asked_questions"
76-
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/>
79+
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
7780

7881
<receiver
7982
android:name=".helpers.MyWidgetProvider"
8083
android:icon="@drawable/ic_flashlight">
8184
<intent-filter>
82-
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
85+
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
8386
</intent-filter>
8487

8588
<meta-data
8689
android:name="android.appwidget.provider"
87-
android:resource="@xml/widget_info"/>
90+
android:resource="@xml/widget_info" />
8891
</receiver>
8992

9093
<service
@@ -93,7 +96,7 @@
9396
android:label="@string/app_launcher_name"
9497
android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
9598
<intent-filter>
96-
<action android:name="android.service.quicksettings.action.QS_TILE"/>
99+
<action android:name="android.service.quicksettings.action.QS_TILE" />
97100
</intent-filter>
98101
</service>
99102

@@ -105,8 +108,8 @@
105108
android:targetActivity=".activities.SplashActivity">
106109

107110
<intent-filter>
108-
<action android:name="android.intent.action.MAIN"/>
109-
<category android:name="android.intent.category.LAUNCHER"/>
111+
<action android:name="android.intent.action.MAIN" />
112+
<category android:name="android.intent.category.LAUNCHER" />
110113
</intent-filter>
111114
</activity-alias>
112115

@@ -118,8 +121,8 @@
118121
android:targetActivity=".activities.SplashActivity">
119122

120123
<intent-filter>
121-
<action android:name="android.intent.action.MAIN"/>
122-
<category android:name="android.intent.category.LAUNCHER"/>
124+
<action android:name="android.intent.action.MAIN" />
125+
<category android:name="android.intent.category.LAUNCHER" />
123126
</intent-filter>
124127
</activity-alias>
125128

@@ -131,8 +134,8 @@
131134
android:targetActivity=".activities.SplashActivity">
132135

133136
<intent-filter>
134-
<action android:name="android.intent.action.MAIN"/>
135-
<category android:name="android.intent.category.LAUNCHER"/>
137+
<action android:name="android.intent.action.MAIN" />
138+
<category android:name="android.intent.category.LAUNCHER" />
136139
</intent-filter>
137140
</activity-alias>
138141

@@ -144,8 +147,8 @@
144147
android:targetActivity=".activities.SplashActivity">
145148

146149
<intent-filter>
147-
<action android:name="android.intent.action.MAIN"/>
148-
<category android:name="android.intent.category.LAUNCHER"/>
150+
<action android:name="android.intent.action.MAIN" />
151+
<category android:name="android.intent.category.LAUNCHER" />
149152
</intent-filter>
150153
</activity-alias>
151154

@@ -157,8 +160,8 @@
157160
android:targetActivity=".activities.SplashActivity">
158161

159162
<intent-filter>
160-
<action android:name="android.intent.action.MAIN"/>
161-
<category android:name="android.intent.category.LAUNCHER"/>
163+
<action android:name="android.intent.action.MAIN" />
164+
<category android:name="android.intent.category.LAUNCHER" />
162165
</intent-filter>
163166
</activity-alias>
164167

@@ -170,8 +173,8 @@
170173
android:targetActivity=".activities.SplashActivity">
171174

172175
<intent-filter>
173-
<action android:name="android.intent.action.MAIN"/>
174-
<category android:name="android.intent.category.LAUNCHER"/>
176+
<action android:name="android.intent.action.MAIN" />
177+
<category android:name="android.intent.category.LAUNCHER" />
175178
</intent-filter>
176179
</activity-alias>
177180

@@ -183,8 +186,8 @@
183186
android:targetActivity=".activities.SplashActivity">
184187

185188
<intent-filter>
186-
<action android:name="android.intent.action.MAIN"/>
187-
<category android:name="android.intent.category.LAUNCHER"/>
189+
<action android:name="android.intent.action.MAIN" />
190+
<category android:name="android.intent.category.LAUNCHER" />
188191
</intent-filter>
189192
</activity-alias>
190193

@@ -196,8 +199,8 @@
196199
android:targetActivity=".activities.SplashActivity">
197200

198201
<intent-filter>
199-
<action android:name="android.intent.action.MAIN"/>
200-
<category android:name="android.intent.category.LAUNCHER"/>
202+
<action android:name="android.intent.action.MAIN" />
203+
<category android:name="android.intent.category.LAUNCHER" />
201204
</intent-filter>
202205
</activity-alias>
203206

@@ -209,8 +212,8 @@
209212
android:targetActivity=".activities.SplashActivity">
210213

211214
<intent-filter>
212-
<action android:name="android.intent.action.MAIN"/>
213-
<category android:name="android.intent.category.LAUNCHER"/>
215+
<action android:name="android.intent.action.MAIN" />
216+
<category android:name="android.intent.category.LAUNCHER" />
214217
</intent-filter>
215218
</activity-alias>
216219

@@ -222,8 +225,8 @@
222225
android:targetActivity=".activities.SplashActivity">
223226

224227
<intent-filter>
225-
<action android:name="android.intent.action.MAIN"/>
226-
<category android:name="android.intent.category.LAUNCHER"/>
228+
<action android:name="android.intent.action.MAIN" />
229+
<category android:name="android.intent.category.LAUNCHER" />
227230
</intent-filter>
228231
</activity-alias>
229232

@@ -235,8 +238,8 @@
235238
android:targetActivity=".activities.SplashActivity">
236239

237240
<intent-filter>
238-
<action android:name="android.intent.action.MAIN"/>
239-
<category android:name="android.intent.category.LAUNCHER"/>
241+
<action android:name="android.intent.action.MAIN" />
242+
<category android:name="android.intent.category.LAUNCHER" />
240243
</intent-filter>
241244
</activity-alias>
242245

@@ -248,8 +251,8 @@
248251
android:targetActivity=".activities.SplashActivity">
249252

250253
<intent-filter>
251-
<action android:name="android.intent.action.MAIN"/>
252-
<category android:name="android.intent.category.LAUNCHER"/>
254+
<action android:name="android.intent.action.MAIN" />
255+
<category android:name="android.intent.category.LAUNCHER" />
253256
</intent-filter>
254257
</activity-alias>
255258

@@ -261,8 +264,8 @@
261264
android:targetActivity=".activities.SplashActivity">
262265

263266
<intent-filter>
264-
<action android:name="android.intent.action.MAIN"/>
265-
<category android:name="android.intent.category.LAUNCHER"/>
267+
<action android:name="android.intent.action.MAIN" />
268+
<category android:name="android.intent.category.LAUNCHER" />
266269
</intent-filter>
267270
</activity-alias>
268271

@@ -274,8 +277,8 @@
274277
android:targetActivity=".activities.SplashActivity">
275278

276279
<intent-filter>
277-
<action android:name="android.intent.action.MAIN"/>
278-
<category android:name="android.intent.category.LAUNCHER"/>
280+
<action android:name="android.intent.action.MAIN" />
281+
<category android:name="android.intent.category.LAUNCHER" />
279282
</intent-filter>
280283
</activity-alias>
281284

@@ -286,8 +289,8 @@
286289
android:roundIcon="@mipmap/ic_launcher"
287290
android:targetActivity=".activities.SplashActivity">
288291
<intent-filter>
289-
<action android:name="android.intent.action.MAIN"/>
290-
<category android:name="android.intent.category.LAUNCHER"/>
292+
<action android:name="android.intent.action.MAIN" />
293+
<category android:name="android.intent.category.LAUNCHER" />
291294
</intent-filter>
292295
</activity-alias>
293296

@@ -299,8 +302,8 @@
299302
android:targetActivity=".activities.SplashActivity">
300303

301304
<intent-filter>
302-
<action android:name="android.intent.action.MAIN"/>
303-
<category android:name="android.intent.category.LAUNCHER"/>
305+
<action android:name="android.intent.action.MAIN" />
306+
<category android:name="android.intent.category.LAUNCHER" />
304307
</intent-filter>
305308
</activity-alias>
306309

@@ -312,8 +315,8 @@
312315
android:targetActivity=".activities.SplashActivity">
313316

314317
<intent-filter>
315-
<action android:name="android.intent.action.MAIN"/>
316-
<category android:name="android.intent.category.LAUNCHER"/>
318+
<action android:name="android.intent.action.MAIN" />
319+
<category android:name="android.intent.category.LAUNCHER" />
317320
</intent-filter>
318321
</activity-alias>
319322

@@ -325,8 +328,8 @@
325328
android:targetActivity=".activities.SplashActivity">
326329

327330
<intent-filter>
328-
<action android:name="android.intent.action.MAIN"/>
329-
<category android:name="android.intent.category.LAUNCHER"/>
331+
<action android:name="android.intent.action.MAIN" />
332+
<category android:name="android.intent.category.LAUNCHER" />
330333
</intent-filter>
331334
</activity-alias>
332335

@@ -338,8 +341,8 @@
338341
android:targetActivity=".activities.SplashActivity">
339342

340343
<intent-filter>
341-
<action android:name="android.intent.action.MAIN"/>
342-
<category android:name="android.intent.category.LAUNCHER"/>
344+
<action android:name="android.intent.action.MAIN" />
345+
<category android:name="android.intent.category.LAUNCHER" />
343346
</intent-filter>
344347
</activity-alias>
345348
</application>

0 commit comments

Comments
 (0)