From 70e63a23bc1af88112181554238c125003d0ecf5 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 3 Jul 2023 20:12:23 +0930
Subject: [PATCH] Fix indicator colors
---
.../org/thoughtcrime/securesms/ui/Colors.kt | 19 ++++++++++++++++++-
.../thoughtcrime/securesms/ui/Components.kt | 6 +++++-
app/src/main/res/drawable/ic_expand.xml | 5 +++++
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_expand.xml
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Colors.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Colors.kt
index 0ea7e07141..dedff26cd5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Colors.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Colors.kt
@@ -6,8 +6,25 @@ import androidx.compose.ui.graphics.Color
val colorDestructive = Color(0xffFF453A)
+val classicDark0 = Color(0xff111111)
+
+val classicDark1 = Color(0xff1B1B1B)
+val classicDark2 = Color(0xff2D2D2D)
+val classicDark3 = Color(0xff414141)
+val classicDark4 = Color(0xff767676)
+val classicDark5 = Color(0xffA1A2A1)
+val classicDark6 = Color(0xffFFFFFF)
+
+val classicLight0 = Color(0xff000000)
+val classicLight1 = Color(0xff6D6D6D)
+val classicLight2 = Color(0xffA1A2A1)
+val classicLight3 = Color(0xffDFDFDF)
+val classicLight4 = Color(0xffF0F0F0)
+val classicLight5 = Color(0xffF9F9F9)
+val classicLight6 = Color(0xffFFFFFF)
+
@Composable
fun transparentButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent)
@Composable
-fun destructiveButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent, contentColor = colorDestructive)
\ No newline at end of file
+fun destructiveButtonColors() = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent, contentColor = colorDestructive)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
index 1819b9a318..a8848adbd1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt
@@ -97,7 +97,11 @@ fun SessionHorizontalPagerIndicator(modifier: Modifier, pagerState: PagerState,
.padding(8.dp)
.then(modifier)) {
Box(modifier = Modifier.padding(8.dp)) {
- HorizontalPagerIndicator(pagerState = pagerState, pageCount = pageCount)
+ HorizontalPagerIndicator(
+ pagerState = pagerState,
+ pageCount = pageCount,
+ activeColor = Color.White,
+ inactiveColor = classicDark5)
}
}
}
diff --git a/app/src/main/res/drawable/ic_expand.xml b/app/src/main/res/drawable/ic_expand.xml
new file mode 100644
index 0000000000..3b2b816a45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_expand.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="27dp"
+ android:viewportHeight="27" android:viewportWidth="26"
+ android:width="26dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="#ffffff" android:pathData="M7.38,12.265C7.792,12.265 8.093,11.962 8.093,11.55V11.079L7.957,9.008L9.494,10.629L11.394,12.542C11.528,12.682 11.703,12.746 11.893,12.746C12.336,12.746 12.654,12.448 12.654,12.009C12.654,11.807 12.58,11.627 12.441,11.489L10.533,9.588L8.911,8.052L10.995,8.188H11.497C11.909,8.188 12.217,7.892 12.217,7.476C12.217,7.058 11.915,6.758 11.497,6.758H7.849C7.097,6.758 6.662,7.193 6.662,7.944V11.55C6.662,11.957 6.969,12.265 7.38,12.265ZM14.497,19.444H18.146C18.897,19.444 19.338,19.009 19.338,18.257V14.65C19.338,14.245 19.031,13.937 18.614,13.937C18.208,13.937 17.901,14.24 17.901,14.65V15.123L18.043,17.193L16.5,15.572L14.605,13.66C14.472,13.52 14.291,13.456 14.101,13.456C13.664,13.456 13.34,13.754 13.34,14.191C13.34,14.394 13.42,14.574 13.559,14.712L15.461,16.613L17.089,18.149L15.005,18.013H14.497C14.086,18.013 13.777,18.309 13.777,18.726C13.777,19.144 14.086,19.444 14.497,19.444Z"/>
+</vector>