implement main client
This commit is contained in:
3
.idea/misc.xml
generated
3
.idea/misc.xml
generated
@@ -1,6 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -2,10 +2,23 @@ package net.rodakot.posthub.ui.theme
|
|||||||
|
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
|
||||||
val Purple80 = Color(0xFFD0BCFF)
|
val PostHubPrimary = Color(0xFF006B5B)
|
||||||
val PurpleGrey80 = Color(0xFFCCC2DC)
|
val PostHubOnPrimary = Color(0xFFFFFFFF)
|
||||||
val Pink80 = Color(0xFFEFB8C8)
|
val PostHubSecondary = Color(0xFFD84B35)
|
||||||
|
val PostHubTertiary = Color(0xFFC47A12)
|
||||||
|
val PostHubBackground = Color(0xFFF5F7F4)
|
||||||
|
val PostHubSurface = Color(0xFFFFFFFF)
|
||||||
|
val PostHubSurfaceVariant = Color(0xFFE9EFEA)
|
||||||
|
val PostHubOutline = Color(0xFFD5DED8)
|
||||||
|
val PostHubOnSurface = Color(0xFF17201C)
|
||||||
|
val PostHubOnSurfaceVariant = Color(0xFF66736D)
|
||||||
|
|
||||||
val Purple40 = Color(0xFF6650a4)
|
val PostHubDarkPrimary = Color(0xFF5FE0C5)
|
||||||
val PurpleGrey40 = Color(0xFF625b71)
|
val PostHubDarkSecondary = Color(0xFFFF9A83)
|
||||||
val Pink40 = Color(0xFF7D5260)
|
val PostHubDarkTertiary = Color(0xFFE8B660)
|
||||||
|
val PostHubDarkBackground = Color(0xFF101715)
|
||||||
|
val PostHubDarkSurface = Color(0xFF18211E)
|
||||||
|
val PostHubDarkSurfaceVariant = Color(0xFF24302B)
|
||||||
|
val PostHubDarkOutline = Color(0xFF3C4943)
|
||||||
|
val PostHubDarkOnSurface = Color(0xFFEAF3EF)
|
||||||
|
val PostHubDarkOnSurfaceVariant = Color(0xFFB8C6BF)
|
||||||
|
|||||||
@@ -12,32 +12,38 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
|
||||||
private val DarkColorScheme = darkColorScheme(
|
private val DarkColorScheme = darkColorScheme(
|
||||||
primary = Purple80,
|
primary = PostHubDarkPrimary,
|
||||||
secondary = PurpleGrey80,
|
onPrimary = PostHubDarkBackground,
|
||||||
tertiary = Pink80
|
secondary = PostHubDarkSecondary,
|
||||||
|
tertiary = PostHubDarkTertiary,
|
||||||
|
background = PostHubDarkBackground,
|
||||||
|
surface = PostHubDarkSurface,
|
||||||
|
surfaceVariant = PostHubDarkSurfaceVariant,
|
||||||
|
outline = PostHubDarkOutline,
|
||||||
|
onBackground = PostHubDarkOnSurface,
|
||||||
|
onSurface = PostHubDarkOnSurface,
|
||||||
|
onSurfaceVariant = PostHubDarkOnSurfaceVariant
|
||||||
)
|
)
|
||||||
|
|
||||||
private val LightColorScheme = lightColorScheme(
|
private val LightColorScheme = lightColorScheme(
|
||||||
primary = Purple40,
|
primary = PostHubPrimary,
|
||||||
secondary = PurpleGrey40,
|
onPrimary = PostHubOnPrimary,
|
||||||
tertiary = Pink40
|
secondary = PostHubSecondary,
|
||||||
|
tertiary = PostHubTertiary,
|
||||||
/* Other default colors to override
|
background = PostHubBackground,
|
||||||
background = Color(0xFFFFFBFE),
|
surface = PostHubSurface,
|
||||||
surface = Color(0xFFFFFBFE),
|
surfaceVariant = PostHubSurfaceVariant,
|
||||||
onPrimary = Color.White,
|
outline = PostHubOutline,
|
||||||
onSecondary = Color.White,
|
onBackground = PostHubOnSurface,
|
||||||
onTertiary = Color.White,
|
onSurface = PostHubOnSurface,
|
||||||
onBackground = Color(0xFF1C1B1F),
|
onSurfaceVariant = PostHubOnSurfaceVariant
|
||||||
onSurface = Color(0xFF1C1B1F),
|
|
||||||
*/
|
|
||||||
)
|
)
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun PostHUBTheme(
|
fun PostHUBTheme(
|
||||||
darkTheme: Boolean = isSystemInDarkTheme(),
|
darkTheme: Boolean = isSystemInDarkTheme(),
|
||||||
// Dynamic color is available on Android 12+
|
// Dynamic color is available on Android 12+
|
||||||
dynamicColor: Boolean = true,
|
dynamicColor: Boolean = false,
|
||||||
content: @Composable () -> Unit
|
content: @Composable () -> Unit
|
||||||
) {
|
) {
|
||||||
val colorScheme = when {
|
val colorScheme = when {
|
||||||
|
|||||||
@@ -6,29 +6,61 @@ import androidx.compose.ui.text.font.FontFamily
|
|||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.unit.sp
|
import androidx.compose.ui.unit.sp
|
||||||
|
|
||||||
// Set of Material typography styles to start with
|
|
||||||
val Typography = Typography(
|
val Typography = Typography(
|
||||||
bodyLarge = TextStyle(
|
bodyLarge = TextStyle(
|
||||||
fontFamily = FontFamily.Default,
|
fontFamily = FontFamily.Default,
|
||||||
fontWeight = FontWeight.Normal,
|
fontWeight = FontWeight.Normal,
|
||||||
fontSize = 16.sp,
|
fontSize = 16.sp,
|
||||||
lineHeight = 24.sp,
|
lineHeight = 24.sp,
|
||||||
letterSpacing = 0.5.sp
|
letterSpacing = 0.sp
|
||||||
)
|
),
|
||||||
/* Other default text styles to override
|
|
||||||
titleLarge = TextStyle(
|
titleLarge = TextStyle(
|
||||||
|
fontFamily = FontFamily.Default,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 24.sp,
|
||||||
|
lineHeight = 30.sp,
|
||||||
|
letterSpacing = 0.sp
|
||||||
|
),
|
||||||
|
titleMedium = TextStyle(
|
||||||
|
fontFamily = FontFamily.Default,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 18.sp,
|
||||||
|
lineHeight = 24.sp,
|
||||||
|
letterSpacing = 0.sp
|
||||||
|
),
|
||||||
|
bodyMedium = TextStyle(
|
||||||
fontFamily = FontFamily.Default,
|
fontFamily = FontFamily.Default,
|
||||||
fontWeight = FontWeight.Normal,
|
fontWeight = FontWeight.Normal,
|
||||||
fontSize = 22.sp,
|
fontSize = 14.sp,
|
||||||
lineHeight = 28.sp,
|
lineHeight = 20.sp,
|
||||||
|
letterSpacing = 0.sp
|
||||||
|
),
|
||||||
|
bodySmall = TextStyle(
|
||||||
|
fontFamily = FontFamily.Default,
|
||||||
|
fontWeight = FontWeight.Normal,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
lineHeight = 16.sp,
|
||||||
|
letterSpacing = 0.sp
|
||||||
|
),
|
||||||
|
labelLarge = TextStyle(
|
||||||
|
fontFamily = FontFamily.Default,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 14.sp,
|
||||||
|
lineHeight = 18.sp,
|
||||||
|
letterSpacing = 0.sp
|
||||||
|
),
|
||||||
|
labelMedium = TextStyle(
|
||||||
|
fontFamily = FontFamily.Default,
|
||||||
|
fontWeight = FontWeight.Bold,
|
||||||
|
fontSize = 12.sp,
|
||||||
|
lineHeight = 16.sp,
|
||||||
letterSpacing = 0.sp
|
letterSpacing = 0.sp
|
||||||
),
|
),
|
||||||
labelSmall = TextStyle(
|
labelSmall = TextStyle(
|
||||||
fontFamily = FontFamily.Default,
|
fontFamily = FontFamily.Default,
|
||||||
fontWeight = FontWeight.Medium,
|
fontWeight = FontWeight.Medium,
|
||||||
fontSize = 11.sp,
|
fontSize = 11.sp,
|
||||||
lineHeight = 16.sp,
|
lineHeight = 14.sp,
|
||||||
letterSpacing = 0.5.sp
|
letterSpacing = 0.sp
|
||||||
)
|
)
|
||||||
*/
|
|
||||||
)
|
)
|
||||||
Reference in New Issue
Block a user