Skip to content

Commit 0020014

Browse files
AwaisKingAwaisKing
committed
+ upgraded Gradle build tools v4.0.0-alpha09 to v4.0.0-beta03
+ some app Gradle fixes and removed useless implementations. + removed useless sdk overrides from manifest and other places. + removed deprecated methods except TTS ones. (Google should make compat library for TTS tho) + moved all SharedPreferences codes to SettingsHelper class. + optimized code a little. + fixed Settings dialog size on different phones. + added theme settings in Settings dialog. + fixed navigation bar color, was too bright that user couldn't see nav buttons. + fixed some Chrome Tabs issues.
1 parent 86acb4c commit 0020014

Some content is hidden

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

49 files changed

+1443
-1158
lines changed

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎.idea/markdown-navigator-enh.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/markdown-navigator.xml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,38 @@ also you can select if the filter either `contains` the text or `starts` with th
2626

2727
---
2828

29-
Screenshots [Album: https://imgur.com/a/Y4XsKU5]
29+
Screenshots [Album][1]
3030
-
3131
<p align="center">
32-
<img src="https://i.imgur.com/o0xAIBJm.png" alt="Screenshot 1" title="Screenshot 1"/>
33-
<img src="https://i.imgur.com/ksG8dncm.png" alt="Screenshot 2" title="Screenshot 2"/>
34-
<img src="https://i.imgur.com/lURKQnZm.png" alt="Screenshot 3" title="Screenshot 3"/>
35-
<img src="https://i.imgur.com/4piTUXqm.png" alt="Screenshot 4" title="Screenshot 4"/>
36-
<img src="https://i.imgur.com/ekZAh3lm.png" alt="Screenshot 5" title="Screenshot 5"/>
37-
<img src="https://i.imgur.com/e9olSSZm.png" alt="Screenshot 6" title="Screenshot 6"/>
32+
<img src="https://i.imgur.com/YUiKu9Im.png" alt="Screenshot 1" title="Screenshot 1"/>
33+
<img src="https://i.imgur.com/l7IBDrJm.png" alt="Screenshot 2" title="Screenshot 2"/>
34+
<img src="https://i.imgur.com/jkJDu54m.png" alt="Screenshot 3" title="Screenshot 3"/>
35+
<img src="https://i.imgur.com/uUpu4Wsm.png" alt="Screenshot 4" title="Screenshot 4"/>
36+
<img src="https://i.imgur.com/w9alZiWm.png" alt="Screenshot 5" title="Screenshot 5"/>
37+
<img src="https://i.imgur.com/qC9n7pZm.png" alt="Screenshot 6" title="Screenshot 6"/>
38+
<img src="https://i.imgur.com/5hgGiLPm.png" alt="Screenshot 7" title="Screenshot 7"/>
3839
</p>
3940

4041
---
4142

4243
Credits to:
4344
-
4445
#### App Icon:
45-
+ [Android Asset Studio](https://romannurik.github.io/AndroidAssetStudio/icons-launcher.html)
46+
+ [Android Asset Studio][2]
4647

4748
#### Dictionary API:
48-
+ [Datamuse Words Database API](https://www.datamuse.com/api/)
49+
+ [Datamuse Words Database API][3]
4950

5051
#### Libraries:
51-
+ ~~[OkHttp3 *-* [square/okhttp]](https://github.com/square/okhttp) *-* [Apache License 2.0]~~ **(removed)**
52-
+ [GSON *-* [google/gson]](https://github.com/google/gson) *-* [Apache License 2.0]
53-
+ [SearchView *-* [lapism/SearchView]](https://github.com/lapism/SearchView) *-* [Apache License 2.0]
54-
+ [Chrome Custom Tabs *-* [GoogleChrome/custom-tabs-client]](https://github.com/GoogleChrome/custom-tabs-client) *-* [Apache License 2.0]
52+
+ ~~[OkHttp3 *-* [square/okhttp]](https://github.com/square/okhttp) *-* [Apache License 2.0][4]~~ **(removed)**
53+
+ ~~[GSON *-* [google/gson]](https://github.com/google/gson) *-* [Apache License 2.0][4]~~ **(removed)**
54+
+ [SearchView *-* [lapism/SearchView]](https://github.com/lapism/SearchView) *-* [Apache License 2.0][4]
55+
+ [Chrome Custom Tabs *-* [GoogleChrome/custom-tabs-client]](https://github.com/GoogleChrome/custom-tabs-client) *-* [Apache License 2.0][4]
5556

5657
#### Licenses:
57-
+ [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0)
58+
+ [Apache License 2.0][1]
59+
60+
[1]:https://imgur.com/a/55zEAKS
61+
[2]:https://romannurik.github.io/AndroidAssetStudio/icons-launcher.html
62+
[3]:https://www.datamuse.com/api/
63+
[4]:https://www.apache.org/licenses/LICENSE-2.0

‎app/build.gradle‎

Lines changed: 40 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@ android {
1010
minSdkVersion 16
1111
targetSdkVersion 29
1212

13-
versionCode 107
14-
versionName '10.7'
13+
versionCode 108
14+
versionName '10.8'
1515

1616
multiDexEnabled true
1717

1818
vectorDrawables.useSupportLibrary = true
1919
vectorDrawables.generatedDensities = []
20+
21+
useLibrary 'org.apache.http.legacy'
2022
}
2123

2224
compileOptions {
25+
coreLibraryDesugaringEnabled true
2326
targetCompatibility JavaVersion.VERSION_1_8
2427
sourceCompatibility JavaVersion.VERSION_1_8
2528
}
@@ -33,21 +36,44 @@ android {
3336
}
3437

3538
aaptOptions { additionalParameters '--no-version-vectors' }
39+
40+
packagingOptions {
41+
exclude '**/**.version'
42+
exclude '**/**.properties'
43+
exclude '**/DEPENDENCIES'
44+
exclude '**/DEPENDENCIES.txt'
45+
exclude '**/dependencies.txt'
46+
exclude '**/LICENSE'
47+
exclude '**/LICENSE.txt'
48+
exclude '**/license.txt'
49+
exclude '**/NOTICE'
50+
exclude '**/NOTICE.txt'
51+
exclude '**/notice.txt'
52+
exclude '**/LGPL2.1'
53+
}
54+
}
55+
56+
allprojects {
57+
tasks.withType(JavaCompile) {
58+
// options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
59+
options.compilerArgs << "-Xlint:all"
60+
}
3661
}
3762

3863
dependencies {
39-
implementation('androidx.multidex:multidex:2.0.1') { transitive true }
40-
implementation('androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03') { transitive true }
41-
implementation('androidx.appcompat:appcompat:1.1.0') { transitive true }
42-
implementation('androidx.legacy:legacy-support-v4:1.0.0') { transitive true }
43-
implementation('com.google.android.material:material:1.2.0-alpha04') { transitive true }
44-
implementation('androidx.recyclerview:recyclerview:1.2.0-alpha01') { transitive true }
45-
implementation('androidx.cardview:cardview:1.0.0') { transitive true }
46-
47-
implementation('com.google.firebase:firebase-core:17.2.2') { transitive true }
48-
implementation('com.google.firebase:firebase-ads:18.3.0') { transitive true }
49-
implementation('com.google.firebase:firebase-crash:16.2.1') { transitive true }
50-
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1') { transitive true }
64+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
65+
66+
// implementation('androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03@aar') { transitive true }
67+
implementation('androidx.appcompat:appcompat:1.1.0@aar') { transitive true }
68+
implementation('androidx.legacy:legacy-support-v4:1.0.0@aar') { transitive true }
69+
implementation('com.google.android.material:material:1.2.0-alpha05@aar') { transitive true }
70+
implementation('androidx.recyclerview:recyclerview:1.2.0-alpha01@aar') { transitive true }
71+
implementation('androidx.cardview:cardview:1.0.0@aar') { transitive true }
72+
73+
implementation('com.google.firebase:firebase-core:17.2.3@aar') { transitive true }
74+
implementation('com.google.firebase:firebase-ads:19.0.1@aar') { transitive true }
75+
implementation('com.google.firebase:firebase-crash:16.2.1@aar') { transitive true }
76+
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') { transitive true }
5177

5278
implementation('androidx.browser:browser:1.2.0') { transitive true }
5379
implementation('com.github.clans:fab:1.6.4') { transitive true }

‎app/lint.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
<lint>
33
<issue id="IconLocation">
44
<ignore path="src/main/res/drawable/dialog_back.9.png" />
5-
<ignore path="src/main/res/drawable/no_internet.9.png" />
5+
<ignore path="src/main/res/drawable/lw.png" />
6+
<ignore path="src/main/res/drawable/ms.png" />
7+
<ignore path="src/main/res/drawable/adm.png" />
8+
<ignore path="src/main/res/drawable/qdb.png" />
9+
<ignore path="src/main/res/drawable/rev.png" />
10+
<ignore path="src/main/res/drawable/vdz.png" />
11+
<ignore path="src/main/res/drawable/revl.png" />
12+
<ignore path="src/main/res/drawable/tesv.png" />
613
</issue>
714
</lint>

‎app/proguard-rules.pro‎

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
1-
-optimizationpasses 5
21
-printmapping proguardMapping.txt
2+
3+
-optimizationpasses 5
34
-optimizations !code/simplification/cast,!field/*,!class/merging/*
45
-keepattributes *Annotation*,Exceptions
56
-keepattributes InnerClasses,LineNumberTable
6-
#-keepattributes Signature,LineNumberTable,SourceFile
7+
-keepattributes Signature,SourceFile
78

89
-keep class **.R$* { public static final int *; }
910
-keep class **$Properties
1011

11-
-keepclassmembers,allowshrinking class awais.backworddictionary.custom.WordItem { private *; }
12+
#-keepclassmembers,allowshrinking class awais.backworddictionary.custom.WordItem { private *; }
1213

1314
-keep,allowshrinking public class android.webkit.*
14-
-keep public class * extends android.app.Service
15-
-keep public class * extends android.content.ContentProvider
16-
-keep public class * extends android.content.BroadcastReceiver
17-
-keep,allowshrinking public class * extends androidx.multidex.MultiDexApplication
15+
#-keep public class * extends android.app.Service
16+
#-keep public class * extends android.content.ContentProvider
17+
#-keep public class * extends android.content.BroadcastReceiver
18+
#-keep,allowshrinking public class * extends androidx.multidex.MultiDexApplication
1819

1920
-keep,allowshrinking class * implements java.lang.annotation.Annotation
20-
-keep public class * implements android.os.IInterface
21+
#-keep public class * implements android.os.IInterface
2122
-keep public class * implements android.os.Parcelable {
22-
public static final android.os.Parcelable$Creator *;
23-
}
24-
-keepclassmembernames,allowshrinking public class * implements java.io.Serializable {
25-
static final long serialVersionUID;
26-
private static final java.io.ObjectStreamField[] serialPersistentFields;
27-
private void writeObject(java.io.ObjectOutputStream);
28-
private void readObject(java.io.ObjectInputStream);
29-
java.lang.Object writeReplace();
30-
java.lang.Object readResolve();
23+
public static final android.os.Parcelable.Creator *;
3124
}
25+
#-keepclassmembernames,allowshrinking public class * implements java.io.Serializable {
26+
# static final long serialVersionUID;
27+
# private static final java.io.ObjectStreamField[] serialPersistentFields;
28+
# private void writeObject(java.io.ObjectOutputStream);
29+
# private void readObject(java.io.ObjectInputStream);
30+
# java.lang.Object writeReplace();
31+
# java.lang.Object readResolve();
32+
#}
3233
-keepclassmembernames public class * extends android.view.View {
3334
public <init>(android.content.Context);
3435
public <init>(android.content.Context, android.util.AttributeSet);
3536
public <init>(android.content.Context, android.util.AttributeSet, int);
3637
}
37-
-keepclassmembernames,allowshrinking public class * extends android.widget.NumberPicker {
38-
public <init>(android.content.Context);
39-
public <init>(android.content.Context, android.util.AttributeSet);
40-
public <init>(android.content.Context, android.util.AttributeSet, int);
41-
}
38+
#-keepclassmembernames,allowshrinking public class * extends android.widget.NumberPicker {
39+
# public <init>(android.content.Context);
40+
# public <init>(android.content.Context, android.util.AttributeSet);
41+
# public <init>(android.content.Context, android.util.AttributeSet, int);
42+
#}
4243
-keepclassmembers,allowshrinking class * extends android.webkit.WebViewClient {
4344
public void *(android.webkit.WebView, java.lang.String);
4445
public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
@@ -48,28 +49,10 @@
4849
public static **[] values();
4950
public static ** valueOf(java.lang.String);
5051
}
51-
-keep public class java.nio.* { *; }
52-
-keep public class * implements androidx.versionedparcelable.VersionedParcelable {
53-
<init>();
54-
}
52+
#-keep public class * implements androidx.versionedparcelable.VersionedParcelable {
53+
# <init>();
54+
#}
5555

56-
-dontwarn rx.*
57-
-dontwarn okio.**
5856
-dontwarn org.apache.**
5957
-dontwarn java.lang.invoke.*
6058
-dontwarn android.webkit.WebView
61-
62-
#noinspection ShrinkerUnresolvedReference
63-
################## GOOGLE ##################
64-
#-keep class com.google.gson.** { *; }
65-
#-keep class com.google.** { *; }
66-
#-keep class com.google.gson.stream.** { *; }
67-
#-keep class com.google.gson.examples.android.model.** { *; }
68-
#
69-
#-keep class com.android.volley.** { *; }
70-
#-keep class com.android.volley.toolbox.** { *; }
71-
#-keep class com.android.volley.Response$* { *; }
72-
#-keep class com.android.volley.Request$* { *; }
73-
#-keep class com.android.volley.RequestQueue$* { *; }
74-
#-keep class com.android.volley.toolbox.HurlStack$* { *; }
75-
#-keep class com.android.volley.toolbox.ImageLoader$* { *; }

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
88

9-
<uses-sdk tools:overrideLibrary="android.support.customtabs" />
9+
<!-- <uses-sdk tools:overrideLibrary="android.support.customtabs" />-->
1010

1111
<application
1212
android:name=".LinkedApp"

0 commit comments

Comments
 (0)