commit 9d1450e8480bada97165d129a6a4de12cce4f5c6 Author: Owen LeJeune Date: Mon Sep 12 21:38:44 2022 -0400 initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..a9f4e52 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..cfc391f --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6199cc2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..058df90 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,129 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-android' +} + +def composeVersion = "1.2.0-beta03" + +android { + compileSdk 33 + + defaultConfig { + applicationId "com.owenlejeune.mydex" + minSdk 24 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary true + } + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + useIR = true + } + buildFeatures { + compose true + } + composeOptions { + kotlinCompilerExtensionVersion composeVersion + } + packagingOptions { + resources { + excludes += '/META-INF/{AL2.0,LGPL2.1}' + } + } +} + +dependencies { + // ktx + def ktx_core = "1.8.0" + def ktx_paging = "3.1.1" + implementation "androidx.core:core-ktx:$ktx_core" + implementation "androidx.paging:paging-common-ktx:$ktx_paging" + + // android x + def androidx = "1.0.0" + implementation "androidx.window:window:$androidx" + + // material + def material = "1.6.1" + implementation "com.google.android.material:material:$material" + + // compose + def compose = composeVersion + def compose_material3 = "1.0.0-alpha13" + def compose_accompanist = "0.24.10-beta" + def compose_navigation = "2.4.2" + def compose_paging = "1.0.0-alpha16" + def compose_constraint_layout = "1.0.1" + def compose_activity = "1.4.0" + implementation "androidx.compose.ui:ui:$compose" + implementation "androidx.compose.material3:material3:$compose_material3" + implementation "androidx.compose.material:material:$compose" + implementation "androidx.compose.material:material-icons-extended:$compose" + implementation "androidx.compose.ui:ui-tooling-preview:$compose" + implementation "androidx.activity:activity-compose:$compose_activity" + implementation "com.google.accompanist:accompanist-systemuicontroller:$compose_accompanist" +// implementation "com.google.accompanist:accompanist-pager:$compose_accompanist" +// implementation "com.google.accompanist:accompanist-pager-indicators:$compose_accompanist" +// implementation "com.google.accompanist:accompanist-flowlayout:$compose_accompanist" +// implementation "com.google.accompanist:accompanist-insets:$compose_accompanist" + implementation "androidx.navigation:navigation-compose:$compose_navigation" + implementation "androidx.paging:paging-compose:$compose_paging" +// implementation "androidx.constraintlayout:constraintlayout-compose:$compose_constraint_layout" + + // material you + def monet_compat = "0.4.1" + implementation "com.github.KieronQuinn:MonetCompat:$monet_compat" + + // lifecycle + def lifecycle_runtime = "2.4.1" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_runtime" + + // retrofit + def retrofit = "2.9.0" + def stetho = "1.6.0" + def gson = "2.9.0" + implementation "com.squareup.retrofit2:retrofit:$retrofit" + implementation "com.squareup.retrofit2:converter-gson:$retrofit" + implementation "com.google.code.gson:gson:$gson" + implementation "com.facebook.stetho:stetho:$stetho" + implementation "com.facebook.stetho:stetho-okhttp3:$stetho" + + // koin + def koin = "3.1.4" + implementation "io.insert-koin:koin-android:$koin" + + // coil + def coil = "2.0.0-rc01" + implementation "io.coil-kt:coil-compose:$coil" + + //Coroutines + def coroutines = "1.6.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines" + + // testing + def junit = "4.13.2" + def androidx_junit = "1.1.3" + def espresso_core = "3.4.0" + testImplementation "junit:junit:$junit" + androidTestImplementation "androidx.test.ext:junit:$androidx_junit" + androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_core" + androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose" + debugImplementation "androidx.compose.ui:ui-tooling:$compose" +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/owenlejeune/mydex/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/owenlejeune/mydex/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..23580d9 --- /dev/null +++ b/app/src/androidTest/java/com/owenlejeune/mydex/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.owenlejeune.mydex + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.owenlejeune.mydex", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8056f82 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/MYDexApplication.kt b/app/src/main/java/com/owenlejeune/mydex/MYDexApplication.kt new file mode 100644 index 0000000..bf9abdf --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/MYDexApplication.kt @@ -0,0 +1,45 @@ +package com.owenlejeune.mydex + +import android.app.Application +import com.facebook.stetho.Stetho +import com.kieronquinn.monetcompat.core.MonetCompat +import com.owenlejeune.mydex.di.preferencesModule +import com.owenlejeune.mydex.preferences.AppPreferences +import org.koin.android.ext.android.inject +import org.koin.android.ext.koin.androidContext +import org.koin.android.ext.koin.androidLogger +import org.koin.core.context.startKoin +import org.koin.core.logger.Level + +class MYDexApplication: Application() { + + private val preferences: AppPreferences by inject() + + override fun onCreate() { + super.onCreate() + + // start koin + startKoin { + androidLogger( + if (BuildConfig.DEBUG) Level.ERROR else Level.NONE + ) + androidContext(this@MYDexApplication) + modules( + preferencesModule + ) + } + + MonetCompat.enablePaletteCompat() + MonetCompat.chromaMultiplier = preferences.chromaMultiplier + + MonetCompat.wallpaperColorPicker = { + val userPickedColor = preferences.selectedColor + it?.firstOrNull { color -> color == userPickedColor } ?: it?.firstOrNull() + } + + if (BuildConfig.DEBUG) { + Stetho.initializeWithDefaults(this) + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/MainActivity.kt b/app/src/main/java/com/owenlejeune/mydex/MainActivity.kt new file mode 100644 index 0000000..f8de99b --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/MainActivity.kt @@ -0,0 +1,37 @@ +package com.owenlejeune.mydex + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Surface +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.lifecycle.lifecycleScope +import androidx.navigation.compose.rememberNavController +import com.kieronquinn.monetcompat.app.MonetCompatActivity +import com.owenlejeune.mydex.ui.theme.MYDexTheme +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +class MainActivity : MonetCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + lifecycleScope.launchWhenCreated { + monet.awaitMonetReady() + setContent { + MYDexTheme(monetCompat = monet) { + val appNavController = rememberNavController() + Box { + + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/di/modules.kt b/app/src/main/java/com/owenlejeune/mydex/di/modules.kt new file mode 100644 index 0000000..f09f319 --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/di/modules.kt @@ -0,0 +1,8 @@ +package com.owenlejeune.mydex.di + +import com.owenlejeune.mydex.preferences.AppPreferences +import org.koin.dsl.module + +val preferencesModule = module { + single { AppPreferences(get()) } +} \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/preferences/AppPreferences.kt b/app/src/main/java/com/owenlejeune/mydex/preferences/AppPreferences.kt new file mode 100644 index 0000000..64b845e --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/preferences/AppPreferences.kt @@ -0,0 +1,75 @@ +package com.owenlejeune.mydex.preferences + +import android.content.Context +import android.content.SharedPreferences +import com.kieronquinn.monetcompat.core.MonetCompat + +class AppPreferences(context: Context) { + + enum class DarkMode { + Automatic, + Dark, + Light + } + + companion object { + private val PREF_FILE = "tvtime_shared_preferences" + + private val CHROMA_MULTIPLIER = "chroma_multiplier" + private val USE_SYSTEM_COLORS = "use_system_colors" + private val SELECTED_COLOR = "selected_color" + private val USE_WALLPAPER_COLORS = "use_wallpaper_colors" + private val DARK_THEME = "dark_theme" + } + + private val preferences: SharedPreferences = context.getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE) + + /******* Design Preferences ********/ + val useWallpaperColorsDefault: Boolean = true + var useWallpaperColors: Boolean + get() = preferences.getBoolean(USE_WALLPAPER_COLORS, useWallpaperColorsDefault) + set(value) { preferences.put(USE_WALLPAPER_COLORS, value) } + + val darkThemeDefault: Int = DarkMode.Automatic.ordinal + var darkTheme: Int + get() = preferences.getInt(DARK_THEME, darkThemeDefault) + set(value) { preferences.put(DARK_THEME, value) } + + val useSystemColorsDefault: Boolean = true + var useSystemColors: Boolean + get() = preferences.getBoolean(USE_SYSTEM_COLORS, useSystemColorsDefault) + set(value) { preferences.put(USE_SYSTEM_COLORS, value) } + + val chromeMultiplyerDefault: Double = MonetCompat.chromaMultiplier.toFloat().toDouble() + var chromaMultiplier: Double + get() = preferences.getFloat(CHROMA_MULTIPLIER, chromeMultiplyerDefault.toFloat()).toDouble() + set(value) { preferences.put(CHROMA_MULTIPLIER, value) } + + val selectedColorDefault: Int = Int.MAX_VALUE + var selectedColor: Int + get() = preferences.getInt(SELECTED_COLOR, selectedColorDefault) + set(value) { preferences.put(SELECTED_COLOR, value) } + + /********* Helpers ********/ + private fun SharedPreferences.put(key: String, value: Any?) { + edit().apply { + when (value) { + is Boolean -> putBoolean(key, value) + is Int -> putInt(key, value) + is Long -> putLong(key, value) + is Float -> putFloat(key, value) + is Double -> putFloat(key, value.toFloat()) + is String -> putString(key, value) + else -> throw UnsupportedTypeError() + } + apply() + } + } + + private fun SharedPreferences.putNullableString(key: String, value: String?) { + edit().putString(key, value).apply() + } + + class UnsupportedTypeError: Exception() + +} \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/ui/theme/Color.kt b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Color.kt new file mode 100644 index 0000000..6d0cb2c --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Color.kt @@ -0,0 +1,8 @@ +package com.owenlejeune.mydex.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple200 = Color(0xFFBB86FC) +val Purple500 = Color(0xFF6200EE) +val Purple700 = Color(0xFF3700B3) +val Teal200 = Color(0xFF03DAC5) \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/ui/theme/MonetTheme.kt b/app/src/main/java/com/owenlejeune/mydex/ui/theme/MonetTheme.kt new file mode 100644 index 0000000..ed0d2a9 --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/ui/theme/MonetTheme.kt @@ -0,0 +1,140 @@ +package com.owenlejeune.mydex.ui.theme + +import androidx.annotation.IntRange +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import com.kieronquinn.monetcompat.core.MonetCompat +import com.kieronquinn.monetcompat.extensions.toArgb + +private fun MonetCompat.getMonetNeutralColor( + @IntRange(from = 1, to = 2) type: Int, + @IntRange(from = 50, to = 900) shade: Int +): Color { + val monetColor = when (type) { + 1 -> this.getMonetColors().neutral1[shade] + else -> this.getMonetColors().neutral2[shade] + }?.toArgb() ?: throw Exception("Neutral$type shade $shade doesn't exist") + return Color(monetColor) +} + +private fun MonetCompat.getMonetAccentColor( + @IntRange(from = 1, to = 3) type: Int, + @IntRange(from = 50, to = 900) shade: Int +): Color { + val monetColor = when (type) { + 1 -> this.getMonetColors().accent1[shade] + 2 -> this.getMonetColors().accent2[shade] + else -> this.getMonetColors().accent3[shade] + }?.toArgb() ?: throw Exception("Accent$type shade $shade doesn't exist") + return Color(monetColor) +} + +/** + * Any values that are not set will be chosen to best represent default values given by [dynamicLightColorScheme][androidx.compose.material3.dynamicLightColorScheme] + * on Android 12+ devices + */ +@Composable +fun MonetCompat.lightMonetCompatScheme( + primary: Color = getMonetAccentColor(1, 700), + onPrimary: Color = getMonetNeutralColor(1, 50), + primaryContainer: Color = getMonetAccentColor(2, 100), + onPrimaryContainer: Color = getMonetAccentColor(1, 900), + inversePrimary: Color = getMonetAccentColor(1, 200), + secondary: Color = getMonetAccentColor(2, 700), + onSecondary: Color = getMonetNeutralColor(1, 50), + secondaryContainer: Color = getMonetAccentColor(2, 100), + onSecondaryContainer: Color = getMonetAccentColor(2, 900), + tertiary: Color = getMonetAccentColor(3, 600), + onTertiary: Color = getMonetNeutralColor(1, 50), + tertiaryContainer: Color = getMonetAccentColor(3, 100), + onTertiaryContainer: Color = getMonetAccentColor(3, 900), + background: Color = getMonetNeutralColor(1, 50), + onBackground: Color = getMonetNeutralColor(1, 900), + surface: Color = getMonetNeutralColor(1, 50), + onSurface: Color = getMonetNeutralColor(1, 900), + surfaceVariant: Color = getMonetNeutralColor(2, 100), + onSurfaceVariant: Color = getMonetNeutralColor(2, 700), + inverseSurface: Color = getMonetNeutralColor(1, 800), + inverseOnSurface: Color = getMonetNeutralColor(2, 50), + outline: Color = getMonetAccentColor(2, 500), +): androidx.compose.material3.ColorScheme = + lightColorScheme( + primary = primary, + onPrimary = onPrimary, + primaryContainer = primaryContainer, + onPrimaryContainer = onPrimaryContainer, + inversePrimary = inversePrimary, + secondary = secondary, + onSecondary = onSecondary, + secondaryContainer = secondaryContainer, + onSecondaryContainer = onSecondaryContainer, + tertiary = tertiary, + onTertiary = onTertiary, + tertiaryContainer = tertiaryContainer, + onTertiaryContainer = onTertiaryContainer, + background = background, + onBackground = onBackground, + surface = surface, + onSurface = onSurface, + surfaceVariant = surfaceVariant, + onSurfaceVariant = onSurfaceVariant, + inverseSurface = inverseSurface, + inverseOnSurface = inverseOnSurface, + outline = outline, + ) + +/** + * Any values that are not set will be chosen to best represent default values given by [dynamicDarkColorScheme][androidx.compose.material3.dynamicDarkColorScheme] + * on Android 12+ devices + */ +@Composable +fun MonetCompat.darkMonetCompatScheme( + primary: Color = getMonetAccentColor(1, 200), + onPrimary: Color = getMonetAccentColor(1, 800), + primaryContainer: Color = getMonetAccentColor(1, 600), + onPrimaryContainer: Color = getMonetAccentColor(2, 100), + inversePrimary: Color = getMonetAccentColor(1, 600), + secondary: Color = getMonetAccentColor(2, 200), + onSecondary: Color = getMonetAccentColor(2, 800), + secondaryContainer: Color = getMonetAccentColor(2, 700), + onSecondaryContainer: Color = getMonetAccentColor(2, 100), + tertiary: Color = getMonetAccentColor(3, 200), + onTertiary: Color = getMonetAccentColor(3, 700), + tertiaryContainer: Color = getMonetAccentColor(3, 700), + onTertiaryContainer: Color = getMonetAccentColor(3, 100), + background: Color = getMonetNeutralColor(1, 900), + onBackground: Color = getMonetNeutralColor(1, 100), + surface: Color = getMonetNeutralColor(1, 900), + onSurface: Color = getMonetNeutralColor(1, 100), + surfaceVariant: Color = getMonetNeutralColor(2, 700), + onSurfaceVariant: Color = getMonetNeutralColor(2, 200), + inverseSurface: Color = getMonetNeutralColor(1, 100), + inverseOnSurface: Color = getMonetNeutralColor(1, 800), + outline: Color = getMonetNeutralColor(2, 500), +): androidx.compose.material3.ColorScheme = + darkColorScheme( + primary = primary, + onPrimary = onPrimary, + primaryContainer = primaryContainer, + onPrimaryContainer = onPrimaryContainer, + inversePrimary = inversePrimary, + secondary = secondary, + onSecondary = onSecondary, + secondaryContainer = secondaryContainer, + onSecondaryContainer = onSecondaryContainer, + tertiary = tertiary, + onTertiary = onTertiary, + tertiaryContainer = tertiaryContainer, + onTertiaryContainer = onTertiaryContainer, + background = background, + onBackground = onBackground, + surface = surface, + onSurface = onSurface, + surfaceVariant = surfaceVariant, + onSurfaceVariant = onSurfaceVariant, + inverseSurface = inverseSurface, + inverseOnSurface = inverseOnSurface, + outline = outline, + ) \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/ui/theme/Shape.kt b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Shape.kt new file mode 100644 index 0000000..4519b70 --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Shape.kt @@ -0,0 +1,11 @@ +package com.owenlejeune.mydex.ui.theme + +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Shapes +import androidx.compose.ui.unit.dp + +val Shapes = Shapes( + small = RoundedCornerShape(4.dp), + medium = RoundedCornerShape(4.dp), + large = RoundedCornerShape(0.dp) +) \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/ui/theme/Theme.kt b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Theme.kt new file mode 100644 index 0000000..38ed94a --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Theme.kt @@ -0,0 +1,93 @@ +package com.owenlejeune.mydex.ui.theme + +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.Colors +import androidx.compose.material.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import com.google.accompanist.systemuicontroller.rememberSystemUiController +import com.kieronquinn.monetcompat.core.MonetCompat +import com.owenlejeune.mydex.preferences.AppPreferences +import org.koin.java.KoinJavaComponent.get + +private val DarkColorPalette = darkColorScheme( + primary = Color.White, + secondary = Color(0xFFC20029), + onPrimary = Color.Black, + tertiary = Color.White, + onSecondary = Color.Black, + background = Color(0xFFEEEEEE), + onBackground = Color.Black, + surface = Color.White, + onSurface = Color.Black, + error = Color(0xFFD00036), + onError = Color.White +) + +val LightColorPalette = lightColorScheme( + primary = Color.White, + secondary = Color(0xFFC20029), + onPrimary = Color.Black, + tertiary = Color.White, + onSecondary = Color.Black, + background = Color(0xFFEEEEEE), + onBackground = Color.Black, + surface = Color.White, + onSurface = Color.Black, + error = Color(0xFFD00036), + onError = Color.White +) + +@Composable +fun MYDexTheme( + preferences: AppPreferences = get(AppPreferences::class.java), + monetCompat: MonetCompat, + content: @Composable () -> Unit +) { + val isDarkTheme = when(preferences.darkTheme) { + AppPreferences.DarkMode.Automatic.ordinal -> isSystemInDarkTheme() + AppPreferences.DarkMode.Dark.ordinal -> true + AppPreferences.DarkMode.Light.ordinal -> false + else -> throw IllegalArgumentException("Illegal theme value ${preferences.darkTheme}") + } + + val colors = when { + isDarkTheme && preferences.useWallpaperColors -> monetCompat.darkMonetCompatScheme() + isDarkTheme && !preferences.useWallpaperColors -> DarkColorPalette + !isDarkTheme && preferences.useWallpaperColors -> monetCompat.lightMonetCompatScheme() + !isDarkTheme && !preferences.useWallpaperColors -> LightColorPalette + else -> throw Exception("Error getting theme colors, should never happen") + } + + androidx.compose.material3.MaterialTheme( + colorScheme = colors, + typography = Typography + ) { + MaterialTheme( + colors = Colors( + primary = colors.primary, + primaryVariant = colors.inversePrimary, + secondary = colors.secondary, + onSecondary = colors.onSecondary, + secondaryVariant = colors.secondaryContainer, + background = colors.background, + onBackground = colors.onBackground, + surface = colors.surface, + error = colors.error, + onPrimary = colors.onPrimary, + onSurface = colors.onSurface, + onError = colors.onError, + isLight = !isDarkTheme + ), + shapes = Shapes, + content = { + val systemUiController = rememberSystemUiController() + systemUiController.setSystemBarsColor(color = androidx.compose.material3.MaterialTheme.colorScheme.background) + + content() + } + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/owenlejeune/mydex/ui/theme/Type.kt b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Type.kt new file mode 100644 index 0000000..bf65f5c --- /dev/null +++ b/app/src/main/java/com/owenlejeune/mydex/ui/theme/Type.kt @@ -0,0 +1,27 @@ +package com.owenlejeune.mydex.ui.theme + +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 = androidx.compose.material3.Typography( + bodyLarge = 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 + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..85805e6 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + MYDex + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..0eaf95e --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/owenlejeune/mydex/ExampleUnitTest.kt b/app/src/test/java/com/owenlejeune/mydex/ExampleUnitTest.kt new file mode 100644 index 0000000..21068aa --- /dev/null +++ b/app/src/test/java/com/owenlejeune/mydex/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.owenlejeune.mydex + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..cfac0f6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +buildscript { + def gradle = "7.1.2" + def kotlin = "1.6.21" + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io" } + + dependencies { + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin" + classpath "com.android.tools.build:gradle:$gradle" + } + } +} + +subprojects { + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..cd0519b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7711b2b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Sep 12 21:10:22 EDT 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f633a6f --- /dev/null +++ b/settings.gradle @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url "https://jitpack.io" } + } +} +rootProject.name = "MYDex" +include ':app'