Minus UI Changes

Signed-off-by: DHD2280 <[email protected]>
DHD2280 · Nov 15, 2024 · 537c954 · 537c954
1 parent 49362b2
commit 537c954
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 18 deletions.
diff --git a/app/src/main/java/it/dhd/oxygencustomizer/ui/adapters/ActivitiesListAdapter.java b/app/src/main/java/it/dhd/oxygencustomizer/ui/adapters/ActivitiesListAdapter.java
@@ -115,13 +115,15 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.title = convertView.findViewById(R.id.title);
             holder.summary = convertView.findViewById(R.id.summary);
             holder.icon = convertView.findViewById(R.id.icon);
+            holder.divider = convertView.findViewById(R.id.divider);
         }
 
         ActivityItem applicationInfo = getItem(position);
         holder.title.setText(applicationInfo.title);
         holder.icon.setImageDrawable(applicationInfo.icon);
-        holder.summary.setText(String.join("/", mPackageName, applicationInfo.activityName));
+        holder.summary.setText(String.join("/n", mPackageName, applicationInfo.activityName));
         holder.summary.setVisibility(View.VISIBLE);
+        holder.divider.setVisibility(position == getCount() - 1 ? View.GONE : View.VISIBLE);
 
         return convertView;
     }
@@ -170,5 +172,6 @@ private static class ViewHolder {
         TextView title;
         TextView summary;
         ImageView icon;
+        ImageView divider;
     }
 }
diff --git a/app/src/main/java/it/dhd/oxygencustomizer/ui/adapters/PackageListAdapter.java b/app/src/main/java/it/dhd/oxygencustomizer/ui/adapters/PackageListAdapter.java
@@ -130,6 +130,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.title = convertView.findViewById(R.id.title);
             holder.summary = convertView.findViewById(R.id.summary);
             holder.icon = convertView.findViewById(R.id.icon);
+            holder.divider = convertView.findViewById(R.id.divider);
         }
 
         PackageItem applicationInfo = getItem(position);
@@ -150,6 +151,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.summary.setVisibility(View.GONE);
         }
 
+        holder.divider.setVisibility(position == getCount() - 1 ? View.GONE : View.VISIBLE);
+
         return convertView;
     }
 
@@ -200,5 +203,6 @@ private static class ViewHolder {
         TextView title;
         TextView summary;
         ImageView icon;
+        ImageView divider;
     }
 }
diff --git a/app/src/main/res/layout/applist_preference_icon.xml b/app/src/main/res/layout/applist_preference_icon.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,13 +12,14 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@android:id/widget_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/oplusColorSurfaces"
     android:gravity="center_vertical"
     android:minHeight="56dp"
-    android:background="@color/oplusColorSurfaces"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
@@ -30,17 +30,24 @@
         android:layout_gravity="center"
         android:layout_marginStart="6dip"
         android:layout_marginEnd="6dip"
-        android:contentDescription="@null" />
+        android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
+        android:id="@+id/main_layout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="2dip"
+        android:layout_marginStart="@dimen/preference_title_padding_start"
         android:layout_marginTop="2dip"
         android:layout_marginEnd="6dip"
         android:layout_marginBottom="2dip"
         android:layout_weight="1"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/title"
@@ -50,15 +57,27 @@
             android:fadingEdge="horizontal"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            android:textColor="?android:attr/textColorPrimary" />
+            android:textColor="@color/text_color_primary" />
 
         <TextView
             android:id="@+id/summary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:ellipsize="end"
+            android:maxLines="4"
+            android:textColor="@color/text_color_secondary" />
 
     </LinearLayout>
 
-</LinearLayout>
+    <ImageView
+        android:id="@+id/divider"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/list_divider_height"
+        android:layout_marginEnd="@dimen/preference_divider_default_horizontal_padding"
+        android:contentDescription="@null"
+        android:src="@color/colorDivider"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/main_layout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_app_list.xml b/app/src/main/res/layout/fragment_app_list.xml
@@ -53,11 +53,6 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="@dimen/preference_card_margin_horizontal"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progress" />
+        android:paddingBottom="@dimen/preference_card_margin_horizontal" />
 
 </LinearLayout>