Skip to content

Commit d318972

Browse files
HSSkyBoyHSSkyBoy
committed
migrate app proxy and home UI structure
1 parent 2347112 commit d318972

3 files changed

Lines changed: 157 additions & 129 deletions

File tree

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

Lines changed: 99 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,121 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
android:background="?attr/colorPrimary"
7-
android:fitsSystemWindows="true"
8-
android:orientation="vertical">
7+
android:fitsSystemWindows="true">
98

10-
<com.google.android.material.appbar.MaterialToolbar
11-
android:id="@+id/toolbar"
9+
<com.google.android.material.appbar.AppBarLayout
1210
android:layout_width="match_parent"
13-
android:layout_height="?attr/actionBarSize"
11+
android:layout_height="200dp"
1412
android:background="?attr/colorPrimary"
1513
android:fitsSystemWindows="true"
16-
app:navigationIcon="@drawable/ic_arrow_back"
17-
app:navigationIconTint="?attr/colorOnPrimary"
18-
app:title="@string/settings_per_app"
19-
app:titleTextColor="?attr/colorOnPrimary" />
14+
app:elevation="0dp">
2015

21-
<com.google.android.material.card.MaterialCardView
16+
<com.google.android.material.appbar.CollapsingToolbarLayout
17+
android:layout_width="match_parent"
18+
android:layout_height="match_parent"
19+
app:contentScrim="?attr/colorPrimary"
20+
app:expandedTitleMarginStart="24dp"
21+
app:expandedTitleTextColor="?attr/colorOnPrimary"
22+
app:layout_scrollFlags="scroll|exitUntilCollapsed"
23+
app:title="@string/settings_per_app"
24+
app:titleCollapseMode="scale">
25+
26+
<ImageView
27+
android:layout_width="wrap_content"
28+
android:layout_height="match_parent"
29+
android:layout_gravity="end"
30+
android:alpha="0.65"
31+
android:contentDescription="@null"
32+
android:src="@drawable/uwu_banner_image_2"
33+
app:layout_collapseMode="parallax" />
34+
35+
<com.google.android.material.appbar.MaterialToolbar
36+
android:id="@+id/toolbar"
37+
android:layout_width="match_parent"
38+
android:layout_height="?attr/actionBarSize"
39+
app:layout_collapseMode="pin"
40+
app:navigationIcon="@drawable/ic_arrow_back"
41+
app:navigationIconTint="?attr/colorOnPrimary"
42+
app:titleTextColor="?attr/colorOnPrimary" />
43+
</com.google.android.material.appbar.CollapsingToolbarLayout>
44+
</com.google.android.material.appbar.AppBarLayout>
45+
46+
<FrameLayout
2247
android:layout_width="match_parent"
23-
android:layout_height="112dp"
24-
android:layout_marginHorizontal="16dp"
25-
android:layout_marginTop="8dp"
26-
app:cardBackgroundColor="?attr/colorCard"
27-
app:cardCornerRadius="26dp"
28-
app:cardElevation="0dp">
48+
android:layout_height="match_parent"
49+
android:background="@drawable/uwu_background_collapse"
50+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
2951

30-
<ImageView
31-
android:layout_width="wrap_content"
52+
<LinearLayout
53+
android:layout_width="match_parent"
3254
android:layout_height="match_parent"
33-
android:layout_gravity="end"
34-
android:alpha="0.72"
35-
android:contentDescription="@null"
36-
android:src="@drawable/uwu_banner_image_2" />
55+
android:orientation="vertical"
56+
android:paddingTop="16dp">
3757

38-
<TextView
39-
android:layout_width="wrap_content"
40-
android:layout_height="wrap_content"
41-
android:layout_gravity="center_vertical"
42-
android:layout_marginStart="20dp"
43-
android:text="APP PROXY"
44-
android:textColor="?attr/colorOnSurface"
45-
android:textSize="24sp"
46-
android:textStyle="bold" />
47-
</com.google.android.material.card.MaterialCardView>
58+
<com.google.android.material.card.MaterialCardView
59+
android:layout_width="match_parent"
60+
android:layout_height="wrap_content"
61+
android:layout_marginHorizontal="16dp"
62+
app:cardBackgroundColor="?attr/colorCard"
63+
app:cardCornerRadius="14dp"
64+
app:cardElevation="0dp">
4865

