Implement arranging desktop icons + various fixes

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index 8c8018a..c13e0cf 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -693,7 +693,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
                 contextMenuFix = false;
                 break;
             case "arrange_icons":
-                // TODO implement
+                LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.ARRANGE_DESKTOP_ICONS"));
                 break;
             case "change_wallpaper":
                 Intent intent3 = Intent.createChooser(new Intent(Intent.ACTION_SET_WALLPAPER), getString(R.string.set_wallpaper));

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/DesktopIconSelectAppActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/DesktopIconSelectAppActivity.java
index becc067..e5e759c 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/DesktopIconSelectAppActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/DesktopIconSelectAppActivity.java
@@ -23,7 +23,6 @@ import android.content.pm.ResolveInfo;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
@@ -32,7 +31,6 @@ import android.widget.ListView;
 import android.widget.ProgressBar;
 
 import com.farmerbb.taskbar.R;
-import com.farmerbb.taskbar.activity.dark.DesktopIconSelectAppActivityDark;
 import com.farmerbb.taskbar.adapter.DesktopIconAppListAdapter;
 import com.farmerbb.taskbar.util.AppEntry;
 import com.farmerbb.taskbar.util.DesktopIconInfo;
@@ -41,6 +39,7 @@ import com.farmerbb.taskbar.util.U;
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -60,48 +59,24 @@ public class DesktopIconSelectAppActivity extends AppCompatActivity {
         desktopIcon = (DesktopIconInfo) getIntent().getSerializableExtra("desktop_icon");
         boolean noShadow = getIntent().hasExtra("no_shadow");
 
-        if(savedInstanceState == null) {
-            setContentView(R.layout.desktop_icon_select_app);
-            setFinishOnTouchOutside(false);
-            setTitle(getString(R.string.select_an_app));
+        setContentView(R.layout.desktop_icon_select_app);
+        setFinishOnTouchOutside(false);
+        setTitle(getString(R.string.select_an_app));
 
-            if(noShadow) {
-                WindowManager.LayoutParams params = getWindow().getAttributes();
-                params.dimAmount = 0;
-                getWindow().setAttributes(params);
+        if(noShadow) {
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.dimAmount = 0;
+            getWindow().setAttributes(params);
 
-                if(U.isChromeOs(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1)
-                    getWindow().setElevation(0);
-            }
-
-            progressBar = findViewById(R.id.progress_bar);
-            appList = findViewById(R.id.list);
-
-            appListGenerator = new DesktopIconAppListGenerator();
-            appListGenerator.execute();
-        } else {
-            finish();
-
-            if(!noShadow)
-                new Handler().post(() -> {
-                    Intent intent = null;
-                    SharedPreferences pref = U.getSharedPreferences(this);
-
-                    switch(pref.getString("theme", "light")) {
-                        case "light":
-                            intent = new Intent(this, DesktopIconSelectAppActivity.class);
-                            break;
-                        case "dark":
-                            intent = new Intent(this, DesktopIconSelectAppActivityDark.class);
-                            break;
-                    }
-
-                    if(intent != null)
-                        intent.putExtra("desktop_icon", desktopIcon);
-
-                    startActivity(intent);
-                });
+            if(U.isChromeOs(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1)
+                getWindow().setElevation(0);
         }
+
+        progressBar = findViewById(R.id.progress_bar);
+        appList = findViewById(R.id.list);
+
+        appListGenerator = new DesktopIconAppListGenerator();
+        appListGenerator.execute();
     }
 
     @Override
@@ -136,7 +111,22 @@ public class DesktopIconSelectAppActivity extends AppCompatActivity {
             intent.addCategory(Intent.CATEGORY_LAUNCHER);
             List<ResolveInfo> info = pm.queryIntentActivities(intent, 0);
 
-            Collections.sort(info, (ai1, ai2) -> ai1.activityInfo.loadLabel(pm).toString().compareTo(ai2.activityInfo.loadLabel(pm).toString()));
+            Collections.sort(info, (ai1, ai2) -> {
+                String label1;
+                String label2;
+
+                try {
+                    label1 = ai1.activityInfo.loadLabel(pm).toString();
+                    label2 = ai2.activityInfo.loadLabel(pm).toString();
+                } catch (OutOfMemoryError e) {
+                    System.gc();
+
+                    label1 = ai1.activityInfo.packageName;
+                    label2 = ai2.activityInfo.packageName;
+                }
+
+                return Collator.getInstance().compare(label1, label2);
+            });
 
             final List<AppEntry> entries = new ArrayList<>();
             for(ResolveInfo appInfo : info) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
index b7dc36f..f5cbe65 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -27,6 +27,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
+import android.content.pm.LauncherActivityInfo;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -68,6 +71,12 @@ import com.farmerbb.taskbar.util.U;
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 public class HomeActivityDelegate extends Activity implements UIHost {
     private TaskbarController taskbarController;
     private StartMenuController startMenuController;
@@ -120,6 +129,13 @@ public class HomeActivityDelegate extends Activity implements UIHost {
         }
     };
 
+    private BroadcastReceiver arrangeDesktopIconsReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            arrangeDesktopIcons();
+        }
+    };
+
     @SuppressLint("RestrictedApi")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -210,8 +226,10 @@ public class HomeActivityDelegate extends Activity implements UIHost {
         if(FeatureFlags.homeActivityUIHost())
             lbm.registerReceiver(restartReceiver, new IntentFilter("com.farmerbb.taskbar.RESTART"));
 
-        if(FeatureFlags.desktopIcons(this))
+        if(FeatureFlags.desktopIcons(this)) {
             lbm.registerReceiver(refreshDesktopIconsReceiver, new IntentFilter("com.farmerbb.taskbar.REFRESH_DESKTOP_ICONS"));
+            lbm.registerReceiver(arrangeDesktopIconsReceiver, new IntentFilter("com.farmerbb.taskbar.ARRANGE_DESKTOP_ICONS"));
+        }
 
         U.initPrefs(this);
     }
@@ -382,8 +400,10 @@ public class HomeActivityDelegate extends Activity implements UIHost {
         if(FeatureFlags.homeActivityUIHost())
             lbm.unregisterReceiver(restartReceiver);
 
-        if(FeatureFlags.desktopIcons(this))
+        if(FeatureFlags.desktopIcons(this)) {
             lbm.unregisterReceiver(refreshDesktopIconsReceiver);
+            lbm.unregisterReceiver(arrangeDesktopIconsReceiver);
+        }
     }
 
     @Override
@@ -468,13 +488,13 @@ public class HomeActivityDelegate extends Activity implements UIHost {
     }
 
     private void refreshDesktopIcons() {
-        int desktopIconSize = getResources().getDimensionPixelSize(R.dimen.start_menu_grid_width)
-                + getResources().getDimensionPixelSize(R.dimen.start_menu_grid_padding);
+        int desktopIconSize = getResources().getDimensionPixelSize(R.dimen.start_menu_grid_width);
 
         int columns = layout.getWidth() / desktopIconSize;
         int rows = layout.getHeight() / desktopIconSize;
 
         desktopIcons.removeAllViews();
+        desktopIcons.setOrientation(LinearLayout.VERTICAL);
         desktopIcons.setColumnCount(columns);
         desktopIcons.setRowCount(rows);
 
@@ -526,19 +546,50 @@ public class HomeActivityDelegate extends Activity implements UIHost {
         }
     }
 
+    private void arrangeDesktopIcons() {
+        try {
+            SharedPreferences pref = U.getSharedPreferences(this);
+            JSONArray jsonIcons = new JSONArray(pref.getString("desktop_icons", "[]"));
+            List<DesktopIconInfo> icons = new ArrayList<>();
+
+            for(int i = 0; i < jsonIcons.length(); i++) {
+                DesktopIconInfo info = DesktopIconInfo.fromJson(jsonIcons.getJSONObject(i));
+                if(info != null)
+                    icons.add(info);
+            }
+
+            Collections.sort(icons, (o1, o2) -> Collator.getInstance().compare(o1.entry.getLabel(), o2.entry.getLabel()));
+
+            jsonIcons = new JSONArray();
+
+            for(int i = 0; i < icons.size(); i++) {
+                DesktopIconInfo oldInfo = icons.get(i);
+                DesktopIconInfo newInfo = getDesktopIconInfo(i);
+
+                oldInfo.column = newInfo.column;
+                oldInfo.row = newInfo.row;
+
+                jsonIcons.put(oldInfo.toJson(this));
+            }
+
+            pref.edit().putString("desktop_icons", jsonIcons.toString()).apply();
+            refreshDesktopIcons();
+        } catch (JSONException e) { /* Gracefully fail */ }
+    }
+
     private int getIndex(DesktopIconInfo info) {
-        return (info.row * desktopIcons.getColumnCount()) + info.column;
+        return (info.column * desktopIcons.getRowCount()) + info.row;
     }
 
     private DesktopIconInfo getDesktopIconInfo(int index) {
-        int column = index % desktopIcons.getColumnCount();
+        int row = index % desktopIcons.getRowCount();
 
         int pos = index;
-        int row = -1;
+        int column = -1;
 
         while(pos >= 0) {
-            pos -= desktopIcons.getColumnCount();
-            row++;
+            pos -= desktopIcons.getRowCount();
+            column++;
         }
 
         return new DesktopIconInfo(column, row, null);
@@ -610,7 +661,11 @@ public class HomeActivityDelegate extends Activity implements UIHost {
                     // do nothing
                     break;
                 case DragEvent.ACTION_DRAG_ENTERED:
-                    v.setBackgroundResource(R.drawable.drop_target);
+                    Drawable dropTarget = ContextCompat.getDrawable(HomeActivityDelegate.this, R.drawable.drop_target);
+                    if(dropTarget != null) {
+                        dropTarget.setColorFilter(U.getAccentColor(HomeActivityDelegate.this), PorterDuff.Mode.DST_IN);
+                        v.setBackground(dropTarget);
+                    }
                     break;
                 case DragEvent.ACTION_DRAG_EXITED:
                 case DragEvent.ACTION_DRAG_ENDED: