Skip to content

Commit f464cd0

Browse files
authored
release: 0.1.0(10) 버전 배포 (#48)
release: 0.1.0(10) 버전 배포
2 parents 4fd6f13 + c7adfda commit f464cd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+873
-213
lines changed

app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId "com.woozoo.menumonya"
2323
minSdk 24
2424
targetSdk 33
25-
versionCode 9
26-
versionName "0.0.9"
25+
versionCode 10
26+
versionName "0.1.0"
2727

2828
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2929
}
@@ -41,19 +41,21 @@ android {
4141
debug {
4242
applicationIdSuffix ".debug"
4343
resValue "string", "NAVER_CLIENT_ID", localProperties['NAVER_CLIENT_ID']
44+
manifestPlaceholders.put("gaEnabled", "false")
4445
manifestPlaceholders = [app_name: "@string/app_name_debug"]
4546
}
4647
release {
4748
minifyEnabled true
4849
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
4950
resValue "string", "NAVER_CLIENT_ID", localProperties['NAVER_CLIENT_ID']
51+
manifestPlaceholders.put("gaEnabled", "true")
5052
manifestPlaceholders = [app_name: "@string/app_name"]
5153
signingConfig signingConfigs.release
5254
}
5355
}
5456
compileOptions {
55-
sourceCompatibility JavaVersion.VERSION_1_8
56-
targetCompatibility JavaVersion.VERSION_1_8
57+
sourceCompatibility JavaVersion.VERSION_1_9
58+
targetCompatibility JavaVersion.VERSION_1_9
5759
}
5860
kotlinOptions {
5961
jvmTarget = '1.8'
@@ -106,6 +108,9 @@ dependencies {
106108
// Hilt
107109
implementation "com.google.dagger:hilt-android:2.44"
108110
kapt "com.google.dagger:hilt-compiler:2.44"
111+
112+
// DataStore
113+
implementation 'androidx.datastore:datastore-preferences:1.0.0'
109114
}
110115

111116
// Allow references to generated code

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
android:usesCleartextTraffic="true"
2020
tools:targetApi="31">
2121
<activity
22-
android:name="com.woozoo.menumonya.MainActivity"
22+
android:name="com.woozoo.menumonya.ui.screen.MainActivity"
2323
android:exported="true">
2424
<intent-filter>
2525
<action android:name="android.intent.action.MAIN" />
@@ -31,6 +31,10 @@
3131
<meta-data
3232
android:name="com.naver.maps.map.CLIENT_ID"
3333
android:value="@string/NAVER_CLIENT_ID" />
34+
35+
<meta-data
36+
android:name="firebase_analytics_collection_enabled"
37+
android:value="@{gaEnabled}" />
3438
</application>
3539

3640
</manifest>

app/src/main/java/com/woozoo/menumonya/Application.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.woozoo.menumonya
22

33
import android.app.Application
44
import android.content.Context
5-
import com.woozoo.menumonya.repository.RemoteConfigRepositoryImpl
5+
import com.woozoo.menumonya.data.repository.RemoteConfigRepositoryImpl
66
import dagger.hilt.android.HiltAndroidApp
77
import javax.inject.Inject
88

app/src/main/java/com/woozoo/menumonya/Constants.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import com.naver.maps.geometry.LatLng
44

55
class Constants {
66
companion object {
7+
val REGION_REPORT = "지역건의"
8+
val REGION_BUTTON_TYPE = 0
9+
val REGION_REPORT_TYPE = 1
10+
711
val LATLNG_GN = LatLng(37.4981647, 127.0283079)
812
val LATLNG_YS = LatLng(37.5007163, 127.0366182)
913
val MAP_MIN_ZOOM = 13.0

app/src/main/java/com/woozoo/menumonya/model/Food.kt renamed to app/src/main/java/com/woozoo/menumonya/data/model/Food.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woozoo.menumonya.model
1+
package com.woozoo.menumonya.data.model
22

33
data class Food(
44
val date: String = "",

app/src/main/java/com/woozoo/menumonya/model/Menu.kt renamed to app/src/main/java/com/woozoo/menumonya/data/model/Menu.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woozoo.menumonya.model
1+
package com.woozoo.menumonya.data.model
22

33
data class Menu (
44
val restaurantId: String = "",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.woozoo.menumonya.data.model
2+
3+
import com.woozoo.menumonya.Constants.Companion.REGION_BUTTON_TYPE
4+
5+
data class Region(
6+
val name: String = "",
7+
val latitude: Double = 0.0,
8+
val longitude: Double = 0.0,
9+
val regionId: Int = -1, // 데이터 정렬 순서(보여주고싶은 순서 변경 용도로 사용, DB 수정을 통해 제어하기 위함)
10+
val viewType: Int = REGION_BUTTON_TYPE
11+
)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.woozoo.menumonya.data.model
2+
3+
data class ReportButtonText(val description: String="")

app/src/main/java/com/woozoo/menumonya/model/Restaurant.kt renamed to app/src/main/java/com/woozoo/menumonya/data/model/Restaurant.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.woozoo.menumonya.model
1+
package com.woozoo.menumonya.data.model
22

33

44
data class Restaurant(
@@ -12,7 +12,8 @@ data class Restaurant(
1212
val time: Time = Time(),
1313
val phoneNumber: String = "",
1414
var todayMenu: Food = Food(),
15-
val updatedTime: String = ""
15+
val updatedTime: String = "",
16+
val menuAvailableOnline: Boolean = false,
1617
)
1718

1819
data class Location(
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.woozoo.menumonya.data.repository
2+
3+
import androidx.datastore.preferences.core.Preferences
4+
5+
interface DataStoreRepository {
6+
suspend fun getLastSelectedRegion(): String
7+
8+
suspend fun setLastSelectedRegion(region: String): Preferences
9+
10+
suspend fun getIsFirstOpen(): Boolean
11+
12+
suspend fun setIsFirstOpen(isFirstOpen: Boolean): Preferences
13+
}

0 commit comments

Comments
 (0)