release/2.1.1 (#227)

* Update release_tag.yml

* Update bug_report.md

* Production to develop (#213)

* release 1.1.15

* Release/2.0.0 (#209)

* [Refactor/#165] 문의하기 리팩토링 (#189)

* refactor: inquire

* add: todo

* [Chore] migrate build.gradle.kts & lib.version.toml (#194)

* chore: migrate build.gradle.kts & lib.version.toml

* chore: toml use kebab-case

* [Fix/#141] remote config ENUM값 있는걸로 교체 (#193)

* fix: as Restaurant 타입 캐스팅 안되는 중

* fix: conflict

* ds

* chore: add gitignore ".DS_Store"

* [Fix/#139] 리뷰 수정시 정보가 안넘어가던 현상 고치기 (#192)

* release 1.1.15

* fix: 리뷰 수정하기 정보 안넘어가던거 성공

* fix: 맛 별점이 양 별점으로 잘못 들어가는거 수정

* fix: endpoint "s"

* [chore/#195] change new color scheme (#196)

* chore: change new color scheme

* chore: naming

* chore: naming lower

* chore: missing "1"

* chore: change missing color

* [Redesign] change home design (#198)

* redesign: calendar

* redesign: item_cafeteria_section.xml

* fix: top 여백을 fragment에서 item으로 변경

* feat: 장소 바인딩

* chore: indicator width min

* add: ic good, bad

* Revert "add: ic good, bad"

This reverts commit f115b5f.

* Revert "chore: indicator width min"

This reverts commit afc2f16.

* [Feat] 현재 시간에 따른 아침/점심/저녁 구분 (#201)

* feat: TabLayout 시간대 설정

* feat: TabLayout 시간대 설정

* [Redesign/#203] my page 리디자인 적용 (#204)

* redesign: 마이페이지 UI 변경

* redesign: 닉네임 변경 디자인 변경

* redesign: 닉네임 변경 디자인 변경

* delete: 안쓰는 drawable 삭제

* add: 정말 탈퇴하시겠습니까? 뷰

* feat: 닉네임 설정 로직 3개 완료

* feat: 정말 탈퇴하시겠습니까?

* feat: 만든 사람들

* [Redesign/#200] review보기 리디자인 적용 (#202)

* resign: 액션바 색상 변경

* add: 리사이클러뷰 메뉴 아이템 생성

* chore: 프로그래스 바 간격 맞추기

* chore: 맛&양 -> 굿&배드

* feat: 카드뷰로 사진 테두리 구현

* feat: 카드뷰로 사진 둥근테두리 구현

* feat: 간격 값 조정

* chore: gitignore 수정

* fix: 사진 있을 때만 imageView&CardView 보이게

* delete: ds_store

* fix: missing files

* chore: 바 추가

* chore: 리뷰 없을 때 간격 조정

* chore: 시간 대 조정

* [Redesign/#199] Info 리디자인 적용 + bottomSheet로 변경 (#205)

* redesign: info bottomsheet로 변경

* feat: 식당 운영정보 실제 정보로 바인딩

* [Redesign] menus (#208)

* refactor: material menus로 신고/수정/삭제 분리

* fix: 삭제 안되는거 수정

dialog import 수정, context를 this로 수정

* fix: 리뷰 삭제 후 리스트 재로딩

* [Redesign/#206] report 리디자인 적용 +문의하기 웹뷰처리 (#207)

* add: shape, selector 파일

* delete: 문의하기 카카오채널로 변경

* refactor: 신고하기 flow로 리팩토링

* chore: 로고 변경

* chore: 메뉴이름 임시 바인딩

* chore: 굿배드 주석처리

* chore: 리뷰 작성 임시 처리

* fix: 리뷰 사진 안보이는거 해결

* fix: 메뉴이름 Text style

* fix: 식당 사진 똑같게 들어가던거 수정

* chore: 체크박스 색상 변경

* fix: 텍스트 비정상적으로 작은거 해결

* chore: tablayout indicator 수정

* fix: NPE 뜨는 부분 주석처리

* fix: 사진이 없는데 자리 차지 하던거 고침

* fix: 아이콘 없대서 다시 되돌림

* Create qa_apk (#218)

* Rename qa_apk to qa_apk.yml

* feat: colored on today was not selected (#219)

* Update README.md

* Update README.md

* [Feat] Notification (#216)

* feat: test notify 성공

* add: notify 작업 파일 스테이징

* feat: workManager로 구현

* chore: modify workManager

* modify: change workManager to AlarmManager

it working on api 28, but not working on api 33

* chore: notify on 11 am

* feat: save notification statue in datastore

* modify: change mypage design

* chore: modify layout

* chore: modify code

* chore: modify code

* delete: work manager

* chore: change alarm logo file to vector

* chore: move code loading app version

* chore: change padding

* chore: separate setting alarm code at UI

* chore: at 11

* [Redesign/login] 로그인 화면 리디자인 적용 (#222)

* chore: delete firebase version

* chore: delete default splash (android 12)

* chore: set new splash

* redesign: login activity

* chore: delete unused logo files

* chore: dark mode

* [Refactor/remote config] 리모트 컨피그 관련 로직 수정 + info 버튼 터치 영역 확대 (#224)

* chore: change small size logo file

* delete: infoviewmodelfactory 제거

* chore: modify default config

* chore: modify real location data

* chore: more larger touch area(cafetria info btn)

* [Refactor/#167] Hilt를 통해 ApplicationContext 주입하기 (#226)

* add: appContext to di

* chore: clean code

* release/2.1.1

app/build.gradle.kts

@@ -21,9 +21,9 @@ android {
         applicationId = "com.eatssu.android"
         minSdk = 23
         targetSdk = 34
-        versionCode = 1
-        versionName = "2.1.0"
-
+        versionCode = 21
+        versionName = "2.1.1"
+        
       testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -32,11 +32,11 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@drawable/img_logo1_44"
+        android:icon="@drawable/img_logo_512"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@drawable/img_logo1_44"
+        android:roundIcon="@drawable/img_logo_512"
         android:supportsRtl="true"
         android:theme="@style/Theme.EatSSUAndroid"
         android:usesCleartextTraffic="true"
@@ -151,14 +151,7 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-        <activity
-            android:name=".ui.info.InfoActivity"
-            android:exported="true"
-            android:theme="@style/Theme.MyDialog">
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
+
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true">

app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt

@@ -2,11 +2,9 @@ package com.eatssu.android.data.repository
 
 import com.eatssu.android.R
 import com.eatssu.android.data.enums.Restaurant
-import com.eatssu.android.data.model.AndroidMessage
 import com.eatssu.android.data.model.RestaurantInfo
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
-import com.google.gson.Gson
 import org.json.JSONArray
 import timber.log.Timber
 
@@ -41,25 +39,25 @@ class FirebaseRemoteConfigRepository {
         }
     }
 
-    fun getAndroidMessage(): AndroidMessage {
-
-        // Gson을 사용하여 JSON 문자열을 DTO로 파싱
-        val serverStatus: AndroidMessage = Gson().fromJson(instance.getString("android_message"), AndroidMessage::class.java)
-
-        // 파싱된 결과 확인
-        println("Dialog: ${serverStatus.dialog}")
-        println("Message: ${serverStatus.message}")
-
-        return serverStatus
-    }
-
-    fun getForceUpdate(): Boolean {
-        return instance.getBoolean("force_update")
-    }
-
-    fun getAppVersion(): String {
-        return instance.getString("app_version")
-    }
+//    fun getAndroidMessage(): AndroidMessage {
+//
+//        // Gson을 사용하여 JSON 문자열을 DTO로 파싱
+//        val serverStatus: AndroidMessage = Gson().fromJson(instance.getString("android_message"), AndroidMessage::class.java)
+//
+//        // 파싱된 결과 확인
+//        println("Dialog: ${serverStatus.dialog}")
+//        println("Message: ${serverStatus.message}")
+//
+//        return serverStatus
+//    }
+
+//    fun getForceUpdate(): Boolean {
+//        return instance.getBoolean("force_update")
+//    }
+//
+//    fun getAppVersion(): String {
+//        return instance.getString("app_version")
+//    }
 
     fun getVersionCode(): Long {
         return instance.getLong("android_version_code")

app/src/main/java/com/eatssu/android/data/usecase/GetAccessTokenUseCase.kt

@@ -1,14 +1,14 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class GetAccessTokenUseCase @Inject constructor(
-//    private val preferencesRepository: PreferencesRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(): String {
-
-        return MySharedPreferences.getAccessToken(App.appContext)
+        return MySharedPreferences.getAccessToken(context)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/GetRefreshTokenUseCase.kt

@@ -1,14 +1,15 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class GetRefreshTokenUseCase @Inject constructor(
+    @ApplicationContext private val context: Context
 //    private val preferencesRepository: PreferencesRepository,
 ) {
     suspend operator fun invoke(): String {
-
-        return MySharedPreferences.getRefreshToken(App.appContext)
+        return MySharedPreferences.getRefreshToken(context)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/GetUserEmailUseCase.kt

@@ -1,14 +1,15 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class GetUserEmailUseCase @Inject constructor(
-//    private val preferencesRepository: PreferencesRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(): String {
 
-        return MySharedPreferences.getUserEmail(App.appContext)
+        return MySharedPreferences.getUserEmail(context)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/GetUserNameUseCase.kt

@@ -1,14 +1,15 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class GetUserNameUseCase @Inject constructor(
 //    private val preferencesRepository: PreferencesRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(): String {
-
-        return MySharedPreferences.getUserName(App.appContext)
+        return MySharedPreferences.getUserName(context)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/LogoutUseCase.kt

@@ -1,14 +1,16 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class LogoutUseCase @Inject constructor(
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke() {
 
-        MySharedPreferences.clearUser(App.appContext)
+        MySharedPreferences.clearUser(context)
 
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/SetAccessTokenUseCase.kt

@@ -1,17 +1,15 @@
 package com.eatssu.android.data.usecase
 
-import android.util.Log
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class SetAccessTokenUseCase @Inject constructor(
 //    private val preferencesRepository: PreferencesRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(accessToken: String) {
-        MySharedPreferences.setAccessToken(App.appContext, accessToken)
-
-        Log.d("SetAccessTokenUseCase", accessToken)
-
+        MySharedPreferences.setAccessToken(context, accessToken)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/SetRefreshTokenUseCase.kt

@@ -1,17 +1,15 @@
 package com.eatssu.android.data.usecase
 
-import android.util.Log
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class SetRefreshTokenUseCase @Inject constructor(
 //    private val preferencesRepository: PreferencesRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(refreshToken: String) {
-        MySharedPreferences.setRefreshToken(App.appContext, refreshToken)
-
-        Log.d("SetRefreshTokenUseCase", refreshToken)
-
+        MySharedPreferences.setRefreshToken(context, refreshToken)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/SetUserEmailUseCase.kt

@@ -1,16 +1,14 @@
 package com.eatssu.android.data.usecase
 
-import android.util.Log
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class SetUserEmailUseCase @Inject constructor(
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(email: String) {
-        MySharedPreferences.setUserEmail(App.appContext, email)
-
-        Log.d("SetUserEmailUseCase", email)
-
+        MySharedPreferences.setUserEmail(context, email)
     }
 }

app/src/main/java/com/eatssu/android/data/usecase/SetUserNameUseCase.kt

@@ -1,18 +1,20 @@
 package com.eatssu.android.data.usecase
 
-import com.eatssu.android.App
+import android.content.Context
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.request.ChangeNicknameRequest
 import com.eatssu.android.data.repository.UserRepository
 import com.eatssu.android.util.MySharedPreferences
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 class SetUserNameUseCase @Inject constructor(
     private val userRepository: UserRepository,
+    @ApplicationContext private val context: Context
 ) {
     suspend operator fun invoke(name: String): Flow<BaseResponse<Void>> {
-        MySharedPreferences.setUserName(App.appContext, name)
+        MySharedPreferences.setUserName(context, name)
         //Todo 이게 최선일까? 로컬에 이름 Set과 리모트의 이름 change를 usecase를 따로 만들어야하나?
 
         return userRepository.updateUserName(ChangeNicknameRequest(name))

app/src/main/java/com/eatssu/android/di/AppModule.kt

@@ -2,6 +2,7 @@ package com.eatssu.android.di
 
 import android.app.Application
 import android.content.Context
+import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
 import com.eatssu.android.data.repository.PreferencesRepository
 import dagger.Module
 import dagger.Provides
@@ -25,4 +26,11 @@ object AppModule {
     fun providePreferencesRepository(@ApplicationContext context: Context): PreferencesRepository {
         return PreferencesRepository(context)
     }
+
+    @Provides
+    @Singleton
+    fun provideFirebaseRemoteConfigRepository(): FirebaseRemoteConfigRepository {
+        return FirebaseRemoteConfigRepository()
+    }
+
 }

app/src/main/java/com/eatssu/android/di/network/TokenInterceptor.kt

@@ -1,12 +1,11 @@
 package com.eatssu.android.di.network
 
 
+import android.content.Context
 import android.content.Intent
 import android.os.Handler
 import android.os.Looper
-import android.util.Log
 import android.widget.Toast
-import com.eatssu.android.App
 import com.eatssu.android.BuildConfig.BASE_URL
 import com.eatssu.android.base.BaseResponse
 import com.eatssu.android.data.dto.response.TokenResponse
@@ -18,6 +17,7 @@ import com.eatssu.android.data.usecase.SetRefreshTokenUseCase
 import com.eatssu.android.ui.login.LoginActivity
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.Request
@@ -33,6 +33,7 @@ class TokenInterceptor @Inject constructor(
     private val setAccessTokenUseCase: SetAccessTokenUseCase,
     private val setRefreshTokenUseCase: SetRefreshTokenUseCase,
     private val logoutUseCase: LogoutUseCase,
+    @ApplicationContext private val context: Context
 ) : Interceptor {
 
     companion object {
@@ -68,7 +69,7 @@ class TokenInterceptor @Inject constructor(
         val response = chain.proceed(request)
 
         if (response.code == 401) {
-            Log.d(TAG, "토큰 퉤퉤")
+            Timber.d("토큰 퉤퉤")
             response.close()
 
             try {
@@ -78,13 +79,13 @@ class TokenInterceptor @Inject constructor(
                     .addHeader(HEADER_AUTHORIZATION, "Bearer $refreshToken")
                     .build()
 
-                Log.d(TAG, "재발급 중")
+                Timber.d("재발급 중")
 
                 val refreshTokenResponse = chain.proceed(refreshTokenRequest)
-                Log.d(TAG, "refreshTokenResponse : $refreshTokenResponse")
+                Timber.d("refreshTokenResponse : $refreshTokenResponse")
 
                 if (refreshTokenResponse.isSuccessful) {
-                    Log.d(TAG, "재발급 성공")
+                    Timber.d("재발급 성공")
 
                     val responseToken = parseRefreshTokenResponse(refreshTokenResponse)
 
@@ -110,7 +111,6 @@ class TokenInterceptor @Inject constructor(
                     Timber.e("재발급에서의 401")
 
                     Handler(Looper.getMainLooper()).post {
-                        val context = App.appContext
                         Toast.makeText(context, "토큰이 만료되어 로그아웃 됩니다.", Toast.LENGTH_SHORT).show()
                         val intent = Intent(context, LoginActivity::class.java) // 로그인 화면으로 이동
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
@@ -123,7 +123,6 @@ class TokenInterceptor @Inject constructor(
                 Timber.e("재발급 실패 $e")
 
                 Handler(Looper.getMainLooper()).post {
-                    val context = App.appContext
                     Toast.makeText(context, "토큰이 만료되어 로그아웃 됩니다.", Toast.LENGTH_SHORT).show()
                     val intent = Intent(context, LoginActivity::class.java) // 로그인 화면으로 이동
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
@@ -137,7 +136,6 @@ class TokenInterceptor @Inject constructor(
             Timber.e("404 + 다른 유저!")
 
             Handler(Looper.getMainLooper()).post {
-                val context = App.appContext
                 Toast.makeText(context, "토큰이 만료되어 로그아웃 됩니다.", Toast.LENGTH_SHORT).show()
                 val intent = Intent(context, LoginActivity::class.java) // 로그인 화면으로 이동
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
@@ -150,7 +148,6 @@ class TokenInterceptor @Inject constructor(
             Timber.e("500 + 다른 유저")
 
             Handler(Looper.getMainLooper()).post {
-                val context = App.appContext
                 Toast.makeText(context, "토큰이 만료되어 로그아웃 됩니다.", Toast.LENGTH_SHORT).show()
                 val intent = Intent(context, LoginActivity::class.java) // 로그인 화면으로 이동
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)