Skip to content

Commit 010f08f

Browse files
stariflystarifly
committed
refactor: route and group list item cards
1 parent 9154efc commit 010f08f

7 files changed

Lines changed: 108 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/content"
6+
style="@style/Widget.SagerNet.CardView.Elevated"
67
android:layout_width="match_parent"
78
android:layout_height="wrap_content"
89
android:layout_margin="4dp">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/content"
6+
style="@style/Widget.SagerNet.CardView.Elevated"
67
android:layout_width="match_parent"
78
android:layout_height="wrap_content"
89
android:layout_margin="4dp">

‎app/src/main/res/values-night/colors.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,28 @@
1010
<color name="color_route_direct">#66BB6A</color> <!-- 直连：浅绿 -->
1111
<color name="color_route_proxy">#42A5F5</color> <!-- 代理：浅蓝 -->
1212
<color name="color_route_config">#AB47BC</color> <!-- 配置：浅紫 -->
13+
14+
<!-- 立体卡片色调提升表面色（深色，#121212 底 + 各 primary 11% 染色） -->
15+
<color name="card_elevated_pink">#2A131B</color>
16+
<color name="card_elevated_pink_ssr">#2C1D21</color>
17+
<color name="card_elevated_amber">#2C2511</color>
18+
<color name="card_elevated_blue">#14212B</color>
19+
<color name="card_elevated_blue_grey">#1B1E1F</color>
20+
<color name="card_elevated_brown">#1D1918</color>
21+
<color name="card_elevated_cyan">#102527</color>
22+
<color name="card_elevated_deep_orange">#2C1A14</color>
23+
<color name="card_elevated_deep_purple">#1B1624</color>
24+
<color name="card_elevated_green">#182319</color>
25+
<color name="card_elevated_grey">#212121</color>
26+
<color name="card_elevated_indigo">#171924</color>
27+
<color name="card_elevated_light_blue">#10232B</color>
28+
<color name="card_elevated_light_green">#1F2518</color>
29+
<color name="card_elevated_lime">#272816</color>
30+
<color name="card_elevated_orange">#2C2110</color>
31+
<color name="card_elevated_purple">#211423</color>
32+
<color name="card_elevated_red">#2B1716</color>
33+
<color name="card_elevated_teal">#10211F</color>
34+
<color name="card_elevated_yellow">#2C2A17</color>
35+
<color name="card_elevated_black">#151515</color>
36+
<color name="card_elevated_verdant_mint">#10241C</color>
1337
</resources>

‎app/src/main/res/values/attrs.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
<attr name="fabColorBackground" format="color" />
1111
<attr name="selectedColorPrimary" format="color" />
1212
<attr name="whiteOrTextPrimary" format="color" />
13+
<!-- 立体卡片（路由/分组）的"色调提升表面色"，各主题变体朝自身 primary 染色 -->
14+
<attr name="cardElevatedSurfaceColor" format="color" />
1315
</resources>

‎app/src/main/res/values/colors.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,4 +305,28 @@
305305
<!-- 卡片默认细边框：约 12% 黑（低对比分隔线），夜间见 values-night/colors.xml -->
306306
<color name="card_stroke">#1F000000</color>
307307

308+
<!-- 立体卡片色调提升表面色（浅色，白底 + 各 primary 8% 染色），夜间见 values-night/colors.xml -->
309+
<color name="card_elevated_pink">#FDEDF3</color>
310+
<color name="card_elevated_pink_ssr">#FFF4F7</color>
311+
<color name="card_elevated_amber">#FFFAEB</color>
312+
<color name="card_elevated_blue">#EDF7FE</color>
313+
<color name="card_elevated_blue_grey">#F2F5F6</color>
314+
<color name="card_elevated_brown">#F4F1F0</color>
315+
<color name="card_elevated_cyan">#EBFAFC</color>
316+
<color name="card_elevated_deep_orange">#FFF2ED</color>
317+
<color name="card_elevated_deep_purple">#F3EFF9</color>
318+
<color name="card_elevated_green">#F1F9F1</color>
319+
<color name="card_elevated_grey">#F7F7F7</color>
320+
<color name="card_elevated_indigo">#F0F1F9</color>
321+
<color name="card_elevated_light_blue">#EBF8FE</color>
322+
<color name="card_elevated_light_green">#F6FAF1</color>
323+
<color name="card_elevated_lime">#FBFCEF</color>
324+
<color name="card_elevated_orange">#FFF7EB</color>
325+
<color name="card_elevated_purple">#F7EEF9</color>
326+
<color name="card_elevated_red">#FEF0EF</color>
327+
<color name="card_elevated_teal">#EBF7F5</color>
328+
<color name="card_elevated_yellow">#FFFDEF</color>
329+
<color name="card_elevated_black">#EEEEEE</color>
330+
<color name="card_elevated_verdant_mint">#EBF9F3</color>
331+
308332
</resources>

‎app/src/main/res/values/dimens.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<dimen name="bottom_sheet_padding">8dp</dimen>
55

66
<dimen name="card_corner_radius">16dp</dimen>
7+
<dimen name="card_elevation">1dp</dimen>
78
<dimen name="card_stroke_width">1dp</dimen>
89
<dimen name="card_stroke_width_selected">2dp</dimen>
910
<dimen name="profile_card_corner_radius">10dp</dimen>

0 commit comments

Comments
 (0)