Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

…o feature/chore-set-amplitude
team-winey · Aug 28, 2023 · 3954800 · 3954800
2 parents 197fa98 + 4a0d99a
commit 3954800
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/...ain/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/...ain/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt
@@ -27,6 +27,7 @@ class NotificationActivity :
         initNotificationAdapter()
         viewModel.getNotification()
         initBackButtonClickListener()
+        initSwipeRefreshListener()
         setupGetNotificationStateObserver()
     }
 
@@ -65,6 +66,13 @@ class NotificationActivity :
         }
     }
 
+    private fun initSwipeRefreshListener() {
+        binding.layoutNotificationRefresh.setOnRefreshListener {
+            viewModel.getNotification()
+            binding.layoutNotificationRefresh.isRefreshing = false
+        }
+    }
+
     private fun navigateToDetail(feedId: Int?) {
         val intent = Intent(this, DetailActivity::class.java)
         intent.putExtra("feedId", feedId)

diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
@@ -45,17 +45,28 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/rv_notification_post"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/layout_notification_refresh"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:nestedScrollingEnabled="false"
-            android:orientation="vertical"
-            android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cl_notification_appbar"
-            tools:listitem="@layout/item_notification_post" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cl_notification_appbar">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_notification_post"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:nestedScrollingEnabled="false"
+                android:orientation="vertical"
+                android:clipToPadding="false"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/item_notification_post" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>