Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/AndroidProjectSystem.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions .idea/appInsightsSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 40 additions & 4 deletions app/src/main/java/com/texthip/thip/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
Expand All @@ -12,6 +13,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.texthip.thip.ui.theme.ThipTheme
import com.texthip.thip.ui.theme.ThipTheme.colors
import com.texthip.thip.ui.theme.ThipTheme.typography

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -32,10 +35,43 @@ class MainActivity : ComponentActivity() {

@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = "Hello $name!",
modifier = modifier
)
Column {
Text(
text = "Hello $name!",
modifier = modifier,
style = typography.bigtitle_b700_s22_h24,
color = colors.Purple,
)

Text(
text = "Hello $name!",
modifier = modifier,
style = typography.smalltitle_sb600_s16_h20,
color = colors.NeonGreen,
)

Text(
text = "Hello $name!",
modifier = modifier,
style = typography.menu_sb600_s12,
color = colors.Red,
)

Text(
text = "Hello $name!",
modifier = modifier,
style = typography.navi_m500_s10,
color = colors.DarkGrey,
)

Text(
text = "Hello $name!",
modifier = modifier,
style = typography.view_r400_s11_h20,
color = colors.Black,
)
}

}

@Preview(showBackground = true)
Expand Down
81 changes: 75 additions & 6 deletions app/src/main/java/com/texthip/thip/ui/theme/Color.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,80 @@
package com.texthip.thip.ui.theme

import androidx.compose.runtime.Immutable
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color

val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
val Purple = Color(0xFF6868FF)
val PurpleSub = Color(0xFFA1A1FF)
val PurpleDark = Color(0xFF414194)

val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
val NeonGreen = Color(0xFFA7FFB4)
val NeonGreen50 = Color(0x80A7FFB4)

val Red = Color(0xFFFF9496)

val PureWhite = Color(0xFFFFFFFF)
val White = Color(0xFFFEFEFE)

val Grey50 = Color(0x80C4C4C4)
val Grey = Color(0xFFDADADA)
val Grey01 = Color(0xFFADADAD)
val Grey02 = Color(0xFF888888)
val Grey03 = Color(0xFF525252)
val DarkGrey = Color(0xFF3D3D3D)
val DarkGrey50 = Color(0x803D3D3D)
val DarkGrey02 = Color(0xFF282828)

val Black = Color(0xFF121212)
val Black50 = Color(0x80121212)
val Black10 = Color(0x1A121212)
val Black00 = Color(0x00121212)

@Immutable
data class ThipColors(
val Purple: Color,
val PurpleSub: Color,
val PurpleDark: Color,
val NeonGreen: Color,
val NeonGreen50: Color,
val Red: Color,
val PureWhite: Color,
val White: Color,
val Grey50: Color,
val Grey: Color,
val Grey01: Color,
val Grey02: Color,
val Grey03: Color,
val DarkGrey: Color,
val DarkGrey50: Color,
val DarkGrey02: Color,
val Black: Color,
val Black50: Color,
val Black10: Color,
val Black00: Color,
)

val defaultThipColors = ThipColors(
Purple = Purple,
PurpleSub = PurpleSub,
PurpleDark = PurpleDark,
NeonGreen = NeonGreen,
NeonGreen50 = NeonGreen50,
Red = Red,
PureWhite = PureWhite,
White = White,
Grey50 = Grey50,
Grey = Grey,
Grey01 = Grey01,
Grey02 = Grey02,
Grey03 = Grey03,
DarkGrey = DarkGrey,
DarkGrey50 = DarkGrey50,
DarkGrey02 = DarkGrey02,
Black = Black,
Black50 = Black50,
Black10 = Black10,
Black00 = Black00
)

val LocalThipColorsProvider = staticCompositionLocalOf { defaultThipColors }
Loading