Skip to content

Commit e7aa006

Browse files
uson1004uson1004
authored
πŸ”€ :: (#822) λ‹€ν¬ν…Œλ§ˆ μ‹œ μ•„μ΄μ½˜ 컬러 λŒ€λΉ„ ν•΄κ²°
 πŸ”€ :: (#822) λ‹€ν¬ν…Œλ§ˆ μ‹œ μ•„μ΄μ½˜ 컬러 λŒ€λΉ„ ν•΄κ²°
2 parents 4def3b4 + 6b34dec commit e7aa006

65 files changed

Lines changed: 732 additions & 117 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

β€Ž.github/workflows/ci.ymlβ€Ž

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ jobs:
3434
- name: Grant execute permission for gradlew
3535
run: chmod +x gradlew
3636

37-
- name: Generate google-services.json
37+
- name: Create google-services.json
3838
run: |
39-
printf "%s" "${{ secrets.GOOGLE_SERVICES }}" | base64 --decode > ./app/google-services.json
40-
39+
mkdir -p ${{ github.workspace }}/app
40+
echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ${{ github.workspace }}/app/google-services.json
41+
4142
- name: Build with Gradle
42-
run: ./gradlew build
43+
run: ./gradlew assembleDebug --parallel
4344

4445
- name: Run test
4546
run: ./gradlew test

β€Žapp/src/dev/AndroidManifest.xmlβ€Ž

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@
1111
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
1212

1313
<application
14-
android:name="team.aliens.dms.android.app.DevApplication"
15-
tools:replace="android:name">
14+
android:name=".android.app.DevApplication"
15+
tools:replace="android:name"
16+
android:allowBackup="true"
17+
android:enableOnBackInvokedCallback="true"
18+
android:icon="@mipmap/ic_launcher"
19+
android:label="@string/app_name"
20+
android:roundIcon="@mipmap/ic_launcher_round"
21+
android:supportsRtl="true"
22+
android:theme="@style/Theme.DMS"
23+
android:usesCleartextTraffic="true"
24+
tools:targetApi="tiramisu">
1625

1726
<activity
1827
android:name=".android.app.MainActivity"
1928
android:exported="true"
20-
android:icon="@mipmap/ic_launcher"
21-
android:label="@string/app_name"
22-
android:roundIcon="@mipmap/ic_launcher_round"
23-
android:screenOrientation="portrait"
24-
android:theme="@style/Theme.DMS"
25-
tools:node="replace">
29+
android:screenOrientation="portrait">
2630

2731
<meta-data
2832
android:name="android.app.lib_name"

β€Žapp/src/dev/kotlin/team/aliens/dms/android/app/DmsApp.ktβ€Ž

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ import androidx.compose.foundation.layout.Box
55
import androidx.compose.foundation.layout.WindowInsets
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
8+
import androidx.compose.foundation.layout.navigationBars
89
import androidx.compose.foundation.layout.padding
910
import androidx.compose.foundation.layout.statusBarsPadding
11+
import androidx.compose.foundation.layout.systemBars
12+
import androidx.compose.foundation.layout.windowInsetsPadding
1013
import androidx.compose.material3.Scaffold
1114
import androidx.compose.material3.SnackbarHost
1215
import androidx.compose.material3.windowsizeclass.WindowSizeClass
@@ -130,10 +133,10 @@ fun DmsApp(
130133
}
131134

132135
Box(
133-
modifier = Modifier.fillMaxSize()
136+
modifier = Modifier
137+
.fillMaxSize(),
134138
) {
135139
Scaffold(
136-
contentWindowInsets = WindowInsets(0),
137140
bottomBar = {
138141
if (shouldShowBottomBar) {
139142
BottomNavigationBar(
@@ -154,12 +157,12 @@ fun DmsApp(
154157
}
155158
)
156159
}
157-
}
160+
},
161+
contentWindowInsets = WindowInsets(0),
158162
) { paddingValues ->
159163
CompositionLocalProvider(LocalResultStore provides resultStore) {
160164
NavDisplay(
161165
modifier = Modifier
162-
.background(DmsTheme.colorScheme.surfaceTint)
163166
.padding(paddingValues),
164167
backStack = backStack,
165168
onBack = { backStack.removeLastOrNull() },

β€Žapp/src/dev/res/drawable/ic_launcher_background.xmlβ€Ž

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path
8+
android:fillColor="#3DDC84"
9+
android:pathData="M0,0h108v108h-108z" />
10+
<path
11+
android:fillColor="#00000000"
12+
android:pathData="M9,0L9,108"
13+
android:strokeWidth="0.8"
14+
android:strokeColor="#33FFFFFF" />
15+
<path
16+
android:fillColor="#00000000"
17+
android:pathData="M19,0L19,108"
18+
android:strokeWidth="0.8"
19+
android:strokeColor="#33FFFFFF" />
20+
<path
21+
android:fillColor="#00000000"
22+
android:pathData="M29,0L29,108"
23+
android:strokeWidth="0.8"
24+
android:strokeColor="#33FFFFFF" />
25+
<path
26+
android:fillColor="#00000000"
27+
android:pathData="M39,0L39,108"
28+
android:strokeWidth="0.8"
29+
android:strokeColor="#33FFFFFF" />
30+
<path
31+
android:fillColor="#00000000"
32+
android:pathData="M49,0L49,108"
33+
android:strokeWidth="0.8"
34+
android:strokeColor="#33FFFFFF" />
35+
<path
36+
android:fillColor="#00000000"
37+
android:pathData="M59,0L59,108"
38+
android:strokeWidth="0.8"
39+
android:strokeColor="#33FFFFFF" />
40+
<path
41+
android:fillColor="#00000000"
42+
android:pathData="M69,0L69,108"
43+
android:strokeWidth="0.8"
44+
android:strokeColor="#33FFFFFF" />
45+
<path
46+
android:fillColor="#00000000"
47+
android:pathData="M79,0L79,108"
48+
android:strokeWidth="0.8"
49+
android:strokeColor="#33FFFFFF" />
50+
<path
51+
android:fillColor="#00000000"
52+
android:pathData="M89,0L89,108"
53+
android:strokeWidth="0.8"
54+
android:strokeColor="#33FFFFFF" />
55+
<path
56+
android:fillColor="#00000000"
57+
android:pathData="M99,0L99,108"
58+
android:strokeWidth="0.8"
59+
android:strokeColor="#33FFFFFF" />
60+
<path
61+
android:fillColor="#00000000"
62+
android:pathData="M0,9L108,9"
63+
android:strokeWidth="0.8"
64+
android:strokeColor="#33FFFFFF" />
65+
<path
66+
android:fillColor="#00000000"
67+
android:pathData="M0,19L108,19"
68+
android:strokeWidth="0.8"
69+
android:strokeColor="#33FFFFFF" />
70+
<path
71+
android:fillColor="#00000000"
72+
android:pathData="M0,29L108,29"
73+
android:strokeWidth="0.8"
74+
android:strokeColor="#33FFFFFF" />
75+
<path
76+
android:fillColor="#00000000"
77+
android:pathData="M0,39L108,39"
78+
android:strokeWidth="0.8"
79+
android:strokeColor="#33FFFFFF" />
80+
<path
81+
android:fillColor="#00000000"
82+
android:pathData="M0,49L108,49"
83+
android:strokeWidth="0.8"
84+
android:strokeColor="#33FFFFFF" />
85+
<path
86+
android:fillColor="#00000000"
87+
android:pathData="M0,59L108,59"
88+
android:strokeWidth="0.8"
89+
android:strokeColor="#33FFFFFF" />
90+
<path
91+
android:fillColor="#00000000"
92+
android:pathData="M0,69L108,69"
93+
android:strokeWidth="0.8"
94+
android:strokeColor="#33FFFFFF" />
95+
<path
96+
android:fillColor="#00000000"
97+
android:pathData="M0,79L108,79"
98+
android:strokeWidth="0.8"
99+
android:strokeColor="#33FFFFFF" />
100+
<path
101+
android:fillColor="#00000000"
102+
android:pathData="M0,89L108,89"
103+
android:strokeWidth="0.8"
104+
android:strokeColor="#33FFFFFF" />
105+
<path
106+
android:fillColor="#00000000"
107+
android:pathData="M0,99L108,99"
108+
android:strokeWidth="0.8"
109+
android:strokeColor="#33FFFFFF" />
110+
<path
111+
android:fillColor="#00000000"
112+
android:pathData="M19,29L89,29"
113+
android:strokeWidth="0.8"
114+
android:strokeColor="#33FFFFFF" />
115+
<path
116+
android:fillColor="#00000000"
117+
android:pathData="M19,39L89,39"
118+
android:strokeWidth="0.8"
119+
android:strokeColor="#33FFFFFF" />
120+
<path
121+
android:fillColor="#00000000"
122+
android:pathData="M19,49L89,49"
123+
android:strokeWidth="0.8"
124+
android:strokeColor="#33FFFFFF" />
125+
<path
126+
android:fillColor="#00000000"
127+
android:pathData="M19,59L89,59"
128+
android:strokeWidth="0.8"
129+
android:strokeColor="#33FFFFFF" />
130+
<path
131+
android:fillColor="#00000000"
132+
android:pathData="M19,69L89,69"
133+
android:strokeWidth="0.8"
134+
android:strokeColor="#33FFFFFF" />
135+
<path
136+
android:fillColor="#00000000"
137+
android:pathData="M19,79L89,79"
138+
android:strokeWidth="0.8"
139+
android:strokeColor="#33FFFFFF" />
140+
<path
141+
android:fillColor="#00000000"
142+
android:pathData="M29,19L29,89"
143+
android:strokeWidth="0.8"
144+
android:strokeColor="#33FFFFFF" />
145+
<path
146+
android:fillColor="#00000000"
147+
android:pathData="M39,19L39,89"
148+
android:strokeWidth="0.8"
149+
android:strokeColor="#33FFFFFF" />
150+
<path
151+
android:fillColor="#00000000"
152+
android:pathData="M49,19L49,89"
153+
android:strokeWidth="0.8"
154+
android:strokeColor="#33FFFFFF" />
155+
<path
156+
android:fillColor="#00000000"
157+
android:pathData="M59,19L59,89"
158+
android:strokeWidth="0.8"
159+
android:strokeColor="#33FFFFFF" />
160+
<path
161+
android:fillColor="#00000000"
162+
android:pathData="M69,19L69,89"
163+
android:strokeWidth="0.8"
164+
android:strokeColor="#33FFFFFF" />
165+
<path
166+
android:fillColor="#00000000"
167+
android:pathData="M79,19L79,89"
168+
android:strokeWidth="0.8"
169+
android:strokeColor="#33FFFFFF" />
170+
</vector>

β€Žapp/src/dev/res/drawable/ic_launcher_foreground.xmlβ€Ž

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="1024"
6+
android:viewportHeight="1024">
7+
<group android:scaleX="0.5"
8+
android:scaleY="0.5"
9+
android:translateX="256"
10+
android:translateY="256">
11+
<group>
12+
<clip-path
13+
android:pathData="M117,0h789v1024h-789z"/>
14+
<path
15+
android:pathData="M496.6,885.7V613.2H495.2V659.5C495.2,692.6 488,725.4 473.9,755.4C459.9,785.4 439.4,812 414,833.2L411.5,835.2L411.1,835.6C397.5,846.5 382.8,855.9 367.1,863.4C336.6,878.2 303,885.8 269.1,885.8H223.5V383.2C223.5,379.2 223.5,375.1 223.9,370.4C223.9,369.5 224.1,366.4 224.1,366.4C224.1,363.3 224.5,360.3 224.8,357.3C224.8,357.3 225.1,354.3 225.1,353.2C225.6,349.2 226.1,345.1 226.7,341.1C226.7,340.1 227,339 227.2,338L227.6,335.9C228.9,325.6 231.3,315.4 234.6,305.6C254,238.7 298,181.6 357.8,145.8C396.1,122.1 439.9,108.7 485,106.8H487.2C491.2,106.6 495.3,106.5 499.3,106.5H768V659.5C768,700.8 756.7,741.3 735.3,776.6C733.4,779.7 731.4,782.8 729.4,785.8C725.3,791.8 721,797.6 716.4,803.2C707.1,814.4 696.9,824.6 685.7,833.9C645.2,867.3 594.4,885.5 541.9,885.5L496.6,885.7Z"
16+
android:fillColor="#ffffff"/>
17+
<path
18+
android:pathData="M117,0h788.9v751.5h-788.9z"
19+
android:fillColor="#00ff0000"/>
20+
<path
21+
android:pathData="M453.3,613.6H768.3V106.2H499.9C426.5,106.2 356,135.4 304.1,187.3C252.2,239.3 223,309.7 223,383.2C223,413.5 228.9,443.4 240.5,471.4C252.1,499.4 269,524.8 290.4,546.2C311.8,567.6 337.2,584.5 365.2,596.1C393.1,607.7 423.1,613.6 453.3,613.6Z">
22+
<aapt:attr name="android:fillColor">
23+
<gradient
24+
android:startX="223"
25+
android:startY="359.9"
26+
android:endX="768.3"
27+
android:endY="359.9"
28+
android:type="linear">
29+
<item android:offset="0" android:color="#FF4AC4FF"/>
30+
<item android:offset="0.4" android:color="#FF429FFF"/>
31+
<item android:offset="0.8" android:color="#FF3D8AFF"/>
32+
<item android:offset="1" android:color="#FF3377FF"/>
33+
</gradient>
34+
</aapt:attr>
35+
</path>
36+
<path
37+
android:pathData="M390.4,508.2h515.6v515.8h-515.6z"
38+
android:fillColor="#00ff0000"/>
39+
<path
40+
android:pathData="M495.9,886.1H541.7C601.8,886.1 659.4,862.2 701.9,819.7C744.4,777.2 768.3,719.6 768.3,659.5V613.6H495.9V886.1Z"
41+
android:fillColor="#226DF0"/>
42+
<path
43+
android:pathData="M117.1,277.4h515.6v746.6h-515.6z"
44+
android:fillColor="#00ff0000"/>
45+
<path
46+
android:pathData="M453.3,613.6C392.3,613.6 333.7,589.3 290.5,546.2C247.4,503 223.1,444.4 223.1,383.3V886.1H268.8C298.6,886.1 328,880.2 355.5,868.8C383,857.4 408,840.7 429,819.7C450,798.7 466.7,773.7 478.1,746.2C489.5,718.7 495.3,689.2 495.3,659.5V613.6H453.3Z">
47+
<aapt:attr name="android:fillColor">
48+
<gradient
49+
android:startX="223"
50+
android:startY="634.6"
51+
android:endX="495.3"
52+
android:endY="634.6"
53+
android:type="linear">
54+
<item android:offset="0" android:color="#FF58C0FF"/>
55+
<item android:offset="0.1" android:color="#FF4CBCFF"/>
56+
<item android:offset="0.7" android:color="#FF15A8FF"/>
57+
<item android:offset="1" android:color="#FF00A0FF"/>
58+
</gradient>
59+
</aapt:attr>
60+
</path>
61+
<path
62+
android:pathData="M453.3,613.6H495.3C495.3,541.9 467,473.1 416.6,422.1C366.2,371.1 297.7,342.1 226,341.3C223.9,355.1 222.9,369.2 222.9,383.2C222.9,413.5 228.8,443.5 240.4,471.4C252,499.4 268.9,524.8 290.3,546.2C311.7,567.6 337.2,584.6 365.1,596.1C393.1,607.7 423,613.6 453.3,613.6Z"
63+
android:fillColor="#00B8FF"/>
64+
<path
65+
android:pathData="M495.9,341.2V613.6H768.3C768.2,541.4 739.5,472.1 688.5,421C637.4,369.9 568.1,341.2 495.9,341.2Z">
66+
<aapt:attr name="android:fillColor">
67+
<gradient
68+
android:startX="495.9"
69+
android:startY="477.4"
70+
android:endX="768.3"
71+
android:endY="477.4"
72+
android:type="linear">
73+
<item android:offset="0" android:color="#FF0090FF"/>
74+
<item android:offset="0.3" android:color="#FF0073FF"/>
75+
<item android:offset="0.7" android:color="#FF5F98FD"/>
76+
<item android:offset="1" android:color="#FF80ADFF"/>
77+
</gradient>
78+
</aapt:attr>
79+
</path>
80+
</group>
81+
</group>
82+
</vector>

β€Žapp/src/dev/res/mipmap-anydpi-v26/ic_launcher.xmlβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
</adaptive-icon>

β€Žapp/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xmlβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_launcher_background"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
</adaptive-icon>

β€Žapp/src/dev/res/mipmap-hdpi/ic_launcher.webpβ€Ž

1.09 KB
Loading

β€Žapp/src/dev/res/mipmap-hdpi/ic_launcher_round.webpβ€Ž

2.42 KB
Loading

β€Žapp/src/dev/res/mipmap-mdpi/ic_launcher.webpβ€Ž

906 Bytes
Loading

0 commit comments

Comments
Β (0)