Skip to content

Commit a22f9b2

Browse files
HatsuneMikuUwUHatsuneMikuUwU
authored
Update UI
1 parent 28f8636 commit a22f9b2

10 files changed

Lines changed: 394 additions & 177 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
app:cardCornerRadius="28.0dip"
4848
app:cardElevation="0.0dip">
4949
<androidx.core.widget.NestedScrollView
50+
android:id="@+id/about_content"
5051
android:paddingBottom="64.0dip"
5152
android:clipToPadding="false"
5253
android:layout_width="fill_parent"

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

Lines changed: 65 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,58 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.coordinatorlayout.widget.CoordinatorLayout
3-
android:orientation="vertical"
4-
android:duplicateParentState="false"
3+
android:id="@+id/coordinator"
54
android:layout_width="fill_parent"
65
android:layout_height="fill_parent"
7-
xmlns:tools="http://schemas.android.com/tools"
86
xmlns:android="http://schemas.android.com/apk/res/android"
97
xmlns:app="http://schemas.android.com/apk/res-auto">
108
<com.google.android.material.appbar.AppBarLayout
119
android:id="@+id/appbar"
1210
android:background="?attr/colorPrimary"
1311
android:layout_width="fill_parent"
14-
android:layout_height="wrap_content">
12+
android:layout_height="200.0dip">
1513
<com.google.android.material.appbar.CollapsingToolbarLayout
14+
android:id="@+id/collapsing_toolbar"
15+
android:background="?attr/colorPrimary"
1616
android:layout_width="fill_parent"
17-
android:layout_height="wrap_content"
18-
app:layout_scrollFlags="enterAlways|scroll"
19-
app:titleEnabled="false">
17+
android:layout_height="fill_parent"
18+
app:collapsedTitleTextAppearance="@style/Theme.SagerNet.CollapsingToolbarTitle.Collapsed"
19+
app:collapsedTitleTextColor="?android:textColorPrimaryInverse"
20+
app:contentScrim="?attr/colorPrimary"
21+
app:expandedTitleTextAppearance="@style/Theme.SagerNet.CollapsingToolbarTitle.Expanded"
22+
app:expandedTitleTextColor="?android:textColorPrimaryInverse"
23+
app:layout_scrollFlags="scroll|exitUntilCollapsed">
2024
<com.google.android.material.appbar.MaterialToolbar
2125
android:theme="?attr/actionBarTheme"
2226
android:id="@+id/toolbar"
23-
android:background="?attr/colorPrimary"
2427
android:layout_width="fill_parent"
25-
android:layout_height="?actionBarSize"
26-
android:elevation="0.0dip"
27-
android:touchscreenBlocksFocus="false"
28+
android:layout_height="?attr/actionBarSize"
2829
app:layout_collapseMode="pin"
29-
app:popupTheme="@style/AppTheme.PopupOverlay"
30-
app:title="@string/app_name"
31-
app:titleTextColor="?android:textColorPrimaryInverse" />
30+
app:popupTheme="@style/AppTheme.PopupOverlay" />
31+
</com.google.android.material.appbar.CollapsingToolbarLayout>
32+
</com.google.android.material.appbar.AppBarLayout>
33+
<FrameLayout
34+
android:background="@drawable/uwu_background_collapse"
35+
android:layout_width="fill_parent"
36+
android:layout_height="fill_parent"
37+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
38+
<com.google.android.material.card.MaterialCardView
39+
android:paddingTop="16.0dip"
40+
android:layout_width="fill_parent"
41+
android:layout_height="fill_parent"
42+
android:layout_marginTop="16.0dip"
43+
android:layout_marginBottom="16.0dip"
44+
android:layout_marginStart="16.0dip"
45+
android:layout_marginEnd="16.0dip"
46+
app:cardBackgroundColor="#00000000"
47+
app:cardCornerRadius="14.0dip"
48+
app:cardElevation="0.0dip">
3249
<LinearLayout
3350
android:orientation="vertical"
34-
android:paddingTop="56.0dip"
3551
android:layout_width="fill_parent"
36-
android:layout_height="fill_parent">
52+
android:layout_height="fill_parent"
53+
android:layout_marginTop="-16.0dip"
54+
android:layout_marginStart="-16.0dip"
55+
android:layout_marginEnd="-16.0dip">
3756
<LinearLayout
3857
android:orientation="vertical"
3958
android:id="@+id/search_layout"
@@ -42,9 +61,11 @@
4261
<com.google.android.material.card.MaterialCardView
4362
android:layout_width="fill_parent"
4463
android:layout_height="wrap_content"
45-
android:layout_margin="4.0dip"
64+
android:layout_marginStart="16.0dip"
65+
android:layout_marginEnd="16.0dip"
66+
android:layout_marginBottom="4.0dip"
4667
app:cardBackgroundColor="?attr/colorCard"
47-
app:cardCornerRadius="10.0dip"
68+
app:cardCornerRadius="14.0dip"
4869
app:cardElevation="0.0dip">
4970
<LinearLayout
5071
android:orientation="vertical"
@@ -56,6 +77,7 @@
5677
android:id="@+id/show_system_apps"
5778
android:layout_width="wrap_content"
5879
android:layout_height="wrap_content"
80+
android:layout_marginTop="8.0dip"
5981
android:layout_marginBottom="4.0dip"
6082
android:text="@string/show_system_apps"
6183
style="@style/Widget.MaterialComponents.Chip.Filter" />
@@ -72,30 +94,30 @@
7294
</LinearLayout>
7395
</com.google.android.material.card.MaterialCardView>
7496
</LinearLayout>
97+
<LinearLayout
98+
android:gravity="center"
99+
android:orientation="vertical"
100+
android:id="@+id/loading"
101+
android:layout_width="fill_parent"
102+
android:layout_height="fill_parent">
103+
<com.google.android.material.progressindicator.CircularProgressIndicator
104+
android:layout_width="wrap_content"
105+
android:layout_height="wrap_content"
106+
android:indeterminate="true" />
107+
</LinearLayout>
108+
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
109+
android:scrollbarSize="0.0dip"
110+
android:id="@+id/list"
111+
android:paddingBottom="64.0dip"
112+
android:visibility="gone"
113+
android:clipToPadding="false"
114+
android:layout_width="fill_parent"
115+
android:layout_height="fill_parent"
116+
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
117+
<include
118+
android:id="@+id/app_placeholder"
119+
layout="@layout/layout_app_placeholder" />
75120
</LinearLayout>
76-
</com.google.android.material.appbar.CollapsingToolbarLayout>
77-
</com.google.android.material.appbar.AppBarLayout>
78-
<LinearLayout
79-
android:gravity="center"
80-
android:orientation="vertical"
81-
android:id="@+id/loading"
82-
android:layout_width="fill_parent"
83-
android:layout_height="fill_parent">
84-
<com.google.android.material.progressindicator.CircularProgressIndicator
85-
android:layout_width="wrap_content"
86-
android:layout_height="wrap_content"
87-
android:indeterminate="true" />
88-
</LinearLayout>
89-
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
90-
android:scrollbarSize="0.0dip"
91-
android:id="@+id/list"
92-
android:paddingBottom="64.0dip"
93-
android:visibility="gone"
94-
android:clipToPadding="false"
95-
android:layout_width="fill_parent"
96-
android:layout_height="fill_parent"
97-
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
98-
<include
99-
android:id="@+id/app_placeholder"
100-
layout="@layout/layout_app_placeholder" />
121+
</com.google.android.material.card.MaterialCardView>
122+
</FrameLayout>
101123
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

