Commit e2d8540a authored by 江佳臻's avatar 江佳臻
Browse files

icon color

parent 89af8bfa
No related merge requests found
Showing with 19 additions and 6 deletions
+19 -6
......@@ -46,6 +46,10 @@
<entry key="../../../../layout/compose-model-1654502489806.xml" value="0.33" />
<entry key="../../../../layout/compose-model-1654761221588.xml" value="0.30930930930930933" />
<entry key="..\:/Users/User/software_lab/project/pancreascat/app/src/main/res/drawable/skin_02_conan.xml" value="0.1" />
<entry key="..\:/software_studio/project/pancreascat/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1735" />
<entry key="..\:/software_studio/project/pancreascat/app/src/main/res/drawable/icon_filled_lock.xml" value="0.1735" />
<entry key="..\:/software_studio/project/pancreascat/app/src/main/res/drawable/icon_filled_school.xml" value="0.1" />
<entry key="..\:/software_studio/project/pancreascat/app/src/main/res/drawable/icon_filled_trophy.xml" value="0.1" />
<entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1165" />
<entry key="app/src/main/res/drawable/icon_filled_edit.xml" value="0.1" />
<entry key="app/src/main/res/drawable/icon_filled_home.xml" value="0.1485" />
......
......@@ -24,6 +24,8 @@ import com.example.pancreascat.data.Achievement
import com.example.pancreascat.data.AchievementData
import com.example.pancreascat.data.SkinData
import com.example.pancreascat.ui.theme.PancreasCatTheme
import com.example.pancreascat.ui.theme.yellow
import com.example.pancreascat.ui.theme.brown
@Composable
fun AchievementScreen(navController: NavController, modifier: Modifier = Modifier) {
......@@ -55,6 +57,7 @@ fun AchievementEntry(achievement: Achievement, unlocked: Boolean) {
) {
Icon(
imageVector = ImageVector.vectorResource(icon),
tint = if (unlocked) brown else yellow,
contentDescription = null
)
Spacer(modifier = Modifier.padding(horizontal = 4.dp))
......
......@@ -12,4 +12,6 @@ val taupe100 = Color(0xFFF0EAE2)
val taupe800 = Color(0xFF655454)
val rust300 = Color(0xFFE1AFAF)
val rust600 = Color(0xFF886363)
val gray900 = Color(0xFF333333)
\ No newline at end of file
val gray900 = Color(0xFF333333)
val yellow = Color(0xFFB58867)
val brown = Color(0xFFFDCB4B)
\ No newline at end of file
<vector android:height="24dp" android:tint="#000000"
<vector android:height="24dp" android:tint="#B58867"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
<path
android:fillColor="#B58867"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>
<vector android:height="24dp" android:tint="#000000"
<vector android:height="24dp" android:tint="#FDCB4B"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19,5h-2V3H7v2H5C3.9,5 3,5.9 3,7v1c0,2.55 1.92,4.63 4.39,4.94c0.63,1.5 1.98,2.63 3.61,2.96V19H7v2h10v-2h-4v-3.1c1.63,-0.33 2.98,-1.46 3.61,-2.96C19.08,12.63 21,10.55 21,8V7C21,5.9 20.1,5 19,5zM5,8V7h2v3.82C5.84,10.4 5,9.3 5,8zM19,8c0,1.3 -0.84,2.4 -2,2.82V7h2V8z"/>
<path
android:fillColor="#FDCB4B"
android:pathData="M19,5h-2V3H7v2H5C3.9,5 3,5.9 3,7v1c0,2.55 1.92,4.63 4.39,4.94c0.63,1.5 1.98,2.63 3.61,2.96V19H7v2h10v-2h-4v-3.1c1.63,-0.33 2.98,-1.46 3.61,-2.96C19.08,12.63 21,10.55 21,8V7C21,5.9 20.1,5 19,5zM5,8V7h2v3.82C5.84,10.4 5,9.3 5,8zM19,8c0,1.3 -0.84,2.4 -2,2.82V7h2V8z"/>
</vector>
......@@ -2,6 +2,6 @@
<resources>
<style name="Theme.PancreasCat" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:statusBarColor">@color/purple_700</item>
<item name="android:statusBarColor">#FFB07449</item>
</style>
</resources>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment