Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fold ".views.swap" package into ".nearby" class

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-06-17 10:10:20 +02:00
parent 790b5ab27d
commit 43c7574228
15 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java → app/src/androidTest/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@ -17,7 +17,7 @@
* MA 02110-1301, USA. * MA 02110-1301, USA.
*/ */
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.nearby;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;

2
app/src/full/AndroidManifest.xml
View File

@ -50,7 +50,7 @@
<activity <activity
android:label="@string/swap" android:label="@string/swap"
android:name=".views.swap.SwapWorkflowActivity" android:name=".nearby.SwapWorkflowActivity"
android:parentActivityName=".views.main.MainActivity" android:parentActivityName=".views.main.MainActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:theme="@style/SwapTheme.Wizard" android:theme="@style/SwapTheme.Wizard"

4
app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java → app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.nearby;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
@ -29,8 +29,6 @@ import android.widget.TextView;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.data.InstalledAppProvider; import org.fdroid.fdroid.data.InstalledAppProvider;
import org.fdroid.fdroid.data.Schema.InstalledAppTable; 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> { public class SelectAppsView extends SwapView implements LoaderManager.LoaderCallbacks<Cursor> {

2
app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java → app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.nearby;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothAdapter;

1
app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
View File

@ -34,7 +34,6 @@ import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.nearby.peers.Peer; import org.fdroid.fdroid.nearby.peers.Peer;
import org.fdroid.fdroid.net.Downloader; import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.WifiStateChangeService; import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.views.swap.SwapWorkflowActivity;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;

3
app/src/full/java/org/fdroid/fdroid/views/swap/SwapSuccessView.java → app/src/full/java/org/fdroid/fdroid/nearby/SwapSuccessView.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.nearby;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; 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.data.Schema.AppMetadataTable;
import org.fdroid.fdroid.installer.InstallManagerService; import org.fdroid.fdroid.installer.InstallManagerService;
import org.fdroid.fdroid.installer.Installer; import org.fdroid.fdroid.installer.Installer;
import org.fdroid.fdroid.nearby.SwapView;
import org.fdroid.fdroid.net.Downloader; import org.fdroid.fdroid.net.Downloader;
import org.fdroid.fdroid.net.DownloaderService; import org.fdroid.fdroid.net.DownloaderService;

1
app/src/full/java/org/fdroid/fdroid/nearby/SwapView.java
View File

@ -8,7 +8,6 @@ import android.support.annotation.LayoutRes;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import org.fdroid.fdroid.R; 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 * A {@link android.view.View} that registers to handle the swap events from

8
app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java → app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid.views.swap; package org.fdroid.fdroid.nearby;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
@ -58,12 +58,6 @@ import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.NewRepoConfig; import org.fdroid.fdroid.data.NewRepoConfig;
import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider; 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.BluetoothPeer;
import org.fdroid.fdroid.nearby.peers.Peer; import org.fdroid.fdroid.nearby.peers.Peer;
import org.fdroid.fdroid.net.BluetoothDownloader; import org.fdroid.fdroid.net.BluetoothDownloader;

2
app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java
View File

@ -39,7 +39,7 @@ import fi.iki.elonen.NanoHTTPD;
import fi.iki.elonen.NanoHTTPD.Response.IStatus; import fi.iki.elonen.NanoHTTPD.Response.IStatus;
import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore; 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 javax.net.ssl.SSLServerSocketFactory;
import java.io.File; import java.io.File;

2
app/src/full/res/layout/swap_join_wifi.xml
View File

@ -9,7 +9,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/swap_blue" android:background="@color/swap_blue"
tools:context=".views.swap.SwapWorkflowActivity"> tools:context=".nearby.SwapWorkflowActivity">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/full/res/layout/swap_select_apps.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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:android="http://schemas.android.com/apk/res/android"
xmlns:swap="http://schemas.android.com/apk/res-auto" xmlns:swap="http://schemas.android.com/apk/res-auto"
swap:toolbarColor="@color/swap_bright_blue" swap:toolbarColor="@color/swap_bright_blue"
@ -15,4 +15,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"/> android:orientation="vertical"/>
</org.fdroid.fdroid.views.swap.SelectAppsView> </org.fdroid.fdroid.nearby.SelectAppsView>

6
app/src/full/res/layout/swap_start_swap.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:swap="http://schemas.android.com/apk/res-auto" xmlns:swap="http://schemas.android.com/apk/res-auto"
@ -8,7 +8,7 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".views.swap.SwapWorkflowActivity"> tools:context=".nearby.SwapWorkflowActivity">
<!-- Misc header --> <!-- Misc header -->
<include layout="@layout/start_swap_header"/> <include layout="@layout/start_swap_header"/>
@ -209,4 +209,4 @@
</ListView> </ListView>
</org.fdroid.fdroid.views.swap.StartSwapView> </org.fdroid.fdroid.nearby.StartSwapView>

4
app/src/full/res/layout/swap_success.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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:android="http://schemas.android.com/apk/res/android"
xmlns:swap="http://schemas.android.com/apk/res-auto" xmlns:swap="http://schemas.android.com/apk/res-auto"
swap:toolbarColor="@color/swap_bright_blue" swap:toolbarColor="@color/swap_bright_blue"
@ -15,4 +15,4 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"/> android:orientation="vertical"/>
</org.fdroid.fdroid.views.swap.SwapSuccessView> </org.fdroid.fdroid.nearby.SwapSuccessView>

2
app/src/main/java/org/fdroid/fdroid/data/NewRepoConfig.java
View File

@ -8,7 +8,7 @@ import android.util.Log;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.nearby.peers.WifiPeer; 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.Arrays;
import java.util.Locale; import java.util.Locale;

2
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -62,7 +62,7 @@ import org.fdroid.fdroid.net.WifiStateChangeService;
import org.fdroid.fdroid.views.AppDetailsActivity; import org.fdroid.fdroid.views.AppDetailsActivity;
import org.fdroid.fdroid.views.ManageReposActivity; import org.fdroid.fdroid.views.ManageReposActivity;
import org.fdroid.fdroid.views.apps.AppListActivity; 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; import java.lang.reflect.Field;