From 43c757422821bf6bd8adf428feff0d6b7beebdd7 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 17 Jun 2019 10:10:20 +0200
Subject: [PATCH] fold ".views.swap" package into ".nearby" class

---
 .../org/fdroid/fdroid/nearby}/SwapWorkflowActivity.java   | 2 +-
 app/src/full/AndroidManifest.xml                          | 2 +-
 .../fdroid/{views/swap => nearby}/SelectAppsView.java     | 4 +---
 .../fdroid/{views/swap => nearby}/StartSwapView.java      | 2 +-
 .../full/java/org/fdroid/fdroid/nearby/SwapService.java   | 1 -
 .../fdroid/{views/swap => nearby}/SwapSuccessView.java    | 3 +--
 app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java  | 1 -
 .../{views/swap => nearby}/SwapWorkflowActivity.java      | 8 +-------
 app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java   | 2 +-
 app/src/full/res/layout/swap_join_wifi.xml                | 2 +-
 app/src/full/res/layout/swap_select_apps.xml              | 4 ++--
 app/src/full/res/layout/swap_start_swap.xml               | 6 +++---
 app/src/full/res/layout/swap_success.xml                  | 4 ++--
 .../main/java/org/fdroid/fdroid/data/NewRepoConfig.java   | 2 +-
 .../java/org/fdroid/fdroid/views/main/MainActivity.java   | 2 +-
 15 files changed, 17 insertions(+), 28 deletions(-)
 rename app/src/{basic/java/org/fdroid/fdroid/views/swap => androidTest/java/org/fdroid/fdroid/nearby}/SwapWorkflowActivity.java (96%)
 rename app/src/full/java/org/fdroid/fdroid/{views/swap => nearby}/SelectAppsView.java (98%)
 rename app/src/full/java/org/fdroid/fdroid/{views/swap => nearby}/StartSwapView.java (99%)
 rename app/src/full/java/org/fdroid/fdroid/{views/swap => nearby}/SwapSuccessView.java (99%)
 rename app/src/full/java/org/fdroid/fdroid/{views/swap => nearby}/SwapWorkflowActivity.java (99%)

diff --git a/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/androidTest/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 96%
rename from app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
rename to app/src/androidTest/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 1dcfaf9bd..c723ec3ef 100644
--- a/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 23e43c7f6..efca3680a 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -50,7 +50,7 @@
 
         <activity
                 android:label="@string/swap"
-                android:name=".views.swap.SwapWorkflowActivity"
+                android:name=".nearby.SwapWorkflowActivity"
                 android:parentActivityName=".views.main.MainActivity"
                 android:launchMode="singleTask"
                 android:theme="@style/SwapTheme.Wizard"
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
similarity index 98%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
index ef88933c8..9d01ecf82 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -29,8 +29,6 @@ import android.widget.TextView;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.data.InstalledAppProvider;
 import org.fdroid.fdroid.data.Schema.InstalledAppTable;
