Taskbar 3.3.3 (release 2)

• Use alternate method of showing icon font

diff --git a/app/build.gradle b/app/build.gradle
index b1d137f..4a5a041 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 25
 
-        versionCode 143
+        versionCode 144
         versionName "3.3.3"
 
         resConfigs "en", "ja", "ru", "de"

diff --git a/app/src/main/java/com/farmerbb/taskbar/MainActivity.java b/app/src/main/java/com/farmerbb/taskbar/MainActivity.java
index bf5da5c..1a53aa4 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/MainActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/MainActivity.java
@@ -58,7 +58,6 @@ import com.farmerbb.taskbar.util.FreeformHackHelper;
 import com.farmerbb.taskbar.util.IconCache;
 import com.farmerbb.taskbar.util.LauncherHelper;
 import com.farmerbb.taskbar.util.U;
-import com.mikepenz.iconics.context.IconicsContextWrapper;
 
 import java.io.File;
 import java.util.Arrays;
@@ -78,11 +77,6 @@ public class MainActivity extends AppCompatActivity implements colorDialog.Color
     public final int ACCENT_COLOR = 2;
 
     @Override
-    protected void attachBaseContext(Context newBase) {
-        super.attachBaseContext(IconicsContextWrapper.wrap(newBase));
-    }
-
-    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
index c62992c..449ec53 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/AdvancedFragment.java
@@ -43,6 +43,7 @@ import com.farmerbb.taskbar.activity.HomeActivity;
 import com.farmerbb.taskbar.activity.KeyboardShortcutActivity;
 import com.farmerbb.taskbar.activity.dark.NavigationBarButtonsActivityDark;
 import com.farmerbb.taskbar.util.U;
+import com.mikepenz.iconics.Iconics;
 
 public class AdvancedFragment extends SettingsFragment implements Preference.OnPreferenceClickListener {
 
@@ -62,6 +63,11 @@ public class AdvancedFragment extends SettingsFragment implements Preference.OnP
             findPreference("keyboard_shortcut").setOnPreferenceClickListener(this);
             findPreference("dashboard_grid_size").setOnPreferenceClickListener(this);
             findPreference("navigation_bar_buttons").setOnPreferenceClickListener(this);
+            findPreference("keyboard_shortcut").setSummary(
+                    new Iconics.IconicsBuilder()
+                            .ctx(getActivity())
+                            .on(getString(R.string.pref_description_keyboard_shortcut))
+                            .build());
 
             bindPreferenceSummaryToValue(findPreference("dashboard"));
 

diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 8e7d713..0542a7e 100644 (file)
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -25,8 +25,7 @@
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="keyboard_shortcut"
-        android:title="@string/pref_title_keyboard_shortcut"
-        android:summary="@string/pref_description_keyboard_shortcut" />
+        android:title="@string/pref_title_keyboard_shortcut" />
 
     <CheckBoxPreference
         android:defaultValue="false"