[feat/album_detail]: rebase and sync develop

TeamPophory · Jul 6, 2023 · c68dbd4 · c68dbd4
1 parent 87c773e
commit c68dbd4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -64,15 +64,20 @@
             android:exported="false" />
         <activity
             android:name=".feature.home.HomeActivity"
-            android:exported="false" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".feature.signup.SignUpActivity"
             android:exported="false" />
         <activity
             android:name=".feature.onboarding.OnBoardingActivity"
             android:exported="true"
-            android:theme="@style/Theme.App.Popopopo.Starting">
-        </activity>
+            android:theme="@style/Theme.App.Popopopo.Starting" />
         <activity
             android:name=".feature.setting.SettingActivity"
             android:exported="true" />
@@ -96,14 +101,7 @@
         </activity>
         <activity
             android:name=".feature.album.list.AlbumListActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
+            android:exported="false" />
         <activity android:name=".feature.album.detail.AlbumDetailActivity" />
     </application>
 </manifest>
diff --git a/app/src/main/java/com/teampophory/pophory/bottomsheet/ModalBottomSheet.kt b/app/src/main/java/com/teampophory/pophory/bottomsheet/ModalBottomSheet.kt
@@ -4,9 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.FrameLayout
-import androidx.constraintlayout.widget.ConstraintLayout
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.teampophory.pophory.databinding.ModalBottomSheetContentBinding
 

diff --git a/app/src/main/java/com/teampophory/pophory/data/repository/DefaultPhotoRepository.kt b/app/src/main/java/com/teampophory/pophory/data/repository/DefaultPhotoRepository.kt
diff --git a/app/src/main/java/com/teampophory/pophory/feature/home/store/StoreFragment.kt b/app/src/main/java/com/teampophory/pophory/feature/home/store/StoreFragment.kt
@@ -16,6 +16,7 @@ import com.teampophory.pophory.common.primitive.textAppearance
 import com.teampophory.pophory.common.view.viewBinding
 import com.teampophory.pophory.databinding.FragmentStoreBinding
 import com.teampophory.pophory.feature.album.list.AlbumListActivity
+import com.teampophory.pophory.feature.home.store.apdater.OnPageChangedListener
 import com.teampophory.pophory.feature.home.store.apdater.StoreAdapter
 import com.teampophory.pophory.feature.home.store.model.AlbumItem
 import dagger.hilt.android.AndroidEntryPoint