Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into ktxExtensions

Browse source
This commit is contained in:
Prathamesh More 2022-04-08 20:02:06 +05:30 • committed by GitHub
commit 9bd15ed5c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 40 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
View file

@ -9,8 +9,6 @@ import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
import android.view.WindowInsetsController
import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS
import androidx.annotation.ColorInt
import androidx.appcompat.widget.Toolbar
import androidx.core.view.WindowInsetsControllerCompat
import code.name.monkey.appthemehelper.util.ColorUtil
import code.name.monkey.appthemehelper.util.TintHelper
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper

2
appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
View file

@ -8,8 +8,6 @@ import androidx.preference.PreferenceFragmentCompat;
import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEListPreferenceDialogFragmentCompat;
import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEPreferenceDialogFragment;
import static androidx.preference.PreferenceFragmentCompat.*;
/**
* @author Karim Abou Zeid (kabouzeid)
*/

6
appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
View file

@ -96,8 +96,8 @@ public final class TintHelper {
return null;
}
drawable = DrawableCompat.wrap(drawable.mutate());
DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
DrawableCompat.setTint(drawable, color);
drawable.setTintMode(PorterDuff.Mode.SRC_IN);
drawable.setTint(color);
return drawable;
}
@ -109,7 +109,7 @@ public final class TintHelper {
return null;
}
Drawable temp = DrawableCompat.wrap(drawable.mutate());
DrawableCompat.setTintList(temp, sl);
temp.setTintList(sl);
return temp;
}

6
appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
View file

@ -550,7 +550,7 @@ public final class ToolbarContentTintHelper {
if (toolbar != null && toolbar.getOverflowIcon() != null) {
Drawable bg = DrawableCompat.wrap(toolbar.getOverflowIcon());
DrawableCompat.setTint(bg, toolbarIconsColor);
bg.setTint(toolbarIconsColor);
}
removeOnGlobalLayoutListener(decorView, this);
}
@ -588,7 +588,7 @@ public final class ToolbarContentTintHelper {
if (drawable != null) {
final Drawable wrapped = DrawableCompat.wrap(drawable);
drawable.mutate();
DrawableCompat.setTint(wrapped, color);
wrapped.setTint(color);
item.setIcon(drawable);
}
}
@ -603,7 +603,7 @@ public final class ToolbarContentTintHelper {
final Drawable drawable = image.getDrawable();
final Drawable wrapped = DrawableCompat.wrap(drawable);
drawable.mutate();
DrawableCompat.setTint(wrapped, color);
wrapped.setTint(color);
image.setImageDrawable(drawable);
}
}