implement icon pack

valkriaine · May 12, 2022 · 5330e90 · 5330e90
1 parent ef94377
commit 5330e90
Show file tree

Hide file tree

Showing 25 changed files with 965 additions and 91 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.factor.launcher"
         minSdkVersion 22
         targetSdkVersion 31
-        versionCode 38
-        versionName "0.66"
+        versionCode 40
+        versionName "0.7"
 
         renderscriptTargetApi 31
         renderscriptSupportModeEnabled true

diff --git a/app/src/main/java/com/factor/launcher/adapters/AppListAdapter.java b/app/src/main/java/com/factor/launcher/adapters/AppListAdapter.java
@@ -236,7 +236,8 @@ public AppListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewT
                 MenuInflater inflater = activity.getMenuInflater();
                 inflater.inflate(R.menu.app_list_item_menu, menu);
 
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                {
                     menu.setGroupDividerEnabled(true);
                 }
 

diff --git a/app/src/main/java/com/factor/launcher/adapters/RecentAppsAdapter.java b/app/src/main/java/com/factor/launcher/adapters/RecentAppsAdapter.java
@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +11,7 @@
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.RecyclerView;
 import com.factor.launcher.R;
-import com.factor.launcher.databinding.RecentAppsItemBinding;
+import com.factor.launcher.databinding.ItemRecentAppsBinding;
 import com.factor.launcher.models.UserApp;
 import com.factor.launcher.receivers.AppActionReceiver;
 import com.factor.launcher.util.Constants;
@@ -41,7 +42,7 @@ public void addRecentBroadcast()
     @Override
     public RecentAppViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
     {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.recent_apps_item, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_recent_apps, parent, false);
         return new RecentAppViewHolder(view);
     }
 
@@ -70,7 +71,7 @@ public int getItemCount()
 
     static class RecentAppViewHolder extends RecyclerView.ViewHolder
     {
-        private final RecentAppsItemBinding binding;
+        private final ItemRecentAppsBinding binding;
 
         public RecentAppViewHolder(@NonNull View itemView)
         {
@@ -83,7 +84,13 @@ public void bind(String name, AppListManager appListManager)
             binding.setPackageName(name);
             try
             {
-                binding.recentIcon.setImageDrawable(appListManager.packageManager.getApplicationIcon(name));
+                Drawable icon;
+                if (appListManager.getIconPack() != null)
+                    icon = appListManager.getIconPack().getDrawableIconForPackage(name, appListManager.packageManager.getApplicationIcon(name));
+                else
+                    icon = appListManager.packageManager.getApplicationIcon(name);
+
+                binding.recentIcon.setImageDrawable(icon);
                 binding.recentIcon.setElevationDp(appListManager.settings.getShowShadowAroundIcon()? 30 : 0);
             }
             catch (PackageManager.NameNotFoundException ignored){}

diff --git a/app/src/main/java/com/factor/launcher/database/AppSettingsDatabase.kt b/app/src/main/java/com/factor/launcher/database/AppSettingsDatabase.kt
@@ -6,7 +6,7 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import com.factor.launcher.models.AppSettings
 
-@Database(entities = [AppSettings::class], exportSchema = false, version = 3)
+@Database(entities = [AppSettings::class], exportSchema = false, version = 4)
 abstract class AppSettingsDatabase : RoomDatabase()
 {
     abstract fun appSettingsDao(): AppSettingsDao
@@ -15,6 +15,7 @@ abstract class AppSettingsDatabase : RoomDatabase()
         Room.databaseBuilder(it.applicationContext, AppSettingsDatabase::class.java, "factor_settings")
             .addMigrations(SettingsMigrations.MIGRATION_CHANGE_TILE_LIST_RESIZING)
             .addMigrations(SettingsMigrations.MIGRATION_STATIC_BLUR)
+            .addMigrations(SettingsMigrations.MIGRATION_ICON_PACK)
             .fallbackToDestructiveMigration()
             .allowMainThreadQueries()
             .build()
@@ -56,6 +57,14 @@ abstract class AppSettingsDatabase : RoomDatabase()
                     database.execSQL("ALTER TABLE AppSettings ADD COLUMN static_blur INTEGER NOT NULL DEFAULT 0")
                 }
             }
+
+            val MIGRATION_ICON_PACK = object : Migration(3, 4)
+            {
+                override fun migrate(database: SupportSQLiteDatabase)
+                {
+                    database.execSQL("ALTER TABLE AppSettings ADD COLUMN icon_pack TEXT NOT NULL DEFAULT ''")
+                }
+            }
         }
     }
 

diff --git a/app/src/main/java/com/factor/launcher/fragments/SettingsFragment.java b/app/src/main/java/com/factor/launcher/fragments/SettingsFragment.java
@@ -13,10 +13,7 @@
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.view.HapticFeedbackConstants;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import android.view.*;
 import android.widget.EditText;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -27,6 +24,8 @@
 import com.factor.launcher.R;
 import com.factor.launcher.activities.EmptyHome;
 import com.factor.launcher.databinding.FragmentSettingsBinding;
+import com.factor.launcher.models.IconPackProvider;
+import com.factor.launcher.ui.IconPackPickerView;
 import com.factor.launcher.view_models.AppSettingsManager;
 import com.factor.launcher.models.AppSettings;
 import com.factor.launcher.ui.CustomFlag;
@@ -59,6 +58,8 @@ public class SettingsFragment extends Fragment implements LifecycleOwner
 
     private Bitmap m;
 
