feat: Improve palette widgets UI

Also replaces outdated icons for some widgets
aikrq · Oct 20, 2024 · eaef5c9 · eaef5c9
1 parent 4781c5a
commit eaef5c9
Show file tree

Hide file tree

Showing 67 changed files with 355 additions and 90 deletions.
diff --git a/app/src/main/java/a/a/a/ViewEditorFragment.java b/app/src/main/java/a/a/a/ViewEditorFragment.java
@@ -218,15 +218,15 @@ private void e() {
         viewEditor.addWidget(PaletteWidget.b.b, "", "TextView", "TextView");
         viewEditor.addWidgetLayout(PaletteWidget.a.c, "");
         viewEditor.addWidgetLayout(PaletteWidget.a.d, "");
-        viewEditor.extraWidgetLayout("", "RadioGroup");
+        viewEditor.extraWidgetLayout("", "RadioGroup", true);
 
         viewEditor.paletteWidget.extraTitle("AndroidX", 0);
         viewEditor.extraWidgetLayout("", "TabLayout");
         viewEditor.extraWidgetLayout("", "BottomNavigationView");
         viewEditor.extraWidgetLayout("", "CollapsingToolbarLayout");
         viewEditor.extraWidgetLayout("", "CardView");
         viewEditor.extraWidgetLayout("", "TextInputLayout");
-        viewEditor.extraWidgetLayout("", "SwipeRefreshLayout");
+        viewEditor.extraWidgetLayout("", "SwipeRefreshLayout", true);
 
         viewEditor.addWidget(PaletteWidget.b.c, "", "EditText", "Edit Text");
         viewEditor.extraWidget("", "AutoCompleteTextView", "AutoCompleteTextView");
@@ -243,34 +243,34 @@ private void e() {
         viewEditor.extraWidget("", "RatingBar", "RatingBar");
         viewEditor.extraWidget("", "SearchView", "SearchView");
         viewEditor.extraWidget("", "VideoView", "VideoView");
-        viewEditor.addWidget(PaletteWidget.b.h, "", "WebView", "WebView");
+        viewEditor.addWidget(PaletteWidget.b.h, "", "WebView", "WebView", true);
 
         viewEditor.paletteWidget.extraTitle("List", 1);
         viewEditor.addWidget(PaletteWidget.b.e, "", "ListView", "ListView");
         viewEditor.extraWidget("", "GridView", "GridView");
         viewEditor.extraWidget("", "RecyclerView", "RecyclerView");
         viewEditor.addWidget(PaletteWidget.b.f, "", "Spinner", "Spinner");
-        viewEditor.extraWidget("", "ViewPager", "ViewPager");
+        viewEditor.extraWidget("", "ViewPager", "ViewPager", true);
 
         viewEditor.paletteWidget.extraTitle("Library", 1);
         viewEditor.extraWidget("", "WaveSideBar", "WaveSideBar");
         viewEditor.extraWidget("", "PatternLockView", "PatternLockView");
         viewEditor.extraWidget("", "CodeView", "CodeView");
         viewEditor.extraWidget("", "LottieAnimation", "LottieAnimation");
-        viewEditor.extraWidget("", "OTPView", "OTPView");
+        viewEditor.extraWidget("", "OTPView", "OTPView", true);
 
         viewEditor.paletteWidget.extraTitle("Google", 1);
         viewEditor.addWidget(PaletteWidget.b.l, "", "AdView", "AdView");
         viewEditor.addWidget(PaletteWidget.b.n, "", "MapView", "MapView");
         viewEditor.extraWidget("", "SignInButton", "SignInButton");
-        viewEditor.extraWidget("", "YoutubePlayer", "YoutubePlayer");
+        viewEditor.extraWidget("", "YoutubePlayer", "YoutubePlayer", true);
 
         viewEditor.paletteWidget.extraTitle("Date & Time", 1);
         viewEditor.extraWidget("", "AnalogClock", "AnalogClock");
         viewEditor.extraWidget("", "DigitalClock", "DigitalClock");
         viewEditor.extraWidget("", "TimePicker", "TimePicker");
         viewEditor.extraWidget("", "DatePicker", "DatePicker");
-        viewEditor.addWidget(PaletteWidget.b.k, "", "CalendarView", "CalendarView");
+        viewEditor.addWidget(PaletteWidget.b.k, "", "CalendarView", "CalendarView", true);
     }
 
     private void startAnimation() {

diff --git a/app/src/main/java/com/besome/sketch/editor/view/ViewEditor.java b/app/src/main/java/com/besome/sketch/editor/view/ViewEditor.java
@@ -857,19 +857,31 @@ public void addWidgetLayout(PaletteWidget.a aVar, String str) {
     }
 
     public void extraWidgetLayout(String str, String str2) {
-        View extraWidgetLayout = paletteWidget.extraWidgetLayout(str, str2);
+        extraWidgetLayout(str, str2, false);
+    }
+
+    public void extraWidgetLayout(String str, String str2, boolean hideDivider) {
+        View extraWidgetLayout = paletteWidget.extraWidgetLayout(str, str2, hideDivider);
         extraWidgetLayout.setClickable(true);
         extraWidgetLayout.setOnTouchListener(this);
     }
 
     public void addWidget(PaletteWidget.b bVar, String str, String str2, String str3) {
-        View widget = paletteWidget.a(bVar, str, str2, str3);
+        addWidget(bVar, str, str2, str3, false);
+    }
+
+    public void addWidget(PaletteWidget.b bVar, String str, String str2, String str3, boolean hideDivider) {
+        View widget = paletteWidget.a(bVar, str, str2, str3, hideDivider);
         widget.setClickable(true);
         widget.setOnTouchListener(this);
     }
 
     public void extraWidget(String str, String str2, String str3) {
-        View extraWidget = paletteWidget.extraWidget(str, str2, str3);
+        extraWidget(str, str2, str3, false);
+    }
+
+    public void extraWidget(String str, String str2, String str3, boolean hideDivider) {
+        View extraWidget = paletteWidget.extraWidget(str, str2, str3, hideDivider);
         extraWidget.setClickable(true);
         extraWidget.setOnTouchListener(this);
     }
@@ -1017,7 +1029,7 @@ public void onClick(View view) {
         public void a(PaletteGroup group) {
             imgGroup.setImageResource(group == PaletteGroup.BASIC ?
                     R.drawable.selector_palette_tab_ic_sketchware :
-                    R.drawable.selector_palette_tab_ic_bookmark);
+                    R.drawable.selector_palette_tab_ic_bookmark_filled);
             setOnClickListener(this);
         }
     }

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconBase.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconBase.java
@@ -11,7 +11,6 @@ public class IconBase extends BaseWidget {
 
     public IconBase(Context context) {
         super(context);
-        setBackgroundResource(R.drawable.icon_bg);
     }
 
     public ViewBean getBean() {

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconCalendarView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconCalendarView.java
@@ -13,7 +13,7 @@ public IconCalendarView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_calendarview);
+        setWidgetImage(R.drawable.ic_calendar_today_24);
         setWidgetName("CalendarView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconCheckBox.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconCheckBox.java
@@ -13,7 +13,7 @@ public IconCheckBox(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_check_box);
+        setWidgetImage(R.drawable.ic_check_box_24);
         setWidgetName("CheckBox");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconEditText.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconEditText.java
@@ -13,7 +13,7 @@ public IconEditText(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_edit_text);
+        setWidgetImage(R.drawable.ic_text_fields_alt_24);
         setWidgetName("EditText");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconImageView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconImageView.java
@@ -14,7 +14,7 @@ public IconImageView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_image_view);
+        setWidgetImage(R.drawable.ic_image_24);
         setWidgetName("ImageView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconLinearHorizontal.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconLinearHorizontal.java
@@ -13,7 +13,7 @@ public IconLinearHorizontal(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_linear_horizontal);
+        setWidgetImage(R.drawable.ic_view_column_24);
         setWidgetName("Linear(H)");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconLinearVertical.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconLinearVertical.java
@@ -13,7 +13,7 @@ public IconLinearVertical(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_linear_vertical);
+        setWidgetImage(R.drawable.ic_table_rows_24);
         setWidgetName("Linear(V)");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconListView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconListView.java
@@ -13,7 +13,7 @@ public IconListView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_list_view);
+        setWidgetImage(R.drawable.ic_view_list_24);
         setWidgetName("ListView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconMapView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconMapView.java
@@ -13,7 +13,7 @@ public IconMapView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_google_map);
+        setWidgetImage(R.drawable.ic_map_24);
         setWidgetName("MapView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconProgressBar.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconProgressBar.java
@@ -13,7 +13,7 @@ public IconProgressBar(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_progress_bar);
+        setWidgetImage(R.drawable.ic_sliders_24);
         setWidgetName("ProgressBar");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconSeekBar.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconSeekBar.java
@@ -13,7 +13,7 @@ public IconSeekBar(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_seek_bar);
+        setWidgetImage(R.drawable.ic_switches_24);
         setWidgetName("SeekBar");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconSwitch.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconSwitch.java
@@ -13,7 +13,7 @@ public IconSwitch(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_switch);
+        setWidgetImage(R.drawable.ic_toggle_on_24);
         setWidgetName("Switch");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconTextView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconTextView.java
@@ -13,7 +13,7 @@ public IconTextView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_text_view);
+        setWidgetImage(R.drawable.ic_text_fields_24);
         setWidgetName("TextView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/IconWebView.java b/app/src/main/java/com/besome/sketch/editor/view/palette/IconWebView.java
@@ -13,7 +13,7 @@ public IconWebView(Context context) {
 
     public void a(Context context) {
         super.a(context);
-        setWidgetImage(R.drawable.widget_web_view);
+        setWidgetImage(R.drawable.ic_public_24);
         setWidgetName("WebView");
     }
 

diff --git a/app/src/main/java/com/besome/sketch/editor/view/palette/PaletteWidget.java b/app/src/main/java/com/besome/sketch/editor/view/palette/PaletteWidget.java
@@ -51,7 +51,6 @@ public class PaletteWidget extends LinearLayout {
 
     private LinearLayout layoutContainer;
     private LinearLayout widgetsContainer;
-    private View divider;
     private TextView titleLayouts;
     private TextView titleWidgets;
     private CustomScrollView scrollView;
@@ -82,7 +81,7 @@ public View a(PaletteWidget.a layoutType, String tag) {
         return layout;
     }
 
-    public View a(PaletteWidget.b widgetType, String tag, String text, String resourceName) {
+    public View a(PaletteWidget.b widgetType, String tag, String text, String resourceName, boolean hideDivider) {
         IconBase iconBase;
         switch (widgetType) {
             case a:
@@ -152,6 +151,7 @@ public View a(PaletteWidget.b widgetType, String tag, String text, String resour
 
         iconBase.setText(text);
         iconBase.setName(resourceName);
+        iconBase.setHideDivider(hideDivider);
         widgetsContainer.addView(iconBase);
         return iconBase;
     }
@@ -164,7 +164,6 @@ private void initialize(Context context) {
         wB.a(context, this, R.layout.palette_widget);
         layoutContainer = findViewById(R.id.layout);
         widgetsContainer = findViewById(R.id.widget);
-        divider = findViewById(R.id.divider);
         titleLayouts = findViewById(R.id.tv_layout);
         titleWidgets = findViewById(R.id.tv_widget);
         titleLayouts.setText(Helper.getResString(R.string.view_panel_title_layouts));
@@ -179,23 +178,17 @@ public void removeWidgets() {
     public void extraTitle(String title, int targetType) {
         LinearLayout target = targetType == 0 ? layoutContainer : widgetsContainer;
 
-        LinearLayout divider = new LinearLayout(getContext());
-        divider.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dpToPx(1)));
-        divider.setOrientation(LinearLayout.HORIZONTAL);
-        divider.setBackgroundColor(Color.parseColor("#00000000"));
-        target.addView(divider);
-
         TextView titleView = new TextView(getContext());
         LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        layoutParams.setMargins(dpToPx(4), dpToPx(4), dpToPx(4), dpToPx(4));
+        layoutParams.setMargins(dpToPx(6), dpToPx(6), dpToPx(6), dpToPx(6));
         titleView.setLayoutParams(layoutParams);
         titleView.setText(title);
         titleView.setTextSize(12);
         titleView.setTextColor(MaterialColors.getColor(titleView, com.google.android.material.R.attr.colorPrimary));
         target.addView(titleView);
     }
 
-    public View extraWidget(String tag, String title, String name) {
+    public View extraWidget(String tag, String title, String name, boolean hideDivider) {
         IconBase iconBase;
         Context context = getContext();
         iconBase = switch (title) {
@@ -230,11 +223,12 @@ public View extraWidget(String tag, String title, String name) {
 
         iconBase.setText(title);
         iconBase.setName(name);
+        iconBase.setHideDivider(hideDivider);
         widgetsContainer.addView(iconBase);
         return iconBase;
     }
 
-    public View extraWidgetLayout(String tag, String name) {
+    public View extraWidgetLayout(String tag, String name, boolean hideDivider) {
         IconBase iconBase;
         Context context = getContext();
         iconBase = switch (name) {
@@ -251,13 +245,13 @@ public View extraWidgetLayout(String tag, String name) {
             iconBase.setTag(tag);
         }
 
+        iconBase.setHideDivider(hideDivider);
         layoutContainer.addView(iconBase);
         return iconBase;
     }
 
     public void setLayoutVisible(int visibility) {
         layoutContainer.setVisibility(visibility);
-        divider.setVisibility(visibility);
         titleLayouts.setVisibility(visibility);
     }
 

diff --git a/app/src/main/java/com/besome/sketch/lib/base/BaseWidget.java b/app/src/main/java/com/besome/sketch/lib/base/BaseWidget.java
@@ -16,6 +16,7 @@
 public class BaseWidget extends LinearLayout {
     private ImageView img_widget;
     private TextView tv_widget;
+    private View divider_widget;
     @DrawableRes
     private int widgetImgResId;
     private int widgetType;
@@ -24,7 +25,8 @@ public BaseWidget(Context context) {
         super(context);
         View.inflate(context, R.layout.widget_layout, this);
 
-        setOrientation(HORIZONTAL);
+        setDrawingCacheEnabled(true);
+        setOrientation(VERTICAL);
         setGravity(Gravity.CENTER);
 
         a(context);
@@ -33,9 +35,7 @@ public BaseWidget(Context context) {
     public void a(Context context) {
         img_widget = findViewById(R.id.img_widget);
         tv_widget = findViewById(R.id.tv_widget);
-
-        setBackgroundResource(R.drawable.icon_bg);
-        setDrawingCacheEnabled(true);
+        divider_widget = findViewById(R.id.divider_widget);
     }
 
     public int getWidgetImageResId() {
@@ -67,6 +67,10 @@ public void setWidgetType(a widgetType) {
         this.widgetType = widgetType.ordinal();
     }
 
+    public void setHideDivider(boolean hideDivider) {
+        divider_widget.setVisibility(hideDivider ? View.GONE : View.VISIBLE);
+    }
+
     public enum a {
         a,
         b

diff --git a/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconBottomNavigationView.java b/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconBottomNavigationView.java
@@ -13,7 +13,7 @@ public class IconBottomNavigationView extends IconBase {
 
     public IconBottomNavigationView(Context context) {
         super(context);
-        setWidgetImage(R.drawable.widget_bottom_view);
+        setWidgetImage(R.drawable.ic_bottom_navigation_24);
         setWidgetName("BottomNavigationView");
     }
 

diff --git a/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconCodeView.java b/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconCodeView.java
@@ -13,7 +13,7 @@ public class IconCodeView extends IconBase {
 
     public IconCodeView(Context context) {
         super(context);
-        setWidgetImage(R.drawable.widget_code_view);
+        setWidgetImage(R.drawable.ic_code_24);
         setWidgetName("CodeView");
     }
 

diff --git a/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconCollapsingToolbar.java b/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconCollapsingToolbar.java
@@ -13,7 +13,7 @@ public class IconCollapsingToolbar extends IconBase {
 
     public IconCollapsingToolbar(Context context) {
         super(context);
-        setWidgetImage(R.drawable.widget_collapsing_toolbar);
+        setWidgetImage(R.drawable.ic_toolbar_24);
         setWidgetName("CollapsingToolbar");
     }
 

diff --git a/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconRecyclerView.java b/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconRecyclerView.java
@@ -13,7 +13,7 @@ public class IconRecyclerView extends IconBase {
 
     public IconRecyclerView(Context context) {
         super(context);
-        setWidgetImage(R.drawable.grid_3_48);
+        setWidgetImage(R.drawable.ic_view_list_24);
         setWidgetName("RecyclerView");
     }
 

diff --git a/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconSwipeRefreshLayout.java b/app/src/main/java/dev/aldi/sayuti/editor/view/palette/IconSwipeRefreshLayout.java
@@ -13,7 +13,7 @@ public class IconSwipeRefreshLayout extends IconBase {
 
     public IconSwipeRefreshLayout(Context context) {
         super(context);
-        setWidgetImage(R.drawable.widget_swipe_refresh);
+        setWidgetImage(R.drawable.ic_refresh_24);
         setWidgetName("SwipeRefreshLayout");
     }