Merge branch 'develop' of https://github.com/team-yello/YELLO-Android …

…into develop
team-yello · Jul 21, 2023 · 3274ace · 3274ace
2 parents b58d865 + 61c6496
commit 3274ace
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 2,
       "versionName": "1.0",
       "outputFile": "app-release.apk"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
 
     <queries>
         <package android:name="com.instagram.android" />
@@ -45,12 +46,12 @@
         </activity>
         <activity
             android:name=".presentation.onboarding.activity.OnBoardingActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustNothing"
-            android:screenOrientation="portrait" />
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".presentation.auth.SignInActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.auth.SocialSyncActivity"
@@ -72,7 +73,7 @@
         </activity>
         <activity
             android:name=".presentation.main.MainActivity"
-            android:exported="true"
+            android:exported="false"
             android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.main.yello.vote.VoteActivity"
@@ -93,8 +94,7 @@
         <activity
             android:name=".presentation.main.myyello.read.MyYelloReadActivity"
             android:exported="false"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.pay.PayActivity"
             android:exported="false"

diff --git a/app/src/main/java/com/el/yello/presentation/main/yello/vote/VoteViewModel.kt b/app/src/main/java/com/el/yello/presentation/main/yello/vote/VoteViewModel.kt
@@ -4,22 +4,22 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.el.yello.presentation.main.yello.vote.NoteState.InvalidCancel
+import com.el.yello.presentation.main.yello.vote.NoteState.InvalidShuffle
+import com.el.yello.presentation.main.yello.vote.NoteState.InvalidSkip
 import com.example.domain.entity.vote.Choice
 import com.example.domain.entity.vote.ChoiceList
 import com.example.domain.entity.vote.Note
 import com.example.domain.repository.VoteRepository
 import com.example.ui.view.UiState
 import com.example.ui.view.UiState.Empty
 import com.example.ui.view.UiState.Success
-import com.el.yello.presentation.main.yello.vote.NoteState.InvalidCancel
-import com.el.yello.presentation.main.yello.vote.NoteState.InvalidShuffle
-import com.el.yello.presentation.main.yello.vote.NoteState.InvalidSkip
 import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import retrofit2.HttpException
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltViewModel
 class VoteViewModel @Inject constructor(

diff --git a/app/src/main/java/com/el/yello/presentation/main/yello/vote/note/NoteFragment.kt b/app/src/main/java/com/el/yello/presentation/main/yello/vote/note/NoteFragment.kt
@@ -6,10 +6,10 @@ import androidx.core.os.bundleOf
 import androidx.fragment.app.activityViewModels
 import com.el.yello.R
 import com.el.yello.databinding.FragmentNoteBinding
-import com.el.yello.util.context.yelloSnackbar
-import com.example.ui.base.BindingFragment
 import com.el.yello.presentation.main.yello.vote.NoteState
 import com.el.yello.presentation.main.yello.vote.VoteViewModel
+import com.el.yello.util.context.yelloSnackbar
+import com.example.ui.base.BindingFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
@@ -3,6 +3,6 @@ object Constants {
     const val compileSdk = 33
     const val minSdk = 28
     const val targetSdk = 33
-    const val versionCode = 1
+    const val versionCode = 3
     const val versionName = "1.0"
 }