mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 16:57:50 +00:00
Use button color lists
This commit is contained in:
parent
27c59a8d7b
commit
8b79fd6850
@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.ui.color
|
|||||||
|
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
|
||||||
|
|
||||||
val classicDark0 = Color.Black
|
val classicDark0 = Color.Black
|
||||||
val classicDark1 = Color(0xff1B1B1B)
|
val classicDark1 = Color(0xff1B1B1B)
|
||||||
val classicDark2 = Color(0xff2D2D2D)
|
val classicDark2 = Color(0xff2D2D2D)
|
||||||
|
@ -38,13 +38,15 @@ interface Colors {
|
|||||||
val backgroundBubbleReceived: Color
|
val backgroundBubbleReceived: Color
|
||||||
val textBubbleReceived: Color
|
val textBubbleReceived: Color
|
||||||
val backgroundBubbleSent: Color get() = primary
|
val backgroundBubbleSent: Color get() = primary
|
||||||
|
val qrCodeContent: Color
|
||||||
|
val qrCodeBackground: Color
|
||||||
|
|
||||||
// buttonFill
|
// buttonFill
|
||||||
val buttonFill: Color
|
val buttonFill: Color get() = text
|
||||||
val buttonFillText: Color get() = background
|
val buttonFillText: Color get() = background
|
||||||
|
|
||||||
// primaryButtonFill
|
// primaryButtonFill
|
||||||
val primaryButtonFill: Color get() = if (isLight) buttonFill else primary
|
val primaryButtonFill: Color
|
||||||
val primaryButtonFillText: Color
|
val primaryButtonFillText: Color
|
||||||
|
|
||||||
// buttonOutline
|
// buttonOutline
|
||||||
@ -52,52 +54,42 @@ interface Colors {
|
|||||||
|
|
||||||
// primaryButtonOutline
|
// primaryButtonOutline
|
||||||
val primaryButtonOutline get() = primaryButtonFill
|
val primaryButtonOutline get() = primaryButtonFill
|
||||||
|
|
||||||
val qrCodeContent: Color
|
|
||||||
val qrCodeBackground: Color
|
|
||||||
}
|
}
|
||||||
|
|
||||||
data class ClassicDark(override val primary: Color = primaryGreen): Colors {
|
data class ClassicDark(override val primary: Color = primaryGreen): Colors {
|
||||||
override val isLight = false
|
override val isLight = false
|
||||||
override val danger = dangerDark
|
override val danger = dangerDark
|
||||||
override val disabled = disabledDark
|
override val disabled = disabledDark
|
||||||
override val background = Color.Black
|
override val background = classicDark0
|
||||||
override val backgroundSecondary = classicDark1
|
override val backgroundSecondary = classicDark1
|
||||||
override val text = Color.White
|
override val text = classicDark6
|
||||||
override val textSecondary = classicDark5
|
override val textSecondary = classicDark5
|
||||||
override val borders = classicDark3
|
override val borders = classicDark3
|
||||||
override val textBubbleSent = Color.Black
|
override val textBubbleSent = Color.Black
|
||||||
override val backgroundBubbleReceived = classicDark2
|
override val backgroundBubbleReceived = classicDark2
|
||||||
override val textBubbleReceived = Color.White
|
override val textBubbleReceived = Color.White
|
||||||
|
|
||||||
override val buttonFill = text
|
|
||||||
override val buttonFillText = text
|
|
||||||
override val primaryButtonFill = primary
|
|
||||||
override val primaryButtonFillText = Color.Black
|
|
||||||
|
|
||||||
override val qrCodeContent = background
|
override val qrCodeContent = background
|
||||||
override val qrCodeBackground = text
|
override val qrCodeBackground = text
|
||||||
|
override val primaryButtonFill = primary
|
||||||
|
override val primaryButtonFillText = Color.Black
|
||||||
}
|
}
|
||||||
|
|
||||||
data class ClassicLight(override val primary: Color = primaryGreen): Colors {
|
data class ClassicLight(override val primary: Color = primaryGreen): Colors {
|
||||||
override val isLight = true
|
override val isLight = true
|
||||||
override val danger = dangerLight
|
override val danger = dangerLight
|
||||||
override val disabled = disabledLight
|
override val disabled = disabledLight
|
||||||
override val background = Color.White
|
override val background = classicLight6
|
||||||
override val backgroundSecondary = classicLight5
|
override val backgroundSecondary = classicLight5
|
||||||
override val text = Color.Black
|
override val text = classicLight0
|
||||||
override val textSecondary = classicLight1
|
override val textSecondary = classicLight1
|
||||||
override val borders = classicLight3
|
override val borders = classicLight3
|
||||||
override val textBubbleSent = Color.Black
|
override val textBubbleSent = Color.Black
|
||||||
override val backgroundBubbleReceived = classicLight4
|
override val backgroundBubbleReceived = classicLight4
|
||||||
override val textBubbleReceived = classicLight4
|
override val textBubbleReceived = classicLight4
|
||||||
|
|
||||||
override val buttonFill = classicLight0
|
|
||||||
override val primaryButtonFill = classicLight0
|
|
||||||
override val primaryButtonFillText = Color.White
|
|
||||||
|
|
||||||
override val qrCodeContent = text
|
override val qrCodeContent = text
|
||||||
override val qrCodeBackground = backgroundSecondary
|
override val qrCodeBackground = backgroundSecondary
|
||||||
|
override val primaryButtonFill = text
|
||||||
|
override val primaryButtonFillText = Color.White
|
||||||
}
|
}
|
||||||
|
|
||||||
data class OceanDark(override val primary: Color = primaryBlue): Colors {
|
data class OceanDark(override val primary: Color = primaryBlue): Colors {
|
||||||
@ -106,19 +98,16 @@ data class OceanDark(override val primary: Color = primaryBlue): Colors {
|
|||||||
override val disabled = disabledDark
|
override val disabled = disabledDark
|
||||||
override val background = oceanDark2
|
override val background = oceanDark2
|
||||||
override val backgroundSecondary = oceanDark1
|
override val backgroundSecondary = oceanDark1
|
||||||
override val text = Color.White
|
override val text = oceanDark7
|
||||||
override val textSecondary = oceanDark5
|
override val textSecondary = oceanDark5
|
||||||
override val borders = oceanDark4
|
override val borders = oceanDark4
|
||||||
override val textBubbleSent = Color.Black
|
override val textBubbleSent = Color.Black
|
||||||
override val backgroundBubbleReceived = oceanDark4
|
override val backgroundBubbleReceived = oceanDark4
|
||||||
override val textBubbleReceived = oceanDark4
|
override val textBubbleReceived = oceanDark4
|
||||||
|
|
||||||
override val buttonFill = text
|
|
||||||
override val primaryButtonFill = primary
|
|
||||||
override val primaryButtonFillText = Color.Black
|
|
||||||
|
|
||||||
override val qrCodeContent = background
|
override val qrCodeContent = background
|
||||||
override val qrCodeBackground = text
|
override val qrCodeBackground = text
|
||||||
|
override val primaryButtonFill = primary
|
||||||
|
override val primaryButtonFillText = Color.Black
|
||||||
}
|
}
|
||||||
|
|
||||||
data class OceanLight(override val primary: Color = primaryBlue): Colors {
|
data class OceanLight(override val primary: Color = primaryBlue): Colors {
|
||||||
@ -133,13 +122,10 @@ data class OceanLight(override val primary: Color = primaryBlue): Colors {
|
|||||||
override val textBubbleSent = oceanLight1
|
override val textBubbleSent = oceanLight1
|
||||||
override val backgroundBubbleReceived = oceanLight4
|
override val backgroundBubbleReceived = oceanLight4
|
||||||
override val textBubbleReceived = oceanLight1
|
override val textBubbleReceived = oceanLight1
|
||||||
|
|
||||||
override val buttonFill = oceanLight1
|
|
||||||
override val primaryButtonFill = oceanLight1
|
|
||||||
override val primaryButtonFillText = Color.White
|
|
||||||
|
|
||||||
override val qrCodeContent = text
|
override val qrCodeContent = text
|
||||||
override val qrCodeBackground = backgroundSecondary
|
override val qrCodeBackground = backgroundSecondary
|
||||||
|
override val primaryButtonFill = text
|
||||||
|
override val primaryButtonFillText = Color.White
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
Loading…
x
Reference in New Issue
Block a user