Release v2.0.0

.github/workflows/Android-release CD.yml

@@ -55,17 +55,31 @@ jobs:
         echo '${{ secrets.SENTRY_PROPERTIES }}' > ./app/src/main/resources/sentry.properties
 
     # Build AAB Release
-    - name: Build release Bundle
+    - name: Build release Bundle (1.x.x)
       run: ./gradlew clean bundleRelease
+      if: startsWith(github.ref, 'refs/heads/release/1.')
+
+    - name: Build prodRelease Bundle (2.x.x+)
+      run: ./gradlew clean bundleProdRelease
+      if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.')
 
     # Upload Google Play
-    - name: Deploy to Play Store 🚀
+    - name: Deploy to Play Store 🚀 (1.x.x)
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
+        packageName: ${{ secrets.AOS_PACKAGE_NAME }}
+        releaseFiles: app/build/outputs/bundle/release/app-release.aab
+        track: production
+        status: draft
+      if: startsWith(github.ref, 'refs/heads/release/1.')
+
+    - name: Deploy to Play Store 🚀 (2.0.0+)
       uses: r0adkll/upload-google-play@v1
       with:
         serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
-        packageName: ${{secrets.AOS_PACKAGE_NAME}}
-        releaseFiles: ./app/build/outputs/bundle/release/app-release.aab
+        packageName: ${{ secrets.AOS_PACKAGE_NAME }}
+        releaseFiles: app/build/outputs/bundle/prodRelease/app-prod-release.aab
         track: production
         status: draft
-      if: github.ref != 'refs/heads/main'
-
+      if: startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/release/1.')

.gitignore

@@ -30,6 +30,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+*.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -54,7 +55,7 @@ captures/
 *.keystore
 
 # Google Services (e.g. APIs or Firebase)
-# google-services.json
+google-services.json
 
 # Android Patch
 gen-external-apklibs
@@ -71,30 +72,7 @@ obj/
 /out/
 
 # User-specific configurations
-.idea/caches/
-.idea/libraries/
-.idea/shelf/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/assetWizardSettings.xml
-.idea/gradle.xml
-.idea/jarRepositories.xml
-.idea/navEditor.xml
+.idea/
 
 # OS-specific files
 .DS_Store

README.md

@@ -27,7 +27,7 @@ git clone git@github.com:Daily-DAYO/DAYO_Android.git
 
 ## Application Version
 - minSdkVersion : 26<br>
-- targetSdkVersion : 33
+- targetSdkVersion : 35
 
 ## Git Convention
 - Create issue<br>

app/build.gradle

@@ -11,6 +11,7 @@ plugins {
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())
 def NATIVE_APP_KEY = properties.getProperty('NATIVE_APP_KEY')
