[Refactor] Remove unused custom color scheme and typography.

zhanghai · Dec 30, 2023 · 05262bc · 05262bc
1 parent 54a0fd9
commit 05262bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 104 deletions.
diff --git a/app/src/main/java/me/zhanghai/android/untracker/ui/theme/ColorScheme.kt b/app/src/main/java/me/zhanghai/android/untracker/ui/theme/ColorScheme.kt
diff --git a/app/src/main/java/me/zhanghai/android/untracker/ui/theme/Theme.kt b/app/src/main/java/me/zhanghai/android/untracker/ui/theme/Theme.kt
@@ -21,8 +21,10 @@ import android.graphics.drawable.ColorDrawable
 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.runtime.SideEffect
 import androidx.compose.ui.graphics.Color
@@ -44,8 +46,8 @@ fun UntrackerTheme(
  dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
  if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
  }
- darkTheme -> DarkColorScheme
- else -> LightColorScheme
+ darkTheme -> darkColorScheme()
+ else -> lightColorScheme()
  }
 
  val view = LocalView.current
@@ -79,5 +81,5 @@ fun UntrackerTheme(
  }
  }
 
- MaterialTheme(colorScheme = colorScheme, typography = Typography, content = content)
+ MaterialTheme(colorScheme = colorScheme, content = content)
 }
diff --git a/app/src/main/java/me/zhanghai/android/untracker/ui/theme/Typography.kt b/app/src/main/java/me/zhanghai/android/untracker/ui/theme/Typography.kt