49-
<com.google.android.material.button.MaterialButtonToggleGroup
50-
android:id="@+id/mode_group"
51-
android:layout_width="match_parent"
52-
android:layout_height="wrap_content"
53-
android:layout_marginTop="12dp"
54-
android:paddingHorizontal="16dp"
55-
android:paddingBottom="8dp"
56-
app:selectionRequired="true"
57-
app:singleSelection="true">
66+
<com.google.android.material.button.MaterialButtonToggleGroup
67+
android:id="@+id/mode_group"
68+
android:layout_width="match_parent"
69+
android:layout_height="wrap_content"
70+
android:padding="8dp"
71+
app:selectionRequired="true"
72+
app:singleSelection="true">
5873

59-
<com.google.android.material.button.MaterialButton
60-
android:id="@+id/mode_all"
61-
style="?attr/materialButtonOutlinedStyle"
62-
android:layout_width="0dp"
63-
android:layout_height="wrap_content"
64-
android:layout_weight="1"
65-
android:text="@string/per_app_mode_all" />
74+
<com.google.android.material.button.MaterialButton
75+
android:id="@+id/mode_all"
76+
style="?attr/materialButtonOutlinedStyle"
77+
android:layout_width="0dp"
78+
android:layout_height="48dp"
79+
android:layout_weight="1"
80+
android:text="@string/per_app_mode_all" />
6681

67-
<com.google.android.material.button.MaterialButton
68-
android:id="@+id/mode_allow"
69-
style="?attr/materialButtonOutlinedStyle"
70-
android:layout_width="0dp"
71-
android:layout_height="wrap_content"
72-
android:layout_weight="1"
73-
android:text="@string/per_app_mode_allow" />
82+
<com.google.android.material.button.MaterialButton
83+
android:id="@+id/mode_allow"
84+
style="?attr/materialButtonOutlinedStyle"
85+
android:layout_width="0dp"
86+
android:layout_height="48dp"
87+
android:layout_weight="1"
88+
android:text="@string/per_app_mode_allow" />
7489

75-
<com.google.android.material.button.MaterialButton
76-
android:id="@+id/mode_disallow"
77-
style="?attr/materialButtonOutlinedStyle"
78-
android:layout_width="0dp"
79-
android:layout_height="wrap_content"
80-
android:layout_weight="1"
81-
android:text="@string/per_app_mode_disallow" />
82-
</com.google.android.material.button.MaterialButtonToggleGroup>
90+
<com.google.android.material.button.MaterialButton
91+
android:id="@+id/mode_disallow"
92+
style="?attr/materialButtonOutlinedStyle"
93+
android:layout_width="0dp"
94+
android:layout_height="48dp"
95+
android:layout_weight="1"
96+
android:text="@string/per_app_mode_disallow" />
97+
</com.google.android.material.button.MaterialButtonToggleGroup>
98+
</com.google.android.material.card.MaterialCardView>
8399

84-
<FrameLayout
85-
android:layout_width="match_parent"
86-
android:layout_height="0dp"
87-
android:layout_weight="1"
88-
android:background="@drawable/uwu_background_collapse">
100+
<FrameLayout
101+
android:layout_width="match_parent"
102+
android:layout_height="0dp"
103+
android:layout_weight="1"
104+
android:layout_marginTop="8dp">
89105

90-
<androidx.recyclerview.widget.RecyclerView
91-
android:id="@+id/rv_apps"
92-
android:layout_width="match_parent"
93-
android:layout_height="match_parent"
94-
android:clipToPadding="false"
95-
android:paddingBottom="16dp" />
106+
<androidx.recyclerview.widget.RecyclerView
107+
android:id="@+id/rv_apps"
108+
android:layout_width="match_parent"
109+
android:layout_height="match_parent"
110+
android:clipToPadding="false"
111+
android:paddingBottom="16dp" />
96112

97-
<ProgressBar
98-
android:id="@+id/progress"
99-
android:layout_width="wrap_content"
100-
android:layout_height="wrap_content"
101-
android:layout_gravity="center" />
113+
<ProgressBar
114+
android:id="@+id/progress"
115+
android:layout_width="wrap_content"
116+
android:layout_height="wrap_content"
117+
android:layout_gravity="center" />
118+
</FrameLayout>
119+
</LinearLayout>
102120
</FrameLayout>
103-
</LinearLayout>
121+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,16 @@
144144
android:src="@drawable/uwu_banner_profile" />
145145
</com.google.android.material.card.MaterialCardView>
146146

