From 16de400fc138af53f73e404f57fb89889dcea709 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 12 Sep 2022 15:51:27 +0200
Subject: [PATCH] UI changes

---
 .../android/helper/PinnedTimelineHelper.java  | 103 ++++++++++--------
 .../android/ui/drawer/ReorderTabAdapter.java  |  20 ++++
 .../settings/FragmentInterfaceSettings.java   |   6 +
 .../res/layout/tab_custom_default_view.xml    |  11 ++
 4 files changed, 92 insertions(+), 48 deletions(-)
 create mode 100644 app/src/main/res/layout/tab_custom_default_view.xml

diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index 0c09a55aa..26108ada0 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -60,6 +60,7 @@ import app.fedilab.android.client.entities.app.RemoteInstance;
 import app.fedilab.android.client.entities.app.TagTimeline;
 import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.ActivityMainBinding;
+import app.fedilab.android.databinding.TabCustomDefaultViewBinding;
 import app.fedilab.android.databinding.TabCustomViewBinding;
 import app.fedilab.android.exception.DBException;
 import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;
@@ -250,60 +251,66 @@ public class PinnedTimelineHelper {
                         name = pinnedTimeline.remoteInstance.host;
                         break;
                 }
-                TabCustomViewBinding tabCustomViewBinding = TabCustomViewBinding.inflate(activity.getLayoutInflater());
-                tabCustomViewBinding.title.setText(name);
-                switch (pinnedTimeline.type) {
-                    case LIST:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_list);
-                        break;
-                    case TAG:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_tag);
-                        break;
-                    case REMOTE:
-                        switch (pinnedTimeline.remoteInstance.type) {
-                            case PIXELFED:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.pixelfed);
-                                break;
-                            case MASTODON:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.mastodon_icon_item);
-                                break;
+                if (pinnedTimeline.type == Timeline.TimeLineEnum.LIST || pinnedTimeline.type == Timeline.TimeLineEnum.TAG || pinnedTimeline.type == Timeline.TimeLineEnum.REMOTE) {
+                    TabCustomViewBinding tabCustomViewBinding = TabCustomViewBinding.inflate(activity.getLayoutInflater());
+                    tabCustomViewBinding.title.setText(name);
+                    switch (pinnedTimeline.type) {
+                        case LIST:
+                            tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_list);
+                            break;
+                        case TAG:
+                            tabCustomViewBinding.icon.setImageResource(R.drawable.ic_tl_tag);
+                            break;
+                        case REMOTE:
+                            switch (pinnedTimeline.remoteInstance.type) {
+                                case PIXELFED:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.pixelfed);
+                                    break;
+                                case MASTODON:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.mastodon_icon_item);
+                                    break;
 
-                            case MISSKEY:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.misskey);
-                                break;
-                            case NITTER:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.nitter);
-                                break;
-                            case GNU:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.ic_gnu_social);
-                                break;
-                            case PEERTUBE:
-                                tabCustomViewBinding.icon.setImageResource(R.drawable.peertube_icon);
-                                break;
-                        }
-                        break;
-                    case HOME:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_baseline_home_24);
-                        break;
-                    case LOCAL:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24);
-                        break;
-                    case PUBLIC:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_baseline_public_24);
-                        break;
-                    case NOTIFICATION:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
-                        break;
-                    case DIRECT:
-                        tabCustomViewBinding.icon.setImageResource(R.drawable.ic_baseline_mail_24);
-                        break;
+                                case MISSKEY:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.misskey);
+                                    break;
+                                case NITTER:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.nitter);
+                                    break;
+                                case GNU:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.ic_gnu_social);
+                                    break;
+                                case PEERTUBE:
+                                    tabCustomViewBinding.icon.setImageResource(R.drawable.peertube_icon);
+                                    break;
+                            }
+                            break;
+                    }
+                    tab.setCustomView(tabCustomViewBinding.getRoot());
+                } else {
+                    TabCustomDefaultViewBinding tabCustomDefaultViewBinding = TabCustomDefaultViewBinding.inflate(activity.getLayoutInflater());
+                    switch (pinnedTimeline.type) {
+                        case HOME:
+                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_home_24);
+                            break;
+                        case LOCAL:
+                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24);
+                            break;
+                        case PUBLIC:
+                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_public_24);
+                            break;
+                        case NOTIFICATION:
+                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
+                            break;
+                        case DIRECT:
+                            tabCustomDefaultViewBinding.icon.setImageResource(R.drawable.ic_baseline_mail_24);
+                            break;
+                    }
+                    tab.setCustomView(tabCustomDefaultViewBinding.getRoot());
                 }
-                tab.setCustomView(tabCustomViewBinding.getRoot());
                 activityMainBinding.tabLayout.addTab(tab);
                 pinnedTimelineVisibleList.add(pinnedTimeline);
             }
         }
-
         LinearLayout tabStrip = (LinearLayout) activityMainBinding.tabLayout.getChildAt(0);
         int finalToRemove = toRemove;
         for (int i = 0; i < tabStrip.getChildCount(); i++) {
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
index d45ad5f16..e8498f66c 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ReorderTabAdapter.java
@@ -110,6 +110,26 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
                 holder.binding.icon.setImageResource(R.drawable.ic_baseline_view_list_24);
                 holder.binding.text.setText(pinned.pinnedTimelines.get(position).mastodonList.title);
                 break;
+            case HOME:
+                holder.binding.icon.setImageResource(R.drawable.ic_baseline_home_24);
+                holder.binding.text.setText(R.string.home_menu);
+                break;
+            case LOCAL:
+                holder.binding.icon.setImageResource(R.drawable.ic_baseline_supervisor_account_24);
+                holder.binding.text.setText(R.string.local_menu);
+                break;
+            case PUBLIC:
+                holder.binding.icon.setImageResource(R.drawable.ic_baseline_public_24);
+                holder.binding.text.setText(R.string.v_public);
+                break;
+            case NOTIFICATION:
+                holder.binding.icon.setImageResource(R.drawable.ic_baseline_notifications_24);
+                holder.binding.text.setText(R.string.notifications);
+                break;
+            case DIRECT:
+                holder.binding.icon.setImageResource(R.drawable.ic_baseline_mail_24);
+                holder.binding.text.setText(R.string.v_direct);
+                break;
         }
 
 
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentInterfaceSettings.java b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentInterfaceSettings.java
index 1a66b9f9a..8eda3aa3e 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentInterfaceSettings.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentInterfaceSettings.java
@@ -63,6 +63,12 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen
                 editor.putFloat(getString(R.string.SET_FONT_SCALE), scale);
                 recreate = true;
             }
+            if (key.compareToIgnoreCase(getString(R.string.SET_USE_SINGLE_TOPBAR)) == 0) {
+                recreate = true;
+            }
+            if (key.compareToIgnoreCase(getString(R.string.SET_TIMELINES_IN_A_LIST)) == 0) {
+                recreate = true;
+            }
             editor.apply();
         }
     }
diff --git a/app/src/main/res/layout/tab_custom_default_view.xml b/app/src/main/res/layout/tab_custom_default_view.xml
new file mode 100644
index 000000000..71ce7b865
--- /dev/null
+++ b/app/src/main/res/layout/tab_custom_default_view.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true" />
+</RelativeLayout>