Skip to content

Commit d8e5d7b

Browse files
committed
Update theme and colors (+ rotate icon vector)
1 parent be5605c commit d8e5d7b

File tree

18 files changed

+43
-40
lines changed

18 files changed

+43
-40
lines changed
-1.25 KB
Loading

app/src/main/java/net/opatry/adoptacat/ui/theme/Color.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ package net.opatry.adoptacat.ui.theme
2323

2424
import androidx.compose.ui.graphics.Color
2525

26-
val purple200 = Color(0xFFBB86FC)
27-
val purple500 = Color(0xFF6200EE)
28-
val purple700 = Color(0xFF3700B3)
29-
val teal200 = Color(0xFF03DAC5)
26+
// colors from https://coolors.co/993955-ae76a6-a3c3d9-ccd6eb-e9ecf5
27+
val quinacridoneMagenta = Color(0xff993955)
28+
val pearlyPurple = Color(0xffae76a6)
29+
val paleCerulean = Color(0xffa3c3d9)
30+
val lightPeriwinkle = Color(0xffccd6eb)
31+
val ghostWhite = Color(0xffe9ecf5)

app/src/main/java/net/opatry/adoptacat/ui/theme/Theme.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ import androidx.compose.material.lightColors
2828
import androidx.compose.runtime.Composable
2929

3030
private val DarkColorPalette = darkColors(
31-
primary = purple200,
32-
primaryVariant = purple700,
33-
secondary = teal200
31+
primary = pearlyPurple,
32+
primaryVariant = pearlyPurple,
33+
secondary = lightPeriwinkle,
3434
)
3535

3636
private val LightColorPalette = lightColors(
37-
primary = purple500,
38-
primaryVariant = purple700,
39-
secondary = teal200
37+
primary = quinacridoneMagenta,
38+
primaryVariant = quinacridoneMagenta,
39+
secondary = paleCerulean,
4040

4141
/* Other default colors to override
4242
background = Color.White,

app/src/main/res/drawable/ic_launcher_foreground.xml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,25 @@
2424
android:width="108dp"
2525
android:height="108dp"
2626
android:viewportWidth="108"
27-
android:viewportHeight="108"
28-
android:tint="#000000">
29-
<group android:scaleX="2.06712"
30-
android:scaleY="2.06712"
31-
android:translateX="29.19456"
32-
android:translateY="28.27584">
27+
android:viewportHeight="108">
28+
<group android:scaleX="2.0633683"
29+
android:scaleY="2.0633683"
30+
android:translateX="31.302948"
31+
android:translateY="27.17621">
3332
<path
34-
android:fillColor="@android:color/white"
35-
android:pathData="M4.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
33+
android:fillColor="#FF000000"
34+
android:pathData="M8.4645,4.9289m-1.7678,-1.7678a2.5,2.5 110.3697,1 1,3.5355 3.5355a2.5,2.5 110.3697,1 1,-3.5355 -3.5355"/>
3635
<path
37-
android:fillColor="@android:color/white"
38-
android:pathData="M9,5.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
36+
android:fillColor="#FF000000"
37+
android:pathData="M14.4749,5.2825m-1.7678,-1.7678a2.5,2.5 0,1 1,3.5355 3.5355a2.5,2.5 0,1 1,-3.5355 -3.5355"/>
3938
<path
40-
android:fillColor="@android:color/white"
41-
android:pathData="M15,5.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
39+
android:fillColor="#FF000000"
40+
android:pathData="M18.7175,9.5251m-1.7678,-1.7678a2.5,2.5 0,1 1,3.5355 3.5355a2.5,2.5 0,1 1,-3.5355 -3.5355"/>
4241
<path
43-
android:fillColor="@android:color/white"
44-
android:pathData="M19.5,9.5m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
42+
android:fillColor="#FF000000"
43+
android:pathData="M19.0711,15.5355m-1.7678,-1.7678a2.5,2.5 105.0456,1 1,3.5355 3.5355a2.5,2.5 105.0456,1 1,-3.5355 -3.5355"/>
4544
<path
46-
android:fillColor="@android:color/white"
47-
android:pathData="M17.34,14.86c-0.87,-1.02 -1.6,-1.89 -2.48,-2.91 -0.46,-0.54 -1.05,-1.08 -1.75,-1.32 -0.11,-0.04 -0.22,-0.07 -0.33,-0.09 -0.25,-0.04 -0.52,-0.04 -0.78,-0.04s-0.53,0 -0.79,0.05c-0.11,0.02 -0.22,0.05 -0.33,0.09 -0.7,0.24 -1.28,0.78 -1.75,1.32 -0.87,1.02 -1.6,1.89 -2.48,2.91 -1.31,1.31 -2.92,2.76 -2.62,4.79 0.29,1.02 1.02,2.03 2.33,2.32 0.73,0.15 3.06,-0.44 5.54,-0.44h0.18c2.48,0 4.81,0.58 5.54,0.44 1.31,-0.29 2.04,-1.31 2.33,-2.32 0.31,-2.04 -1.3,-3.49 -2.61,-4.8z"/>
45+
android:fillColor="#FF000000"
46+
android:pathData="M13.7536,17.7983c0.1061,-1.3364 0.2051,-2.4678 0.3041,-3.8113 0.0566,-0.7071 0.0212,-1.5061 -0.3041,-2.1708 -0.0495,-0.1061 -0.1061,-0.2051 -0.1697,-0.297 -0.1485,-0.2051 -0.3394,-0.396 -0.5233,-0.5798s-0.3748,-0.3748 -0.594,-0.5233c-0.0919,-0.0636 -0.1909,-0.1202 -0.297,-0.1697 -0.6647,-0.3253 -1.4566,-0.3536 -2.1708,-0.3041 -1.3364,0.1061 -2.4678,0.2051 -3.8113,0.3041 -1.8526,0 -4.0164,-0.1131 -5.2397,1.5344 -0.5162,0.9263 -0.7142,2.1567 0.0071,3.288 0.4101,0.6223 2.4749,1.8526 4.2285,3.6062l0.1273,0.1273c1.7536,1.7536 2.9911,3.8113 3.6062,4.2285 1.1314,0.7212 2.3688,0.5162 3.288,0.0071 1.6617,-1.2233 1.5486,-3.387 1.5486,-5.2397z"/>
4847
</group>
4948
</vector>
-133 Bytes
Loading
-133 Bytes
Loading
-65 Bytes
Loading
-130 Bytes
Loading
-29 Bytes
Loading
-230 Bytes
Loading

0 commit comments

Comments
 (0)