Lines changed: 65 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<androidx.coordinatorlayout.widget.CoordinatorLayout
3-
android:orientation="vertical"
4-
android:duplicateParentState="false"
3+
android:id="@+id/coordinator"
54
android:layout_width="fill_parent"
65
android:layout_height="fill_parent"
76
xmlns:android="http://schemas.android.com/apk/res/android"
@@ -10,35 +9,58 @@
109
android:id="@+id/appbar"
1110
android:background="?attr/colorPrimary"
1211
android:layout_width="fill_parent"
13-
android:layout_height="wrap_content">
12+
android:layout_height="200.0dip">
1413
<com.google.android.material.appbar.CollapsingToolbarLayout
14+
android:id="@+id/collapsing_toolbar"
15+
android:background="?attr/colorPrimary"
1516
android:layout_width="fill_parent"
16-
android:layout_height="wrap_content"
17-
app:layout_scrollFlags="enterAlways|scroll"
18-
app:titleEnabled="false">
17+
android:layout_height="fill_parent"
18+
app:collapsedTitleTextAppearance="@style/Theme.SagerNet.CollapsingToolbarTitle.Collapsed"
19+
app:collapsedTitleTextColor="?android:textColorPrimaryInverse"
20+
app:contentScrim="?attr/colorPrimary"
21+
app:expandedTitleTextAppearance="@style/Theme.SagerNet.CollapsingToolbarTitle.Expanded"
22+
app:expandedTitleTextColor="?android:textColorPrimaryInverse"
23+
app:layout_scrollFlags="scroll|exitUntilCollapsed">
1924
<com.google.android.material.appbar.MaterialToolbar
2025
android:theme="?attr/actionBarTheme"
2126
android:id="@+id/toolbar"
22-
android:background="?attr/colorPrimary"
2327
android:layout_width="fill_parent"
2428
android:layout_height="?attr/actionBarSize"
25-
android:elevation="0.0dip"
26-
android:touchscreenBlocksFocus="false"
2729
app:layout_collapseMode="pin"
28-
app:popupTheme="@style/AppTheme.PopupOverlay"
29-
app:title="@string/app_name"
30-
app:titleTextColor="?android:textColorPrimaryInverse" />
30+
app:popupTheme="@style/AppTheme.PopupOverlay" />
31+
</com.google.android.material.appbar.CollapsingToolbarLayout>
32+
</com.google.android.material.appbar.AppBarLayout>
33+
<FrameLayout
34+
android:background="@drawable/uwu_background_collapse"
35+
android:layout_width="fill_parent"
36+
android:layout_height="fill_parent"
37+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
38+
<com.google.android.material.card.MaterialCardView
39+
android:paddingTop="16.0dip"
40+
android:layout_width="fill_parent"
41+
android:layout_height="fill_parent"
42+
android:layout_marginTop="16.0dip"
43+
android:layout_marginBottom="16.0dip"
44+
android:layout_marginStart="16.0dip"
45+
android:layout_marginEnd="16.0dip"
46+
app:cardBackgroundColor="#00000000"
47+
app:cardCornerRadius="14.0dip"
48+
app:cardElevation="0.0dip">
3149
<LinearLayout
3250
android:orientation="vertical"
33-
android:paddingTop="56.0dip"
3451
android:layout_width="fill_parent"
35-
android:layout_height="wrap_content">
52+
android:layout_height="fill_parent"
53+
android:layout_marginTop="-16.0dip"
54+
android:layout_marginStart="-16.0dip"
55+
android:layout_marginEnd="-16.0dip">
3656
<com.google.android.material.card.MaterialCardView
3757
android:layout_width="fill_parent"
3858
android:layout_height="wrap_content"
39-
android:layout_margin="4.0dip"
59+
android:layout_marginStart="16.0dip"
60+
android:layout_marginEnd="16.0dip"
61+
android:layout_marginBottom="4.0dip"
4062
app:cardBackgroundColor="?attr/colorCard"
41-
app:cardCornerRadius="10.0dip"
63+
app:cardCornerRadius="14.0dip"
4264
app:cardElevation="0.0dip">
4365
<LinearLayout
4466
android:orientation="vertical"
@@ -49,7 +71,7 @@
4971
android:id="@+id/bypassGroup"
5072
android:layout_width="fill_parent"
5173
android:layout_height="wrap_content"
52-
android:layout_marginTop="4.0dip"
74+
android:layout_marginTop="8.0dip"
5375
app:selectionRequired="true"
5476
app:singleLine="true"
5577
app:singleSelection="true">
@@ -74,17 +96,15 @@
7496
android:text="@string/bypass_apps" />
7597
</com.google.android.material.chip.ChipGroup>
7698
<LinearLayout
77-
android:orientation="horizontal"
99+
android:orientation="vertical"
78100
android:layout_width="wrap_content"
79101
android:layout_height="wrap_content">
80102
<com.google.android.material.chip.Chip
81103
android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.TitleSmall"
82104
android:id="@+id/show_system_apps"
83105
android:layout_width="wrap_content"
84106
android:layout_height="wrap_content"
85-
android:layout_marginBottom="4.0dip"
86107
android:text="@string/show_system_apps"
87-
android:layout_marginEnd="8.0dip"
88108
style="@style/Widget.MaterialComponents.Chip.Filter" />
89109
<com.google.android.material.chip.Chip
90110
android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.TitleSmall"
@@ -106,30 +126,30 @@
106126
</com.google.android.material.textfield.TextInputLayout>
107127
</LinearLayout>
108128
</com.google.android.material.card.MaterialCardView>
129+
<LinearLayout
130+
android:gravity="center"
131+
android:orientation="vertical"
132+
android:id="@+id/loading"
133+
android:layout_width="fill_parent"
134+
android:layout_height="fill_parent">
135+
<com.google.android.material.progressindicator.CircularProgressIndicator
136+
android:layout_width="wrap_content"
137+
android:layout_height="wrap_content"
138+
android:indeterminate="true" />
139+
</LinearLayout>
140+
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
141+
android:scrollbarSize="0.0dip"
142+
android:id="@+id/list"
143+
android:paddingBottom="64.0dip"
144+
android:visibility="gone"
145+
android:clipToPadding="false"
146+
android:layout_width="fill_parent"
147+
android:layout_height="fill_parent"
148+
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
149+
<include
150+
android:id="@+id/app_placeholder"
151+
layout="@layout/layout_app_placeholder" />
109152
</LinearLayout>
110-
</com.google.android.material.appbar.CollapsingToolbarLayout>
111-
</com.google.android.material.appbar.AppBarLayout>
112-
<LinearLayout
113-
android:gravity="center"
114-
android:orientation="vertical"
115-
android:id="@+id/loading"
116-
android:layout_width="fill_parent"
117-
android:layout_height="fill_parent">
118-
<com.google.android.material.progressindicator.CircularProgressIndicator
119-
android:layout_width="wrap_content"
120-
android:layout_height="wrap_content"
121-
android:indeterminate="true" />
122-
</LinearLayout>
123-
<com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
124-
android:scrollbarSize="0.0dip"
125-
android:id="@+id/list"
126-
android:paddingBottom="64.0dip"
127-
android:visibility="gone"
128-
android:clipToPadding="false"
129-
android:layout_width="fill_parent"
130-
android:layout_height="fill_parent"
131-
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
132-
<include
133-
android:id="@+id/app_placeholder"
134-
layout="@layout/layout_app_placeholder" />
153+
</com.google.android.material.card.MaterialCardView>
154+
</FrameLayout>
135155
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
android:id="@+id/content"
44
android:layout_width="fill_parent"
55
android:layout_height="wrap_content"
6-
android:layout_margin="4.0dip"
6+
android:layout_marginStart="16.0dip"
7+
android:layout_marginEnd="16.0dip"
8+
android:layout_marginBottom="4.0dip"
9+
android:layout_marginTop="4.0dip"
710
app:cardBackgroundColor="?attr/colorCard"
8-
app:cardCornerRadius="10.0dip"
11+
app:cardCornerRadius="14.0dip"
912
app:cardElevation="0.0dip"
10-
xmlns:tools="http://schemas.android.com/tools"
11-
tools:ignore="SelectableText"
1213
xmlns:android="http://schemas.android.com/apk/res/android"
1314
xmlns:app="http://schemas.android.com/apk/res-auto">
1415
<LinearLayout
@@ -18,7 +19,6 @@
1819
android:layout_width="fill_parent"
1920
android:layout_height="fill_parent">
2021
<ImageView
21-
tools:src="@android:drawable/sym_def_app_icon"
2222
android:id="@+id/itemicon"
2323
android:layout_width="40.0dip"
2424
android:layout_height="40.0dip"
@@ -35,7 +35,6 @@
3535
android:layout_marginStart="16.0dip"
3636
android:layout_marginEnd="8.0dip">
3737
<TextView
38-
tools:text="Package label"
3938
android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.TitleMedium"
4039
android:textSize="17.0sp"
4140
android:textColor="?attr/colorOnSurface"
@@ -44,7 +43,6 @@
4443
android:layout_width="wrap_content"
4544
android:layout_height="wrap_content" />
4645
<TextView
47-
tools:text="com.package.name (10000)"
4846
android:textAppearance="@style/TextAppearance.M3.Sys.Typescale.TitleSmall"
4947
android:textSize="12.0sp"
5048
android:textColor="?attr/colorOnSurfaceVariant"

0 commit comments

Comments
 (0)