diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java b/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java
index 57884f7c..5e8ca435 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/activities/CandyBarMainActivity.java
@@ -520,14 +520,7 @@ public void OnSearchExpanded(boolean expand) {
mIsMenuVisible = !expand;
if (expand) {
- int color = ColorHelper.getAttributeColor(this, R.attr.search_toolbar);
- ViewHelper.changeSearchViewActionModeColor(this,
- collapsingToolbar, R.attr.colorPrimary, R.attr.search_toolbar);
- ColorHelper.setStatusBarColor(this, color);
-
- int icon = ColorHelper.getAttributeColor(this, R.attr.search_toolbar_icon);
- toolbar.setNavigationIcon(DrawableHelper.getTintedDrawable(
- this, R.drawable.ic_toolbar_back, icon));
+ toolbar.setNavigationIcon(R.drawable.ic_toolbar_back);
toolbar.setNavigationOnClickListener(view -> onBackPressed());
} else {
SoftKeyboardHelper.closeKeyboard(this);
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java
index 8a356f9c..801a6e5a 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/fragments/IconsSearchFragment.java
@@ -113,9 +113,9 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
mSearchView.setIconifiedByDefault(false);
mSearchView.clearFocus();
- int color = ColorHelper.getAttributeColor(getActivity(), R.attr.search_toolbar_icon);
- ViewHelper.changeSearchViewTextColor(mSearchView, color,
- ColorHelper.getAttributeColor(getActivity(), R.attr.search_toolbar_hint));
+ int color = ColorHelper.getAttributeColor(getActivity(), R.attr.toolbar_icon);
+ ViewHelper.changeSearchViewTextColor(mSearchView,
+ color, ColorHelper.setColorAlpha(color, 0.6f));
View view = mSearchView.findViewById(android.support.v7.appcompat.R.id.search_plate);
if (view != null) view.setBackgroundColor(Color.TRANSPARENT);
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/LauncherHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/LauncherHelper.java
index 5e4fb02b..14e7450e 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/LauncherHelper.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/LauncherHelper.java
@@ -60,6 +60,7 @@ public class LauncherHelper {
private static final int ITOP = 25;
private static final int ZERO = 26;
private static final int V = 27;
+ private static final int ABC = 28;
private static int getLauncherId(String packageName) {
if (packageName == null) return UNKNOWN;
@@ -125,6 +126,8 @@ private static int getLauncherId(String packageName) {
return ZERO;
case "com.vivid.launcher":
return V;
+ case "com.abclauncher.launcher":
+ return ABC;
default:
return UNKNOWN;
}
@@ -478,6 +481,26 @@ private static void applyLauncher(@NonNull Context context, String launcherPacka
openGooglePlay(context, launcherPackage, launcherName);
}
break;
+ case ABC:
+ try {
+ /*
+ * Just want to let anyone who is going to copy
+ * It's not easy searching for this
+ * I will be grateful if you take this with a proper credit
+ * Thank you
+ */
+ final Intent abc = context.getPackageManager().getLaunchIntentForPackage(
+ "com.abclauncher.launcher");
+ final Intent abc1 = new Intent("com.abclauncher.launcher.themes.themeaction");
+ abc1.putExtra("theme_package_name", context.getPackageName());
+ abc.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.sendBroadcast(abc1);
+ context.startActivity(abc);
+ ((AppCompatActivity) context).finish();
+ } catch (ActivityNotFoundException | NullPointerException e) {
+ openGooglePlay(context, launcherPackage, launcherName);
+ }
+ break;
}
}
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/PreferencesHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/PreferencesHelper.java
index e0f7c51d..9491435f 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/PreferencesHelper.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/PreferencesHelper.java
@@ -64,7 +64,7 @@ public boolean isFirstRun() {
return getSharedPreferences().getBoolean(KEY_FIRST_RUN, true);
}
- void setFirstRun(boolean bool) {
+ public void setFirstRun(boolean bool) {
getSharedPreferences().edit().putBoolean(KEY_FIRST_RUN, bool).apply();
}
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/RequestHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/RequestHelper.java
index 8308dade..73887f56 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/RequestHelper.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/RequestHelper.java
@@ -209,6 +209,10 @@ public static void showPremiumRequestExist(@NonNull Context context) {
}
public static void checkPiracyApp(@NonNull Context context) {
+ boolean premiumRequest = context.getResources().getBoolean(R.bool.enable_premium_request);
+ //Dashboard don't need to check piracy app if premium request is disabled
+ if (!premiumRequest) return;
+
//Lucky Patcher and Freedom package name
String[] strings = new String[] {
"com.chelpus.lackypatch",
@@ -228,14 +232,12 @@ public static void checkPiracyApp(@NonNull Context context) {
string, PackageManager.GET_ACTIVITIES);
if (packageInfo != null) {
isPiracyAppInstalled = true;
- Preferences.getPreferences(context).setPremiumRequestEnabled(false);
- return;
+ break;
}
} catch (Exception ignored) {}
}
- Preferences.getPreferences(context).setPremiumRequestEnabled(
- context.getResources().getBoolean(R.bool.enable_premium_request));
+ Preferences.getPreferences(context).setPremiumRequestEnabled(!isPiracyAppInstalled);
try {
RequestListener listener = (RequestListener) context;
diff --git a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java
index b0d5196a..be701971 100644
--- a/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java
+++ b/core/src/main/java/com/dm/material/dashboard/candybar/helpers/WallpaperHelper.java
@@ -195,6 +195,7 @@ protected Boolean doInBackground(Void... voids) {
byte data[] = new byte[1024];
long total = 0;
int count;
+
while ((count = stream.read(data)) != -1) {
total += count;
if (fileLength > 0)
diff --git a/core/src/main/res/drawable-xxxhdpi/ic_launcher_abc.png b/core/src/main/res/drawable-xxxhdpi/ic_launcher_abc.png
new file mode 100644
index 00000000..f92faead
Binary files /dev/null and b/core/src/main/res/drawable-xxxhdpi/ic_launcher_abc.png differ
diff --git a/core/src/main/res/drawable/ic_toolbar_close.xml b/core/src/main/res/drawable/ic_toolbar_close.xml
index 7bf12e18..39ffa27c 100644
--- a/core/src/main/res/drawable/ic_toolbar_close.xml
+++ b/core/src/main/res/drawable/ic_toolbar_close.xml
@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/core/src/main/res/layout/fragment_icons_base.xml b/core/src/main/res/layout/fragment_icons_base.xml
index dfe8c3d9..882e8016 100644
--- a/core/src/main/res/layout/fragment_icons_base.xml
+++ b/core/src/main/res/layout/fragment_icons_base.xml
@@ -7,15 +7,19 @@
\ No newline at end of file
diff --git a/core/src/main/res/values-sw600dp/dimens.xml b/core/src/main/res/values-sw600dp/dimens.xml
index 8b96f654..fb2ee81a 100644
--- a/core/src/main/res/values-sw600dp/dimens.xml
+++ b/core/src/main/res/values-sw600dp/dimens.xml
@@ -3,6 +3,7 @@
16sp
+ 14dp
114dp
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index 182841b2..860c8f85 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -23,8 +23,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index 76590bc9..bea2fe6d 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -29,14 +29,6 @@
#FFFFFFFF
#FFFFFFFF
-
- #E2E2E2
- #181818
- #555555
- #DDFFFFFF
- #44000000
- #44FFFFFF
-
#FFFFFF
#FFFFFF
@@ -76,8 +68,6 @@
#EEFFFFFF
#777777
#99FFFFFF
- #44FFFFFF
- #44FFFFFF
#EEEEEE
#22FFFFFF
diff --git a/core/src/main/res/values/dashboard_launchers.xml b/core/src/main/res/values/dashboard_launchers.xml
index e7a78972..b694ceba 100644
--- a/core/src/main/res/values/dashboard_launchers.xml
+++ b/core/src/main/res/values/dashboard_launchers.xml
@@ -28,6 +28,7 @@
- Solo Launcher
- Zero Launcher
- V Launcher
+ - ABC Launcher
@@ -57,6 +58,7 @@
- @drawable/ic_launcher_solo
- @drawable/ic_launcher_zero
- @drawable/ic_launcher_v
+ - @drawable/ic_launcher_abc
@@ -87,6 +89,7 @@
- home.solo.launcher.free
- com.zeroteam.zerolauncher
- com.vivid.launcher
+ - com.abclauncher.launcher
@@ -115,7 +118,8 @@
- ginlemon.flowerpro
- none
- none
- - note
+ - none
+ - none
@@ -145,6 +149,7 @@
- none
- none
- note
+ - none
\ No newline at end of file
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
index 4c6a0d31..2546f79e 100644
--- a/core/src/main/res/values/dimens.xml
+++ b/core/src/main/res/values/dimens.xml
@@ -28,6 +28,7 @@
8dp
14sp
+ 12dp
96dp
@@ -38,11 +39,6 @@
8dp
220dp
-
- 68dp
- 100dp
- 16dp
-
16dp
90dp
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index fe17e075..70a4173b 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -33,14 +33,10 @@
- @color/colorAccent
- @color/dividerList
- @color/homeFeatureLine
- - @color/hintText
- @color/tabIndicator
- @color/tabText
- @color/tabTextSelected
- @color/homeTitle
- - @color/searchToolbar
- - @color/searchToolbarIcon
- - @color/searchToolbarHintText
- @color/colorAccent
- @color/primaryText
@@ -72,14 +68,10 @@
- @color/darkColorAccent
- @color/dividerListDark
- @color/homeFeatureLineDark
- - @color/hintTextDark
- @color/tabIndicatorDark
- @color/tabTextDark
- @color/tabTextSelectedDark
- @color/homeTitleDark
- - @color/searchToolbarDark
- - @color/searchToolbarIconDark
- - @color/searchToolbarHintTextDark
- @color/cardBackgroundDark
- @color/darkColorAccent