From bc330018e14ea666a1b67f56fba7c66fdfe4713c Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Tue, 17 Apr 2018 20:50:17 +0200
Subject: [PATCH] Rename list layout

Summary: Give it a proper name

Reviewers: #kde_connect, mtijink

Reviewed By: #kde_connect, mtijink

Subscribers: mtijink, #kde_connect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D12289
---
 res/layout/activity_list.xml                           | 10 ----------
 .../{activity_refresh_list.xml => devices_list.xml}    |  2 +-
 .../kdeconnect/Plugins/SharePlugin/ShareActivity.java  |  4 ++--
 .../kde/kdeconnect/UserInterface/PairingFragment.java  |  6 +++---
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 res/layout/activity_list.xml
 rename res/layout/{activity_refresh_list.xml => devices_list.xml} (94%)

diff --git a/res/layout/activity_list.xml b/res/layout/activity_list.xml
deleted file mode 100644
index 981686a9..00000000
--- a/res/layout/activity_list.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/listView1"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:addStatesFromChildren="true"
-    android:orientation="vertical"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip"
-    tools:context="org.kde.kdeconnect.UserInterface.MainActivity" />
diff --git a/res/layout/activity_refresh_list.xml b/res/layout/devices_list.xml
similarity index 94%
rename from res/layout/activity_refresh_list.xml
rename to res/layout/devices_list.xml
index 9343e6dc..d2f33575 100644
--- a/res/layout/activity_refresh_list.xml
+++ b/res/layout/devices_list.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <ListView
-        android:id="@+id/listView1"
+        android:id="@+id/devices_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:addStatesFromChildren="true"
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
index cfe01a95..e366ee46 100644
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
@@ -124,7 +124,7 @@ public class ShareActivity extends AppCompatActivity {
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        ListView list = (ListView) findViewById(R.id.listView1);
+                        ListView list = (ListView) findViewById(R.id.devices_list);
                         list.setAdapter(new ListAdapter(ShareActivity.this, items));
                         list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                             @Override
@@ -145,7 +145,7 @@ public class ShareActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_refresh_list);
+        setContentView(R.layout.devices_list);
 
         ActionBar actionBar = getSupportActionBar();
         mSwipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.refresh_list_layout);
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index c858d038..030cdd90 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -75,8 +75,8 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
         setHasOptionsMenu(true);
 
-        rootView = inflater.inflate(R.layout.activity_refresh_list, container, false);
-        View listRootView = rootView.findViewById(R.id.listView1);
+        rootView = inflater.inflate(R.layout.devices_list, container, false);
+        View listRootView = rootView.findViewById(R.id.devices_list);
         mSwipeRefreshLayout = (SwipeRefreshLayout) rootView.findViewById(R.id.refresh_list_layout);
         mSwipeRefreshLayout.setOnRefreshListener(
                 new SwipeRefreshLayout.OnRefreshListener() {
@@ -195,7 +195,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
                                 items.remove(items.size() - 1); //Remove remembered devices section if empty
                             }
 
-                            final ListView list = (ListView) rootView.findViewById(R.id.listView1);
+                            final ListView list = (ListView) rootView.findViewById(R.id.devices_list);
 
                             //Store current scroll
                             int index = list.getFirstVisiblePosition();