+def ADS_APPLICATION_ID = properties.getProperty('ADS_APPLICATION_ID')
 def keystorePropertiesFile = rootProject.file("app/keystore-release.properties")
 
 sentry {
@@ -26,18 +27,22 @@ kotlin {
 }
 
 android {
+    compileSdk rootProject.ext.compileSdkVersion
+
     defaultConfig {
         applicationId "com.daily.dayo"
-        compileSdk 34
-        minSdkVersion 26
-        targetSdkVersion 34
-        versionCode 11500
-        versionName "1.1.5"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 20000
+        versionName "2.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         buildConfigField ("String", "NATIVE_APP_KEY", properties['NATIVE_APP_KEY_STR'])
-        manifestPlaceholders = [NATIVE_APP_KEY: NATIVE_APP_KEY]
+        manifestPlaceholders = [
+                NATIVE_APP_KEY    : NATIVE_APP_KEY,
+                ADS_APPLICATION_ID: ADS_APPLICATION_ID
+        ]
     }
 
     signingConfigs {
@@ -59,6 +64,7 @@ android {
 
     buildTypes {
         debug {
+            minifyEnabled false
             applicationIdSuffix ".debug"
             versionNameSuffix "-debug"
             resValue "string", "app_name", "DAYO (Debug)"
@@ -70,6 +76,17 @@ android {
             signingConfig signingConfigs.release
         }
     }
+    flavorDimensions = ["environment"]
+    productFlavors {
+        dev {
+            dimension "environment"
+            buildConfigField("String", "BASE_URL", properties['BASE_URL_DEV'])
+        }
+        prod {
+            dimension "environment"
+            buildConfigField("String", "BASE_URL", properties['BASE_URL_PROD'])
+        }
+    }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.toString()
     }
@@ -102,4 +119,7 @@ dependencies {
     // Firebase
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
+
+    // Google Ads
+    implementation 'com.google.android.gms:play-services-ads:23.6.0'
 }

app/src/main/AndroidManifest.xml

@@ -30,6 +30,11 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/ic_dayo_logo" />
+
+        <meta-data
+            android:name="com.google.android.gms.ads.APPLICATION_ID"
+            android:value="${ADS_APPLICATION_ID}" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
@@ -43,6 +48,7 @@
         <activity android:name="daily.dayo.presentation.activity.LoginActivity"
             android:theme="@style/Theme.DAYO.Splash"
             android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -64,7 +70,7 @@
         </activity>
         <activity android:name="daily.dayo.presentation.activity.MainActivity"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustNothing" />
+            android:windowSoftInputMode="adjustResize" />
         <service
             android:name="daily.dayo.presentation.service.firebase.FirebaseMessagingService"
             android:exported="false">

app/src/main/java/com/daily/dayo/DayoApplication.kt

@@ -2,18 +2,20 @@ package com.daily.dayo
 
 import android.app.Application
 import com.bumptech.glide.Glide
+import com.google.android.gms.ads.MobileAds
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase
 import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class DayoApplication : Application(){
+class DayoApplication : Application() {
     private lateinit var firebaseAnalytics: FirebaseAnalytics
     override fun onCreate() {
         super.onCreate()
         KakaoSdk.init(this, BuildConfig.NATIVE_APP_KEY)
+        MobileAds.initialize(this)
         firebaseAnalytics = Firebase.analytics
     }
 

build.gradle

@@ -6,6 +6,9 @@ buildscript {
         compose_version = '1.4.6'
         nav_version = '2.6.0'
         paging_version = "3.2.0"
+        targetSdkVersion = 35
+        compileSdkVersion = 35
+        minSdkVersion = 26
     }
     repositories {
         google()

data/build.gradle

@@ -14,10 +14,10 @@ properties.load(project.rootProject.file('local.properties').newDataInputStream(
 
 android {
     namespace 'daily.dayo.data'
-    compileSdk 33
+    compileSdk rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        minSdk 26
+        minSdk rootProject.ext.minSdkVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -32,11 +32,17 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField("String", "BASE_URL", properties['BASE_URL_RELEASE'])
         }
-
-        debug {
-            buildConfigField("String", "BASE_URL", properties['BASE_URL_DEBUG'])
+    }
+    flavorDimensions = ["environment"]
+    productFlavors {
+        dev {
+            dimension "environment"
+            buildConfigField("String", "BASE_URL", properties['BASE_URL_DEV'])
+        }
+        prod {
+            dimension "environment"
+            buildConfigField("String", "BASE_URL", properties['BASE_URL_PROD'])
         }
     }
     compileOptions {

data/src/main/java/daily/dayo/data/datasource/local/SharedManager.kt

@@ -2,11 +2,14 @@ package daily.dayo.data.datasource.local
 
 import android.content.Context
 import android.content.SharedPreferences
+import com.google.gson.Gson
 import daily.dayo.data.util.PreferenceHelper
 import daily.dayo.data.util.PreferenceHelper.get
 import daily.dayo.data.util.PreferenceHelper.set
 import com.google.gson.JsonArray
 import dagger.hilt.android.qualifiers.ApplicationContext
+import daily.dayo.domain.model.SearchHistory
+import daily.dayo.domain.model.SearchHistoryDetail
 import daily.dayo.domain.model.User
 import daily.dayo.domain.model.UserTokens
 import org.json.JSONArray
@@ -16,6 +19,7 @@ import javax.inject.Singleton
 @Singleton
 class SharedManager @Inject constructor(@ApplicationContext context: Context) {
     private val prefs: SharedPreferences = PreferenceHelper.defaultPrefs(context)
+    private val KEY_SEARCH_HISTORY = "search_history"
 
     fun saveCurrentUser(userInfo: Any?) = when (userInfo) {
         is UserTokens -> {
@@ -58,31 +62,47 @@ class SharedManager @Inject constructor(@ApplicationContext context: Context) {
             prefs["notiNoticePermit"] = value
         }
 
-    fun setSearchKeywordRecent(searchKeywordRecent: ArrayList<String>) {
-        val jsonArr = JsonArray()
-        for (i in searchKeywordRecent) {
-            jsonArr.add(i)
-        }
+    fun saveSearchHistory(searchHistory: SearchHistory) {
+        val gson = Gson()
+        val json = gson.toJson(searchHistory)
+        val editor = prefs.edit()
+        editor.putString(KEY_SEARCH_HISTORY, json)
+        editor.apply()
+    }
 
-        var result = jsonArr.toString()
-        prefs["recentSearchKeyword"] = result
+    fun getSearchKeywordRecent(): SearchHistory {
+        val json = prefs.getString(KEY_SEARCH_HISTORY, null)
+        val gson = Gson()
+        return gson.fromJson(json, SearchHistory::class.java) ?: SearchHistory(0, mutableListOf())
     }
 
-    fun getSearchKeywordRecent(): ArrayList<String> {
-        val result = prefs["recentSearchKeyword", ""]
-        val resultArr = ArrayList<String>()
-        val jsonArr: JSONArray = if (result.isEmpty()) {
-            JSONArray()
-        } else {
-            JSONArray(result)
+    fun updateSearchHistory(newItem: SearchHistoryDetail) {
+        var searchHistory = getSearchKeywordRecent()
+        // History에 Type 구분을 하지 않음에 따라 OR문으로 처리
+        val existingItem = searchHistory.data.find {
+            it.history == newItem.history || it.searchHistoryType == newItem.searchHistoryType
         }
 
-        if (jsonArr.length() != 0) {
-            for (i in 0 until jsonArr.length()) {
-                resultArr.add(jsonArr.optString(i))
-            }
+        if (existingItem != null) {
+            searchHistory = searchHistory.copy(
+                count = searchHistory.count - 1,
+                data = searchHistory.data.filter {
+                    it.history != existingItem.history || it.searchHistoryType != existingItem.searchHistoryType
+                }.toMutableList()
+            )
         }
-        return resultArr
+
+        searchHistory = searchHistory.copy(
+            count = searchHistory.count + 1,
+            data = listOf(newItem) + searchHistory.data
+        )
+        saveSearchHistory(searchHistory)
+    }
+
+    fun clearSearchHistory() {
+        val editor = prefs.edit()
+        editor.remove(KEY_SEARCH_HISTORY)
+        editor.apply()
     }
 
     fun clearPreferences() {

data/src/main/java/daily/dayo/data/datasource/remote/alarm/AlarmApiService.kt

@@ -12,5 +12,5 @@ interface AlarmApiService {
     suspend fun requestAllAlarmList(@Query("end") end: Int): NetworkResponse<ListAllAlarmResponse>
 
     @POST("/api/v1/alarms/{alarmId}")
-    suspend fun requestIsCheckAlarm(@Path("alarmId") alarmId: Int): NetworkResponse<Void>
+    suspend fun markAlarmAsChecked(@Path("alarmId") alarmId: Int): NetworkResponse<Void>
 }

data/src/main/java/daily/dayo/data/datasource/remote/alarm/AlarmResponse.kt

@@ -30,5 +30,7 @@ data class AlarmDto(
     @SerializedName("memberId")
     val memberId: String?,
     @SerializedName("postId")
-    val postId: Int?
+    val postId: Long?,
+    @SerializedName("profileImage")
+    val profileImage: String?,
 )

data/src/main/java/daily/dayo/data/datasource/remote/bookmark/BookmarkApiService.kt

@@ -9,7 +9,7 @@ interface BookmarkApiService {
     suspend fun requestBookmarkPost(@Body body: CreateBookmarkRequest): NetworkResponse<CreateBookmarkResponse>
 
     @POST("/api/v1/bookmark/delete/{postId}")
-    suspend fun requestDeleteBookmarkPost(@Path("postId") postId: Int): NetworkResponse<Void>
+    suspend fun requestDeleteBookmarkPost(@Path("postId") postId: Long): NetworkResponse<Void>
 
     @GET("/api/v1/bookmark/list")
     suspend fun requestAllMyBookmarkPostList(@Query("end") end: Int): NetworkResponse<ListAllMyBookmarkPostResponse>

data/src/main/java/daily/dayo/data/datasource/remote/bookmark/BookmarkRequest.kt

@@ -4,5 +4,5 @@ import com.google.gson.annotations.SerializedName
 
 data class CreateBookmarkRequest(
     @SerializedName("postId")
-    val postId: Int
+    val postId: Long
 )