Skip to content

Commit

Permalink
#5 - Chaeum -> Piece 앱 네임 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
tgyuuAn committed Dec 14, 2024
1 parent 35b09dc commit 1221628
Show file tree
Hide file tree
Showing 55 changed files with 140 additions and 141 deletions.
7 changes: 3 additions & 4 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
plugins {
id("chaeum.android.application")
id("chaeum.android.compose")
alias(libs.plugins.kotlin.serialization)
id("piece.android.application")
id("piece.android.compose")
}

android {
namespace = "com.yapp.chaeum"
namespace = "com.puzzle.piece"

defaultConfig {
versionCode = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum
package com.puzzle.piece

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
Expand All @@ -17,6 +17,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.yapp.chaeum", appContext.packageName)
assertEquals("com.puzzle.piece", appContext.packageName)
}
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Chaeum"
android:theme="@style/Theme.Piece"
tools:targetApi="31">
<activity
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.Chaeum">
android:theme="@style/Theme.Piece">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.yapp.chaeum
package com.puzzle.piece

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import com.yapp.chaeum.ui.App
import com.yapp.chaeum.ui.rememberAppState
import com.yapp.chaeum.ui.theme.ChaeumTheme
import com.puzzle.piece.ui.App
import com.puzzle.piece.ui.rememberAppState
import com.puzzle.piece.ui.theme.PieceTheme

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
val appState = rememberAppState()
ChaeumTheme {
PieceTheme {
App(appState)
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.yapp.chaeum.navigation
package com.puzzle.piece.navigation

import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.compose.NavHost
import com.example.auth.navigation.AuthGraph
import com.example.auth.navigation.authNavGraph
import com.example.matching.navigation.navigateToMatchingDetailRoute
import com.yapp.chaeum.navigation.home.homeNavGraph
import com.yapp.chaeum.ui.AppState
import com.puzzle.auth.navigation.AuthGraph
import com.puzzle.auth.navigation.authNavGraph
import com.puzzle.matching.navigation.navigateToMatchingDetailRoute
import com.puzzle.piece.navigation.home.homeNavGraph
import com.puzzle.piece.ui.AppState

@Composable
fun AppNavHost(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.yapp.chaeum.navigation
package com.puzzle.piece.navigation

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Call
import androidx.compose.material.icons.outlined.Call
import androidx.compose.ui.graphics.vector.ImageVector
import com.example.etc.navigation.EtcRoute
import com.example.matching.navigation.MatchingGraphDest
import com.example.mypage.navigation.MyPageRoute
import com.puzzle.etc.navigation.EtcRoute
import com.puzzle.matching.navigation.MatchingGraphDest
import com.puzzle.mypage.navigation.MyPageRoute
import kotlin.reflect.KClass

enum class TopLevelDestination(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.yapp.chaeum.navigation.home
package com.puzzle.piece.navigation.home

import androidx.compose.ui.Modifier
import androidx.navigation.NavGraphBuilder
import androidx.navigation.navigation
import com.example.etc.navigation.etcScreen
import com.example.matching.navigation.MatchingGraph
import com.example.matching.navigation.matchingNavGraph
import com.example.mypage.navigation.myPageScreen
import com.puzzle.etc.navigation.etcScreen
import com.puzzle.matching.navigation.MatchingGraph
import com.puzzle.matching.navigation.matchingNavGraph
import com.puzzle.mypage.navigation.myPageScreen
import kotlinx.serialization.Serializable

@Serializable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum.ui
package com.puzzle.piece.ui

import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
Expand All @@ -12,9 +12,9 @@ import androidx.compose.ui.Modifier
import androidx.navigation.NavDestination
import androidx.navigation.NavDestination.Companion.hasRoute
import androidx.navigation.NavDestination.Companion.hierarchy
import com.example.auth.navigation.AuthGraph
import com.yapp.chaeum.navigation.AppNavHost
import com.yapp.chaeum.navigation.TopLevelDestination
import com.puzzle.auth.navigation.AuthGraph
import com.puzzle.piece.navigation.AppNavHost
import com.puzzle.piece.navigation.TopLevelDestination
import kotlin.reflect.KClass

@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum.ui
package com.puzzle.piece.ui

import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
Expand All @@ -7,12 +7,12 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import androidx.navigation.navOptions
import com.example.auth.navigation.AuthGraphDest
import com.example.etc.navigation.navigateToEtc
import com.example.matching.navigation.navigateToMatchingGraph
import com.example.mypage.navigation.navigateToMyPage
import com.yapp.chaeum.navigation.TopLevelDestination
import com.yapp.chaeum.navigation.home.HomeGraph
import com.puzzle.auth.navigation.AuthGraphDest
import com.puzzle.etc.navigation.navigateToEtc
import com.puzzle.matching.navigation.navigateToMatchingGraph
import com.puzzle.mypage.navigation.navigateToMyPage
import com.puzzle.piece.navigation.TopLevelDestination
import com.puzzle.piece.navigation.home.HomeGraph

@Composable
fun rememberAppState(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum.ui.theme
package com.puzzle.piece.ui.theme

import androidx.compose.ui.graphics.Color

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum.ui.theme
package com.puzzle.piece.ui.theme

import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
Expand Down Expand Up @@ -33,7 +33,7 @@ private val LightColorScheme = lightColorScheme(
)

@Composable
fun ChaeumTheme(
fun PieceTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+
dynamicColor: Boolean = true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.chaeum.ui.theme
package com.puzzle.piece.ui.theme

import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">Chaeum</string>
<string name="app_name">Piece</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.Chaeum" parent="android:Theme.Material.Light.NoActionBar" />
<style name="Theme.Piece" parent="android:Theme.Material.Light.NoActionBar" />
</resources>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.auth
package com.puzzle.piece

import org.junit.Assert.assertEquals
import org.junit.Test
Expand Down
2 changes: 1 addition & 1 deletion build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ dependencyResolutionManagement {
}
}

rootProject.name = "Chaeum"
rootProject.name = "Piece"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.CommonExtension
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import org.gradle.api.Plugin
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import org.gradle.api.Plugin
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import org.gradle.api.JavaVersion
import org.gradle.api.Project
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.yapp.build.logic
package com.puzzle.build.logic

import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.yapp.build.logic.configure
package com.puzzle.build.logic.configure

import com.yapp.build.logic.androidExtension
import com.yapp.build.logic.libs
import com.puzzle.build.logic.androidExtension
import com.puzzle.build.logic.libs
import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import com.puzzle.build.logic.configureHiltAndroid
import com.puzzle.build.logic.configureKotlinAndroid
import com.puzzle.build.logic.configureTestAndroid

plugins {
id("com.android.application")
}

configureKotlinAndroid()
configureHiltAndroid()
configureTestAndroid()
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import com.puzzle.build.logic.configure.configureAndroidCompose

configureAndroidCompose()
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import com.yapp.build.logic.configureHiltAndroid
import com.yapp.build.logic.libs
import com.puzzle.build.logic.configureHiltAndroid
import com.puzzle.build.logic.libs

plugins {
id("chaeum.android.library")
id("chaeum.android.compose")
id("piece.android.library")
id("piece.android.compose")
}

android {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import com.puzzle.build.logic.configureHiltAndroid
import com.puzzle.build.logic.configureKotlinAndroid
import com.puzzle.build.logic.configureTestAndroid

plugins {
id("com.android.library")
}

configureKotlinAndroid()
configureTestAndroid()
configureHiltAndroid()
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import com.puzzle.build.logic.configureKotlin
import com.puzzle.build.logic.configureTest

plugins {
kotlin("jvm")
}

configureKotlin()
configureTest()

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions feature/auth/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("chaeum.android.feature")
id("piece.android.feature")
}

android {
namespace = "com.chaeum.auth"
namespace = "com.puzzle.auth"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.auth
package com.puzzle.auth

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.example.auth
package com.puzzle.auth

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Text
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down
Loading

0 comments on commit 1221628

Please sign in to comment.