Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
dd7b927
โœจ `FileModalWindow`๋ฅผ ๋ฒ”์šฉ `ModalWindow`๋กœ ์ „ํ™˜ ๋ฐ `design` ๋ชจ๋“ˆ๋กœ ์ด๋™
ugmin1030 Mar 17, 2026
b9442a1
โœจ `DeleteLinkModal` ํ”„๋ฆฌ๋ทฐ ํ•จ์ˆ˜ ์ ‘๊ทผ ์ œ์–ด์ž ์ˆ˜์ •
ugmin1030 Mar 17, 2026
a852974
โœจ design: `ModalWindow` ์ปดํฌ๋„ŒํŠธ KDoc ์ฃผ์„ ์ถ”๊ฐ€
ugmin1030 Mar 19, 2026
817975e
โœจ `TestActivity` ๋‚ด `ThemeProvider` ์ ์šฉ ๋ฐ UI ํ…Œ๋งˆ ์„ค์ • ์ถ”๊ฐ€
ugmin1030 Mar 26, 2026
fd21dfa
โœจ design: `ThemeProvider` ์ตœ์ ํ™” ๋ฐ ํ…Œ๋งˆ ์ ‘๊ทผ์„ฑ ๊ฐœ์„ 
ugmin1030 Mar 26, 2026
f620663
โœจ `Modifier.skeleton` ํ™•์žฅ ํ•จ์ˆ˜ ๋ฐ ๋กœ๋”ฉ ์• ๋‹ˆ๋ฉ”์ด์…˜ ๊ตฌํ˜„
ugmin1030 Mar 30, 2026
dfdf0b0
โœจ feature/file: `ShareBottomSheet` ์ ‘๊ทผ ์ œ์–ด์ž ์ˆ˜์ •
ugmin1030 Mar 31, 2026
1c86767
โœจ feature/file: ํด๋” ๊ณต์œ ๋ฅผ ์œ„ํ•œ `_ShareBottomSheet` ํ…Œ์ŠคํŠธ ์ปดํฌ๋„ŒํŠธ ์ถ”๊ฐ€
ugmin1030 Mar 31, 2026
37e2a04
๐Ÿšš ํ”„๋กœ์ ํŠธ ์ „์ฒด ํŒจํ‚ค์ง€ ๊ฒฝ๋กœ ๋ฐ ๋„ค์ž„์ŠคํŽ˜์ด์Šค ๋ณ€๊ฒฝ (`com.example` -> `com.linku`)
ugmin1030 Mar 31, 2026
f53eea5
๐Ÿ”ฅ feature/file: ๋ฏธ์‚ฌ์šฉ `InnerShadow` ์ปค์Šคํ…€ Modifier ์‚ญ์ œ
ugmin1030 Apr 1, 2026
2904e8c
โœจ ๋””์ž์ธ ์‹œ์Šคํ…œ ํ†ตํ•ฉ: ํ…Œ๋งˆ ๊ธฐ๋ฐ˜ ์ปฌ๋Ÿฌ ๋ฐ ํฐํŠธ ์ ์šฉ (Typography & Color Refactoring)
ugmin1030 Apr 2, 2026
6cfa324
โœจ feature/file: `ShareBottomSheet` UI ๊ตฌ์กฐ ์„ค๊ณ„ ๋ฐ ๋ฉ”์ธ ํ™”๋ฉด ์ปดํฌ๋„ŒํŠธ ๊ตฌํ˜„
ugmin1030 Apr 3, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ plugins {
}

