Merge pull request #158 from BCSDLab/feature/#153-shop-screen

Feature/#153 shop screen
BCSDLab · Jan 30, 2024 · e51e5c9 · e51e5c9
2 parents ca0a241 + 1fb5756
commit e51e5c9
Show file tree

Hide file tree

Showing 93 changed files with 2,689 additions and 140 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.jjbaksa.jjbaksa"
+    tools:ignore="ObsoleteSdkInt"
     tools:remove="android:appComponentFactory"
-    tools:targetApi="p"
-    tools:ignore="ObsoleteSdkInt">
+    tools:targetApi="p">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -23,52 +23,49 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.JJBAKSAAOS"
         tools:targetApi="33">
+        <activity
+            android:name=".ui.follower.FollowerProfileActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.follower.FollowerActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.shop.ShopActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.pin.PinMyFriendReviewReportActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.pin.PinReviewWriteActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.pin.PinActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.inquiry.WriteInquiryActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity android:name=".ui.inquiry.InquiryActivity" />
         <activity
             android:name=".ui.post.PostDetailActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.post.PostActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.withdrawal.WithdrawalActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.splash.SplashActivity"
             android:exported="true"
             android:screenOrientation="portrait">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -83,57 +80,46 @@
             android:name=".ui.setting.SettingActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.SampleActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.example.imageselector.gallery.GalleryActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.findpassword.FindPasswordActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.findid.FindIdActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.mainpage.MainPageActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.signup.SignUpActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.social.SocialLoginActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.login.LoginActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.search.SearchActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
-
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">

diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/di/DataSourceModule.kt b/app/src/main/java/com/jjbaksa/jjbaksa/di/DataSourceModule.kt
@@ -7,6 +7,7 @@ import com.jjbaksa.data.database.UserDao
 import com.jjbaksa.data.datasource.local.HomeLocalDataSource
 import com.jjbaksa.data.datasource.local.SearchLocalDataSource
 import com.jjbaksa.data.datasource.local.UserLocalDataSource
+import com.jjbaksa.data.datasource.remote.FollowerRemoteDataSource
 import com.jjbaksa.data.datasource.remote.HomeRemoteDataSource
 import com.jjbaksa.data.datasource.remote.InquiryRemoteDataSource
 import com.jjbaksa.data.datasource.remote.ShopRemoteDataSource
@@ -113,4 +114,10 @@ object DataSourceModule {
     ): SearchLocalDataSource {
         return SearchLocalDataSource(context)
     }
+
+    @Provides
+    @Singleton
+    fun provideFollowerRemoteDataSource(authApi: AuthApi, noAuthApi: NoAuthApi): FollowerRemoteDataSource {
+        return FollowerRemoteDataSource(authApi, noAuthApi)
+    }
 }
diff --git a/app/src/main/java/com/jjbaksa/jjbaksa/di/RepositoryModule.kt b/app/src/main/java/com/jjbaksa/jjbaksa/di/RepositoryModule.kt
@@ -11,6 +11,7 @@ import com.jjbaksa.data.repository.HomeRepositoryImpl
 import com.jjbaksa.domain.repository.UserRepository
 import com.jjbaksa.data.repository.UserRepositoryImpl
 import com.example.imageselector.repository.ImageRepository
+import com.jjbaksa.data.datasource.remote.FollowerRemoteDataSource
 import com.jjbaksa.data.datasource.local.SearchLocalDataSource
 import com.jjbaksa.data.datasource.remote.InquiryRemoteDataSource
 import com.jjbaksa.data.datasource.remote.ShopRemoteDataSource
@@ -22,10 +23,12 @@ import com.jjbaksa.domain.repository.InquiryRepository
 import com.jjbaksa.data.datasource.remote.PostRemoteDataSource
 import com.jjbaksa.data.datasource.remote.ReviewRemoteDataSource
 import com.jjbaksa.data.datasource.remote.ScrapRemoteDataSource
+import com.jjbaksa.data.repository.FollowerRepositoryImpl
 import com.jjbaksa.data.repository.ShopRepositoryImpl
 import com.jjbaksa.data.repository.PostRepositoryImpl
 import com.jjbaksa.data.repository.ReviewRepositoryImpl
 import com.jjbaksa.data.repository.ScrapRepositoryImpl
+import com.jjbaksa.domain.repository.FollowerRepository
 import com.jjbaksa.domain.repository.ShopRepository
 import com.jjbaksa.domain.repository.PostRepository
 import com.jjbaksa.domain.repository.ReviewRepository
@@ -113,4 +116,12 @@ object RepositoryModule {
     ): ReviewRepository {
         return ReviewRepositoryImpl(reviewRemoteDataSource, userLocalDataSource)
     }
+
+    @Singleton
+    @Provides
+    fun provideFollowerRepository(
+        followerRemoteDataSource: FollowerRemoteDataSource,
+    ): FollowerRepository {
+        return FollowerRepositoryImpl(followerRemoteDataSource)
+    }
 }