style: ktlint에 걸린 코드 정렬

woowacourse-teams · Jul 27, 2023 · 244580b · 244580b
1 parent cd5090e
commit 244580b
Show file tree

Hide file tree

Showing 21 changed files with 494 additions and 486 deletions.
diff --git a/android/app/src/androidTest/java/com/now/naaga/ExampleInstrumentedTest.kt b/android/app/src/androidTest/java/com/now/naaga/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.now.naaga
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+        xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <application
-        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:supportsRtl="true"
-        android:theme="@style/Theme.Naaga"
-        android:usesCleartextTraffic="true"
-        tools:targetApi="33">
+            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:supportsRtl="true"
+            android:theme="@style/Theme.Naaga"
+            android:usesCleartextTraffic="true"
+            tools:targetApi="33">
 
         <meta-data
-            android:name="com.naver.maps.map.CLIENT_ID"
-            android:value="hl7nqvg6bj" />
+                android:name="com.naver.maps.map.CLIENT_ID"
+                android:value="hl7nqvg6bj" />
 
         <activity
-            android:name=".presentation.beginadventure.BeginAdventureActivity"
-            android:exported="true">
+                android:name=".presentation.beginadventure.BeginAdventureActivity"
+                android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -31,8 +31,8 @@
         </activity>
 
         <activity
-            android:name=".presentation.onadventure.OnAdventureActivity"
-            android:exported="true"/>
+                android:name=".presentation.onadventure.OnAdventureActivity"
+                android:exported="true" />
     </application>
 
 </manifest>
diff --git a/android/app/src/main/java/com/now/naaga/data/NaagaThrowable.kt b/android/app/src/main/java/com/now/naaga/data/NaagaThrowable.kt
@@ -16,5 +16,6 @@ sealed class NaagaThrowable(override val message: String?, val userMessage: Stri
     class GameError(errorMessage: String) :
         NaagaThrowable(errorMessage, "게임에 오류가 발생했습니다. 게임을 다시 시작합니다")
 
-    class NaagaUnknownError(errorMessage: String) : NaagaThrowable(errorMessage, "예상치 못한 오류가 발생했습니다")
-}
+    class NaagaUnknownError(errorMessage: String) :
+        NaagaThrowable(errorMessage, "예상치 못한 오류가 발생했습니다")
+}
diff --git a/android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureActivity.kt
@@ -130,7 +130,7 @@ class OnAdventureActivity : AppCompatActivity(), OnMapReadyCallback {
             Toast.makeText(
                 this,
                 getString(R.string.onAdventure_fail_load_description),
-                Toast.LENGTH_SHORT,
+                Toast.LENGTH_SHORT
             ).show()
             finish()
         }
@@ -154,19 +154,28 @@ class OnAdventureActivity : AppCompatActivity(), OnMapReadyCallback {
     private fun onStatusChanged(status: AdventureStatus) {
         when (status) {
             AdventureStatus.DONE -> {
-                Toast.makeText(this, getString(R.string.onAdventure_adventure_success), Toast.LENGTH_LONG).show()
+                Toast.makeText(
+                    this,
+                    getString(R.string.onAdventure_adventure_success),
+                    Toast.LENGTH_LONG
+                ).show()
                 startActivity(Intent(this, BeginAdventureActivity::class.java))
                 finish()
             }
+
             AdventureStatus.IN_PROGRESS -> {
-                Toast.makeText(this, getString(R.string.onAdventure_retry), Toast.LENGTH_LONG).show()
+                Toast.makeText(this, getString(R.string.onAdventure_retry), Toast.LENGTH_LONG)
+                    .show()
+            }
+
+            AdventureStatus.ERROR -> {
+                stopAdventure(status)
             }
-            AdventureStatus.ERROR -> { stopAdventure(status) }
         }
     }
 
     companion object {
         private const val LOCATION_PERMISSION_REQUEST_CODE = 1000
         private const val DESTINATION_PHOTO = "DESTINATION_PHOTO"
     }
-}
+}
diff --git a/android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureFactory.kt b/android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureFactory.kt
@@ -4,12 +4,13 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.now.domain.repository.AdventureRepository
 
-class OnAdventureFactory(private val adventureRepository: AdventureRepository) : ViewModelProvider.Factory {
+class OnAdventureFactory(private val adventureRepository: AdventureRepository) :
+    ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         if (modelClass.isAssignableFrom(OnAdventureViewModel::class.java)) {
             return OnAdventureViewModel(adventureRepository) as T
         } else {
             throw IllegalArgumentException()
         }
     }
-}
+}
diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,30 +1,30 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
+        xmlns:aapt="http://schemas.android.com/aapt"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="108"
+        android:viewportHeight="108">
     <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
         <aapt:attr name="android:fillColor">
             <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
+                    android:endX="85.84757"
+                    android:endY="92.4963"
+                    android:startX="42.9492"
+                    android:startY="49.59793"
+                    android:type="linear">
                 <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
+                        android:color="#44000000"
+                        android:offset="0.0" />
                 <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
+                        android:color="#00000000"
+                        android:offset="1.0" />
             </gradient>
         </aapt:attr>
     </path>
     <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
+            android:fillColor="#FFFFFF"
+            android:fillType="nonZero"
+            android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_close.xml b/android/app/src/main/res/drawable/ic_close.xml
@@ -1,13 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M18,2L2,18M2,2L18,18"
-      android:strokeLineJoin="round"
-      android:strokeWidth="3"
-      android:fillColor="#FFFFFF"
-      android:strokeColor="#FFFFFF"
-      android:strokeLineCap="round"/>
+        android:width="20dp"
+        android:height="20dp"
+        android:viewportWidth="20"
+        android:viewportHeight="20">
+    <path
+            android:pathData="M18,2L2,18M2,2L18,18"
+            android:strokeLineJoin="round"
+            android:strokeWidth="3"
+            android:fillColor="#FFFFFF"
+            android:strokeColor="#FFFFFF"
+            android:strokeLineCap="round" />
 </vector>