Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ val devRoundIcon = "@mipmap/dev_ic_launcher_round"


plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.androidApplication)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.ksp)
alias(libs.plugins.jetbrains.kotlin.serialization)
alias(libs.plugins.oss.licenses)
alias(libs.plugins.kotlinSerialization)
alias(libs.plugins.ossLicenses)
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget = JvmTarget.JVM_21
}
}

Expand Down Expand Up @@ -205,6 +205,7 @@ android {

dependencies {
// In project library / feature modules
implementation(project(":design_system"))
implementation(project(":core"))
implementation(project(":database"))
implementation(project(":password_manager"))
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
android:theme="@style/PasscodesTheme.Default"
tools:targetApi="33" >

<activity android:name=".ui.MainActivity" />
<activity android:name=".MainActivity" />

<activity
android:name=".oldui.MainActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jeeldobariya.passcodes.ui
package com.jeeldobariya.passcodes

import android.content.Intent
import android.os.Bundle
Expand All @@ -10,9 +10,9 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.LocalContext
import com.jeeldobariya.passcodes.core.feature_flags.FeatureFlagsSettings
import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme
import com.jeeldobariya.passcodes.navigation.NavigationRoot
import com.jeeldobariya.passcodes.oldui.MainActivity
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand All @@ -36,4 +36,4 @@ class MainActivity : ComponentActivity() {
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class MainActivity : AppCompatActivity() {
if (featureFlagsDatastore.data.first().isPreviewLayoutEnabled) {
Intent(
this@MainActivity,
com.jeeldobariya.passcodes.ui.MainActivity::class.java
com.jeeldobariya.passcodes.MainActivity::class.java
).also {
startActivity(it)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import androidx.compose.ui.unit.dp
import androidx.core.net.toUri
import com.jeeldobariya.passcodes.Constant
import com.jeeldobariya.passcodes.R
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme


@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.jeeldobariya.passcodes.R
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme

@Composable
fun ModernAboutScreen() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.jeeldobariya.passcodes.R
import com.jeeldobariya.passcodes.core.navigation.Route
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme

@Composable
fun ClassicalMainScreen(navigateTo: (Route) -> Unit) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.jeeldobariya.passcodes.R
import com.jeeldobariya.passcodes.core.navigation.Route
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme


@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import com.jeeldobariya.passcodes.core.datastore.AppSettings
import com.jeeldobariya.passcodes.core.datastore.appDatastore
import com.jeeldobariya.passcodes.core.feature_flags.FeatureFlagsSettings
import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme
import kotlinx.coroutines.launch


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import com.jeeldobariya.passcodes.core.datastore.AppSettings
import com.jeeldobariya.passcodes.core.datastore.appDatastore
import com.jeeldobariya.passcodes.core.feature_flags.FeatureFlagsSettings
import com.jeeldobariya.passcodes.core.feature_flags.featureFlagsDatastore
import com.jeeldobariya.passcodes.ui.ui.theme.PasscodesTheme
import com.jeeldobariya.passcodes.design_system.theme.PasscodesTheme
import kotlinx.coroutines.launch

@Composable
Expand Down

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions autofill/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.ksp)
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget = JvmTarget.JVM_21
}
}

Expand Down
14 changes: 8 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.jetbrains.kotlin.serialization) apply false
alias(libs.plugins.androidApplication) apply false
alias(libs.plugins.androidLibrary) apply false
alias(libs.plugins.composeMultiplatform) apply false
alias(libs.plugins.composeCompiler) apply false
alias(libs.plugins.kotlinMultiplatform) apply false
alias(libs.plugins.androidKmpLibrary) apply false
alias(libs.plugins.kotlinSerialization) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.oss.licenses) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.ossLicenses) apply false
}

// All projects block is common for setting up common repositories for all subprojects.
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.jetbrains.kotlin.serialization)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.kotlinSerialization)
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget = JvmTarget.JVM_21
}
}

Expand Down
4 changes: 2 additions & 2 deletions database/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.ksp)
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
jvmTarget = JvmTarget.JVM_21
}
}

Expand Down
1 change: 1 addition & 0 deletions design_system/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
51 changes: 51 additions & 0 deletions design_system/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.composeMultiplatform)
alias(libs.plugins.composeCompiler)
alias(libs.plugins.androidKmpLibrary)
}

kotlin {
androidLibrary {
compileSdk = 36
minSdk = 26
namespace = "com.jeeldobariya.passcodes.design_system"
experimentalProperties["android.experimental.kmp.enableAndroidResources"] = true
}

// listOf(
// iosArm64(),
// iosSimulatorArm64()
// ).forEach { iosTarget ->
// iosTarget.binaries.framework {
// baseName = "ComposeApp"
// isStatic = true
// }
// }
//
// jvm("desktop")

sourceSets {
// androidMain.dependencies {
// implementation(compose.preview)
// implementation(libs.androidx.activity.compose)
// }
commonMain.dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.preview)
// implementation(libs.androidx.lifecycle.viewmodelCompose)
// implementation(libs.androidx.lifecycle.runtimeCompose)
}
// commonTest.dependencies {
// implementation(libs.kotlin.test)
// }
// val desktopMain by getting
// desktopMain.dependencies {
// implementation(compose.desktop.currentOs)
// }
}
}
Empty file.
21 changes: 21 additions & 0 deletions design_system/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package com.jeeldobariya.passcodes.design_system.theme

import androidx.compose.ui.graphics.Color

// Primary
val primaryLight = Color(0xFF6750A4)
val primaryDark = Color(0xFFD0BCFF)

// Secondary
val secondaryLight = Color(0xFF625B71)
val secondaryDark = Color(0xFFCCC2DC)

// Tertiary
val tertiaryLight = Color(0xFF7D5260)
val tertiaryDark = Color(0xFFEFB8C8)

// Background
val BackgroundLight = Color(0xFFFFFBFE)
val BackgroundDark = Color(0xFF1C1B1F)

// Surface
val SurfaceLight = Color(0xFFFFFBFE)
val SurfaceDark = Color(0xFF1C1B1F)

// Error
val ErrorLight = Color(0xFFB3261E)
val ErrorDark = Color(0xFFF2B8B5)
Loading
Loading