android {
namespace = "com.example.linku_android"
namespace = "com.linku"

compileSdk = 36


defaultConfig {
applicationId = "com.example.linku_android"
applicationId = "com.linku"
minSdk = 26
targetSdk = 35
versionCode = 1
Expand Down
2 changes: 1 addition & 1 deletion app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"client_info": {
"mobilesdk_app_id": "1:338497125500:android:0aa677277b4fa02fae9df9",
"android_client_info": {
"package_name": "com.example.linku_android"
"package_name": "com.linku"
}
},
"oauth_client": [],
Expand Down
2 changes: 1 addition & 1 deletion app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.example.linku_android",
"applicationId": "com.linku",
"variantName": "release",
"elements": [
{
Expand Down

This file was deleted.

22 changes: 22 additions & 0 deletions app/src/androidTest/java/com/linku/ExampleInstrumentedTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.linku

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
import org.junit.Assert
import org.junit.Test
import org.junit.runner.RunWith

/**
* 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
Assert.assertEquals("com.linku", appContext.packageName)
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.link
package com.linku.link

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand All @@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.link", appContext.packageName)
assertEquals("com.linku.link", appContext.packageName)
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android
package com.linku

import android.content.Intent
import android.os.Bundle
Expand All @@ -9,11 +9,11 @@ import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat
import androidx.hilt.navigation.compose.hiltViewModel
import com.example.core.model.SystemBarMode
import com.example.core.system.SystemBarController
import com.example.linku_android.deeplink.extractSocialDeepLinkData
import com.linku.core.model.SystemBarMode
import com.linku.core.system.SystemBarController
import com.linku.deeplink.extractSocialDeepLinkData
import dagger.hilt.android.AndroidEntryPoint
import com.example.linku_android.deeplink.SocialDeepLinkBus
import com.linku.deeplink.SocialDeepLinkBus
@AndroidEntryPoint
class MainActivity : ComponentActivity(), SystemBarController {
private var currentSystemBarMode: SystemBarMode? = null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android
package com.linku

import android.app.Activity
import android.content.Context
Expand All @@ -12,6 +12,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -34,46 +35,45 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.example.design.theme.ThemeProvider
import com.example.home.HomeViewModel
import com.example.home.screen.SaveLinkResultScreen
import com.example.home.screen.SaveLinkScreen
import com.example.linku_android.navigation.LinkuNavigationItem

//import com.example.login.LoginScreen
import com.example.mypage.MyPageApp
import com.example.mypage.MyPageViewModel
//import com.example.mypage.MyPageScreen
import com.linku.design.theme.ThemeProvider
import com.linku.home.HomeViewModel
import com.linku.home.screen.SaveLinkResultScreen
import com.linku.home.screen.SaveLinkScreen
import com.linku.navigation.LinkuNavigationItem

//import com.linku.login.LoginScreen
import com.linku.mypage.MyPageApp
import com.linku.mypage.MyPageViewModel
//import com.linku.mypage.MyPageScreen
import androidx.navigation.NavType
import androidx.navigation.navArgument


import androidx.navigation.compose.currentBackStackEntryAsState
import com.example.home.HomeApp
import com.example.login.ui.animation.AnimatedLoginScreen
import com.linku.home.HomeApp
import com.linku.login.ui.animation.AnimatedLoginScreen
import java.io.File
import java.io.FileOutputStream

// ๋งํฌ ๊ณต์œ  ์•ฑ๋งํฌ
import androidx.navigation.navDeepLink
import com.example.curation.CurationViewModel
import com.example.file.FileApp
import com.example.file.FileViewModel
import com.example.file.ui.modal.FileModalWindow
import com.example.file.ui.theme.DefaultFont
import com.example.file.ui.theme.Gray600
import com.example.file.viewmodel.folder.state.FolderStateViewModel
import com.example.linku_android.deeplink.DeepLinkHandlerViewModel
import com.example.login.viewmodel.LoginViewModel
import com.linku.curation.CurationViewModel
import com.linku.file.FileApp
import com.linku.file.FileViewModel
import com.linku.file.viewmodel.folder.state.FolderStateViewModel
import com.linku.deeplink.DeepLinkHandlerViewModel
import com.linku.login.viewmodel.LoginViewModel

import dagger.hilt.android.EntryPointAccessors
import androidx.core.net.toUri
import com.example.core.model.auth.LoginState
import com.example.core.model.auth.SocialLoginEvent
import com.example.linku_android.curation.curationGraph
import com.example.linku_android.deeplink.SocialDeepLinkBus
import com.example.linku_android.deeplink.appLinkRoute
import com.example.login.navigation.LoginApp
import com.linku.core.model.auth.LoginState
import com.linku.core.model.auth.SocialLoginEvent
import com.linku.design.modal.ModalWindow
import com.linku.curation.curationGraph
import com.linku.deeplink.SocialDeepLinkBus
import com.linku.deeplink.appLinkRoute
import com.linku.design.theme.linkuColors
import com.linku.login.navigation.LoginApp



Expand Down Expand Up @@ -173,7 +173,7 @@ fun MainApp(
}
}


val colors = MaterialTheme.linkuColors

ThemeProvider {
MainScreen(
Expand Down Expand Up @@ -573,7 +573,7 @@ fun MainApp(

Log.d("MainApp", "On Modal")

FileModalWindow(
ModalWindow(
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ํ”„๋ฆฌ๋ทฐ ๋งŒ๋“ค์–ด์ฃผ์‹ค ์ˆ˜ ์žˆ๋‚˜์š”?

visible = visible,
title = "์ ‘๊ทผ ๊ถŒํ•œ์ด ์—†์Šต๋‹ˆ๋‹ค.",
onOkay = { visible = false },
Expand All @@ -584,9 +584,8 @@ fun MainApp(
text = "๋งํ ํšŒ์›๋งŒ ํด๋”๋ฅผ ๊ณต์œ ๋ฐ›์„ ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.\nํด๋”๋ฅผ ํ™•์ธํ•˜๊ธฐ ์œ„ํ•ด ๋กœ๊ทธ์ธ/ํšŒ์›๊ฐ€์ž… ํ•ด์ฃผ์„ธ์š”.",
fontSize = 15.sp,
lineHeight = 22.sp,
fontFamily = DefaultFont,
fontWeight = FontWeight.Normal,
color = Gray600,
color = colors.gray[600],
textAlign = TextAlign.Center,
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android
package com.linku

import android.app.Application
import android.util.Log
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android
package com.linku

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.WindowInsets
Expand All @@ -23,9 +23,9 @@ import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.layout.positionInRoot
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.tooling.preview.Preview
import com.example.design.theme.ThemeProvider
import com.example.linku_android.component.LinkuNavigationBar
import com.example.linku_android.navigation.LinkuNavigationItem
import com.linku.design.theme.ThemeProvider
import com.linku.component.LinkuNavigationBar
import com.linku.navigation.LinkuNavigationItem

data class NavigationBarProp(
val currentLinkuNavigationItem: LinkuNavigationItem?,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.example.linku_android
package com.linku

import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import com.example.core.repository.RecentSearchRepository
import com.linku.core.repository.RecentSearchRepository
import kotlinx.coroutines.launch

@HiltViewModel
class MainViewModel @Inject constructor(
private val recentRepository: RecentSearchRepository,
val sessionStore: com.example.core.session.SessionStore
val sessionStore: com.linku.core.session.SessionStore
): ViewModel() {

// ์ตœ๊ทผ ๊ฒ€์ƒ‰ ๊ธฐ๋ก ์ „์ฒด ์‚ญ์ œ
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.example.linku_android
package com.linku

import androidx.compose.animation.AnimatedContentScope
import androidx.compose.runtime.Composable
import androidx.navigation.NavBackStackEntry
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import java.io.File

sealed class NavigationRoute(
val route: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android
package com.linku

import androidx.compose.animation.Crossfade
import androidx.compose.animation.core.Animatable
Expand All @@ -7,32 +7,28 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay
import dagger.hilt.android.EntryPointAccessors
import kotlinx.coroutines.flow.first
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalInspectionMode
import com.example.core.model.SystemBarMode
import com.example.core.session.SessionStore
import com.example.core.system.SystemBarController
import com.example.data.preference.AuthPreference
import com.linku.core.model.SystemBarMode
import com.linku.core.session.SessionStore
import com.linku.core.system.SystemBarController
import com.linku.data.preference.AuthPreference
import dagger.hilt.EntryPoint
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import com.example.design.util.PixelScaler
import com.example.design.util.DesignSystemBars

import com.linku.design.util.PixelScaler


@EntryPoint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android.component
package com.linku.component

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
Expand Down Expand Up @@ -29,11 +29,11 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.example.design.modifier.gradientTint
import com.example.design.theme.LocalFontTheme
import com.example.design.theme.ThemeProvider
import com.example.design.theme.color.Basic
import com.example.linku_android.navigation.LinkuNavigationItem
import com.linku.design.modifier.gradientTint
import com.linku.design.theme.LocalFontTheme
import com.linku.design.theme.ThemeProvider
import com.linku.design.theme.color.Basic
import com.linku.navigation.LinkuNavigationItem

// val centerButtonSize = DpSize(19.2.dp, 19.2.dp)
val iconHeight = 24.dp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android.component
package com.linku.component

import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource
Expand All @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.example.design.modifier.gradientTint
import com.example.design.theme.LocalColorTheme
import com.example.design.theme.color.Basic
import com.example.linku_android.R
import com.linku.design.modifier.gradientTint
import com.linku.design.theme.LocalColorTheme
import com.linku.design.theme.color.Basic
import com.linku.R

/*
* ๋‚ด๋น„๊ฒŒ์ด์…˜ ๋ฐ” ์ค‘์•™์— ๋“ค์–ด๊ฐˆ ๋งํฌ ์ถ”๊ฐ€ ๋ฒ„ํŠผ ์ปดํฌ๋„ŒํŠธ
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android.component
package com.linku.component

import androidx.annotation.DrawableRes
import androidx.compose.foundation.Image
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.linku_android.deeplink
package com.linku.deeplink

import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
Expand Down
Loading