-import org.fdroid.fdroid.nearby.LocalRepoService;
-import org.fdroid.fdroid.nearby.SwapView;
 
 public class SelectAppsView extends SwapView implements LoaderManager.LoaderCallbacks<Cursor> {
 
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 1f70e99d6..bc123f35b 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
index 6bf2f1caf..d515f9628 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -34,7 +34,6 @@ import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.nearby.peers.Peer;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.WifiStateChangeService;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
index 192945b54..c6ef14113 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -43,7 +43,6 @@ import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
 import org.fdroid.fdroid.installer.InstallManagerService;
 import org.fdroid.fdroid.installer.Installer;
-import org.fdroid.fdroid.nearby.SwapView;
 import org.fdroid.fdroid.net.Downloader;
 import org.fdroid.fdroid.net.DownloaderService;
 
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
index 57cf2ba71..864bc980c 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
@@ -8,7 +8,6 @@ import android.support.annotation.LayoutRes;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
 
 /**
  * A {@link android.view.View} that registers to handle the swap events from
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
similarity index 99%
rename from app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
rename to app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
index 5aee52285..de1126078 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid.views.swap;
+package org.fdroid.fdroid.nearby;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -58,12 +58,6 @@ import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.NewRepoConfig;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
-import org.fdroid.fdroid.nearby.BluetoothManager;
-import org.fdroid.fdroid.nearby.BonjourManager;
-import org.fdroid.fdroid.nearby.LocalHTTPDManager;
-import org.fdroid.fdroid.nearby.LocalRepoService;
-import org.fdroid.fdroid.nearby.SwapService;
-import org.fdroid.fdroid.nearby.SwapView;
 import org.fdroid.fdroid.nearby.peers.BluetoothPeer;
 import org.fdroid.fdroid.nearby.peers.Peer;
 import org.fdroid.fdroid.net.BluetoothDownloader;
diff --git a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
index cdde5d8be..a5e16e7fc 100644
--- a/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
+++ b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
@@ -39,7 +39,7 @@ import fi.iki.elonen.NanoHTTPD;
 import fi.iki.elonen.NanoHTTPD.Response.IStatus;
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
diff --git a/app/src/full/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml
index 014eae77e..c25e8be00 100644
--- a/app/src/full/res/layout/swap_join_wifi.xml
+++ b/app/src/full/res/layout/swap_join_wifi.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/swap_blue"
-        tools:context=".views.swap.SwapWorkflowActivity">
+        tools:context=".nearby.SwapWorkflowActivity">
 
     <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/full/res/layout/swap_select_apps.xml b/app/src/full/res/layout/swap_select_apps.xml
index a422e701a..6243e7486 100644
--- a/app/src/full/res/layout/swap_select_apps.xml
+++ b/app/src/full/res/layout/swap_select_apps.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SelectAppsView
+<org.fdroid.fdroid.nearby.SelectAppsView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
@@ -15,4 +15,4 @@
             android:layout_height="match_parent"
             android:orientation="vertical"/>
 
-</org.fdroid.fdroid.views.swap.SelectAppsView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SelectAppsView>
\ No newline at end of file
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 5c9b51b3f..21a488b63 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.fdroid.fdroid.views.swap.StartSwapView
+<org.fdroid.fdroid.nearby.StartSwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
@@ -8,7 +8,7 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".views.swap.SwapWorkflowActivity">
+        tools:context=".nearby.SwapWorkflowActivity">
 
     <!-- Misc header -->
     <include layout="@layout/start_swap_header"/>
@@ -209,4 +209,4 @@
 
     </ListView>
 
-</org.fdroid.fdroid.views.swap.StartSwapView>
+</org.fdroid.fdroid.nearby.StartSwapView>
diff --git a/app/src/full/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml
index ffcb3c180..2c6cd1647 100644
--- a/app/src/full/res/layout/swap_success.xml
+++ b/app/src/full/res/layout/swap_success.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.SwapSuccessView
+<org.fdroid.fdroid.nearby.SwapSuccessView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarColor="@color/swap_bright_blue"
@@ -15,4 +15,4 @@
             android:layout_height="match_parent"
             android:orientation="vertical"/>
 
-</org.fdroid.fdroid.views.swap.SwapSuccessView>
\ No newline at end of file
+</org.fdroid.fdroid.nearby.SwapSuccessView>
\ No newline at end of file
diff --git a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
index 10a5cf0e2..28c847b9c 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -8,7 +8,7 @@ import android.util.Log;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.nearby.peers.WifiPeer;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import java.util.Arrays;
 import java.util.Locale;
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index f96efce75..23e3d3a3c 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -62,7 +62,7 @@ import org.fdroid.fdroid.net.WifiStateChangeService;
 import org.fdroid.fdroid.views.AppDetailsActivity;
 import org.fdroid.fdroid.views.ManageReposActivity;
 import org.fdroid.fdroid.views.apps.AppListActivity;
-import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
+import org.fdroid.fdroid.nearby.SwapWorkflowActivity;
 
 import java.lang.reflect.Field;