Skip to content

Commit

Permalink
[feat #66] 로그인 퍼블리싱
Browse files Browse the repository at this point in the history
  • Loading branch information
parkuiery authored Oct 11, 2024
2 parents 5a7d5ab + 1a657a5 commit cb633bc
Show file tree
Hide file tree
Showing 33 changed files with 816 additions and 40 deletions.
4 changes: 4 additions & 0 deletions composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ kotlin {
implementation(projects.core.database)
implementation(projects.core.jwt)
implementation(projects.core.designSystem)
implementation(projects.core.domain)

implementation(projects.database)

implementation(projects.feature.splash)
implementation(projects.feature.signin)
}
jvmMain.dependencies {
implementation(compose.desktop.currentOs)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package team.aliens.dms.kmp

import android.app.Application
import team.aliens.dms.kmp.di.initKoin
import org.koin.android.ext.koin.androidContext
import org.koin.core.context.startKoin
import team.aliens.dms.kmp.di.appModule

class DmsAppApplication : Application() {
override fun onCreate() {
super.onCreate()

initKoin()
startKoin {
modules(appModule())
androidContext(this@DmsAppApplication)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import team.aliens.dms.kmp.navigation.authorized.AuthNavigator
import team.aliens.dms.kmp.navigation.main.MainNavigator
import team.aliens.dms.kmp.feature.signin.navigation.navigateToSignIn

internal class DmsNavigator(
val navController: NavHostController,
) : AuthNavigator, MainNavigator
) {

fun navigateToLogin() {
navController.navigateToSignIn()
}
}

@Composable
internal fun rememberDmsNavigator(navController: NavHostController = rememberNavController()): DmsNavigator =
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package team.aliens.dms.kmp.di

import org.koin.dsl.module
import team.aliens.dms.kmp.feature.signin.di.signInModule
import team.aliens.dms.kmp.feature.splash.di.splashModule

internal val featureModule = module {
includes(
splashModule,
signInModule,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package team.aliens.dms.kmp.di

import org.koin.core.context.startKoin
import team.aliens.dms.kmp.core.datastore.di.dataStoreModule
import team.aliens.dms.kmp.core.domain.di.domainModule
import team.aliens.dms.kmp.core.jwt.di.jwtModule
import team.aliens.dms.kmp.core.network.di.networkModule
import team.aliens.dms.kmp.database.di.databaseModule
Expand All @@ -12,6 +13,8 @@ fun appModule() =
dataStoreModule,
databaseModule,
jwtModule,
featureModule,
domainModule,
)

fun initKoin() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package team.aliens.dms.kmp.navigation.authorized
import androidx.navigation.NavGraphBuilder
import androidx.navigation.navigation
import team.aliens.dms.kmp.DmsNavigator
import team.aliens.dms.kmp.feature.signin.navigation.signIn
import team.aliens.dms.kmp.feature.splash.navigation.NAVIGATION_SPLASH
import team.aliens.dms.kmp.feature.splash.navigation.splash

Expand All @@ -16,7 +17,13 @@ internal fun NavGraphBuilder.authNavigation(
startDestination = NAVIGATION_SPLASH,
) {
splash(
navigateToLogin = { },
navigateToLogin = navigator::navigateToLogin,
)
signIn(
navigateToMain = { },
navigateToSignUp = { },
navigateToFindId = { },
navigateToFindPassword = { },
)
}
}

This file was deleted.

This file was deleted.

5 changes: 5 additions & 0 deletions core/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import team.aliens.dms.kmp.buildsrc.Versions
plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.androidLibrary)
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.ktlint)
}

kotlin {
Expand Down Expand Up @@ -34,6 +37,8 @@ kotlin {
sourceSets {
commonMain.dependencies {
implementation(libs.lifecycle.viewmodel.compose)
implementation(compose.runtime)
implementation(compose.foundation)
}
commonTest.dependencies {
implementation(libs.kotlin.test)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package team.aliens.dms.kmp.core.common.ui

import androidx.compose.foundation.layout.padding
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp

object PaddingDefaults {
val Medium = 12.dp
val Large = 24.dp
}

fun Modifier.horizontalPadding(
value: Dp = PaddingDefaults.Large,
): Modifier = padding(horizontal = value)

fun Modifier.topPadding(
value: Dp = PaddingDefaults.Medium,
): Modifier = padding(top = value)

fun Modifier.bottomPadding(
value: Dp = PaddingDefaults.Medium,
): Modifier = padding(bottom = value)
1 change: 0 additions & 1 deletion core/design-system/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ kotlin {
implementation(compose.ui)
implementation(compose.components.resources)
implementation(compose.components.uiToolingPreview)
implementation(libs.androidx.lifecycle.runtime.compose)
implementation(libs.kottie)
}
commonTest.dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="109dp"
android:height="43dp"
android:viewportWidth="109"
android:viewportHeight="43">
<path
android:pathData="M15.4,36.52V25.47H15.34V27.34C15.34,28.69 15.05,30.02 14.48,31.23C13.91,32.45 13.08,33.53 12.04,34.39L11.94,34.47L11.93,34.48C11.38,34.93 10.78,35.31 10.14,35.61C8.9,36.21 7.54,36.52 6.17,36.52H4.32V16.14C4.32,15.98 4.32,15.81 4.33,15.62C4.33,15.59 4.34,15.46 4.34,15.46C4.34,15.34 4.36,15.21 4.37,15.09C4.37,15.09 4.38,14.97 4.39,14.93C4.4,14.76 4.42,14.6 4.45,14.44C4.45,14.39 4.46,14.35 4.47,14.31L4.49,14.23C4.54,13.81 4.63,13.39 4.77,13C5.56,10.28 7.34,7.97 9.76,6.52C11.32,5.55 13.1,5.01 14.92,4.93H15.01C15.18,4.93 15.34,4.92 15.51,4.92H26.4V27.34C26.4,29.02 25.94,30.66 25.08,32.09C25,32.22 24.92,32.34 24.84,32.47C24.67,32.71 24.5,32.95 24.31,33.17C23.93,33.63 23.52,34.04 23.07,34.42C21.42,35.77 19.36,36.51 17.23,36.51L15.4,36.52Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M13.64,25.48H26.41V4.91H15.53C12.55,4.91 9.69,6.09 7.59,8.2C5.48,10.31 4.3,13.16 4.3,16.14C4.3,17.37 4.54,18.58 5.01,19.72C5.48,20.85 6.17,21.88 7.03,22.75C7.9,23.62 8.93,24.31 10.06,24.77C11.2,25.24 12.41,25.49 13.64,25.48Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="4.3"
android:startY="15.2"
android:endX="26.41"
android:endY="15.2"
android:type="linear">
<item android:offset="0" android:color="#FF4AC4FF"/>
<item android:offset="0.44" android:color="#FF429FFF"/>
<item android:offset="0.75" android:color="#FF3D8AFF"/>
<item android:offset="1" android:color="#FF3377FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M15.37,36.53H17.23C19.66,36.53 22,35.56 23.72,33.84C25.45,32.12 26.41,29.78 26.41,27.34V25.48H15.37V36.53Z"
android:fillColor="#226DF0"/>
<path
android:pathData="M13.64,25.48C11.16,25.48 8.79,24.5 7.04,22.75C5.29,21 4.3,18.62 4.3,16.15V36.53H6.16C7.37,36.53 8.56,36.29 9.67,35.83C10.79,35.37 11.8,34.69 12.65,33.84C13.51,32.99 14.18,31.97 14.64,30.86C15.11,29.75 15.34,28.55 15.34,27.34V25.48H13.64Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="4.3"
android:startY="26.34"
android:endX="15.34"
android:endY="26.34"
android:type="linear">
<item android:offset="0" android:color="#FF58C0FF"/>
<item android:offset="0.12" android:color="#FF4CBCFF"/>
<item android:offset="0.71" android:color="#FF15A8FF"/>
<item android:offset="1" android:color="#FF00A0FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M13.64,25.48H15.34C15.34,22.58 14.2,19.79 12.15,17.72C10.11,15.65 7.33,14.47 4.42,14.44C4.34,15 4.29,15.57 4.29,16.14C4.29,17.37 4.53,18.59 5,19.72C5.47,20.85 6.16,21.88 7.03,22.75C7.9,23.62 8.93,24.31 10.06,24.78C11.2,25.25 12.41,25.49 13.64,25.48Z"
android:fillColor="#00B8FF"/>
<path
android:pathData="M15.3,14.13V25.48H26.4C26.4,22.47 25.23,19.59 23.15,17.46C21.07,15.33 18.25,14.13 15.3,14.13Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="15.3"
android:startY="19.81"
android:endX="26.4"
android:endY="19.81"
android:type="linear">
<item android:offset="0" android:color="#FF0090FF"/>
<item android:offset="0.34" android:color="#FF0073FF"/>
<item android:offset="0.71" android:color="#FF0052E4"/>
<item android:offset="1" android:color="#FF003DD2"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M57.89,25.86C57.33,27.23 56.5,28.47 55.44,29.5C54.35,30.54 53.08,31.36 51.68,31.91C50.15,32.51 48.52,32.81 46.88,32.79H38.55V9.93H46.88C48.52,9.91 50.15,10.21 51.68,10.8C53.08,11.34 54.36,12.15 55.45,13.2C56.5,14.22 57.33,15.46 57.89,16.83C58.47,18.26 58.76,19.79 58.75,21.34C58.76,22.89 58.47,24.42 57.89,25.86ZM54.07,18.27C53.71,17.34 53.18,16.5 52.5,15.79C51.81,15.07 50.97,14.51 50.05,14.15C49.03,13.74 47.95,13.54 46.85,13.56H42.43V29.17H46.85C47.94,29.18 49.03,28.99 50.05,28.6C50.97,28.24 51.8,27.69 52.5,26.99C53.18,26.28 53.72,25.45 54.07,24.53C54.45,23.53 54.64,22.47 54.63,21.39C54.64,20.32 54.45,19.26 54.07,18.27V18.27Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M73.88,27.18H73.76L66.76,16.46V32.8H62.87V9.93H67.05L73.85,20.74L80.65,9.93H84.83V32.8H80.94V16.4L73.88,27.18Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M100.01,33.23C98.09,33.23 96.19,32.92 94.37,32.31C92.6,31.7 90.95,30.77 89.5,29.57L92.03,26.8C93.16,27.71 94.41,28.45 95.74,29.02C97.14,29.58 98.62,29.85 100.12,29.83C101.54,29.83 102.68,29.55 103.52,28.99C104.36,28.44 104.81,27.65 104.81,26.68C104.81,26.26 104.73,25.85 104.56,25.47C104.34,25.06 104.02,24.72 103.63,24.48C103.06,24.14 102.45,23.86 101.82,23.67C101.07,23.42 100.08,23.16 98.89,22.89C97.66,22.64 96.44,22.31 95.25,21.92C94.3,21.61 93.41,21.17 92.6,20.58C91.92,20.09 91.37,19.43 90.99,18.67C90.62,17.93 90.43,17.01 90.43,15.93C90.42,14.98 90.64,14.03 91.07,13.18C91.5,12.35 92.1,11.62 92.83,11.04C93.65,10.42 94.57,9.95 95.54,9.67C96.67,9.33 97.84,9.17 99.02,9.18C100.72,9.16 102.42,9.42 104.05,9.94C105.51,10.43 106.88,11.14 108.13,12.05L105.88,14.97C104.82,14.25 103.67,13.67 102.47,13.22C101.34,12.8 100.15,12.59 98.94,12.59C97.6,12.59 96.54,12.88 95.78,13.44C95.03,14.01 94.63,14.74 94.63,15.57C94.61,16.01 94.71,16.45 94.9,16.85C95.14,17.27 95.48,17.61 95.89,17.85C96.48,18.21 97.12,18.49 97.79,18.68C98.59,18.92 99.61,19.19 100.84,19.46C102.04,19.73 103.24,20.08 104.4,20.5C105.32,20.82 106.18,21.28 106.96,21.88C107.6,22.38 108.12,23.02 108.48,23.76C108.84,24.55 109.02,25.41 109,26.28C109.02,27.3 108.79,28.31 108.34,29.22C107.9,30.08 107.27,30.83 106.51,31.41C105.65,32.03 104.69,32.49 103.67,32.76C102.48,33.08 101.24,33.24 100.01,33.23V33.23Z"
android:fillColor="#ffffff"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="109dp"
android:height="43dp"
android:viewportWidth="109"
android:viewportHeight="43">
<path
android:pathData="M15.4,36.52V25.47H15.34V27.34C15.34,28.69 15.05,30.02 14.48,31.23C13.91,32.45 13.08,33.53 12.04,34.39L11.94,34.47L11.93,34.48C11.38,34.93 10.78,35.31 10.14,35.61C8.9,36.21 7.54,36.52 6.17,36.52H4.32V16.14C4.32,15.98 4.32,15.81 4.33,15.62C4.33,15.59 4.34,15.46 4.34,15.46C4.34,15.34 4.36,15.21 4.37,15.09C4.37,15.09 4.38,14.97 4.39,14.93C4.4,14.76 4.42,14.6 4.45,14.44C4.45,14.39 4.46,14.35 4.47,14.31L4.49,14.23C4.54,13.81 4.63,13.39 4.77,13C5.56,10.28 7.34,7.97 9.76,6.52C11.32,5.55 13.1,5.01 14.92,4.93H15.01C15.18,4.93 15.34,4.92 15.51,4.92H26.4V27.34C26.4,29.02 25.94,30.66 25.08,32.09C25,32.22 24.92,32.34 24.84,32.47C24.67,32.71 24.5,32.95 24.31,33.17C23.93,33.63 23.52,34.04 23.07,34.42C21.42,35.77 19.36,36.51 17.23,36.51L15.4,36.52Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M13.64,25.48H26.41V4.91H15.53C12.55,4.91 9.69,6.09 7.59,8.2C5.48,10.31 4.3,13.16 4.3,16.14C4.3,17.37 4.54,18.58 5.01,19.72C5.48,20.85 6.17,21.88 7.03,22.75C7.9,23.62 8.93,24.31 10.06,24.77C11.2,25.24 12.41,25.49 13.64,25.48Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="4.3"
android:startY="15.2"
android:endX="26.41"
android:endY="15.2"
android:type="linear">
<item android:offset="0" android:color="#FF4AC4FF"/>
<item android:offset="0.44" android:color="#FF429FFF"/>
<item android:offset="0.75" android:color="#FF3D8AFF"/>
<item android:offset="1" android:color="#FF3377FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M15.37,36.53H17.23C19.66,36.53 22,35.56 23.72,33.84C25.45,32.12 26.41,29.78 26.41,27.34V25.48H15.37V36.53Z"
android:fillColor="#226DF0"/>
<path
android:pathData="M13.64,25.48C11.16,25.48 8.79,24.5 7.04,22.75C5.29,21 4.3,18.62 4.3,16.15V36.53H6.16C7.37,36.53 8.56,36.29 9.67,35.83C10.79,35.37 11.8,34.69 12.65,33.84C13.51,32.99 14.18,31.97 14.64,30.86C15.11,29.75 15.34,28.55 15.34,27.34V25.48H13.64Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="4.3"
android:startY="26.34"
android:endX="15.34"
android:endY="26.34"
android:type="linear">
<item android:offset="0" android:color="#FF58C0FF"/>
<item android:offset="0.12" android:color="#FF4CBCFF"/>
<item android:offset="0.71" android:color="#FF15A8FF"/>
<item android:offset="1" android:color="#FF00A0FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M13.64,25.48H15.34C15.34,22.58 14.2,19.79 12.15,17.72C10.11,15.65 7.33,14.47 4.42,14.44C4.34,15 4.29,15.57 4.29,16.14C4.29,17.37 4.53,18.59 5,19.72C5.47,20.85 6.16,21.88 7.03,22.75C7.9,23.62 8.93,24.31 10.06,24.78C11.2,25.25 12.41,25.49 13.64,25.48Z"
android:fillColor="#00B8FF"/>
<path
android:pathData="M15.3,14.13V25.48H26.4C26.4,22.47 25.23,19.59 23.15,17.46C21.07,15.33 18.25,14.13 15.3,14.13Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="15.3"
android:startY="19.81"
android:endX="26.4"
android:endY="19.81"
android:type="linear">
<item android:offset="0" android:color="#FF0090FF"/>
<item android:offset="0.34" android:color="#FF0073FF"/>
<item android:offset="0.71" android:color="#FF0052E4"/>
<item android:offset="1" android:color="#FF003DD2"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M57.89,25.86C57.33,27.23 56.5,28.47 55.44,29.5C54.35,30.54 53.08,31.36 51.68,31.91C50.15,32.51 48.52,32.81 46.88,32.79H38.55V9.93H46.88C48.52,9.91 50.15,10.21 51.68,10.8C53.08,11.34 54.36,12.15 55.45,13.2C56.5,14.22 57.33,15.46 57.89,16.83C58.47,18.26 58.76,19.79 58.75,21.34C58.76,22.89 58.47,24.42 57.89,25.86ZM54.07,18.27C53.71,17.34 53.18,16.5 52.5,15.79C51.81,15.07 50.97,14.51 50.05,14.15C49.03,13.74 47.95,13.54 46.85,13.56H42.43V29.17H46.85C47.94,29.18 49.03,28.99 50.05,28.6C50.97,28.24 51.8,27.69 52.5,26.99C53.18,26.28 53.72,25.45 54.07,24.53C54.45,23.53 54.64,22.47 54.63,21.39C54.64,20.32 54.45,19.26 54.07,18.27V18.27Z"
android:fillColor="#262626"/>
<path
android:pathData="M73.88,27.18H73.76L66.76,16.46V32.8H62.87V9.93H67.05L73.85,20.74L80.65,9.93H84.83V32.8H80.94V16.4L73.88,27.18Z"
android:fillColor="#262626"/>
<path
android:pathData="M100.01,33.23C98.09,33.23 96.19,32.92 94.37,32.31C92.6,31.7 90.95,30.77 89.5,29.57L92.03,26.8C93.16,27.71 94.41,28.45 95.74,29.02C97.14,29.58 98.62,29.85 100.12,29.83C101.54,29.83 102.68,29.55 103.52,28.99C104.36,28.44 104.81,27.65 104.81,26.68C104.81,26.26 104.73,25.85 104.56,25.47C104.34,25.06 104.02,24.72 103.63,24.48C103.06,24.14 102.45,23.86 101.82,23.67C101.07,23.42 100.08,23.16 98.89,22.89C97.66,22.64 96.44,22.31 95.25,21.92C94.3,21.61 93.41,21.17 92.6,20.58C91.92,20.09 91.37,19.43 90.99,18.67C90.62,17.93 90.43,17.01 90.43,15.93C90.42,14.98 90.64,14.03 91.07,13.18C91.5,12.35 92.1,11.62 92.83,11.04C93.65,10.42 94.57,9.95 95.54,9.67C96.67,9.33 97.84,9.17 99.02,9.18C100.72,9.16 102.42,9.42 104.05,9.94C105.51,10.43 106.88,11.14 108.13,12.05L105.88,14.97C104.82,14.25 103.67,13.67 102.47,13.22C101.34,12.8 100.15,12.59 98.94,12.59C97.6,12.59 96.54,12.88 95.78,13.44C95.03,14.01 94.63,14.74 94.63,15.57C94.61,16.01 94.71,16.45 94.9,16.85C95.14,17.27 95.48,17.61 95.89,17.85C96.48,18.21 97.12,18.49 97.79,18.68C98.59,18.92 99.61,19.19 100.84,19.46C102.04,19.73 103.24,20.08 104.4,20.5C105.32,20.82 106.18,21.28 106.96,21.88C107.6,22.38 108.12,23.02 108.48,23.76C108.84,24.55 109.02,25.41 109,26.28C109.02,27.3 108.79,28.31 108.34,29.22C107.9,30.08 107.27,30.83 106.51,31.41C105.65,32.03 104.69,32.49 103.67,32.76C102.48,33.08 101.24,33.24 100.01,33.23V33.23Z"
android:fillColor="#262626"/>
</vector>
Loading

0 comments on commit cb633bc

Please sign in to comment.