Skip to content

Commit 5e8a98d

Browse files
CreativeCodeCatCreativeCodeCat
committed
refactor(ui): Improve App Drawer search bar layout
The search bar container in the app drawer has been refactored from a `ConstraintLayout` to a `LinearLayout`. This change simplifies the layout by arranging the search view and its accompanying icon buttons horizontally. The `FontSearchView` now uses `layout_weight` to fill the available space, and all icons have been updated to use `wrap_content` with adjusted padding and scaling for a more consistent appearance.
1 parent a1b0c85 commit 5e8a98d

File tree

1 file changed

+62
-54
lines changed

1 file changed

+62
-54
lines changed

‎app/src/main/res/layout/fragment_app_drawer.xml‎

Lines changed: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,110 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
45
android:id="@+id/mainLayout"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
android:animateLayoutChanges="true"
89
android:background="?attr/primaryShadeDarkColor">
910

1011
<!-- Search Bar positioned at the top -->
11-
<androidx.constraintlayout.widget.ConstraintLayout
12+
<LinearLayout
1213
android:id="@+id/searchContainer"
1314
android:layout_width="match_parent"
1415
android:layout_height="wrap_content"
16+
android:layout_alignParentTop="true"
1517
android:layout_marginTop="34dp"
18+
android:layout_marginEnd="12dp"
19+
android:gravity="center_vertical"
20+
android:orientation="horizontal"
1621
android:paddingHorizontal="8dp">
1722

1823
<com.github.creativecodecat.components.views.FontSearchView
1924
android:id="@+id/search"
20-
android:layout_width="wrap_content"
25+
android:layout_width="0dp"
2126
android:layout_height="wrap_content"
27+
android:layout_weight="1"
28+
android:gravity="end"
2229
android:imeOptions="actionSearch"
30+
android:paddingHorizontal="0dp"
31+
android:paddingVertical="0dp"
2332
app:iconifiedByDefault="false"
24-
app:layout_constraintBottom_toBottomOf="parent"
25-
app:layout_constraintEnd_toStartOf="@id/workApps"
26-
app:layout_constraintStart_toStartOf="parent"
27-
app:layout_constraintTop_toTopOf="parent"
2833
app:queryBackground="@null"
2934
app:queryHint="___"
3035
app:searchIcon="@drawable/ic_search"
3136
app:theme="@style/AppSearchText" />
3237

3338
<ImageView
3439
android:id="@+id/workApps"
35-
android:layout_width="38dp"
36-
android:layout_height="38dp"
37-
android:contentDescription="@string/show_work_apps"
38-
android:padding="8dp"
39-
android:scaleType="centerInside"
40+
android:layout_width="wrap_content"
41+
android:layout_height="wrap_content"
42+
android:adjustViewBounds="true"
43+
android:contentDescription="@string/advanced_settings_app_info_title"
44+
android:paddingHorizontal="5dp"
45+
android:paddingVertical="8dp"
46+
android:scaleType="fitCenter"
4047
android:visibility="gone"
41-
app:layout_constraintBottom_toBottomOf="@id/search"
42-
app:layout_constraintStart_toEndOf="@id/search"
43-
app:layout_constraintTop_toTopOf="@id/search"
44-
app:srcCompat="@drawable/work_profile" />
48+
app:srcCompat="@drawable/work_profile"
49+
tools:layout_conversion_absoluteHeight="0dp"
50+
tools:layout_conversion_absoluteWidth="0dp" />
4551

4652
<ImageView
4753
android:id="@+id/privateApps"
48-
android:layout_width="38dp"
49-
android:layout_height="38dp"
50-
android:contentDescription="@string/show_private_apps"
51-
android:padding="8dp"
52-
android:scaleType="centerInside"
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:adjustViewBounds="true"
57+
android:contentDescription="@string/advanced_settings_app_info_title"
58+
android:paddingHorizontal="5dp"
59+
android:paddingVertical="8dp"
60+
android:scaleType="fitCenter"
5361
android:visibility="gone"
54-
app:layout_constraintBottom_toBottomOf="@id/search"
55-
app:layout_constraintStart_toEndOf="@id/workApps"
56-
app:layout_constraintTop_toTopOf="@id/search"
57-
app:srcCompat="@drawable/private_profile_off" />
62+
app:srcCompat="@drawable/private_profile_off"
63+
tools:layout_conversion_absoluteHeight="0dp"
64+
tools:layout_conversion_absoluteWidth="0dp" />
5865

