diff --git a/appthemehelper/appthemehelper.iml b/appthemehelper/appthemehelper.iml
index b7cb4063..a66cda8f 100644
--- a/appthemehelper/appthemehelper.iml
+++ b/appthemehelper/appthemehelper.iml
@@ -22,8 +22,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -36,7 +64,6 @@
-
@@ -85,6 +112,8 @@
+
+
@@ -107,43 +136,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 7b1fcce3..ed9914c4 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,5 +1,6 @@
apply plugin: 'com.android.library'
-
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
android {
compileSdkVersion 28
defaultConfig {
@@ -17,6 +18,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
productFlavors {
}
}
@@ -30,4 +35,5 @@ dependencies {
// Used for the list preference classes
implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java
index b5380973..bfb47fc6 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.java
@@ -35,9 +35,6 @@ public class MaterialUtil {
button.setIconTint(colorState);
}
- Typeface font = ResourcesCompat.getFont(button.getContext(), R.font.product_sans);
- button.setTypeface(font);
-
}
public static void setTint(TextInputLayout textInputLayout, boolean background) {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
index 495cfb2d..1746c26b 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.java
@@ -1,11 +1,15 @@
package code.name.monkey.appthemehelper.util;
import android.content.res.ColorStateList;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
+import android.graphics.drawable.Drawable;
+
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.navigation.NavigationView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import code.name.monkey.appthemehelper.ThemeStore;
+
/**
* @author Karim Abou Zeid (kabouzeid)
*/
@@ -25,6 +29,8 @@ public final class NavigationViewUtil {
selectedColor
});
navigationView.setItemIconTintList(iconSl);
+ Drawable drawable = navigationView.getItemBackground();
+ navigationView.setItemBackground(TintHelper.createTintedDrawable(drawable, ColorUtil.withAlpha(ThemeStore.accentColor(navigationView.getContext()), 0.2f)));
}
public static void setItemTextColors(@NonNull NavigationView navigationView, @ColorInt int normalColor, @ColorInt int selectedColor) {
diff --git a/appthemehelper/src/main/res/font/product_sans.xml b/appthemehelper/src/main/res/font/product_sans.xml
deleted file mode 100644
index 4ba80df6..00000000
--- a/appthemehelper/src/main/res/font/product_sans.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/font/products_sans_regular.ttf b/appthemehelper/src/main/res/font/products_sans_regular.ttf
deleted file mode 100755
index c0442ee2..00000000
Binary files a/appthemehelper/src/main/res/font/products_sans_regular.ttf and /dev/null differ
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom.xml b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
index 5ab58e4c..55fdca08 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_custom.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
@@ -12,7 +12,7 @@
tools:ignore="RtlSymmetry,UnusedAttribute">
@@ -53,7 +52,6 @@
android:layout_alignStart="@android:id/title"
android:layout_below="@android:id/title"
android:layout_marginTop="2dp"
- android:fontFamily="sans-serif"
android:maxLines="4"
android:textSize="@dimen/ate_default_textsize_body"
tools:text="Summary" />
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
index a5dc335c..aff3a9ee 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
@@ -13,7 +13,7 @@
tools:ignore="RtlSymmetry,UnusedAttribute">
@@ -54,7 +53,6 @@
android:layout_alignStart="@android:id/title"
android:layout_below="@android:id/title"
android:layout_marginTop="2dp"
- android:fontFamily="sans-serif"
android:maxLines="4"
android:textSize="@dimen/ate_default_textsize_body"
tools:text="Summary" />