Merge pull request #270 from droidknights/2024/feature/rename

#269 앱이름, 패키지 이름 수정

app/build.gradle.kts

@@ -4,10 +4,10 @@ plugins {
 }
 
 android {
-    namespace = "com.droidknights.app2023"
+    namespace = "com.droidknights.app"
 
     defaultConfig {
-        applicationId = "com.droidknights.app2023"
+        applicationId = "com.droidknights.app"
         versionCode = 1
         versionName = "1.0"
     }

app/src/main/AndroidManifest.xml

@@ -5,15 +5,15 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".DroidKnightsApplication"
+        android:name="com.droidknights.app.DroidKnightsApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.DroidKnights2023"
+        android:theme="@style/Theme.DroidKnights"
         tools:targetApi="31">
 
     </application>

app/src/main/java/com/droidknights/app2023/DroidKnightsApplication.kt → app/src/main/java/com/droidknights/app/DroidKnightsApplication.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">드로이드나이츠 2023</string>
+    <string name="app_name">드로이드나이츠</string>
 </resources>

app/src/test/java/com/droidknights/app2023/ExampleUnitTest.kt → app/src/test/java/com/droidknights/app/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe

build-logic/build.gradle.kts

@@ -13,11 +13,11 @@ gradlePlugin {
     plugins {
         register("androidHilt") {
             id = "droidknights.android.hilt"
-            implementationClass = "com.droidknights.app2023.HiltAndroidPlugin"
+            implementationClass = "com.droidknights.app.HiltAndroidPlugin"
         }
         register("kotlinHilt") {
             id = "droidknights.kotlin.hilt"
-            implementationClass = "com.droidknights.app2023.HiltKotlinPlugin"
+            implementationClass = "com.droidknights.app.HiltKotlinPlugin"
         }
     }
 }

build-logic/settings.gradle.kts

@@ -1,4 +1,5 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+@Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
     repositories {
         google()

build-logic/src/main/kotlin/com/droidknights/app/AppNameExtension.kt

@@ -0,0 +1,9 @@
+package com.droidknights.app
+
+import org.gradle.api.Project
+
+fun Project.setNamespace(name: String) {
+    androidExtension.apply {
+        namespace = "com.droidknights.app.$name"
+    }
+}

build-logic/src/main/kotlin/com/droidknights/app2023/ComposeAndroid.kt → build-logic/src/main/kotlin/com/droidknights/app/ComposeAndroid.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies

build-logic/src/main/kotlin/com/droidknights/app2023/CoroutineAndroid.kt → build-logic/src/main/kotlin/com/droidknights/app/CoroutineAndroid.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies

build-logic/src/main/kotlin/com/droidknights/app2023/Extension.kt → build-logic/src/main/kotlin/com/droidknights/app/Extension.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.CommonExtension

build-logic/src/main/kotlin/com/droidknights/app2023/HiltAndroid.kt → build-logic/src/main/kotlin/com/droidknights/app/HiltAndroid.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

build-logic/src/main/kotlin/com/droidknights/app2023/HiltKotlin.kt → build-logic/src/main/kotlin/com/droidknights/app/HiltKotlin.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

build-logic/src/main/kotlin/com/droidknights/app2023/KotestAndroid.kt → build-logic/src/main/kotlin/com/droidknights/app/KotestAndroid.kt

@@ -1,13 +1,13 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureKotestAndroid() {
     configureKotest()
     configureJUnitAndroid()
 }
 
+@Suppress("UnstableApiUsage")
 internal fun Project.configureJUnitAndroid() {
     androidExtension.apply {
         testOptions {

build-logic/src/main/kotlin/com/droidknights/app2023/KotestKotlin.kt → build-logic/src/main/kotlin/com/droidknights/app/KotestKotlin.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test

build-logic/src/main/kotlin/com/droidknights/app2023/KotlinAndroid.kt → build-logic/src/main/kotlin/com/droidknights/app/KotlinAndroid.kt

@@ -1,6 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project

build-logic/src/main/kotlin/com/droidknights/app2023/VerifyDetekt.kt → build-logic/src/main/kotlin/com/droidknights/app/VerifyDetekt.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023
+package com.droidknights.app
 
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies

build-logic/src/main/kotlin/droidknights.android.application.gradle.kts

@@ -1,6 +1,6 @@
-import com.droidknights.app2023.configureHiltAndroid
-import com.droidknights.app2023.configureKotestAndroid
-import com.droidknights.app2023.configureKotlinAndroid
+import com.droidknights.app.configureHiltAndroid
+import com.droidknights.app.configureKotestAndroid
+import com.droidknights.app.configureKotlinAndroid
 
 plugins {
     id("com.android.application")

build-logic/src/main/kotlin/droidknights.android.compose.gradle.kts

@@ -1,3 +1,3 @@
-import com.droidknights.app2023.configureComposeAndroid
+import com.droidknights.app.configureComposeAndroid
 
 configureComposeAndroid()

build-logic/src/main/kotlin/droidknights.android.feature.gradle.kts

@@ -1,5 +1,5 @@
-import com.droidknights.app2023.configureHiltAndroid
-import com.droidknights.app2023.libs
+import com.droidknights.app.configureHiltAndroid
+import com.droidknights.app.libs
 
 plugins {
     id("droidknights.android.library")

build-logic/src/main/kotlin/droidknights.android.library.gradle.kts

@@ -1,7 +1,7 @@
-import com.droidknights.app2023.configureCoroutineAndroid
-import com.droidknights.app2023.configureHiltAndroid
-import com.droidknights.app2023.configureKotest
-import com.droidknights.app2023.configureKotlinAndroid
+import com.droidknights.app.configureCoroutineAndroid
+import com.droidknights.app.configureHiltAndroid
+import com.droidknights.app.configureKotest
+import com.droidknights.app.configureKotlinAndroid
 
 plugins {
     id("com.android.library")

build-logic/src/main/kotlin/droidknights.kotlin.library.gradle.kts

@@ -1,5 +1,5 @@
-import com.droidknights.app2023.configureKotest
-import com.droidknights.app2023.configureKotlin
+import com.droidknights.app.configureKotest
+import com.droidknights.app.configureKotlin
 
 plugins {
     kotlin("jvm")

build-logic/src/main/kotlin/droidknights.verify.detekt.gradle.kts

@@ -1,4 +1,4 @@
-import com.droidknights.app2023.configureVerifyDetekt
+import com.droidknights.app.configureVerifyDetekt
 
 configureVerifyDetekt()
 

core/data/build.gradle.kts

@@ -1,11 +1,13 @@
+import com.droidknights.app.setNamespace
+
 plugins {
     id("droidknights.android.library")
     id("droidknights.android.hilt")
     id("kotlinx-serialization")
 }
 
 android {
-    namespace = "com.droidknights.app2023.core.data"
+    setNamespace("core.data")
 }
 
 dependencies {

core/data/src/main/java/com/droidknights/app2023/core/data/api/GithubApi.kt → core/data/src/main/java/com/droidknights/app/core/data/api/GithubApi.kt

@@ -1,10 +1,11 @@
-package com.droidknights.app2023.core.data.api
+package com.droidknights.app.core.data.api
 
-import com.droidknights.app2023.core.data.api.model.ContributorResponse
+import com.droidknights.app.core.data.api.model.ContributorResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 internal interface GithubApi {
+
     @GET("repos/{owner}/{name}/contributors")
     suspend fun getContributors(
         @Path("owner") owner: String,

core/data/src/main/java/com/droidknights/app/core/data/api/GithubRawApi.kt

@@ -0,0 +1,14 @@
+package com.droidknights.app.core.data.api
+
+import com.droidknights.app.core.data.api.model.SessionResponse
+import com.droidknights.app.core.data.api.model.SponsorResponse
+import retrofit2.http.GET
+
+internal interface GithubRawApi {
+
+    @GET("/droidknights/DroidKnightsApp/main/core/data/src/main/assets/sponsors.json")
+    suspend fun getSponsors(): List<SponsorResponse>
+
+    @GET("/droidknights/DroidKnightsApp/main/core/data/src/main/assets/sessions.json")
+    suspend fun getSessions(): List<SessionResponse>
+}

core/data/src/main/java/com/droidknights/app2023/core/data/api/fake/AssetsGithubRawApi.kt → core/data/src/main/java/com/droidknights/app/core/data/api/fake/AssetsGithubRawApi.kt

@@ -1,9 +1,9 @@
-package com.droidknights.app2023.core.data.api.fake
+package com.droidknights.app.core.data.api.fake
 
 import android.content.Context
-import com.droidknights.app2023.core.data.api.GithubRawApi
-import com.droidknights.app2023.core.data.api.model.SessionResponse
-import com.droidknights.app2023.core.data.api.model.SponsorResponse
+import com.droidknights.app.core.data.api.GithubRawApi
+import com.droidknights.app.core.data.api.model.SessionResponse
+import com.droidknights.app.core.data.api.model.SponsorResponse
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/ContributorResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/ContributorResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/LevelResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/LevelResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/RoomResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/RoomResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/SessionResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/SessionResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/SpeakerResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/SpeakerResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/api/model/SponsorResponse.kt → core/data/src/main/java/com/droidknights/app/core/data/api/model/SponsorResponse.kt

@@ -1,4 +1,4 @@
-package com.droidknights.app2023.core.data.api.model
+package com.droidknights.app.core.data.api.model
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

core/data/src/main/java/com/droidknights/app2023/core/data/di/ApiModule.kt → core/data/src/main/java/com/droidknights/app/core/data/di/ApiModule.kt

@@ -1,7 +1,7 @@
-package com.droidknights.app2023.core.data.di
+package com.droidknights.app.core.data.di
 
-import com.droidknights.app2023.core.data.api.GithubApi
-import com.droidknights.app2023.core.data.api.GithubRawApi
+import com.droidknights.app.core.data.api.GithubApi
+import com.droidknights.app.core.data.api.GithubRawApi
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

core/data/src/main/java/com/droidknights/app2023/core/data/di/DataModule.kt → core/data/src/main/java/com/droidknights/app/core/data/di/DataModule.kt

@@ -1,18 +1,18 @@
-package com.droidknights.app2023.core.data.di
+package com.droidknights.app.core.data.di
 
 import android.content.Context
-import com.droidknights.app2023.core.data.api.GithubRawApi
-import com.droidknights.app2023.core.data.api.fake.AssetsGithubRawApi
-import com.droidknights.app2023.core.data.repository.ContributorRepository
-import com.droidknights.app2023.core.data.repository.DefaultContributorRepository
-import com.droidknights.app2023.core.data.repository.DefaultSessionRepository
-import com.droidknights.app2023.core.data.repository.DefaultSettingsRepository
-import com.droidknights.app2023.core.data.repository.DefaultSponsorRepository
-import com.droidknights.app2023.core.data.repository.SessionRepository
-import com.droidknights.app2023.core.data.repository.SettingsRepository
-import com.droidknights.app2023.core.data.repository.SponsorRepository
-import com.droidknights.app2023.core.datastore.datasource.DefaultSessionPreferencesDataSource
-import com.droidknights.app2023.core.datastore.datasource.SessionPreferencesDataSource
+import com.droidknights.app.core.data.api.GithubRawApi
+import com.droidknights.app.core.data.api.fake.AssetsGithubRawApi
+import com.droidknights.app.core.data.repository.ContributorRepository
+import com.droidknights.app.core.data.repository.DefaultContributorRepository
+import com.droidknights.app.core.data.repository.DefaultSessionRepository
+import com.droidknights.app.core.data.repository.DefaultSettingsRepository
+import com.droidknights.app.core.data.repository.DefaultSponsorRepository
+import com.droidknights.app.core.data.repository.SessionRepository
+import com.droidknights.app.core.data.repository.SettingsRepository
+import com.droidknights.app.core.data.repository.SponsorRepository
+import com.droidknights.app.core.datastore.datasource.DefaultSessionPreferencesDataSource
+import com.droidknights.app.core.datastore.datasource.SessionPreferencesDataSource
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -48,19 +48,22 @@ internal abstract class DataModule {
         @Singleton
         fun provideSponsorRepository(
             githubRawApi: GithubRawApi,
-        ): SponsorRepository = DefaultSponsorRepository(githubRawApi)
+        ): SponsorRepository =
+            DefaultSponsorRepository(githubRawApi)
 
         @Provides
         @Singleton
         fun provideSessionRepository(
             githubRawApi: GithubRawApi,
             sessionDataSource: SessionPreferencesDataSource,
-        ): SessionRepository = DefaultSessionRepository(githubRawApi, sessionDataSource)
+        ): SessionRepository =
+            DefaultSessionRepository(githubRawApi, sessionDataSource)
 
         @Provides
         @Singleton
         fun provideGithubRawApi(
             @ApplicationContext context: Context,
-        ): AssetsGithubRawApi = AssetsGithubRawApi(context)
+        ): AssetsGithubRawApi =
+            AssetsGithubRawApi(context)
     }
 }

core/data/src/main/java/com/droidknights/app2023/core/data/mapper/ContributorMapper.kt → core/data/src/main/java/com/droidknights/app/core/data/mapper/ContributorMapper.kt

@@ -1,7 +1,7 @@
-package com.droidknights.app2023.core.data.mapper
+package com.droidknights.app.core.data.mapper
 
-import com.droidknights.app2023.core.data.api.model.ContributorResponse
-import com.droidknights.app2023.core.model.Contributor
+import com.droidknights.app.core.data.api.model.ContributorResponse
+import com.droidknights.app.core.model.Contributor
 
 internal fun ContributorResponse.toData(): Contributor =
     Contributor(

core/data/src/main/java/com/droidknights/app2023/core/data/mapper/SessionMapper.kt → core/data/src/main/java/com/droidknights/app/core/data/mapper/SessionMapper.kt

@@ -1,14 +1,14 @@
-package com.droidknights.app2023.core.data.mapper
+package com.droidknights.app.core.data.mapper
 
-import com.droidknights.app2023.core.data.api.model.LevelResponse
-import com.droidknights.app2023.core.data.api.model.RoomResponse
-import com.droidknights.app2023.core.data.api.model.SessionResponse
-import com.droidknights.app2023.core.data.api.model.SpeakerResponse
-import com.droidknights.app2023.core.model.Level
-import com.droidknights.app2023.core.model.Room
-import com.droidknights.app2023.core.model.Session
-import com.droidknights.app2023.core.model.Speaker
-import com.droidknights.app2023.core.model.Tag
+import com.droidknights.app.core.data.api.model.LevelResponse
+import com.droidknights.app.core.data.api.model.RoomResponse
+import com.droidknights.app.core.data.api.model.SessionResponse
+import com.droidknights.app.core.data.api.model.SpeakerResponse
+import com.droidknights.app.core.model.Level
+import com.droidknights.app.core.model.Room
+import com.droidknights.app.core.model.Session
+import com.droidknights.app.core.model.Speaker
+import com.droidknights.app.core.model.Tag
 
 internal fun SessionResponse.toData(): Session = Session(
     id = this.id,