From 0db1599cf76daddef43fe6c8a2c08a6a5f9e23e8 Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Mon, 24 Oct 2022 11:40:29 +0200 Subject: [PATCH] Remove unnecessary comments from template and stray semicolon --- .../main/java/dev/lonami/talaria/MainActivity.kt | 1 - .../dev/lonami/talaria/data/DialogRepository.kt | 2 +- .../main/java/dev/lonami/talaria/ui/theme/Theme.kt | 9 --------- .../main/java/dev/lonami/talaria/ui/theme/Type.kt | 13 ------------- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/app/src/main/java/dev/lonami/talaria/MainActivity.kt b/app/src/main/java/dev/lonami/talaria/MainActivity.kt index c17146c..ff1df47 100644 --- a/app/src/main/java/dev/lonami/talaria/MainActivity.kt +++ b/app/src/main/java/dev/lonami/talaria/MainActivity.kt @@ -15,7 +15,6 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { TalariaTheme { - // A surface container using the 'background' color from the theme Surface( modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background diff --git a/app/src/main/java/dev/lonami/talaria/data/DialogRepository.kt b/app/src/main/java/dev/lonami/talaria/data/DialogRepository.kt index 01cee71..791f8b6 100644 --- a/app/src/main/java/dev/lonami/talaria/data/DialogRepository.kt +++ b/app/src/main/java/dev/lonami/talaria/data/DialogRepository.kt @@ -8,7 +8,7 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter interface DialogRepository { - fun loadDialogs(): List; + fun loadDialogs(): List } class NativeDialogRepository : DialogRepository { diff --git a/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt b/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt index 2223771..13d75f1 100644 --- a/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt +++ b/app/src/main/java/dev/lonami/talaria/ui/theme/Theme.kt @@ -16,15 +16,6 @@ private val LightColorPalette = lightColors( primary = Purple500, primaryVariant = Purple700, secondary = Teal200 - - /* Other default colors to override -background = Color.White, -surface = Color.White, -onPrimary = Color.White, -onSecondary = Color.Black, -onBackground = Color.Black, -onSurface = Color.Black, -*/ ) @Composable diff --git a/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt b/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt index 4ea971d..ca380ba 100644 --- a/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt +++ b/app/src/main/java/dev/lonami/talaria/ui/theme/Type.kt @@ -6,23 +6,10 @@ 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( body1 = TextStyle( fontFamily = FontFamily.Default, fontWeight = FontWeight.Normal, fontSize = 16.sp ) - /* Other default text styles to override -button = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.W500, - fontSize = 14.sp -), -caption = TextStyle( - fontFamily = FontFamily.Default, - fontWeight = FontWeight.Normal, - fontSize = 12.sp -) -*/ )