Skip to content

Commit 244580b

Browse files
briandr97briandr97
committed
style: ktlint에 걸린 코드 정렬
1 parent cd5090e commit 244580b

21 files changed

+494
-486
lines changed

‎android/app/src/androidTest/java/com/now/naaga/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.now.naaga
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*

‎android/app/src/main/AndroidManifest.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
3+
xmlns:tools="http://schemas.android.com/tools">
44

55
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
66
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
77

88
<application
9-
android:allowBackup="true"
10-
android:dataExtractionRules="@xml/data_extraction_rules"
11-
android:fullBackupContent="@xml/backup_rules"
12-
android:icon="@mipmap/ic_launcher"
13-
android:label="@string/app_name"
14-
android:supportsRtl="true"
15-
android:theme="@style/Theme.Naaga"
16-
android:usesCleartextTraffic="true"
17-
tools:targetApi="33">
9+
android:allowBackup="true"
10+
android:dataExtractionRules="@xml/data_extraction_rules"
11+
android:fullBackupContent="@xml/backup_rules"
12+
android:icon="@mipmap/ic_launcher"
13+
android:label="@string/app_name"
14+
android:supportsRtl="true"
15+
android:theme="@style/Theme.Naaga"
16+
android:usesCleartextTraffic="true"
17+
tools:targetApi="33">
1818

1919
<meta-data
20-
android:name="com.naver.maps.map.CLIENT_ID"
21-
android:value="hl7nqvg6bj" />
20+
android:name="com.naver.maps.map.CLIENT_ID"
21+
android:value="hl7nqvg6bj" />
2222

2323
<activity
24-
android:name=".presentation.beginadventure.BeginAdventureActivity"
25-
android:exported="true">
24+
android:name=".presentation.beginadventure.BeginAdventureActivity"
25+
android:exported="true">
2626
<intent-filter>
2727
<action android:name="android.intent.action.MAIN" />
2828

@@ -31,8 +31,8 @@
3131
</activity>
3232

3333
<activity
34-
android:name=".presentation.onadventure.OnAdventureActivity"
35-
android:exported="true"/>
34+
android:name=".presentation.onadventure.OnAdventureActivity"
35+
android:exported="true" />
3636
</application>
3737

3838
</manifest>

‎android/app/src/main/java/com/now/naaga/data/NaagaThrowable.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ sealed class NaagaThrowable(override val message: String?, val userMessage: Stri
1616
class GameError(errorMessage: String) :
1717
NaagaThrowable(errorMessage, "게임에 오류가 발생했습니다. 게임을 다시 시작합니다")
1818

19-
class NaagaUnknownError(errorMessage: String) : NaagaThrowable(errorMessage, "예상치 못한 오류가 발생했습니다")
20-
}
19+
class NaagaUnknownError(errorMessage: String) :
20+
NaagaThrowable(errorMessage, "예상치 못한 오류가 발생했습니다")
21+
}

‎android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureActivity.kt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class OnAdventureActivity : AppCompatActivity(), OnMapReadyCallback {
130130
Toast.makeText(
131131
this,
132132
getString(R.string.onAdventure_fail_load_description),
133-
Toast.LENGTH_SHORT,
133+
Toast.LENGTH_SHORT
134134
).show()
135135
finish()
136136
}
@@ -154,19 +154,28 @@ class OnAdventureActivity : AppCompatActivity(), OnMapReadyCallback {
154154
private fun onStatusChanged(status: AdventureStatus) {
155155
when (status) {
156156
AdventureStatus.DONE -> {
157-
Toast.makeText(this, getString(R.string.onAdventure_adventure_success), Toast.LENGTH_LONG).show()
157+
Toast.makeText(
158+
this,
159+
getString(R.string.onAdventure_adventure_success),
160+
Toast.LENGTH_LONG
161+
).show()
158162
startActivity(Intent(this, BeginAdventureActivity::class.java))
159163
finish()
160164
}
165+
161166
AdventureStatus.IN_PROGRESS -> {
162-
Toast.makeText(this, getString(R.string.onAdventure_retry), Toast.LENGTH_LONG).show()
167+
Toast.makeText(this, getString(R.string.onAdventure_retry), Toast.LENGTH_LONG)
168+
.show()
169+
}
170+
171+
AdventureStatus.ERROR -> {
172+
stopAdventure(status)
163173
}
164-
AdventureStatus.ERROR -> { stopAdventure(status) }
165174
}
166175
}
167176

168177
companion object {
169178
private const val LOCATION_PERMISSION_REQUEST_CODE = 1000
170179
private const val DESTINATION_PHOTO = "DESTINATION_PHOTO"
171180
}
172-
}
181+
}

‎android/app/src/main/java/com/now/naaga/presentation/onadventure/OnAdventureFactory.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import androidx.lifecycle.ViewModel
44
import androidx.lifecycle.ViewModelProvider
55
import com.now.domain.repository.AdventureRepository
66

7-
class OnAdventureFactory(private val adventureRepository: AdventureRepository) : ViewModelProvider.Factory {
7+
class OnAdventureFactory(private val adventureRepository: AdventureRepository) :
8+
ViewModelProvider.Factory {
89
override fun <T : ViewModel> create(modelClass: Class<T>): T {
910
if (modelClass.isAssignableFrom(OnAdventureViewModel::class.java)) {
1011
return OnAdventureViewModel(adventureRepository) as T
1112
} else {
1213
throw IllegalArgumentException()
1314
}
1415
}
15-
}
16+
}

‎android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:width="108dp"
4-
android:height="108dp"
5-
android:viewportWidth="108"
6-
android:viewportHeight="108">
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
77
<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">
88
<aapt:attr name="android:fillColor">
99
<gradient
10-
android:endX="85.84757"
11-
android:endY="92.4963"
12-
android:startX="42.9492"
13-
android:startY="49.59793"
14-
android:type="linear">
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
1515
<item
16-
android:color="#44000000"
17-
android:offset="0.0" />
16+
android:color="#44000000"
17+
android:offset="0.0" />
1818
<item
19-
android:color="#00000000"
20-
android:offset="1.0" />
19+
android:color="#00000000"
20+
android:offset="1.0" />
2121
</gradient>
2222
</aapt:attr>
2323
</path>
2424
<path
25-
android:fillColor="#FFFFFF"
26-
android:fillType="nonZero"
27-
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"
28-
android:strokeWidth="1"
29-
android:strokeColor="#00000000" />
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
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"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
3030
</vector>

‎android/app/src/main/res/drawable/ic_close.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="20dp"
3-
android:height="20dp"
4-
android:viewportWidth="20"
5-
android:viewportHeight="20">
6-
<path
7-
android:pathData="M18,2L2,18M2,2L18,18"
8-
android:strokeLineJoin="round"
9-
android:strokeWidth="3"
10-
android:fillColor="#FFFFFF"
11-
android:strokeColor="#FFFFFF"
12-
android:strokeLineCap="round"/>
2+
android:width="20dp"
3+
android:height="20dp"
4+
android:viewportWidth="20"
5+
android:viewportHeight="20">
6+
<path
7+
android:pathData="M18,2L2,18M2,2L18,18"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="3"
10+
android:fillColor="#FFFFFF"
11+
android:strokeColor="#FFFFFF"
12+
android:strokeLineCap="round" />
1313
</vector>

0 commit comments

Comments
 (0)