147+
<LinearLayout
148+
android:layout_width="0dp"
149+
android:layout_height="wrap_content"
150+
android:layout_marginStart="12dp"
151+
android:layout_weight="1"
152+
android:orientation="vertical">
153+
147154
<TextView
148155
android:layout_width="wrap_content"
149156
android:layout_height="wrap_content"
150-
android:layout_gravity="center_vertical"
151-
android:layout_marginStart="12dp"
152157
android:fontFamily="@font/uwu_font_title"
153158
android:text="Hi, miku 💕"
154159
android:textColor="?attr/colorOnSurface"
@@ -160,10 +165,9 @@
160165
android:layout_height="wrap_content"
161166
android:fontFamily="@font/uwu_font_summary"
162167
android:text="Good night..."
163-
android:layout_gravity="center_vertical"
164-
android:layout_marginStart="8dp"
165168
android:textColor="?attr/colorOnSurfaceVariant"
166169
android:textSize="14sp" />
170+
</LinearLayout>
167171
</LinearLayout>
168172

169173
<com.google.android.material.card.MaterialCardView

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

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,65 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
2+
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
66
android:layout_marginHorizontal="16dp"
7-
android:layout_marginTop="8dp"
8-
android:background="@drawable/uwu_bg_mid"
7+
android:layout_marginVertical="4dp"
98
android:clickable="true"
109
android:focusable="true"
11-
android:gravity="center_vertical"
12-
android:minHeight="64dp"
13-
android:orientation="horizontal"
14-
android:paddingHorizontal="20dp"
15-
android:paddingVertical="10dp">
16-
17-
<ImageView
18-
android:id="@+id/app_icon"
19-
android:layout_width="40dp"
20-
android:layout_height="40dp"
21-
tools:ignore="ContentDescription"
22-
tools:src="@mipmap/ic_launcher" />
10+
android:foreground="?attr/selectableItemBackground"
11+
app:cardBackgroundColor="?attr/colorCard"
12+
app:cardCornerRadius="14dp"
13+
app:cardElevation="0dp">
2314

2415
<LinearLayout
25-
android:layout_width="0dp"
16+
android:layout_width="match_parent"
2617
android:layout_height="wrap_content"
27-
android:layout_weight="1"
28-
android:layout_marginStart="16dp"
29-
android:layout_marginEnd="12dp"
30-
android:orientation="vertical">
18+
android:gravity="center_vertical"
19+
android:minHeight="64dp"
20+
android:orientation="horizontal"
21+
android:padding="8dp">
3122

32-
<TextView
33-
android:id="@+id/app_name"
34-
android:layout_width="wrap_content"
23+
<ImageView
24+
android:id="@+id/app_icon"
25+
android:layout_width="40dp"
26+
android:layout_height="40dp"
27+
android:layout_marginStart="8dp"
28+
android:contentDescription="@null"
29+
android:scaleType="fitCenter" />
30+
31+
<LinearLayout
32+
android:layout_width="0dp"
3533
android:layout_height="wrap_content"
36-
android:ellipsize="end"
37-
android:maxLines="1"
38-
android:textColor="?attr/colorOnSurface"
39-
android:textSize="16sp"
40-
tools:text="Some App" />
34+
android:layout_marginStart="16dp"
35+
android:layout_marginEnd="8dp"
36+
android:layout_weight="1"
37+
android:orientation="vertical">
38+
39+
<TextView
40+
android:id="@+id/app_name"
41+
android:layout_width="match_parent"
42+
android:layout_height="wrap_content"
43+
android:ellipsize="end"
44+
android:maxLines="1"
45+
android:textColor="?attr/colorOnSurface"
46+
android:textSize="17sp" />
4147

42-
<TextView
43-
android:id="@+id/app_package"
48+
<TextView
49+
android:id="@+id/app_package"
50+
android:layout_width="match_parent"
51+
android:layout_height="wrap_content"
52+
android:ellipsize="end"
53+
android:maxLines="1"
54+
android:textColor="?attr/colorOnSurfaceVariant"
55+
android:textSize="12sp" />
56+
</LinearLayout>
57+
58+
<com.google.android.material.checkbox.MaterialCheckBox
59+
android:id="@+id/app_check"
4460
android:layout_width="wrap_content"
4561
android:layout_height="wrap_content"
46-
android:ellipsize="end"
47-
android:maxLines="1"
48-
android:textColor="?attr/colorOnSurfaceVariant"
49-
android:textSize="12sp"
50-
tools:text="com.example.app" />
62+
android:clickable="false"
63+
android:focusable="false" />
5164
</LinearLayout>
52-
53-
<com.google.android.material.checkbox.MaterialCheckBox
54-
android:id="@+id/app_check"
55-
android:layout_width="wrap_content"
56-
android:layout_height="wrap_content"
57-
android:clickable="false"
58-
android:focusable="false" />
59-
</LinearLayout>
65+
</com.google.android.material.card.MaterialCardView>

0 commit comments

Comments
 (0)