Merge pull request #23 from SSU-Plector/feat/#21-logo-splash

[Feat/#21 logo-splash]: 로고, 소개 사진 파일 추가 및 소개 화면 구현
SSU-Plector · Apr 20, 2024 · 716d62d · 716d62d
2 parents fdebbcf + ffded66
commit 716d62d
Show file tree

Hide file tree

Showing 47 changed files with 306 additions and 484 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -76,7 +76,6 @@ dependencies {
     implementation(project(":core:designsystem"))
     implementation(project(":core:common"))
     implementation(project(":feature:projects"))
-    implementation(project(":feature:mypage"))
 
     KotlinDependencies.run {
         implementation(kotlin)
@@ -120,4 +119,4 @@ dependencies {
         implementation(composeMaterial3)
         implementation(composeTooling)
     }
-}
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,9 +9,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/logo_olive_rotational"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/logo_olive_rotational"
         android:supportsRtl="true"
         android:theme="@style/Theme.SSUPlectorAndroid"
         tools:targetApi="31">

diff --git a/app/src/main/java/com/zucchini/ssuplector/InitActivity.kt b/app/src/main/java/com/zucchini/ssuplector/InitActivity.kt
@@ -3,6 +3,7 @@ package com.zucchini.ssuplector
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import com.zucchini.projects.IntroduceActivity
 import com.zucchini.projects.MainActivity
 import com.zucchini.ssuplector.databinding.ActivityInitBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -15,7 +16,7 @@ class InitActivity : AppCompatActivity() {
         binding = ActivityInitBinding.inflate(layoutInflater)
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
-        startActivity(Intent(this, MainActivity::class.java))
+        startActivity(Intent(this, IntroduceActivity::class.java))
         finish()
     }
 }
diff --git a/app/src/main/res/drawable/logo_leaf_dark.png b/app/src/main/res/drawable/logo_leaf_dark.png
diff --git a/app/src/main/res/drawable/logo_leaf_light.png b/app/src/main/res/drawable/logo_leaf_light.png
diff --git a/app/src/main/res/drawable/logo_olive_rotational.png b/app/src/main/res/drawable/logo_olive_rotational.png
diff --git a/app/src/main/res/drawable/logo_olive_vertical.png b/app/src/main/res/drawable/logo_olive_vertical.png
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">SSUPlector</string>
+    <string name="app_name">슈플렉터</string>
 </resources>
diff --git a/buildSrc/src/main/java/com/zucchini/buildsrc/Dependencies.kt b/buildSrc/src/main/java/com/zucchini/buildsrc/Dependencies.kt
@@ -87,6 +87,7 @@ object ThirdPartyDependencies {
 
     const val flexbox = "com.google.android.flexbox:flexbox:${Versions.flexboxVersion}"
     const val circleImageView = "de.hdodenhof:circleimageview:${Versions.circleImageViewVersion}"
+    const val dotIndicator = "com.tbuonomo:dotsindicator:${Versions.dotIndicatorVersion}"
 }
 
 object ClassPathPlugins {

diff --git a/buildSrc/src/main/java/com/zucchini/buildsrc/Versions.kt b/buildSrc/src/main/java/com/zucchini/buildsrc/Versions.kt
@@ -43,6 +43,7 @@ object Versions {
     const val androidTestVersion = "1.1.2"
     const val flexboxVersion = "3.0.0"
     const val circleImageViewVersion = "3.1.0"
+    const val dotIndicatorVersion = "5.0"
 
     val javaVersion = JavaVersion.VERSION_17
     const val jvmVersion = "17"

diff --git a/feature/devInfo/.gitignore b/feature/devInfo/.gitignore
diff --git a/feature/devInfo/build.gradle.kts b/feature/devInfo/build.gradle.kts
diff --git a/feature/devInfo/consumer-rules.pro b/feature/devInfo/consumer-rules.pro
diff --git a/feature/devInfo/proguard-rules.pro b/feature/devInfo/proguard-rules.pro
diff --git a/feature/devInfo/src/androidTest/java/com/zucchini/devinfo/ExampleInstrumentedTest.kt b/feature/devInfo/src/androidTest/java/com/zucchini/devinfo/ExampleInstrumentedTest.kt
diff --git a/feature/devInfo/src/main/AndroidManifest.xml b/feature/devInfo/src/main/AndroidManifest.xml
diff --git a/feature/devInfo/src/main/res/values/strings.xml b/feature/devInfo/src/main/res/values/strings.xml
diff --git a/feature/devInfo/src/test/java/com/zucchini/devinfo/ExampleUnitTest.kt b/feature/devInfo/src/test/java/com/zucchini/devinfo/ExampleUnitTest.kt
diff --git a/feature/mypage/.gitignore b/feature/mypage/.gitignore
diff --git a/feature/mypage/build.gradle.kts b/feature/mypage/build.gradle.kts
diff --git a/feature/mypage/consumer-rules.pro b/feature/mypage/consumer-rules.pro
diff --git a/feature/mypage/proguard-rules.pro b/feature/mypage/proguard-rules.pro