Add option to use Taskbar logo as app drawer icon

diff --git a/README.md b/README.md
index 4c0b86e..c1c8061 100644 (file)
--- a/README.md
+++ b/README.md
@@ -42,5 +42,5 @@ Taskbar includes support for ADW-style icon packs.  If you are an icon pack deve
     startActivity(intent);
 
 ## Contributors
-* Mark Morilla (icons) (https://plus.google.com/106169552593075739372)
+* Mark Morilla (app logo) (https://plus.google.com/106169552593075739372)
 * naofum (Japanese translation)

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
index 2fff5f0..194f667 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/GeneralFragment.java
@@ -49,6 +49,7 @@ public class GeneralFragment extends SettingsFragment {
         bindPreferenceSummaryToValue(findPreference("theme"));
         bindPreferenceSummaryToValue(findPreference("invisible_button"));
         bindPreferenceSummaryToValue(findPreference("anchor"));
+        bindPreferenceSummaryToValue(findPreference("app_drawer_icon"));
 
         AppCompatActivity activity = (AppCompatActivity) getActivity();
         activity.setTitle(R.string.pref_header_general);

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
index ad8927e..d4c8a7b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
@@ -257,6 +257,17 @@ public class TaskbarService extends Service {
         taskbar.setEnabled(false);
 
         startButton = (ImageView) layout.findViewById(R.id.start_button);
+        int padding;
+
+        if(pref.getBoolean("app_drawer_icon", false)) {
+            startButton.setImageDrawable(ContextCompat.getDrawable(this, R.mipmap.ic_launcher));
+            padding = getResources().getDimensionPixelSize(R.dimen.app_drawer_icon_padding_alt);
+        } else {
+            startButton.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.all_apps_button_icon));
+            padding = getResources().getDimensionPixelSize(R.dimen.app_drawer_icon_padding);
+        }
+
+        startButton.setPadding(padding, padding, padding, padding);
         startButton.setOnClickListener(ocl);
         startButton.setOnLongClickListener(new View.OnLongClickListener() {
             @Override

diff --git a/app/src/main/res/drawable-hdpi/ic_system.png b/app/src/main/res/drawable-hdpi/ic_system.png
deleted file mode 100644 (file)
index 950e13e..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_system.png and /dev/null differ

diff --git a/app/src/main/res/drawable-mdpi/ic_system.png b/app/src/main/res/drawable-mdpi/ic_system.png
deleted file mode 100644 (file)
index 990ec59..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_system.png and /dev/null differ

diff --git a/app/src/main/res/drawable-nodpi/ic_system.png b/app/src/main/res/drawable-nodpi/ic_system.png
new file mode 100644 (file)
index 0000000..82f0c10
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_system.png differ

diff --git a/app/src/main/res/drawable-xhdpi/ic_system.png b/app/src/main/res/drawable-xhdpi/ic_system.png
deleted file mode 100644 (file)
index 4499892..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_system.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xxhdpi/ic_system.png b/app/src/main/res/drawable-xxhdpi/ic_system.png
deleted file mode 100644 (file)
index 3bc13f9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_system.png and /dev/null differ

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_system.png b/app/src/main/res/drawable-xxxhdpi/ic_system.png
deleted file mode 100644 (file)
index 163033c..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_system.png and /dev/null differ

diff --git a/app/src/main/res/layout/taskbar_left.xml b/app/src/main/res/layout/taskbar_left.xml
index 0cf44fa..958cb21 100644 (file)
--- a/app/src/main/res/layout/taskbar_left.xml
+++ b/app/src/main/res/layout/taskbar_left.xml
@@ -21,9 +21,7 @@
         <ImageView
             android:id="@+id/start_button"
             android:layout_width="@dimen/icon_size"
-            android:layout_height="@dimen/icon_size"
-            android:padding="4dp"
-            android:src="@drawable/all_apps_button_icon" />
+            android:layout_height="@dimen/icon_size" />
 
         <View
             android:id="@+id/divider"

diff --git a/app/src/main/res/layout/taskbar_right.xml b/app/src/main/res/layout/taskbar_right.xml
index b0e7372..595edf2 100644 (file)
--- a/app/src/main/res/layout/taskbar_right.xml
+++ b/app/src/main/res/layout/taskbar_right.xml
@@ -55,8 +55,6 @@
         <ImageView
             android:id="@+id/start_button"
             android:layout_width="@dimen/icon_size"
-            android:layout_height="@dimen/icon_size"
-            android:padding="4dp"
-            android:src="@drawable/all_apps_button_icon" />
+            android:layout_height="@dimen/icon_size" />
         
 </LinearLayout>

diff --git a/app/src/main/res/layout/taskbar_top_vertical.xml b/app/src/main/res/layout/taskbar_top_vertical.xml
index 75fe517..f92129b 100644 (file)
--- a/app/src/main/res/layout/taskbar_top_vertical.xml
+++ b/app/src/main/res/layout/taskbar_top_vertical.xml
@@ -22,9 +22,7 @@
     <ImageView
         android:id="@+id/start_button"
         android:layout_width="@dimen/icon_size"
-        android:layout_height="@dimen/icon_size"
-        android:padding="4dp"
-        android:src="@drawable/all_apps_button_icon" />
+        android:layout_height="@dimen/icon_size" />
 
     <View
         android:id="@+id/divider"

diff --git a/app/src/main/res/layout/taskbar_vertical.xml b/app/src/main/res/layout/taskbar_vertical.xml
index fc6ecb5..00a840c 100644 (file)
--- a/app/src/main/res/layout/taskbar_vertical.xml
+++ b/app/src/main/res/layout/taskbar_vertical.xml
@@ -65,8 +65,6 @@
     <ImageView
         android:id="@+id/start_button"
         android:layout_width="@dimen/icon_size"
-        android:layout_height="@dimen/icon_size"
-        android:padding="4dp"
-        android:src="@drawable/all_apps_button_icon" />
+        android:layout_height="@dimen/icon_size" />
 
 </LinearLayout>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 34b78ad..34482dc 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -198,4 +198,6 @@
     <string name="pref_title_use_mask">Use masks for unthemed icons</string>
     <string name="pref_description_use_mask">When an icon pack is set, generate icons unthemed apps using masking images found within the icon pack. (Experimental)</string>
 
+    <string name="pref_title_app_drawer_icon">Use Taskbar logo as start menu icon</string>
+
 </resources>

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 9037d95..25ec827 100644 (file)
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,4 +28,6 @@
     <dimen name="phone_size_width">320dp</dimen>
     <dimen name="phone_size_height">480dp</dimen>
     <dimen name="max_width">@dimen/match_parent</dimen>
+    <dimen name="app_drawer_icon_padding">4dp</dimen>
+    <dimen name="app_drawer_icon_padding_alt">7dp</dimen>
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1aae16b..4227a78 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
     <string name="pref_description_freeform_hack">Allows Taskbar to launch apps in freeform window mode, for a more desktop-like experience.\n\nThis feature is experimental, and may cause issues with standard split-screen multitasking.</string>
 
     <string name="pref_header_about">About Taskbar</string>
-    <string name="pref_about_description">Taskbar: start menu and recent apps at your fingertips\n\n&#169; 2016 Braden Farmer\nLauncher icon by Mark Morilla\n\nClick here to check for updates or leave a rating! %1$s</string>
+    <string name="pref_about_description">Taskbar: start menu and recent apps at your fingertips\n\n&#169; 2016 Braden Farmer\nApp logo by Mark Morilla\n\nClick here to check for updates or leave a rating! %1$s</string>
 
     <string name="pref_title_hide_taskbar">Collapse Taskbar when selecting an app</string>
 
@@ -198,4 +198,6 @@
     <string name="pref_title_use_mask">Use masks for unthemed icons</string>
     <string name="pref_description_use_mask">When an icon pack is set, generate icons unthemed apps using masking images found within the icon pack. (Experimental)</string>
 
+    <string name="pref_title_app_drawer_icon">Use Taskbar logo as start menu icon</string>
+
 </resources>

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index b50ed78..9708983 100644 (file)
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -78,6 +78,11 @@
 
     <CheckBoxPreference
         android:defaultValue="false"
+        android:key="app_drawer_icon"
+        android:title="@string/pref_title_app_drawer_icon"/>
+
+    <CheckBoxPreference
+        android:defaultValue="false"
         android:key="start_on_boot"
         android:title="@string/pref_title_start_on_boot"/>