+    private String iconPack = "";
+
     public SettingsFragment()
     {
         // Required empty public constructor
@@ -305,6 +306,31 @@ public void afterTextChanged(Editable s) {}
         binding.tileColorPickerButton.setOnClickListener(v -> showColorPickerDialog("Tile color"));
         binding.searchBarColorPickerButton.setOnClickListener(v -> showColorPickerDialog("Search bar color"));
 
+
+        // Icon pack picker
+        iconPack = settings.getIconPackPackageName();
+        binding.iconPackPicker.setCurrentIconPack(iconPack);
+        binding.iconPackPicker.setOnIconPackClickedListener(new IconPackPickerView.OnIconPackClickedListener()
+        {
+            @Override
+            public void onIconPackClicked(IconPackProvider clickedIconPack)
+            {
+                if (clickedIconPack.isCurrentIconPack())
+                {
+                    binding.demoIconPack.setImageDrawable(clickedIconPack.getIcon());
+                    binding.demoIconPack.setVisibility(View.VISIBLE);
+                    iconPack = clickedIconPack.getPackageName();
+                }
+                else
+                {
+                    binding.demoIconPack.setVisibility(View.INVISIBLE);
+                    iconPack = "";
+                }
+
+                binding.tileLabel.setText(binding.iconPackPicker.getCurrentIconPackName());
+            }
+        });
+
         setUpUIState();
         setUpDemoTile();
     }
@@ -412,6 +438,8 @@ private void updateSettings()
             updated.setTileThemeColor(tileColor);
             updated.setSearchBarColor(searchColor);
 
+            updated.setIconPackPackageName(binding.iconPackPicker.getCurrentIconPackPackageName());
+
 
             AppSettingsManager.getInstance(getActivity().getApplication()).setAppSettings(updated).updateSettings();
             Intent intent = new Intent();
@@ -433,7 +461,8 @@ private boolean areSettingsChanged()
                 !tileColor.equals(settings.getTileThemeColor()) ||
                 !searchColor.equals(settings.getSearchBarColor()) ||
                 binding.iconShadowToggle.isChecked() != settings.getShowShadowAroundIcon() ||
-                binding.staticBlurToggle.isChecked() != settings.getStaticBlur();
+                binding.staticBlurToggle.isChecked() != settings.getStaticBlur() ||
+                binding.iconPackPicker.getCurrentIconPackPackageName().equals(settings.getIconPackPackageName());
     }
 
 

diff --git a/app/src/main/java/com/factor/launcher/models/AppSettings.kt b/app/src/main/java/com/factor/launcher/models/AppSettings.kt
@@ -1,9 +1,11 @@
 package com.factor.launcher.models
 
+import android.content.Context
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import com.factor.launcher.util.Constants
+import com.factor.launcher.util.IconPackManager
 
 
 @Entity
@@ -44,4 +46,16 @@ class AppSettings
 
     @ColumnInfo(name = "static_blur")
     var staticBlur = false
+
+    @ColumnInfo(name = "icon_pack")
+    var iconPackPackageName = ""
+
+
+    fun getIconPackProvider(context: Context): IconPackManager.IconPack?
+    {
+        val iconPackManager = IconPackManager()
+        iconPackManager.setContext(context)
+        iconPackManager.getAvailableIconPacks(true)
+        return iconPackManager.getIconPackWithName(iconPackPackageName)
+    }
 }
diff --git a/app/src/main/java/com/factor/launcher/models/Factor.kt b/app/src/main/java/com/factor/launcher/models/Factor.kt
@@ -1,5 +1,6 @@
 package com.factor.launcher.models
 
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -44,11 +45,18 @@ class Factor
 
     fun getIcon() : Drawable? = this.userApp.icon
 
+    fun getBitmapIcon() : Bitmap? = this.userApp.bitmapIcon
+
     fun setIcon(icon : Drawable)
     {
         this.userApp.icon = icon
     }
 
+    fun setIcon(bitmap: Bitmap)
+    {
+        this.userApp.bitmapIcon = bitmap
+    }
+
     object Size
     {
         const val small : Int = 1

diff --git a/app/src/main/java/com/factor/launcher/models/IconPackProvider.kt b/app/src/main/java/com/factor/launcher/models/IconPackProvider.kt
@@ -0,0 +1,6 @@
+package com.factor.launcher.models
+
+class IconPackProvider : UserApp()
+{
+    var isCurrentIconPack = false
+}
diff --git a/app/src/main/java/com/factor/launcher/models/UserApp.kt b/app/src/main/java/com/factor/launcher/models/UserApp.kt
@@ -1,5 +1,6 @@
 package com.factor.launcher.models
 
+import android.graphics.Bitmap
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.view.View
@@ -14,7 +15,7 @@ import java.util.*
 import kotlin.collections.ArrayList
 
 @Entity
-class UserApp
+open class UserApp
 {
     @PrimaryKey
     var packageName: String = ""
@@ -69,6 +70,9 @@ class UserApp
     @Ignore
     var icon: Drawable? = null
 
+    @Ignore
+    var bitmapIcon: Bitmap? = null
+
     @Ignore
     var isMediaTile = false
 
@@ -90,6 +94,11 @@ class UserApp
         //...
     }
 
+    fun equals(userApp: UserApp) : Boolean
+    {
+        return this.packageName.equals(userApp.packageName)
+    }
+
     //generate new factor
     fun toFactor(): Factor
     {
@@ -113,8 +122,16 @@ class UserApp
             {
                 return if (notification.title != notificationHolder.title || notification.text != notificationHolder.text)
                 {
-                    currentNotifications[currentNotifications.indexOf(notification)] = notificationHolder
-                    true
+                    try
+                    {
+                        currentNotifications[currentNotifications.indexOf(notification)] = notificationHolder
+                        return true
+                    }
+                    catch (e : IndexOutOfBoundsException)
+                    {
+                        return false
+                    }
+
                 }
                 else false
             }