5966
<ImageView
6067
android:id="@+id/systemApps"
61-
android:layout_width="38dp"
62-
android:layout_height="38dp"
63-
android:contentDescription="@string/show_app_list"
64-
android:padding="8dp"
65-
android:scaleType="centerInside"
68+
android:layout_width="wrap_content"
69+
android:layout_height="wrap_content"
70+
android:adjustViewBounds="true"
71+
android:contentDescription="@string/advanced_settings_app_info_title"
72+
android:paddingHorizontal="5dp"
73+
android:paddingVertical="8dp"
74+
android:scaleType="fitCenter"
6675
android:visibility="gone"
67-
app:layout_constraintBottom_toBottomOf="@id/search"
68-
app:layout_constraintStart_toEndOf="@id/privateApps"
69-
app:layout_constraintTop_toTopOf="@id/search"
70-
app:srcCompat="@drawable/system_profile" />
76+
app:srcCompat="@drawable/system_profile"
77+
tools:layout_conversion_absoluteHeight="0dp"
78+
tools:layout_conversion_absoluteWidth="0dp" />
7179

7280
<ImageView
7381
android:id="@+id/internetSearch"
74-
android:layout_width="38dp"
75-
android:layout_height="38dp"
76-
android:contentDescription="@string/applist_button_web"
77-
android:padding="8dp"
78-
android:scaleType="centerInside"
82+
android:layout_width="wrap_content"
83+
android:layout_height="wrap_content"
84+
android:adjustViewBounds="true"
85+
android:contentDescription="@string/advanced_settings_app_info_title"
86+
android:paddingHorizontal="5dp"
87+
android:paddingVertical="8dp"
88+
android:scaleType="fitCenter"
7989
android:visibility="gone"
80-
app:layout_constraintBottom_toBottomOf="@id/search"
81-
app:layout_constraintStart_toEndOf="@id/systemApps"
82-
app:layout_constraintTop_toTopOf="@id/search"
83-
app:srcCompat="@drawable/ic_browser" />
90+
app:srcCompat="@drawable/ic_browser"
91+
tools:layout_conversion_absoluteHeight="0dp"
92+
tools:layout_conversion_absoluteWidth="0dp" />
8493

8594
<ImageView
8695
android:id="@+id/searchSwitcher"
87-
android:layout_width="38dp"
88-
android:layout_height="38dp"
89-
android:contentDescription="@string/applist_button_contacts"
90-
android:padding="8dp"
91-
android:scaleType="centerInside"
96+
android:layout_width="wrap_content"
97+
android:layout_height="wrap_content"
98+
android:adjustViewBounds="true"
99+
android:contentDescription="@string/advanced_settings_app_info_title"
100+
android:paddingHorizontal="5dp"
101+
android:paddingVertical="8dp"
102+
android:scaleType="fitCenter"
92103
android:visibility="gone"
93-
app:layout_constraintBottom_toBottomOf="@id/search"
94-
app:layout_constraintEnd_toEndOf="parent"
95-
app:layout_constraintStart_toEndOf="@id/internetSearch"
96-
app:layout_constraintTop_toTopOf="@id/search"
97-
app:srcCompat="@drawable/ic_contacts" />
98-
99-
</androidx.constraintlayout.widget.ConstraintLayout>
104+
app:srcCompat="@drawable/ic_contacts"
105+
tools:layout_conversion_absoluteHeight="0dp"
106+
tools:layout_conversion_absoluteWidth="0dp" />
107+
</LinearLayout>
100108

101109
<com.github.creativecodecat.components.views.FontAppCompatTextView
102110
android:id="@+id/clearHomeButton"

0 commit comments

Comments
 (0)