diff --git a/.androidide/editor/openedFiles.json b/.androidide/editor/openedFiles.json deleted file mode 100644 index b771b32..0000000 --- a/.androidide/editor/openedFiles.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "allFiles": [ - { - "file": "/storage/emulated/0/sakura/app/src/main/java/com/syntaxspin/sakura/MainActivity.kt", - "selection": { - "end": { - "column": 37, - "index": 7588, - "line": 245 - }, - "start": { - "column": 37, - "index": 7588, - "line": 245 - } - } - } - ], - "selectedFile": "/storage/emulated/0/sakura/app/src/main/java/com/syntaxspin/sakura/MainActivity.kt" -} \ No newline at end of file diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d0cd57d..7699193 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -13,7 +13,7 @@ on: jobs: build: - name: Build Sakura + name: Build nozomi runs-on: ubuntu-latest steps: @@ -33,11 +33,11 @@ jobs: - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v4 - - name: Build Sakura Debug + - name: Build nozomi Debug run: ./gradlew assembleDebug - name: Upload release app uses: actions/upload-artifact@v4 with: - name: Sakura-debug + name: nozomi-debug path: app/build/outputs/apk/debug/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b6bc011 --- /dev/null +++ b/.gitignore @@ -0,0 +1,83 @@ +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +/bin/ +/gen/ +/out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# Gradle files +.gradle/ +/build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ diff --git a/.gradle/8.9/checksums/checksums.lock b/.gradle/8.9/checksums/checksums.lock index 701e7eb..535cc4c 100644 Binary files a/.gradle/8.9/checksums/checksums.lock and b/.gradle/8.9/checksums/checksums.lock differ diff --git a/.gradle/8.9/checksums/md5-checksums.bin b/.gradle/8.9/checksums/md5-checksums.bin deleted file mode 100644 index f5af5bc..0000000 Binary files a/.gradle/8.9/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/8.9/checksums/sha1-checksums.bin b/.gradle/8.9/checksums/sha1-checksums.bin deleted file mode 100644 index a84acfa..0000000 Binary files a/.gradle/8.9/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/8.9/executionHistory/executionHistory.bin b/.gradle/8.9/executionHistory/executionHistory.bin deleted file mode 100644 index ebac4cc..0000000 Binary files a/.gradle/8.9/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/8.9/executionHistory/executionHistory.lock b/.gradle/8.9/executionHistory/executionHistory.lock deleted file mode 100644 index b52c272..0000000 Binary files a/.gradle/8.9/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/8.9/fileHashes/fileHashes.bin b/.gradle/8.9/fileHashes/fileHashes.bin index 57cebea..e0e8df2 100644 Binary files a/.gradle/8.9/fileHashes/fileHashes.bin and b/.gradle/8.9/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.9/fileHashes/fileHashes.lock b/.gradle/8.9/fileHashes/fileHashes.lock index e44deb3..1ee886f 100644 Binary files a/.gradle/8.9/fileHashes/fileHashes.lock and b/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.9/fileHashes/resourceHashesCache.bin b/.gradle/8.9/fileHashes/resourceHashesCache.bin deleted file mode 100644 index c28d1c4..0000000 Binary files a/.gradle/8.9/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 1ff5bc7..56458ed 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index ad2c1f8..3499e5e 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Wed Oct 30 05:02:26 GMT 2024 +#Sun Dec 15 06:41:48 GMT 2024 gradle.version=8.9 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 6d4c2ed..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/README.md b/README.md deleted file mode 100644 index 5409956..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ - -A SyntaxSpin Playground For testing Jetpack Compose diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b986f31..77ee7b6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,15 +2,14 @@ plugins { id("com.android.application") id("kotlin-android") - id("org.jetbrains.kotlin.plugin.compose") } android { - namespace = "com.syntaxspin.sakura" + namespace = "com.syntaxspin.nozomi" compileSdk = 34 defaultConfig { - applicationId = "com.syntaxspin.sakura" + applicationId = "com.syntaxspin.nozomi" minSdk = 21 targetSdk = 34 versionCode = 1 @@ -27,8 +26,8 @@ android { } buildTypes { - debug { - isMinifyEnabled = false + release { + isMinifyEnabled = true proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") } } diff --git a/app/src/main/java/com/syntaxspin/nozomi/MainActivity.kt b/app/src/main/java/com/syntaxspin/nozomi/MainActivity.kt new file mode 100644 index 0000000..d2d15bd --- /dev/null +++ b/app/src/main/java/com/syntaxspin/nozomi/MainActivity.kt @@ -0,0 +1,42 @@ +package com.syntaxspin.nozomi + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import com.syntaxspin.nozomi.ui.theme.NozomiTheme + +class MainActivity : ComponentActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + NozomiTheme { + // A surface container using the 'background' color from the theme + Surface(modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background) { + Greeting("Android") + } + } + } + } +} + +@Composable +fun Greeting(name: String, modifier: Modifier = Modifier) { + Text(text = "Hello $name!", modifier = modifier) +} + +@Preview(showBackground = true) +@Composable +fun GreetingPreview() { + MyComposeApplicationTheme { + Greeting("Android") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Color.kt b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Color.kt new file mode 100644 index 0000000..bf28e4e --- /dev/null +++ b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Color.kt @@ -0,0 +1,225 @@ +package com.example.compose +import androidx.compose.ui.graphics.Color + +val primaryLight = Color(0xFF3B665C) +val onPrimaryLight = Color(0xFFFFFFFF) +val primaryContainerLight = Color(0xFFA4D1C5) +val onPrimaryContainerLight = Color(0xFF103E35) +val secondaryLight = Color(0xFF51625D) +val onSecondaryLight = Color(0xFFFFFFFF) +val secondaryContainerLight = Color(0xFFD6E8E2) +val onSecondaryContainerLight = Color(0xFF3C4C48) +val tertiaryLight = Color(0xFF5A5C7D) +val onTertiaryLight = Color(0xFFFFFFFF) +val tertiaryContainerLight = Color(0xFFC3C4EA) +val onTertiaryContainerLight = Color(0xFF323453) +val errorLight = Color(0xFFBA1A1A) +val onErrorLight = Color(0xFFFFFFFF) +val errorContainerLight = Color(0xFFFFDAD6) +val onErrorContainerLight = Color(0xFF410002) +val backgroundLight = Color(0xFFF9F9F7) +val onBackgroundLight = Color(0xFF1A1C1B) +val surfaceLight = Color(0xFFF9F9F7) +val onSurfaceLight = Color(0xFF1A1C1B) +val surfaceVariantLight = Color(0xFFDCE4E0) +val onSurfaceVariantLight = Color(0xFF404846) +val outlineLight = Color(0xFF717976) +val outlineVariantLight = Color(0xFFC0C8C5) +val scrimLight = Color(0xFF000000) +val inverseSurfaceLight = Color(0xFF2F3130) +val inverseOnSurfaceLight = Color(0xFFF0F1EF) +val inversePrimaryLight = Color(0xFFA3D0C4) +val surfaceDimLight = Color(0xFFD9DAD8) +val surfaceBrightLight = Color(0xFFF9F9F7) +val surfaceContainerLowestLight = Color(0xFFFFFFFF) +val surfaceContainerLowLight = Color(0xFFF3F4F2) +val surfaceContainerLight = Color(0xFFEDEEEC) +val surfaceContainerHighLight = Color(0xFFE8E8E6) +val surfaceContainerHighestLight = Color(0xFFE2E3E1) + +val primaryLightMediumContrast = Color(0xFF1E4A41) +val onPrimaryLightMediumContrast = Color(0xFFFFFFFF) +val primaryContainerLightMediumContrast = Color(0xFF527D72) +val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val secondaryLightMediumContrast = Color(0xFF364642) +val onSecondaryLightMediumContrast = Color(0xFFFFFFFF) +val secondaryContainerLightMediumContrast = Color(0xFF677873) +val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryLightMediumContrast = Color(0xFF3E4060) +val onTertiaryLightMediumContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightMediumContrast = Color(0xFF707294) +val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF) +val errorLightMediumContrast = Color(0xFF8C0009) +val onErrorLightMediumContrast = Color(0xFFFFFFFF) +val errorContainerLightMediumContrast = Color(0xFFDA342E) +val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF) +val backgroundLightMediumContrast = Color(0xFFF9F9F7) +val onBackgroundLightMediumContrast = Color(0xFF1A1C1B) +val surfaceLightMediumContrast = Color(0xFFF9F9F7) +val onSurfaceLightMediumContrast = Color(0xFF1A1C1B) +val surfaceVariantLightMediumContrast = Color(0xFFDCE4E0) +val onSurfaceVariantLightMediumContrast = Color(0xFF3D4442) +val outlineLightMediumContrast = Color(0xFF59615E) +val outlineVariantLightMediumContrast = Color(0xFF747C79) +val scrimLightMediumContrast = Color(0xFF000000) +val inverseSurfaceLightMediumContrast = Color(0xFF2F3130) +val inverseOnSurfaceLightMediumContrast = Color(0xFFF0F1EF) +val inversePrimaryLightMediumContrast = Color(0xFFA3D0C4) +val surfaceDimLightMediumContrast = Color(0xFFD9DAD8) +val surfaceBrightLightMediumContrast = Color(0xFFF9F9F7) +val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightMediumContrast = Color(0xFFF3F4F2) +val surfaceContainerLightMediumContrast = Color(0xFFEDEEEC) +val surfaceContainerHighLightMediumContrast = Color(0xFFE8E8E6) +val surfaceContainerHighestLightMediumContrast = Color(0xFFE2E3E1) + +val primaryLightHighContrast = Color(0xFF002821) +val onPrimaryLightHighContrast = Color(0xFFFFFFFF) +val primaryContainerLightHighContrast = Color(0xFF1E4A41) +val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF) +val secondaryLightHighContrast = Color(0xFF162521) +val onSecondaryLightHighContrast = Color(0xFFFFFFFF) +val secondaryContainerLightHighContrast = Color(0xFF364642) +val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF) +val tertiaryLightHighContrast = Color(0xFF1D203D) +val onTertiaryLightHighContrast = Color(0xFFFFFFFF) +val tertiaryContainerLightHighContrast = Color(0xFF3E4060) +val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF) +val errorLightHighContrast = Color(0xFF4E0002) +val onErrorLightHighContrast = Color(0xFFFFFFFF) +val errorContainerLightHighContrast = Color(0xFF8C0009) +val onErrorContainerLightHighContrast = Color(0xFFFFFFFF) +val backgroundLightHighContrast = Color(0xFFF9F9F7) +val onBackgroundLightHighContrast = Color(0xFF1A1C1B) +val surfaceLightHighContrast = Color(0xFFF9F9F7) +val onSurfaceLightHighContrast = Color(0xFF000000) +val surfaceVariantLightHighContrast = Color(0xFFDCE4E0) +val onSurfaceVariantLightHighContrast = Color(0xFF1E2523) +val outlineLightHighContrast = Color(0xFF3D4442) +val outlineVariantLightHighContrast = Color(0xFF3D4442) +val scrimLightHighContrast = Color(0xFF000000) +val inverseSurfaceLightHighContrast = Color(0xFF2F3130) +val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF) +val inversePrimaryLightHighContrast = Color(0xFFC7F6E9) +val surfaceDimLightHighContrast = Color(0xFFD9DAD8) +val surfaceBrightLightHighContrast = Color(0xFFF9F9F7) +val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF) +val surfaceContainerLowLightHighContrast = Color(0xFFF3F4F2) +val surfaceContainerLightHighContrast = Color(0xFFEDEEEC) +val surfaceContainerHighLightHighContrast = Color(0xFFE8E8E6) +val surfaceContainerHighestLightHighContrast = Color(0xFFE2E3E1) + +val primaryDark = Color(0xFFBEECDF) +val onPrimaryDark = Color(0xFF07372F) +val primaryContainerDark = Color(0xFF95C2B6) +val onPrimaryContainerDark = Color(0xFF01332B) +val secondaryDark = Color(0xFFB9CAC4) +val onSecondaryDark = Color(0xFF24332F) +val secondaryContainerDark = Color(0xFF33433E) +val onSecondaryContainerDark = Color(0xFFC6D8D2) +val tertiaryDark = Color(0xFFE2E1FF) +val onTertiaryDark = Color(0xFF2C2E4C) +val tertiaryContainerDark = Color(0xFFB6B7DD) +val onTertiaryContainerDark = Color(0xFF282A49) +val errorDark = Color(0xFFFFB4AB) +val onErrorDark = Color(0xFF690005) +val errorContainerDark = Color(0xFF93000A) +val onErrorContainerDark = Color(0xFFFFDAD6) +val backgroundDark = Color(0xFF111413) +val onBackgroundDark = Color(0xFFE2E3E1) +val surfaceDark = Color(0xFF111413) +val onSurfaceDark = Color(0xFFE2E3E1) +val surfaceVariantDark = Color(0xFF404846) +val onSurfaceVariantDark = Color(0xFFC0C8C5) +val outlineDark = Color(0xFF8A928F) +val outlineVariantDark = Color(0xFF404846) +val scrimDark = Color(0xFF000000) +val inverseSurfaceDark = Color(0xFFE2E3E1) +val inverseOnSurfaceDark = Color(0xFF2F3130) +val inversePrimaryDark = Color(0xFF3B665C) +val surfaceDimDark = Color(0xFF111413) +val surfaceBrightDark = Color(0xFF373A39) +val surfaceContainerLowestDark = Color(0xFF0C0F0E) +val surfaceContainerLowDark = Color(0xFF1A1C1B) +val surfaceContainerDark = Color(0xFF1E201F) +val surfaceContainerHighDark = Color(0xFF282A29) +val surfaceContainerHighestDark = Color(0xFF333534) + +val primaryDarkMediumContrast = Color(0xFFBEECDF) +val onPrimaryDarkMediumContrast = Color(0xFF003029) +val primaryContainerDarkMediumContrast = Color(0xFF95C2B6) +val onPrimaryContainerDarkMediumContrast = Color(0xFF000000) +val secondaryDarkMediumContrast = Color(0xFFBDCFC9) +val onSecondaryDarkMediumContrast = Color(0xFF091916) +val secondaryContainerDarkMediumContrast = Color(0xFF83948F) +val onSecondaryContainerDarkMediumContrast = Color(0xFF000000) +val tertiaryDarkMediumContrast = Color(0xFFE2E1FF) +val onTertiaryDarkMediumContrast = Color(0xFF262846) +val tertiaryContainerDarkMediumContrast = Color(0xFFB6B7DD) +val onTertiaryContainerDarkMediumContrast = Color(0xFF000000) +val errorDarkMediumContrast = Color(0xFFFFBAB1) +val onErrorDarkMediumContrast = Color(0xFF370001) +val errorContainerDarkMediumContrast = Color(0xFFFF5449) +val onErrorContainerDarkMediumContrast = Color(0xFF000000) +val backgroundDarkMediumContrast = Color(0xFF111413) +val onBackgroundDarkMediumContrast = Color(0xFFE2E3E1) +val surfaceDarkMediumContrast = Color(0xFF111413) +val onSurfaceDarkMediumContrast = Color(0xFFFAFBF9) +val surfaceVariantDarkMediumContrast = Color(0xFF404846) +val onSurfaceVariantDarkMediumContrast = Color(0xFFC4CDC9) +val outlineDarkMediumContrast = Color(0xFF9CA5A1) +val outlineVariantDarkMediumContrast = Color(0xFF7D8582) +val scrimDarkMediumContrast = Color(0xFF000000) +val inverseSurfaceDarkMediumContrast = Color(0xFFE2E3E1) +val inverseOnSurfaceDarkMediumContrast = Color(0xFF282A29) +val inversePrimaryDarkMediumContrast = Color(0xFF244F46) +val surfaceDimDarkMediumContrast = Color(0xFF111413) +val surfaceBrightDarkMediumContrast = Color(0xFF373A39) +val surfaceContainerLowestDarkMediumContrast = Color(0xFF0C0F0E) +val surfaceContainerLowDarkMediumContrast = Color(0xFF1A1C1B) +val surfaceContainerDarkMediumContrast = Color(0xFF1E201F) +val surfaceContainerHighDarkMediumContrast = Color(0xFF282A29) +val surfaceContainerHighestDarkMediumContrast = Color(0xFF333534) + +val primaryDarkHighContrast = Color(0xFFECFFF8) +val onPrimaryDarkHighContrast = Color(0xFF000000) +val primaryContainerDarkHighContrast = Color(0xFFA7D4C8) +val onPrimaryContainerDarkHighContrast = Color(0xFF000000) +val secondaryDarkHighContrast = Color(0xFFEDFFF8) +val onSecondaryDarkHighContrast = Color(0xFF000000) +val secondaryContainerDarkHighContrast = Color(0xFFBDCFC9) +val onSecondaryContainerDarkHighContrast = Color(0xFF000000) +val tertiaryDarkHighContrast = Color(0xFFFDF9FF) +val onTertiaryDarkHighContrast = Color(0xFF000000) +val tertiaryContainerDarkHighContrast = Color(0xFFC7C8EE) +val onTertiaryContainerDarkHighContrast = Color(0xFF000000) +val errorDarkHighContrast = Color(0xFFFFF9F9) +val onErrorDarkHighContrast = Color(0xFF000000) +val errorContainerDarkHighContrast = Color(0xFFFFBAB1) +val onErrorContainerDarkHighContrast = Color(0xFF000000) +val backgroundDarkHighContrast = Color(0xFF111413) +val onBackgroundDarkHighContrast = Color(0xFFE2E3E1) +val surfaceDarkHighContrast = Color(0xFF111413) +val onSurfaceDarkHighContrast = Color(0xFFFFFFFF) +val surfaceVariantDarkHighContrast = Color(0xFF404846) +val onSurfaceVariantDarkHighContrast = Color(0xFFF4FDF9) +val outlineDarkHighContrast = Color(0xFFC4CDC9) +val outlineVariantDarkHighContrast = Color(0xFFC4CDC9) +val scrimDarkHighContrast = Color(0xFF000000) +val inverseSurfaceDarkHighContrast = Color(0xFFE2E3E1) +val inverseOnSurfaceDarkHighContrast = Color(0xFF000000) +val inversePrimaryDarkHighContrast = Color(0xFF003029) +val surfaceDimDarkHighContrast = Color(0xFF111413) +val surfaceBrightDarkHighContrast = Color(0xFF373A39) +val surfaceContainerLowestDarkHighContrast = Color(0xFF0C0F0E) +val surfaceContainerLowDarkHighContrast = Color(0xFF1A1C1B) +val surfaceContainerDarkHighContrast = Color(0xFF1E201F) +val surfaceContainerHighDarkHighContrast = Color(0xFF282A29) +val surfaceContainerHighestDarkHighContrast = Color(0xFF333534) + + + + + + + diff --git a/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Theme.kt b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Theme.kt new file mode 100644 index 0000000..5bdd270 --- /dev/null +++ b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Theme.kt @@ -0,0 +1,280 @@ +package com.example.compose +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.Typography +import androidx.compose.runtime.Composable +import androidx.compose.runtime.Immutable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext + +private val lightScheme = lightColorScheme( + primary = primaryLight, + onPrimary = onPrimaryLight, + primaryContainer = primaryContainerLight, + onPrimaryContainer = onPrimaryContainerLight, + secondary = secondaryLight, + onSecondary = onSecondaryLight, + secondaryContainer = secondaryContainerLight, + onSecondaryContainer = onSecondaryContainerLight, + tertiary = tertiaryLight, + onTertiary = onTertiaryLight, + tertiaryContainer = tertiaryContainerLight, + onTertiaryContainer = onTertiaryContainerLight, + error = errorLight, + onError = onErrorLight, + errorContainer = errorContainerLight, + onErrorContainer = onErrorContainerLight, + background = backgroundLight, + onBackground = onBackgroundLight, + surface = surfaceLight, + onSurface = onSurfaceLight, + surfaceVariant = surfaceVariantLight, + onSurfaceVariant = onSurfaceVariantLight, + outline = outlineLight, + outlineVariant = outlineVariantLight, + scrim = scrimLight, + inverseSurface = inverseSurfaceLight, + inverseOnSurface = inverseOnSurfaceLight, + inversePrimary = inversePrimaryLight, + surfaceDim = surfaceDimLight, + surfaceBright = surfaceBrightLight, + surfaceContainerLowest = surfaceContainerLowestLight, + surfaceContainerLow = surfaceContainerLowLight, + surfaceContainer = surfaceContainerLight, + surfaceContainerHigh = surfaceContainerHighLight, + surfaceContainerHighest = surfaceContainerHighestLight, +) + +private val darkScheme = darkColorScheme( + primary = primaryDark, + onPrimary = onPrimaryDark, + primaryContainer = primaryContainerDark, + onPrimaryContainer = onPrimaryContainerDark, + secondary = secondaryDark, + onSecondary = onSecondaryDark, + secondaryContainer = secondaryContainerDark, + onSecondaryContainer = onSecondaryContainerDark, + tertiary = tertiaryDark, + onTertiary = onTertiaryDark, + tertiaryContainer = tertiaryContainerDark, + onTertiaryContainer = onTertiaryContainerDark, + error = errorDark, + onError = onErrorDark, + errorContainer = errorContainerDark, + onErrorContainer = onErrorContainerDark, + background = backgroundDark, + onBackground = onBackgroundDark, + surface = surfaceDark, + onSurface = onSurfaceDark, + surfaceVariant = surfaceVariantDark, + onSurfaceVariant = onSurfaceVariantDark, + outline = outlineDark, + outlineVariant = outlineVariantDark, + scrim = scrimDark, + inverseSurface = inverseSurfaceDark, + inverseOnSurface = inverseOnSurfaceDark, + inversePrimary = inversePrimaryDark, + surfaceDim = surfaceDimDark, + surfaceBright = surfaceBrightDark, + surfaceContainerLowest = surfaceContainerLowestDark, + surfaceContainerLow = surfaceContainerLowDark, + surfaceContainer = surfaceContainerDark, + surfaceContainerHigh = surfaceContainerHighDark, + surfaceContainerHighest = surfaceContainerHighestDark, +) + +private val mediumContrastLightColorScheme = lightColorScheme( + primary = primaryLightMediumContrast, + onPrimary = onPrimaryLightMediumContrast, + primaryContainer = primaryContainerLightMediumContrast, + onPrimaryContainer = onPrimaryContainerLightMediumContrast, + secondary = secondaryLightMediumContrast, + onSecondary = onSecondaryLightMediumContrast, + secondaryContainer = secondaryContainerLightMediumContrast, + onSecondaryContainer = onSecondaryContainerLightMediumContrast, + tertiary = tertiaryLightMediumContrast, + onTertiary = onTertiaryLightMediumContrast, + tertiaryContainer = tertiaryContainerLightMediumContrast, + onTertiaryContainer = onTertiaryContainerLightMediumContrast, + error = errorLightMediumContrast, + onError = onErrorLightMediumContrast, + errorContainer = errorContainerLightMediumContrast, + onErrorContainer = onErrorContainerLightMediumContrast, + background = backgroundLightMediumContrast, + onBackground = onBackgroundLightMediumContrast, + surface = surfaceLightMediumContrast, + onSurface = onSurfaceLightMediumContrast, + surfaceVariant = surfaceVariantLightMediumContrast, + onSurfaceVariant = onSurfaceVariantLightMediumContrast, + outline = outlineLightMediumContrast, + outlineVariant = outlineVariantLightMediumContrast, + scrim = scrimLightMediumContrast, + inverseSurface = inverseSurfaceLightMediumContrast, + inverseOnSurface = inverseOnSurfaceLightMediumContrast, + inversePrimary = inversePrimaryLightMediumContrast, + surfaceDim = surfaceDimLightMediumContrast, + surfaceBright = surfaceBrightLightMediumContrast, + surfaceContainerLowest = surfaceContainerLowestLightMediumContrast, + surfaceContainerLow = surfaceContainerLowLightMediumContrast, + surfaceContainer = surfaceContainerLightMediumContrast, + surfaceContainerHigh = surfaceContainerHighLightMediumContrast, + surfaceContainerHighest = surfaceContainerHighestLightMediumContrast, +) + +private val highContrastLightColorScheme = lightColorScheme( + primary = primaryLightHighContrast, + onPrimary = onPrimaryLightHighContrast, + primaryContainer = primaryContainerLightHighContrast, + onPrimaryContainer = onPrimaryContainerLightHighContrast, + secondary = secondaryLightHighContrast, + onSecondary = onSecondaryLightHighContrast, + secondaryContainer = secondaryContainerLightHighContrast, + onSecondaryContainer = onSecondaryContainerLightHighContrast, + tertiary = tertiaryLightHighContrast, + onTertiary = onTertiaryLightHighContrast, + tertiaryContainer = tertiaryContainerLightHighContrast, + onTertiaryContainer = onTertiaryContainerLightHighContrast, + error = errorLightHighContrast, + onError = onErrorLightHighContrast, + errorContainer = errorContainerLightHighContrast, + onErrorContainer = onErrorContainerLightHighContrast, + background = backgroundLightHighContrast, + onBackground = onBackgroundLightHighContrast, + surface = surfaceLightHighContrast, + onSurface = onSurfaceLightHighContrast, + surfaceVariant = surfaceVariantLightHighContrast, + onSurfaceVariant = onSurfaceVariantLightHighContrast, + outline = outlineLightHighContrast, + outlineVariant = outlineVariantLightHighContrast, + scrim = scrimLightHighContrast, + inverseSurface = inverseSurfaceLightHighContrast, + inverseOnSurface = inverseOnSurfaceLightHighContrast, + inversePrimary = inversePrimaryLightHighContrast, + surfaceDim = surfaceDimLightHighContrast, + surfaceBright = surfaceBrightLightHighContrast, + surfaceContainerLowest = surfaceContainerLowestLightHighContrast, + surfaceContainerLow = surfaceContainerLowLightHighContrast, + surfaceContainer = surfaceContainerLightHighContrast, + surfaceContainerHigh = surfaceContainerHighLightHighContrast, + surfaceContainerHighest = surfaceContainerHighestLightHighContrast, +) + +private val mediumContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkMediumContrast, + onPrimary = onPrimaryDarkMediumContrast, + primaryContainer = primaryContainerDarkMediumContrast, + onPrimaryContainer = onPrimaryContainerDarkMediumContrast, + secondary = secondaryDarkMediumContrast, + onSecondary = onSecondaryDarkMediumContrast, + secondaryContainer = secondaryContainerDarkMediumContrast, + onSecondaryContainer = onSecondaryContainerDarkMediumContrast, + tertiary = tertiaryDarkMediumContrast, + onTertiary = onTertiaryDarkMediumContrast, + tertiaryContainer = tertiaryContainerDarkMediumContrast, + onTertiaryContainer = onTertiaryContainerDarkMediumContrast, + error = errorDarkMediumContrast, + onError = onErrorDarkMediumContrast, + errorContainer = errorContainerDarkMediumContrast, + onErrorContainer = onErrorContainerDarkMediumContrast, + background = backgroundDarkMediumContrast, + onBackground = onBackgroundDarkMediumContrast, + surface = surfaceDarkMediumContrast, + onSurface = onSurfaceDarkMediumContrast, + surfaceVariant = surfaceVariantDarkMediumContrast, + onSurfaceVariant = onSurfaceVariantDarkMediumContrast, + outline = outlineDarkMediumContrast, + outlineVariant = outlineVariantDarkMediumContrast, + scrim = scrimDarkMediumContrast, + inverseSurface = inverseSurfaceDarkMediumContrast, + inverseOnSurface = inverseOnSurfaceDarkMediumContrast, + inversePrimary = inversePrimaryDarkMediumContrast, + surfaceDim = surfaceDimDarkMediumContrast, + surfaceBright = surfaceBrightDarkMediumContrast, + surfaceContainerLowest = surfaceContainerLowestDarkMediumContrast, + surfaceContainerLow = surfaceContainerLowDarkMediumContrast, + surfaceContainer = surfaceContainerDarkMediumContrast, + surfaceContainerHigh = surfaceContainerHighDarkMediumContrast, + surfaceContainerHighest = surfaceContainerHighestDarkMediumContrast, +) + +private val highContrastDarkColorScheme = darkColorScheme( + primary = primaryDarkHighContrast, + onPrimary = onPrimaryDarkHighContrast, + primaryContainer = primaryContainerDarkHighContrast, + onPrimaryContainer = onPrimaryContainerDarkHighContrast, + secondary = secondaryDarkHighContrast, + onSecondary = onSecondaryDarkHighContrast, + secondaryContainer = secondaryContainerDarkHighContrast, + onSecondaryContainer = onSecondaryContainerDarkHighContrast, + tertiary = tertiaryDarkHighContrast, + onTertiary = onTertiaryDarkHighContrast, + tertiaryContainer = tertiaryContainerDarkHighContrast, + onTertiaryContainer = onTertiaryContainerDarkHighContrast, + error = errorDarkHighContrast, + onError = onErrorDarkHighContrast, + errorContainer = errorContainerDarkHighContrast, + onErrorContainer = onErrorContainerDarkHighContrast, + background = backgroundDarkHighContrast, + onBackground = onBackgroundDarkHighContrast, + surface = surfaceDarkHighContrast, + onSurface = onSurfaceDarkHighContrast, + surfaceVariant = surfaceVariantDarkHighContrast, + onSurfaceVariant = onSurfaceVariantDarkHighContrast, + outline = outlineDarkHighContrast, + outlineVariant = outlineVariantDarkHighContrast, + scrim = scrimDarkHighContrast, + inverseSurface = inverseSurfaceDarkHighContrast, + inverseOnSurface = inverseOnSurfaceDarkHighContrast, + inversePrimary = inversePrimaryDarkHighContrast, + surfaceDim = surfaceDimDarkHighContrast, + surfaceBright = surfaceBrightDarkHighContrast, + surfaceContainerLowest = surfaceContainerLowestDarkHighContrast, + surfaceContainerLow = surfaceContainerLowDarkHighContrast, + surfaceContainer = surfaceContainerDarkHighContrast, + surfaceContainerHigh = surfaceContainerHighDarkHighContrast, + surfaceContainerHighest = surfaceContainerHighestDarkHighContrast, +) + +@Immutable +data class ColorFamily( + val color: Color, + val onColor: Color, + val colorContainer: Color, + val onColorContainer: Color +) + +val unspecified_scheme = ColorFamily( + Color.Unspecified, Color.Unspecified, Color.Unspecified, Color.Unspecified +) + +@Composable +fun NozomiTheme( + 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 -> darkScheme + else -> lightScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = AppTypography, + content = content + ) +} + diff --git a/app/src/main/java/com/syntaxspin/sakura/ui/theme/Type.kt b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Type.kt similarity index 95% rename from app/src/main/java/com/syntaxspin/sakura/ui/theme/Type.kt rename to app/src/main/java/com/syntaxspin/nozomi/ui/theme/Type.kt index f4e5bc0..a8d7452 100644 --- a/app/src/main/java/com/syntaxspin/sakura/ui/theme/Type.kt +++ b/app/src/main/java/com/syntaxspin/nozomi/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.syntaxspin.sakura.ui.theme +package com.syntaxspin.nozomi.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/com/syntaxspin/sakura/MainActivity.kt b/app/src/main/java/com/syntaxspin/sakura/MainActivity.kt deleted file mode 100644 index f1c03a3..0000000 --- a/app/src/main/java/com/syntaxspin/sakura/MainActivity.kt +++ /dev/null @@ -1,250 +0,0 @@ -package com.syntaxspin.sakura - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview -//ScriptWrap's Shortcuts for code -import androidx.compose.ui.* -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.* -import androidx.compose.ui.res.* -import androidx.compose.foundation.shape.* -import androidx.compose.material3.* -import androidx.compose.ui.layout.* -import androidx.compose.ui.text.style.* -import androidx.compose.foundation.clickable - - -//Local Context -import androidx.compose.ui.platform.LocalContext -//Logics -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember - -//Units & Draws -import androidx.compose.ui.draw.clip -import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp -//LazyComponents -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.LazyRow -import androidx.compose.foundation.lazy.items -//icons -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Search -import androidx.compose.material.icons.filled.Home -//Kotlin Values Functions -import androidx.compose.runtime.remember -import androidx.compose.runtime.getValue -import androidx.compose.runtime.setValue -//Theme -import com.syntaxspin.sakura.ui.theme.ThemeSakura - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContent{ - ThemeSakura{ - Surface( modifier = Modifier.fillMaxSize()){ - Column(modifier = Modifier.verticalScroll(rememberScrollState())){ Items() - dividerText("SearchBar (TextField)") - searchBar() - dividerText("Contacts List") - Listy() - dividerText("Compose Card") - PartyCard() - dividerText("Material Button") - mtrlButton("Click Me") - dividerText("TextField") - textfield() - dividerText("Material Switch") - Switchify() - } - } - } - } -} - -@Composable -fun Name(name:String){ -Text( -text= name , -style = MaterialTheme.typography.titleMedium -) - -} -@Composable -fun Desc(d:String){ -Text( -text = d , -color = MaterialTheme.colorScheme.secondary , -style = MaterialTheme.typography.bodyMedium , -) -} -@Composable -fun Items(){ - Row(modifier = Modifier.padding(all = 8.dp)){ - Image( - painterResource(R.drawable.pfp), - contentDescription = "Profile Picture" , - modifier = Modifier - .size(50.dp) - .clip(CircleShape) - - ) - - Spacer(modifier = Modifier .width(8.dp) .padding(top = 8.dp)) - Column{ - Name("ScriptWrap") - Desc("Learning Compose from the Master Of Compose Aquiles Trindade") - - } - } - } -@Composable -fun dividerText(txt:String){ -Text( -text = txt , -style = MaterialTheme.typography.labelSmall , -modifier = Modifier .padding(16.dp) -) - -} -@Composable -fun searchBar (modifier: Modifier = Modifier){ -TextField( -value="" , -onValueChange = {}, - leadingIcon = { - Icon( - imageVector = Icons.Default.Search, - contentDescription = null - ) - }, - colors = TextFieldDefaults.colors( - unfocusedContainerColor = MaterialTheme.colorScheme.surface, - focusedContainerColor = MaterialTheme.colorScheme.surface - ), - placeholder = { - Text(text = "Search") - }, - modifier = modifier - .fillMaxWidth() - .heightIn(min = 56.dp) - .padding(16.dp) - ) - - -} -@Composable -fun Listy(){ -LazyRow(modifier = Modifier.padding(8.dp)) { -items(1){item -> -Row(horizontalArrangement = Arrangement.spacedBy(16.dp)){ -storyItem("Jensen Ackles" ,R.drawable.jea) -storyItem("Jenna Ortega" ,R.drawable.jo) -storyItem("Aquiles Trindade" ,R.drawable.at) -storyItem("Felipe Teixeira" ,R.drawable.ft) -storyItem("Rohit Kushvaha" ,R.drawable.rk) -storyItem("Vivek" ,R.drawable.vv) -} -} -} -} -@Composable -fun storyItem(text:String ,icon:Int ){ - Column(horizontalAlignment= Alignment.CenterHorizontally , modifier = Modifier.padding(8.dp)){ - Image( - /* painter = painterResource( - LocalContext.current.resources.getIdentifier(icon, "drawable", LocalContext.current.packageName))*/ - painter = painterResource(id = icon), - contentDescription = text , - contentScale = ContentScale.Crop , - modifier = Modifier - .size(88.dp) - .clip(CircleShape) - - ) - Text( - text= text , - style = MaterialTheme.typography.bodyMedium , - modifier = Modifier - .paddingFromBaseline(top = 24.dp , bottom = 8.dp) - - ) - } -} -@Composable -fun PartyCard(){ - Card( - modifier = Modifier - .fillMaxWidth() - .padding(8.dp) - .height(150.dp) - ){ - Box{ - Image( - painterResource(R.drawable.mtrl), - contentDescription = null, - contentScale = ContentScale.Crop, - modifier = Modifier - .fillMaxWidth() - - ) - Text( - text = "Hello CardView", - fontSize = 50.sp, - lineHeight = 136.sp, - textAlign = TextAlign.Center, - modifier = Modifier - .padding(8.dp) - ) - - - - } - } - -} -@Composable -fun mtrlButton(txt:String){ - Button( modifier = Modifier.padding(8.dp), onClick = {/*DoSomething*/}){ - Text(text = txt) - } -} -@Composable -fun textfield(){ -/*var textFieldText by remember { - murableStateOf("") -}*/ - TextField( - value = "", - label = { Name("Hello") }, - onValueChange = {/*newValue -> - textFieldText = newValue*/}, - modifier = Modifier - .padding(8.dp) - ) - } -@Composable -fun Switchify (){ -var checked by remember { mutableStateOf(true) } -Switch( //text ="Switch ON/OFF", - checked = checked , - onCheckedChange = { - checked = it - }, - modifier = Modifier.padding(16.dp)) - } - } - - diff --git a/app/src/main/java/com/syntaxspin/sakura/ui/theme/Color.kt b/app/src/main/java/com/syntaxspin/sakura/ui/theme/Color.kt deleted file mode 100644 index e5f7091..0000000 --- a/app/src/main/java/com/syntaxspin/sakura/ui/theme/Color.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.syntaxspin.sakura.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/com/syntaxspin/sakura/ui/theme/Theme.kt b/app/src/main/java/com/syntaxspin/sakura/ui/theme/Theme.kt deleted file mode 100644 index 803f257..0000000 --- a/app/src/main/java/com/syntaxspin/sakura/ui/theme/Theme.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.syntaxspin.sakura.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.runtime.SideEffect -import androidx.compose.ui.graphics.toArgb -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalView -import androidx.core.view.WindowCompat - -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 ThemeSakura(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 - } - val view = LocalView.current - if (!view.isInEditMode) { - SideEffect { - val window = (view.context as Activity).window - window.statusBarColor = colorScheme.primary.toArgb() - WindowCompat.getInsetsController(window, - view).isAppearanceLightStatusBars = darkTheme - } - } - - MaterialTheme(colorScheme = colorScheme, typography = Typography, - content = content) -} \ 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/at.jpg b/app/src/main/res/drawable/at.jpg deleted file mode 100644 index cb0a90c..0000000 Binary files a/app/src/main/res/drawable/at.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/ft.jpg b/app/src/main/res/drawable/ft.jpg deleted file mode 100644 index 9bcf0f3..0000000 Binary files a/app/src/main/res/drawable/ft.jpg and /dev/null differ 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/drawable/jea.jpg b/app/src/main/res/drawable/jea.jpg deleted file mode 100644 index 3ba03fe..0000000 Binary files a/app/src/main/res/drawable/jea.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/jo.jpg b/app/src/main/res/drawable/jo.jpg deleted file mode 100644 index 0cac7d7..0000000 Binary files a/app/src/main/res/drawable/jo.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/mtrl.png b/app/src/main/res/drawable/mtrl.png deleted file mode 100644 index a419f88..0000000 Binary files a/app/src/main/res/drawable/mtrl.png and /dev/null differ diff --git a/app/src/main/res/drawable/pfp.png b/app/src/main/res/drawable/pfp.png deleted file mode 100644 index 1ec26ca..0000000 Binary files a/app/src/main/res/drawable/pfp.png and /dev/null differ diff --git a/app/src/main/res/drawable/rk.jpeg b/app/src/main/res/drawable/rk.jpeg deleted file mode 100644 index 50d760e..0000000 Binary files a/app/src/main/res/drawable/rk.jpeg and /dev/null differ diff --git a/app/src/main/res/drawable/vv.jpg b/app/src/main/res/drawable/vv.jpg deleted file mode 100644 index 085f2e6..0000000 Binary files a/app/src/main/res/drawable/vv.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 345888d..eca70cf 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +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.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 56de6f1..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ 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_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 1aa4852..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index 43ed796..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png deleted file mode 100644 index 43ed796..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and /dev/null 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.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index f362bd3..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null 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_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index deabe2a..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 073759e..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png deleted file mode 100644 index d628684..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and /dev/null 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.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index f06785a..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null 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_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index 321dd43..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 594eeb5..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png deleted file mode 100644 index 594eeb5..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and /dev/null 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.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 9117824..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null 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_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index 1a16322..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 3673a4a..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png deleted file mode 100644 index 657e52e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and /dev/null 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.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 58b091c..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null 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_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index fcd4198..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 5ca83e3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png deleted file mode 100644 index 5ca83e3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and /dev/null 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/strings.xml b/app/src/main/res/values/strings.xml index b8a999a..af63378 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Sakura + Nozomi \ No newline at end of file diff --git a/bannersak.png b/bannersak.png deleted file mode 100644 index 111c732..0000000 Binary files a/bannersak.png and /dev/null differ diff --git a/gradle.properties b/gradle.properties index 7cb5f24..2d12095 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # 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=-Xmx512m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx512m -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 @@ -14,14 +14,10 @@ # 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 +android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -#kotlin.code.style=official +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 -org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -android.useAndroidX=true -kotlin.code.style=official android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradlew b/gradlew index 1aa94a4..b740cf1 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle.kts b/settings.gradle.kts index e169df6..193cd9b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,6 +14,6 @@ dependencyResolutionManagement { } } -rootProject.name = "Sakura" +rootProject.name = " Nozomi" include(":app") \ No newline at end of file