From 907f2cd6293364e2f9a7d67975fb26114f0c8903 Mon Sep 17 00:00:00 2001 From: Minecon724 Date: Mon, 5 Aug 2024 14:19:27 +0200 Subject: [PATCH] remove useless files --- .../dashboard/loading/LoadingActivity.kt | 2 +- .../dashboard/loading/ui/theme/Color.kt | 11 ---- .../dashboard/loading/ui/theme/Theme.kt | 58 ------------------- .../dashboard/loading/ui/theme/Type.kt | 34 ----------- .../activity/termux/TermuxSshActivity.kt | 2 +- .../vastapp/activity/termux/ui/theme/Color.kt | 11 ---- .../vastapp/activity/termux/ui/theme/Theme.kt | 58 ------------------- .../vastapp/activity/termux/ui/theme/Type.kt | 34 ----------- 8 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Color.kt delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Theme.kt delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Type.kt delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Color.kt delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Theme.kt delete mode 100644 app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Type.kt diff --git a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/LoadingActivity.kt b/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/LoadingActivity.kt index 7f0f942..915e754 100644 --- a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/LoadingActivity.kt +++ b/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/LoadingActivity.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import eu.m724.vastapp.R import eu.m724.vastapp.activity.dashboard.DashboardActivity -import eu.m724.vastapp.activity.dashboard.loading.ui.theme.VastappTheme import eu.m724.vastapp.activity.login.LoginActivity +import eu.m724.vastapp.ui.theme.VastappTheme class LoadingActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Color.kt b/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Color.kt deleted file mode 100644 index b383a21..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Color.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.m724.vastapp.activity.dashboard.loading.ui.theme - -import androidx.compose.ui.graphics.Color - -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) - -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Theme.kt b/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Theme.kt deleted file mode 100644 index 10e5b06..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Theme.kt +++ /dev/null @@ -1,58 +0,0 @@ -package eu.m724.vastapp.activity.dashboard.loading.ui.theme - -import android.app.Activity -import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext - -private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 -) - -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ -) - -@Composable -fun VastappTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, - content: @Composable () -> Unit -) { - val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } - - darkTheme -> DarkColorScheme - else -> LightColorScheme - } - - MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content - ) -} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Type.kt b/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Type.kt deleted file mode 100644 index 09e2472..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/dashboard/loading/ui/theme/Type.kt +++ /dev/null @@ -1,34 +0,0 @@ -package eu.m724.vastapp.activity.dashboard.loading.ui.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp - -// Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ -) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/activity/termux/TermuxSshActivity.kt b/app/src/main/java/eu/m724/vastapp/activity/termux/TermuxSshActivity.kt index afea701..40a9b4c 100644 --- a/app/src/main/java/eu/m724/vastapp/activity/termux/TermuxSshActivity.kt +++ b/app/src/main/java/eu/m724/vastapp/activity/termux/TermuxSshActivity.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import eu.m724.vastapp.R import eu.m724.vastapp.activity.Opener -import eu.m724.vastapp.activity.termux.ui.theme.VastappTheme +import eu.m724.vastapp.ui.theme.VastappTheme class TermuxSshActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Color.kt b/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Color.kt deleted file mode 100644 index 881a269..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Color.kt +++ /dev/null @@ -1,11 +0,0 @@ -package eu.m724.vastapp.activity.termux.ui.theme - -import androidx.compose.ui.graphics.Color - -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) - -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Theme.kt b/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Theme.kt deleted file mode 100644 index 6aebeb8..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Theme.kt +++ /dev/null @@ -1,58 +0,0 @@ -package eu.m724.vastapp.activity.termux.ui.theme - -import android.app.Activity -import android.os.Build -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.darkColorScheme -import androidx.compose.material3.dynamicDarkColorScheme -import androidx.compose.material3.dynamicLightColorScheme -import androidx.compose.material3.lightColorScheme -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext - -private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 -) - -private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ -) - -@Composable -fun VastappTheme( - darkTheme: Boolean = isSystemInDarkTheme(), - // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, - content: @Composable () -> Unit -) { - val colorScheme = when { - dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { - val context = LocalContext.current - if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) - } - - darkTheme -> DarkColorScheme - else -> LightColorScheme - } - - MaterialTheme( - colorScheme = colorScheme, - typography = Typography, - content = content - ) -} \ No newline at end of file diff --git a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Type.kt b/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Type.kt deleted file mode 100644 index 14b5a46..0000000 --- a/app/src/main/java/eu/m724/vastapp/activity/termux/ui/theme/Type.kt +++ /dev/null @@ -1,34 +0,0 @@ -package eu.m724.vastapp.activity.termux.ui.theme - -import androidx.compose.material3.Typography -import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.unit.sp - -// Set of Material typography styles to start with -val Typography = Typography( - bodyLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp - ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp - ) - */ -) \ No newline at end of file