From 4308831b00e32fbe2b0d45cfa4a82df746ecba17 Mon Sep 17 00:00:00 2001
From: Alex Gotev <alex@gotev.net>
Date: Mon, 22 Mar 2021 23:43:35 +0100
Subject: [PATCH] feat: refactor layout names

---
 .../activities/PagingActivity.kt              |  4 ++--
 .../activities/RecyclerViewActivity.kt        |  2 +-
 .../src/main/res/layout/activity_paging.xml   | 13 ++++++++++++
 .../res/layout/activity_recycler_view.xml     | 19 ++++++++----------
 .../main/res/layout/activity_selection.xml    | 20 -------------------
 5 files changed, 24 insertions(+), 34 deletions(-)
 create mode 100644 app/demo/src/main/res/layout/activity_paging.xml
 delete mode 100644 app/demo/src/main/res/layout/activity_selection.xml

diff --git a/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/PagingActivity.kt b/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/PagingActivity.kt
index 242bd63..e490b1e 100644
--- a/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/PagingActivity.kt
+++ b/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/PagingActivity.kt
@@ -6,7 +6,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.paging.PagedList
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.activity_recycler_view.*
+import kotlinx.android.synthetic.main.activity_paging.*
 import net.gotev.recycleradapter.paging.PagingAdapter
 import net.gotev.recycleradapterdemo.App
 import net.gotev.recycleradapterdemo.R
@@ -24,7 +24,7 @@ class PagingActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_recycler_view)
+        setContentView(R.layout.activity_paging)
 
         title = getString(R.string.paged_scrolling)
 
diff --git a/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/RecyclerViewActivity.kt b/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/RecyclerViewActivity.kt
index 983e9e6..cd1dd4a 100644
--- a/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/RecyclerViewActivity.kt
+++ b/app/demo/src/main/java/net/gotev/recycleradapterdemo/activities/RecyclerViewActivity.kt
@@ -16,7 +16,7 @@ open class RecyclerViewActivity : AppCompatActivity(), RecyclerAdapterProvider {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.activity_selection)
+        setContentView(R.layout.activity_recycler_view)
 
         supportActionBar?.apply {
             setHomeButtonEnabled(true)
diff --git a/app/demo/src/main/res/layout/activity_paging.xml b/app/demo/src/main/res/layout/activity_paging.xml
new file mode 100644
index 0000000..8de4699
--- /dev/null
+++ b/app/demo/src/main/res/layout/activity_paging.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/swipeRefresh"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical" />
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/demo/src/main/res/layout/activity_recycler_view.xml b/app/demo/src/main/res/layout/activity_recycler_view.xml
index 8de4699..b2b59c2 100644
--- a/app/demo/src/main/res/layout/activity_recycler_view.xml
+++ b/app/demo/src/main/res/layout/activity_recycler_view.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/swipeRefresh"
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/recycler_view"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
-
-</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    android:layout_height="match_parent"
+    android:scrollbars="none" />
diff --git a/app/demo/src/main/res/layout/activity_selection.xml b/app/demo/src/main/res/layout/activity_selection.xml
deleted file mode 100644
index 8bb6cf2..0000000
--- a/app/demo/src/main/res/layout/activity_selection.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="net.gotev.recycleradapterdemo.activities.GroupsSelectionActivity">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:scrollbars="none" />
-
-</LinearLayout>