From ea80704598987da30818cb5a2320c7cf18a9f834 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 May 2018 17:44:21 +0200 Subject: [PATCH 1/7] split up everything into 'full' and 'basic' build flavor "full" is the original F-Droid app with all the features. It should still build the exact same app after this change. "basic" is the smallest version of F-Droid possible. It does not yet build, nor work. --- app/build.gradle | 30 ++++++++++++++----- .../javax/jmdns/impl/FDroidServiceInfo.java | 0 .../kellinwood/logging/AbstractLogger.java | 0 .../logging/ConsoleLoggerFactory.java | 0 .../kellinwood/logging/LoggerFactory.java | 0 .../kellinwood/logging/LoggerInterface.java | 0 .../kellinwood/logging/LoggerManager.java | 0 .../kellinwood/logging/NullLoggerFactory.java | 0 .../java/kellinwood/logging/StreamLogger.java | 0 .../security/zipsigner/AutoKeyException.java | 0 .../kellinwood/security/zipsigner/Base64.java | 0 .../zipsigner/DefaultResourceAdapter.java | 0 .../security/zipsigner/HexDumpEncoder.java | 0 .../security/zipsigner/HexEncoder.java | 0 .../kellinwood/security/zipsigner/KeySet.java | 0 .../security/zipsigner/ProgressEvent.java | 0 .../security/zipsigner/ProgressHelper.java | 0 .../security/zipsigner/ProgressListener.java | 0 .../security/zipsigner/ResourceAdapter.java | 0 .../security/zipsigner/ZipSignature.java | 0 .../security/zipsigner/ZipSigner.java | 0 .../zipsigner/optional/CertCreator.java | 0 .../zipsigner/optional/CustomKeySigner.java | 0 .../optional/DistinguishedNameValues.java | 0 .../zipsigner/optional/Fingerprint.java | 0 .../security/zipsigner/optional/JKS.java | 0 .../zipsigner/optional/JksKeyStore.java | 0 .../optional/KeyNameConflictException.java | 0 .../optional/KeyStoreFileManager.java | 0 .../optional/LoadKeystoreException.java | 0 .../optional/PasswordObfuscator.java | 0 .../optional/SignatureBlockGenerator.java | 0 .../java/kellinwood/zipio/CentralEnd.java | 0 .../java/kellinwood/zipio/ZioEntry.java | 0 .../kellinwood/zipio/ZioEntryInputStream.java | 0 .../zipio/ZioEntryOutputStream.java | 0 .../java/kellinwood/zipio/ZipInput.java | 0 .../kellinwood/zipio/ZipListingHelper.java | 0 .../java/kellinwood/zipio/ZipOutput.java | 0 .../localrepo/CacheSwapAppsService.java | 0 .../fdroid/localrepo/LocalRepoKeyStore.java | 0 .../fdroid/localrepo/LocalRepoManager.java | 0 .../fdroid/fdroid/localrepo/SwapService.java | 0 .../localrepo/peers/BluetoothFinder.java | 0 .../fdroid/localrepo/peers/BluetoothPeer.java | 0 .../fdroid/localrepo/peers/BonjourFinder.java | 0 .../fdroid/localrepo/peers/BonjourPeer.java | 0 .../fdroid/fdroid/localrepo/peers/Peer.java | 0 .../fdroid/localrepo/peers/PeerFinder.java | 0 .../fdroid/localrepo/peers/WifiPeer.java | 0 .../fdroid/localrepo/type/BluetoothSwap.java | 0 .../localrepo/type/BonjourBroadcast.java | 0 .../fdroid/localrepo/type/SwapType.java | 0 .../fdroid/localrepo/type/WifiSwap.java | 0 .../org/fdroid/fdroid/net/LocalHTTPD.java | 0 .../fdroid/net/WifiStateChangeService.java | 0 .../fdroid/net/bluetooth/BluetoothClient.java | 0 .../fdroid/net/bluetooth/BluetoothServer.java | 0 .../receiver/WifiStateChangeReceiver.java | 0 .../views/hiding/CalculatorActivity.java | 0 .../fdroid/views/hiding/HidingManager.java | 0 .../views/main/CategoriesViewBinder.java | 0 .../fdroid/views/main/MainViewController.java | 0 .../fdroid/views/main/WhatsNewViewBinder.java | 0 .../fdroid/views/panic/ExitActivity.java | 0 .../views/panic/PanicPreferencesActivity.java | 0 .../views/panic/PanicPreferencesFragment.java | 0 .../views/panic/PanicResponderActivity.java | 0 .../fdroid/views/swap/ConfirmReceive.java | 0 .../fdroid/views/swap/InitialLoadingView.java | 0 .../fdroid/views/swap/JoinWifiView.java | 0 .../org/fdroid/fdroid/views/swap/NfcView.java | 0 .../fdroid/views/swap/SelectAppsView.java | 0 .../fdroid/views/swap/SendFDroidView.java | 0 .../fdroid/views/swap/StartSwapView.java | 0 .../fdroid/views/swap/SwapAppsView.java | 0 .../fdroid/views/swap/SwapConnecting.java | 0 .../views/swap/SwapWorkflowActivity.java | 0 .../fdroid/fdroid/views/swap/WifiQrView.java | 0 .../camera/CameraCharacteristicsChecker.java | 0 .../CameraCharacteristicsMaxApiLevel20.java | 0 .../CameraCharacteristicsMinApiLevel21.java | 0 .../res/layout/activity_calculator.xml | 0 .../res/menu/main_activity_screens.xml | 0 .../res/xml/preferences_panic.xml | 0 .../net/WifiStateChangeServiceTest.java | 0 86 files changed, 23 insertions(+), 7 deletions(-) rename app/src/{main => full}/java/javax/jmdns/impl/FDroidServiceInfo.java (100%) rename app/src/{main => full}/java/kellinwood/logging/AbstractLogger.java (100%) rename app/src/{main => full}/java/kellinwood/logging/ConsoleLoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerInterface.java (100%) rename app/src/{main => full}/java/kellinwood/logging/LoggerManager.java (100%) rename app/src/{main => full}/java/kellinwood/logging/NullLoggerFactory.java (100%) rename app/src/{main => full}/java/kellinwood/logging/StreamLogger.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/AutoKeyException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/Base64.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/HexDumpEncoder.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/HexEncoder.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/KeySet.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressEvent.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressHelper.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ProgressListener.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ResourceAdapter.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ZipSignature.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/ZipSigner.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/CertCreator.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/Fingerprint.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/JKS.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/JksKeyStore.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java (100%) rename app/src/{main => full}/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/CentralEnd.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntry.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntryInputStream.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZioEntryOutputStream.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipInput.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipListingHelper.java (100%) rename app/src/{main => full}/java/kellinwood/zipio/ZipOutput.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/SwapService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/Peer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/SwapType.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/LocalHTTPD.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/WifiStateChangeService.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/hiding/HidingManager.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/MainViewController.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/ExitActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/JoinWifiView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/NfcView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SelectAppsView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SendFDroidView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/StartSwapView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapAppsView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapConnecting.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/WifiQrView.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java (100%) rename app/src/{main => full}/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java (100%) rename app/src/{main => full}/res/layout/activity_calculator.xml (100%) rename app/src/{main => full}/res/menu/main_activity_screens.xml (100%) rename app/src/{main => full}/res/xml/preferences_panic.xml (100%) rename app/src/{test => testFull}/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java (100%) diff --git a/app/build.gradle b/app/build.gradle index 4378d6879..7376e1fbc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,9 @@ def getVersionName = { -> def isCi = "true".equals(System.getenv("CI")) def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true")) +def fullApplicationId = "org.fdroid.fdroid" +def basicApplicationId = "org.fdroid.basic" + android { compileSdkVersion 27 buildToolsVersion '27.0.3' @@ -31,6 +34,20 @@ android { } } + flavorDimensions "base" + productFlavors { + full { + dimension "base" + applicationId fullApplicationId + resValue "string", "applicationId", fullApplicationId + } + basic { + dimension "base" + applicationId basicApplicationId + resValue "string", "applicationId", basicApplicationId + } + } + compileOptions { compileOptions.encoding = "UTF-8" } @@ -49,15 +66,13 @@ android { defaultConfig { versionCode 1003001 versionName getVersionName() - applicationId 'org.fdroid.fdroid' - resValue "string", "applicationId", applicationId testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { debug { applicationIdSuffix ".debug" - resValue "string", "applicationId", defaultConfig.applicationId + applicationIdSuffix + resValue "string", "applicationId", fullApplicationId + applicationIdSuffix versionNameSuffix "-debug" println 'buildTypes.debug defaultConfig.versionCode ' + defaultConfig.versionCode } @@ -125,13 +140,10 @@ dependencies { implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'com.google.zxing:core:3.3.2' implementation 'eu.chainfire:libsuperuser:1.0.0.201602271131' - implementation 'cc.mvdan.accesspoint:library:0.2.0' implementation 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1' implementation 'info.guardianproject.panic:panic:0.5' implementation 'commons-io:commons-io:2.5' implementation 'commons-net:commons-net:3.5' - implementation 'org.jmdns:jmdns:3.5.3' - implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation 'ch.acra:acra:4.9.1' implementation 'io.reactivex:rxjava:1.1.0' implementation 'io.reactivex:rxandroid:0.23.0' @@ -142,10 +154,14 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' implementation 'com.fasterxml.jackson.core:jackson-databind:2.8.7' - implementation 'org.bouncycastle:bcpkix-jdk15on:1.59' implementation 'org.bouncycastle:bcprov-jdk15on:1.59' + fullImplementation 'org.bouncycastle:bcpkix-jdk15on:1.59' + fullImplementation 'cc.mvdan.accesspoint:library:0.2.0' + fullImplementation 'org.jmdns:jmdns:3.5.3' + fullImplementation 'org.nanohttpd:nanohttpd:2.3.1' testImplementation 'org.robolectric:robolectric:3.8' + testImplementation 'org.bouncycastle:bcprov-jdk15on:1.59' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.7.22' diff --git a/app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java b/app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java similarity index 100% rename from app/src/main/java/javax/jmdns/impl/FDroidServiceInfo.java rename to app/src/full/java/javax/jmdns/impl/FDroidServiceInfo.java diff --git a/app/src/main/java/kellinwood/logging/AbstractLogger.java b/app/src/full/java/kellinwood/logging/AbstractLogger.java similarity index 100% rename from app/src/main/java/kellinwood/logging/AbstractLogger.java rename to app/src/full/java/kellinwood/logging/AbstractLogger.java diff --git a/app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java b/app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/ConsoleLoggerFactory.java rename to app/src/full/java/kellinwood/logging/ConsoleLoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/LoggerFactory.java b/app/src/full/java/kellinwood/logging/LoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerFactory.java rename to app/src/full/java/kellinwood/logging/LoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/LoggerInterface.java b/app/src/full/java/kellinwood/logging/LoggerInterface.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerInterface.java rename to app/src/full/java/kellinwood/logging/LoggerInterface.java diff --git a/app/src/main/java/kellinwood/logging/LoggerManager.java b/app/src/full/java/kellinwood/logging/LoggerManager.java similarity index 100% rename from app/src/main/java/kellinwood/logging/LoggerManager.java rename to app/src/full/java/kellinwood/logging/LoggerManager.java diff --git a/app/src/main/java/kellinwood/logging/NullLoggerFactory.java b/app/src/full/java/kellinwood/logging/NullLoggerFactory.java similarity index 100% rename from app/src/main/java/kellinwood/logging/NullLoggerFactory.java rename to app/src/full/java/kellinwood/logging/NullLoggerFactory.java diff --git a/app/src/main/java/kellinwood/logging/StreamLogger.java b/app/src/full/java/kellinwood/logging/StreamLogger.java similarity index 100% rename from app/src/main/java/kellinwood/logging/StreamLogger.java rename to app/src/full/java/kellinwood/logging/StreamLogger.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java b/app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/AutoKeyException.java rename to app/src/full/java/kellinwood/security/zipsigner/AutoKeyException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/Base64.java b/app/src/full/java/kellinwood/security/zipsigner/Base64.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/Base64.java rename to app/src/full/java/kellinwood/security/zipsigner/Base64.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java rename to app/src/full/java/kellinwood/security/zipsigner/DefaultResourceAdapter.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/HexDumpEncoder.java rename to app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexEncoder.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/HexEncoder.java rename to app/src/full/java/kellinwood/security/zipsigner/HexEncoder.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/KeySet.java b/app/src/full/java/kellinwood/security/zipsigner/KeySet.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/KeySet.java rename to app/src/full/java/kellinwood/security/zipsigner/KeySet.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressEvent.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressEvent.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressHelper.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressHelper.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java b/app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ProgressListener.java rename to app/src/full/java/kellinwood/security/zipsigner/ProgressListener.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java b/app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ResourceAdapter.java rename to app/src/full/java/kellinwood/security/zipsigner/ResourceAdapter.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java b/app/src/full/java/kellinwood/security/zipsigner/ZipSignature.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ZipSignature.java rename to app/src/full/java/kellinwood/security/zipsigner/ZipSignature.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java b/app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/ZipSigner.java rename to app/src/full/java/kellinwood/security/zipsigner/ZipSigner.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/CertCreator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/CertCreator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/CertCreator.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java b/app/src/full/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/CustomKeySigner.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java b/app/src/full/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/DistinguishedNameValues.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java b/app/src/full/java/kellinwood/security/zipsigner/optional/Fingerprint.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/Fingerprint.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/Fingerprint.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java b/app/src/full/java/kellinwood/security/zipsigner/optional/JKS.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/JKS.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/JKS.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java b/app/src/full/java/kellinwood/security/zipsigner/optional/JksKeyStore.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/JksKeyStore.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/JksKeyStore.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java b/app/src/full/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/KeyNameConflictException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java b/app/src/full/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java b/app/src/full/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/LoadKeystoreException.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/PasswordObfuscator.java diff --git a/app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java b/app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java similarity index 100% rename from app/src/main/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java rename to app/src/full/java/kellinwood/security/zipsigner/optional/SignatureBlockGenerator.java diff --git a/app/src/main/java/kellinwood/zipio/CentralEnd.java b/app/src/full/java/kellinwood/zipio/CentralEnd.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/CentralEnd.java rename to app/src/full/java/kellinwood/zipio/CentralEnd.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntry.java b/app/src/full/java/kellinwood/zipio/ZioEntry.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntry.java rename to app/src/full/java/kellinwood/zipio/ZioEntry.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntryInputStream.java rename to app/src/full/java/kellinwood/zipio/ZioEntryInputStream.java diff --git a/app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java b/app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZioEntryOutputStream.java rename to app/src/full/java/kellinwood/zipio/ZioEntryOutputStream.java diff --git a/app/src/main/java/kellinwood/zipio/ZipInput.java b/app/src/full/java/kellinwood/zipio/ZipInput.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipInput.java rename to app/src/full/java/kellinwood/zipio/ZipInput.java diff --git a/app/src/main/java/kellinwood/zipio/ZipListingHelper.java b/app/src/full/java/kellinwood/zipio/ZipListingHelper.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipListingHelper.java rename to app/src/full/java/kellinwood/zipio/ZipListingHelper.java diff --git a/app/src/main/java/kellinwood/zipio/ZipOutput.java b/app/src/full/java/kellinwood/zipio/ZipOutput.java similarity index 100% rename from app/src/main/java/kellinwood/zipio/ZipOutput.java rename to app/src/full/java/kellinwood/zipio/ZipOutput.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/CacheSwapAppsService.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/LocalRepoManager.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/SwapService.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/BonjourPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/Peer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/Peer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/PeerFinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/BluetoothSwap.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/BonjourBroadcast.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/SwapType.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/SwapType.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/SwapType.java diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java b/app/src/full/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java rename to app/src/full/java/org/fdroid/fdroid/localrepo/type/WifiSwap.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java b/app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/LocalHTTPD.java rename to app/src/full/java/org/fdroid/fdroid/net/LocalHTTPD.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/WifiStateChangeService.java rename to app/src/full/java/org/fdroid/fdroid/net/WifiStateChangeService.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java rename to app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java b/app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java rename to app/src/full/java/org/fdroid/fdroid/net/bluetooth/BluetoothServer.java diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java rename to app/src/full/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java b/app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/hiding/CalculatorActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/hiding/HidingManager.java rename to app/src/full/java/org/fdroid/fdroid/views/hiding/HidingManager.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java rename to app/src/full/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java rename to app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java rename to app/src/full/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/ExitActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/ExitActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/ExitActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicPreferencesFragment.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java b/app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/panic/PanicResponderActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/JoinWifiView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SelectAppsView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SendFDroidView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SendFDroidView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SendFDroidView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/StartSwapView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapAppsView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapConnecting.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/WifiQrView.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsChecker.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMaxApiLevel20.java diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java b/app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java similarity index 100% rename from app/src/main/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java rename to app/src/full/java/org/fdroid/fdroid/views/swap/device/camera/CameraCharacteristicsMinApiLevel21.java diff --git a/app/src/main/res/layout/activity_calculator.xml b/app/src/full/res/layout/activity_calculator.xml similarity index 100% rename from app/src/main/res/layout/activity_calculator.xml rename to app/src/full/res/layout/activity_calculator.xml diff --git a/app/src/main/res/menu/main_activity_screens.xml b/app/src/full/res/menu/main_activity_screens.xml similarity index 100% rename from app/src/main/res/menu/main_activity_screens.xml rename to app/src/full/res/menu/main_activity_screens.xml diff --git a/app/src/main/res/xml/preferences_panic.xml b/app/src/full/res/xml/preferences_panic.xml similarity index 100% rename from app/src/main/res/xml/preferences_panic.xml rename to app/src/full/res/xml/preferences_panic.xml diff --git a/app/src/test/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java b/app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java similarity index 100% rename from app/src/test/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java rename to app/src/testFull/java/org/fdroid/fdroid/net/WifiStateChangeServiceTest.java From c87f6a64f9829eb95413446c0aae9dcd6dc8e050 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 30 May 2018 14:44:09 +0200 Subject: [PATCH 2/7] get "basic" flavor building and running --- app/build.gradle | 6 + app/lint.xml | 2 +- .../fdroid/localrepo/peers/WifiPeer.java | 30 ++++ .../fdroid/net/WifiStateChangeService.java | 35 ++++ .../fdroid/net/bluetooth/BluetoothClient.java | 34 ++++ .../fdroid/views/hiding/HidingManager.java | 32 ++++ .../fdroid/views/main/MainViewController.java | 96 +++++++++++ .../views/swap/SwapWorkflowActivity.java | 28 +++ .../basic/res/menu/main_activity_screens.xml | 14 ++ app/src/basic/res/xml/preferences.xml | 163 ++++++++++++++++++ app/src/full/AndroidManifest.xml | 131 ++++++++++++++ .../res/drawable-hdpi/circle.png | Bin .../res/drawable-hdpi/hotspot.png | Bin .../ic_add_circle_outline_white.png | Bin .../drawable-hdpi/ic_arrow_forward_white.png | Bin .../res/drawable-hdpi/ic_bluetooth_white.png | Bin .../drawable-hdpi/ic_check_circle_white.png | Bin .../res/drawable-hdpi/ic_fdroid_grey.png | Bin .../drawable-hdpi/ic_network_wifi_white.png | Bin .../res/drawable-hdpi/ic_qr_grey.png | Bin .../res/drawable-hdpi/ic_swap.png | Bin .../res/drawable-ldpi/circle.png | Bin .../res/drawable-ldpi/hotspot.png | Bin .../res/drawable-ldpi/ic_fdroid_grey.png | Bin .../res/drawable-ldpi/ic_qr_grey.png | Bin .../res/drawable-ldpi/ic_swap.png | Bin .../res/drawable-mdpi/circle.png | Bin .../res/drawable-mdpi/hotspot.png | Bin .../ic_add_circle_outline_white.png | Bin .../drawable-mdpi/ic_arrow_forward_white.png | Bin .../res/drawable-mdpi/ic_bluetooth_white.png | Bin .../drawable-mdpi/ic_check_circle_white.png | Bin .../res/drawable-mdpi/ic_fdroid_grey.png | Bin .../drawable-mdpi/ic_network_wifi_white.png | Bin .../res/drawable-mdpi/ic_qr_grey.png | Bin .../res/drawable-mdpi/ic_swap.png | Bin .../res/drawable-xhdpi/circle.png | Bin .../ic_add_circle_outline_white.png | Bin .../drawable-xhdpi/ic_arrow_forward_white.png | Bin .../res/drawable-xhdpi/ic_bluetooth_white.png | Bin .../drawable-xhdpi/ic_check_circle_white.png | Bin .../res/drawable-xhdpi/ic_fdroid_grey.png | Bin .../drawable-xhdpi/ic_network_wifi_white.png | Bin .../res/drawable-xhdpi/ic_qr_grey.png | Bin .../res/drawable-xhdpi/ic_swap.png | Bin .../res/drawable-xxhdpi/circle.png | Bin .../ic_add_circle_outline_white.png | Bin .../ic_arrow_forward_white.png | Bin .../drawable-xxhdpi/ic_bluetooth_white.png | Bin .../drawable-xxhdpi/ic_check_circle_white.png | Bin .../res/drawable-xxhdpi/ic_fdroid_grey.png | Bin .../drawable-xxhdpi/ic_network_wifi_white.png | Bin .../res/drawable-xxhdpi/ic_qr_grey.png | Bin .../res/drawable-xxxhdpi/circle.png | Bin .../ic_add_circle_outline_white.png | Bin .../ic_arrow_forward_white.png | Bin .../drawable-xxxhdpi/ic_bluetooth_white.png | Bin .../ic_check_circle_white.png | Bin .../res/drawable-xxxhdpi/ic_fdroid_grey.png | Bin .../ic_network_wifi_white.png | Bin .../res/drawable-xxxhdpi/ic_qr_grey.png | Bin .../res/drawable/nearby_splash.xml | 0 .../select_local_apps_list_item.xml | 0 .../select_local_apps_list_item.xml | 0 .../res/layout/activity_panic_settings.xml | 0 .../res/layout/dialog_app_hiding.xml | 0 .../res/layout/main_tab_categories.xml | 0 .../res/layout/main_tab_swap.xml | 0 .../res/layout/main_tab_whats_new.xml | 0 .../layout/select_local_apps_list_item.xml | 0 .../res/layout/swap_activity.xml | 0 .../res/layout/swap_app_list_item.xml | 0 .../{main => full}/res/layout/swap_blank.xml | 0 .../res/layout/swap_confirm_receive.xml | 0 .../res/layout/swap_connecting.xml | 0 .../res/layout/swap_initial_loading.xml | 0 .../res/layout/swap_join_wifi.xml | 0 .../{main => full}/res/layout/swap_nfc.xml | 0 .../res/layout/swap_peer_list_item.xml | 0 .../res/layout/swap_select_apps.xml | 0 .../res/layout/swap_send_fdroid.xml | 0 .../res/layout/swap_success.xml | 0 .../res/layout/swap_wifi_qr.xml | 0 app/src/{main => full}/res/menu/swap_next.xml | 0 .../res/menu/swap_next_search.xml | 0 .../{main => full}/res/menu/swap_search.xml | 0 app/src/{main => full}/res/menu/swap_skip.xml | 0 .../mipmap-hdpi/ic_calculator_launcher.png | Bin .../mipmap-mdpi/ic_calculator_launcher.png | Bin .../mipmap-xhdpi/ic_calculator_launcher.png | Bin .../mipmap-xxhdpi/ic_calculator_launcher.png | Bin .../mipmap-xxxhdpi/ic_calculator_launcher.png | Bin app/src/full/res/values-v17/styles.xml | 29 ++++ app/src/full/res/values-v21/styles.xml | 8 + app/src/full/res/values/attrs.xml | 6 + app/src/full/res/values/colors.xml | 13 ++ app/src/full/res/values/styles.xml | 134 ++++++++++++++ app/src/main/AndroidManifest.xml | 109 +++--------- .../fdroid/views/main/MainActivity.java | 10 +- app/src/main/res/values-v17/styles.xml | 25 --- app/src/main/res/values-v21/styles.xml | 4 - app/src/main/res/values/attrs.xml | 3 - app/src/main/res/values/colors.xml | 9 - app/src/main/res/values/ids.xml | 5 + app/src/main/res/values/styles.xml | 130 -------------- 105 files changed, 795 insertions(+), 261 deletions(-) create mode 100644 app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java create mode 100644 app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java create mode 100644 app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java create mode 100644 app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java create mode 100644 app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java create mode 100644 app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java create mode 100644 app/src/basic/res/menu/main_activity_screens.xml create mode 100644 app/src/basic/res/xml/preferences.xml create mode 100644 app/src/full/AndroidManifest.xml rename app/src/{main => full}/res/drawable-hdpi/circle.png (100%) rename app/src/{main => full}/res/drawable-hdpi/hotspot.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_add_circle_outline_white.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_arrow_forward_white.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_bluetooth_white.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_check_circle_white.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_network_wifi_white.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable-hdpi/ic_swap.png (100%) rename app/src/{main => full}/res/drawable-ldpi/circle.png (100%) rename app/src/{main => full}/res/drawable-ldpi/hotspot.png (100%) rename app/src/{main => full}/res/drawable-ldpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-ldpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable-ldpi/ic_swap.png (100%) rename app/src/{main => full}/res/drawable-mdpi/circle.png (100%) rename app/src/{main => full}/res/drawable-mdpi/hotspot.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_add_circle_outline_white.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_arrow_forward_white.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_bluetooth_white.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_check_circle_white.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_network_wifi_white.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable-mdpi/ic_swap.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/circle.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_add_circle_outline_white.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_arrow_forward_white.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_bluetooth_white.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_check_circle_white.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_network_wifi_white.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable-xhdpi/ic_swap.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/circle.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_add_circle_outline_white.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_arrow_forward_white.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_bluetooth_white.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_check_circle_white.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_network_wifi_white.png (100%) rename app/src/{main => full}/res/drawable-xxhdpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/circle.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_add_circle_outline_white.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_arrow_forward_white.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_bluetooth_white.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_check_circle_white.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_fdroid_grey.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_network_wifi_white.png (100%) rename app/src/{main => full}/res/drawable-xxxhdpi/ic_qr_grey.png (100%) rename app/src/{main => full}/res/drawable/nearby_splash.xml (100%) rename app/src/{main => full}/res/layout-v11/select_local_apps_list_item.xml (100%) rename app/src/{main => full}/res/layout-v17/select_local_apps_list_item.xml (100%) rename app/src/{main => full}/res/layout/activity_panic_settings.xml (100%) rename app/src/{main => full}/res/layout/dialog_app_hiding.xml (100%) rename app/src/{main => full}/res/layout/main_tab_categories.xml (100%) rename app/src/{main => full}/res/layout/main_tab_swap.xml (100%) rename app/src/{main => full}/res/layout/main_tab_whats_new.xml (100%) rename app/src/{main => full}/res/layout/select_local_apps_list_item.xml (100%) rename app/src/{main => full}/res/layout/swap_activity.xml (100%) rename app/src/{main => full}/res/layout/swap_app_list_item.xml (100%) rename app/src/{main => full}/res/layout/swap_blank.xml (100%) rename app/src/{main => full}/res/layout/swap_confirm_receive.xml (100%) rename app/src/{main => full}/res/layout/swap_connecting.xml (100%) rename app/src/{main => full}/res/layout/swap_initial_loading.xml (100%) rename app/src/{main => full}/res/layout/swap_join_wifi.xml (100%) rename app/src/{main => full}/res/layout/swap_nfc.xml (100%) rename app/src/{main => full}/res/layout/swap_peer_list_item.xml (100%) rename app/src/{main => full}/res/layout/swap_select_apps.xml (100%) rename app/src/{main => full}/res/layout/swap_send_fdroid.xml (100%) rename app/src/{main => full}/res/layout/swap_success.xml (100%) rename app/src/{main => full}/res/layout/swap_wifi_qr.xml (100%) rename app/src/{main => full}/res/menu/swap_next.xml (100%) rename app/src/{main => full}/res/menu/swap_next_search.xml (100%) rename app/src/{main => full}/res/menu/swap_search.xml (100%) rename app/src/{main => full}/res/menu/swap_skip.xml (100%) rename app/src/{main => full}/res/mipmap-hdpi/ic_calculator_launcher.png (100%) rename app/src/{main => full}/res/mipmap-mdpi/ic_calculator_launcher.png (100%) rename app/src/{main => full}/res/mipmap-xhdpi/ic_calculator_launcher.png (100%) rename app/src/{main => full}/res/mipmap-xxhdpi/ic_calculator_launcher.png (100%) rename app/src/{main => full}/res/mipmap-xxxhdpi/ic_calculator_launcher.png (100%) create mode 100644 app/src/full/res/values-v17/styles.xml create mode 100644 app/src/full/res/values-v21/styles.xml create mode 100644 app/src/full/res/values/attrs.xml create mode 100644 app/src/full/res/values/colors.xml create mode 100644 app/src/full/res/values/styles.xml diff --git a/app/build.gradle b/app/build.gradle index 7376e1fbc..9236b55e8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -170,6 +170,12 @@ dependencies { androidTestImplementation 'com.android.support.test:rules:0.5' } +tasks.whenTaskAdded { task -> + if (task.name.startsWith("lintBasic")) { + android.lintOptions.abortOnError = false + } +} + checkstyle { toolVersion = '7.2' } diff --git a/app/lint.xml b/app/lint.xml index a2eed735d..277c6dcb1 100644 --- a/app/lint.xml +++ b/app/lint.xml @@ -36,7 +36,7 @@ - + diff --git a/app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java b/app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java new file mode 100644 index 000000000..112dfdce7 --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/localrepo/peers/WifiPeer.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.localrepo.peers; + +import org.fdroid.fdroid.data.NewRepoConfig; + +/** + * Dummy version for basic app flavor. + */ +public class WifiPeer { + public WifiPeer(NewRepoConfig config) { + } +} diff --git a/app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java b/app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java new file mode 100644 index 000000000..4a7e652f0 --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/net/WifiStateChangeService.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.net; + +import android.content.Context; +import android.content.Intent; +import android.support.annotation.Nullable; + +/** + * Dummy version for basic app flavor. + */ +public class WifiStateChangeService { + public static void start(Context context, @Nullable Intent intent) { + } + + public class WifiInfoThread extends Thread { + } +} diff --git a/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java b/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java new file mode 100644 index 000000000..bb095c56a --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/net/bluetooth/BluetoothClient.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.net.bluetooth; + +/** + * Dummy version for basic app flavor. + */ + +public class BluetoothClient { + + public BluetoothClient(String ignored) { + } + + public BluetoothConnection openConnection() { + return null; + } +} diff --git a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java new file mode 100644 index 000000000..6a574e0fb --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.views.hiding; + +import android.content.Context; + +/** + * Dummy version for basic app flavor. + */ +public class HidingManager { + + public static boolean isHidden(Context context) { + return false; + } +} diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java new file mode 100644 index 000000000..ba85cd1dc --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.views.main; + +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.RecyclerView; +import android.widget.FrameLayout; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.views.fragments.PreferencesFragment; +import org.fdroid.fdroid.views.updates.UpdatesViewBinder; + +/** + * Decides which view on the main screen to attach to a given {@link FrameLayout}. This class + * doesn't know which view it will be rendering at the time it is constructed. Rather, at some + * point in the future the {@link MainViewAdapter} will have information about which view we + * are required to render, and will invoke the relevant "bind*()" method on this class. + */ +class MainViewController extends RecyclerView.ViewHolder { + + private final AppCompatActivity activity; + private final FrameLayout frame; + + @Nullable + private UpdatesViewBinder updatesView = null; + + MainViewController(AppCompatActivity activity, FrameLayout frame) { + super(frame); + this.activity = activity; + this.frame = frame; + } + + public void bindWhatsNewView() { + throw new IllegalStateException("unimplemented"); + } + + /** + * @see UpdatesViewBinder + */ + public void bindUpdates() { + if (updatesView == null) { + updatesView = new UpdatesViewBinder(activity, frame); + } + + updatesView.bind(); + } + + public void unbindUpdates() { + if (updatesView != null) { + updatesView.unbind(); + } + } + + public void bindCategoriesView() { + throw new IllegalStateException("unimplemented"); + } + + public void bindSwapView() { + throw new IllegalStateException("unimplemented"); + } + + /** + * Attaches a {@link PreferencesFragment} to the view. Everything else is managed by the + * fragment itself, so no further work needs to be done by this view binder. + *

+ * Note: It is tricky to attach a {@link Fragment} to a view from this view holder. This is due + * to the way in which the {@link RecyclerView} will reuse existing views and ask us to + * put a settings fragment in there at arbitrary times. Usually it wont be the same view we + * attached the fragment to last time, which causes weirdness. The solution is to use code from + * the com.lsjwzh.widget.recyclerviewpager.FragmentStatePagerAdapter which manages this. + * The code has been ported to {@link SettingsView}. + * + * @see SettingsView + */ + public void bindSettingsView() { + activity.getLayoutInflater().inflate(R.layout.main_tab_settings, frame, true); + } +} diff --git a/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java new file mode 100644 index 000000000..4e86467a5 --- /dev/null +++ b/app/src/basic/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2018 Senecto Limited + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 3 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +package org.fdroid.fdroid.views.swap; + +/** + * Dummy version for basic app flavor. + */ +public class SwapWorkflowActivity { + public static final String EXTRA_PREVENT_FURTHER_SWAP_REQUESTS = "preventFurtherSwap"; + public static final String EXTRA_CONFIRM = "EXTRA_CONFIRM"; +} diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml new file mode 100644 index 000000000..4785bd5c0 --- /dev/null +++ b/app/src/basic/res/menu/main_activity_screens.xml @@ -0,0 +1,14 @@ + +

+ + + \ No newline at end of file diff --git a/app/src/basic/res/xml/preferences.xml b/app/src/basic/res/xml/preferences.xml new file mode 100644 index 000000000..d1a123d4f --- /dev/null +++ b/app/src/basic/res/xml/preferences.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml new file mode 100644 index 000000000..f2ed455be --- /dev/null +++ b/app/src/full/AndroidManifest.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-hdpi/circle.png b/app/src/full/res/drawable-hdpi/circle.png similarity index 100% rename from app/src/main/res/drawable-hdpi/circle.png rename to app/src/full/res/drawable-hdpi/circle.png diff --git a/app/src/main/res/drawable-hdpi/hotspot.png b/app/src/full/res/drawable-hdpi/hotspot.png similarity index 100% rename from app/src/main/res/drawable-hdpi/hotspot.png rename to app/src/full/res/drawable-hdpi/hotspot.png diff --git a/app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_add_circle_outline_white.png rename to app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-hdpi/ic_arrow_forward_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png rename to app/src/full/res/drawable-hdpi/ic_arrow_forward_white.png diff --git a/app/src/main/res/drawable-hdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_bluetooth_white.png rename to app/src/full/res/drawable-hdpi/ic_bluetooth_white.png diff --git a/app/src/main/res/drawable-hdpi/ic_check_circle_white.png b/app/src/full/res/drawable-hdpi/ic_check_circle_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_check_circle_white.png rename to app/src/full/res/drawable-hdpi/ic_check_circle_white.png diff --git a/app/src/main/res/drawable-hdpi/ic_fdroid_grey.png b/app/src/full/res/drawable-hdpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-hdpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-hdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_network_wifi_white.png rename to app/src/full/res/drawable-hdpi/ic_network_wifi_white.png diff --git a/app/src/main/res/drawable-hdpi/ic_qr_grey.png b/app/src/full/res/drawable-hdpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_qr_grey.png rename to app/src/full/res/drawable-hdpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable-hdpi/ic_swap.png b/app/src/full/res/drawable-hdpi/ic_swap.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_swap.png rename to app/src/full/res/drawable-hdpi/ic_swap.png diff --git a/app/src/main/res/drawable-ldpi/circle.png b/app/src/full/res/drawable-ldpi/circle.png similarity index 100% rename from app/src/main/res/drawable-ldpi/circle.png rename to app/src/full/res/drawable-ldpi/circle.png diff --git a/app/src/main/res/drawable-ldpi/hotspot.png b/app/src/full/res/drawable-ldpi/hotspot.png similarity index 100% rename from app/src/main/res/drawable-ldpi/hotspot.png rename to app/src/full/res/drawable-ldpi/hotspot.png diff --git a/app/src/main/res/drawable-ldpi/ic_fdroid_grey.png b/app/src/full/res/drawable-ldpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-ldpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-ldpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-ldpi/ic_qr_grey.png b/app/src/full/res/drawable-ldpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-ldpi/ic_qr_grey.png rename to app/src/full/res/drawable-ldpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable-ldpi/ic_swap.png b/app/src/full/res/drawable-ldpi/ic_swap.png similarity index 100% rename from app/src/main/res/drawable-ldpi/ic_swap.png rename to app/src/full/res/drawable-ldpi/ic_swap.png diff --git a/app/src/main/res/drawable-mdpi/circle.png b/app/src/full/res/drawable-mdpi/circle.png similarity index 100% rename from app/src/main/res/drawable-mdpi/circle.png rename to app/src/full/res/drawable-mdpi/circle.png diff --git a/app/src/main/res/drawable-mdpi/hotspot.png b/app/src/full/res/drawable-mdpi/hotspot.png similarity index 100% rename from app/src/main/res/drawable-mdpi/hotspot.png rename to app/src/full/res/drawable-mdpi/hotspot.png diff --git a/app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_add_circle_outline_white.png rename to app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-mdpi/ic_arrow_forward_white.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png rename to app/src/full/res/drawable-mdpi/ic_arrow_forward_white.png diff --git a/app/src/main/res/drawable-mdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_bluetooth_white.png rename to app/src/full/res/drawable-mdpi/ic_bluetooth_white.png diff --git a/app/src/main/res/drawable-mdpi/ic_check_circle_white.png b/app/src/full/res/drawable-mdpi/ic_check_circle_white.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_check_circle_white.png rename to app/src/full/res/drawable-mdpi/ic_check_circle_white.png diff --git a/app/src/main/res/drawable-mdpi/ic_fdroid_grey.png b/app/src/full/res/drawable-mdpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-mdpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-mdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_network_wifi_white.png rename to app/src/full/res/drawable-mdpi/ic_network_wifi_white.png diff --git a/app/src/main/res/drawable-mdpi/ic_qr_grey.png b/app/src/full/res/drawable-mdpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_qr_grey.png rename to app/src/full/res/drawable-mdpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable-mdpi/ic_swap.png b/app/src/full/res/drawable-mdpi/ic_swap.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_swap.png rename to app/src/full/res/drawable-mdpi/ic_swap.png diff --git a/app/src/main/res/drawable-xhdpi/circle.png b/app/src/full/res/drawable-xhdpi/circle.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/circle.png rename to app/src/full/res/drawable-xhdpi/circle.png diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_add_circle_outline_white.png rename to app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xhdpi/ic_arrow_forward_white.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png rename to app/src/full/res/drawable-xhdpi/ic_arrow_forward_white.png diff --git a/app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_bluetooth_white.png rename to app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png diff --git a/app/src/main/res/drawable-xhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xhdpi/ic_check_circle_white.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_check_circle_white.png rename to app/src/full/res/drawable-xhdpi/ic_check_circle_white.png diff --git a/app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png b/app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-xhdpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_network_wifi_white.png rename to app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png diff --git a/app/src/main/res/drawable-xhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xhdpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_qr_grey.png rename to app/src/full/res/drawable-xhdpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable-xhdpi/ic_swap.png b/app/src/full/res/drawable-xhdpi/ic_swap.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_swap.png rename to app/src/full/res/drawable-xhdpi/ic_swap.png diff --git a/app/src/main/res/drawable-xxhdpi/circle.png b/app/src/full/res/drawable-xxhdpi/circle.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/circle.png rename to app/src/full/res/drawable-xxhdpi/circle.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_add_circle_outline_white.png rename to app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xxhdpi/ic_arrow_forward_white.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png rename to app/src/full/res/drawable-xxhdpi/ic_arrow_forward_white.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_bluetooth_white.png rename to app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xxhdpi/ic_check_circle_white.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_check_circle_white.png rename to app/src/full/res/drawable-xxhdpi/ic_check_circle_white.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png b/app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-xxhdpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_network_wifi_white.png rename to app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xxhdpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_qr_grey.png rename to app/src/full/res/drawable-xxhdpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable-xxxhdpi/circle.png b/app/src/full/res/drawable-xxxhdpi/circle.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/circle.png rename to app/src/full/res/drawable-xxxhdpi/circle.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_add_circle_outline_white.png rename to app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xxxhdpi/ic_arrow_forward_white.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_white.png rename to app/src/full/res/drawable-xxxhdpi/ic_arrow_forward_white.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_bluetooth_white.png rename to app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xxxhdpi/ic_check_circle_white.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_check_circle_white.png rename to app/src/full/res/drawable-xxxhdpi/ic_check_circle_white.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png b/app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_fdroid_grey.png rename to app/src/full/res/drawable-xxxhdpi/ic_fdroid_grey.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_network_wifi_white.png rename to app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png b/app/src/full/res/drawable-xxxhdpi/ic_qr_grey.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_qr_grey.png rename to app/src/full/res/drawable-xxxhdpi/ic_qr_grey.png diff --git a/app/src/main/res/drawable/nearby_splash.xml b/app/src/full/res/drawable/nearby_splash.xml similarity index 100% rename from app/src/main/res/drawable/nearby_splash.xml rename to app/src/full/res/drawable/nearby_splash.xml diff --git a/app/src/main/res/layout-v11/select_local_apps_list_item.xml b/app/src/full/res/layout-v11/select_local_apps_list_item.xml similarity index 100% rename from app/src/main/res/layout-v11/select_local_apps_list_item.xml rename to app/src/full/res/layout-v11/select_local_apps_list_item.xml diff --git a/app/src/main/res/layout-v17/select_local_apps_list_item.xml b/app/src/full/res/layout-v17/select_local_apps_list_item.xml similarity index 100% rename from app/src/main/res/layout-v17/select_local_apps_list_item.xml rename to app/src/full/res/layout-v17/select_local_apps_list_item.xml diff --git a/app/src/main/res/layout/activity_panic_settings.xml b/app/src/full/res/layout/activity_panic_settings.xml similarity index 100% rename from app/src/main/res/layout/activity_panic_settings.xml rename to app/src/full/res/layout/activity_panic_settings.xml diff --git a/app/src/main/res/layout/dialog_app_hiding.xml b/app/src/full/res/layout/dialog_app_hiding.xml similarity index 100% rename from app/src/main/res/layout/dialog_app_hiding.xml rename to app/src/full/res/layout/dialog_app_hiding.xml diff --git a/app/src/main/res/layout/main_tab_categories.xml b/app/src/full/res/layout/main_tab_categories.xml similarity index 100% rename from app/src/main/res/layout/main_tab_categories.xml rename to app/src/full/res/layout/main_tab_categories.xml diff --git a/app/src/main/res/layout/main_tab_swap.xml b/app/src/full/res/layout/main_tab_swap.xml similarity index 100% rename from app/src/main/res/layout/main_tab_swap.xml rename to app/src/full/res/layout/main_tab_swap.xml diff --git a/app/src/main/res/layout/main_tab_whats_new.xml b/app/src/full/res/layout/main_tab_whats_new.xml similarity index 100% rename from app/src/main/res/layout/main_tab_whats_new.xml rename to app/src/full/res/layout/main_tab_whats_new.xml diff --git a/app/src/main/res/layout/select_local_apps_list_item.xml b/app/src/full/res/layout/select_local_apps_list_item.xml similarity index 100% rename from app/src/main/res/layout/select_local_apps_list_item.xml rename to app/src/full/res/layout/select_local_apps_list_item.xml diff --git a/app/src/main/res/layout/swap_activity.xml b/app/src/full/res/layout/swap_activity.xml similarity index 100% rename from app/src/main/res/layout/swap_activity.xml rename to app/src/full/res/layout/swap_activity.xml diff --git a/app/src/main/res/layout/swap_app_list_item.xml b/app/src/full/res/layout/swap_app_list_item.xml similarity index 100% rename from app/src/main/res/layout/swap_app_list_item.xml rename to app/src/full/res/layout/swap_app_list_item.xml diff --git a/app/src/main/res/layout/swap_blank.xml b/app/src/full/res/layout/swap_blank.xml similarity index 100% rename from app/src/main/res/layout/swap_blank.xml rename to app/src/full/res/layout/swap_blank.xml diff --git a/app/src/main/res/layout/swap_confirm_receive.xml b/app/src/full/res/layout/swap_confirm_receive.xml similarity index 100% rename from app/src/main/res/layout/swap_confirm_receive.xml rename to app/src/full/res/layout/swap_confirm_receive.xml diff --git a/app/src/main/res/layout/swap_connecting.xml b/app/src/full/res/layout/swap_connecting.xml similarity index 100% rename from app/src/main/res/layout/swap_connecting.xml rename to app/src/full/res/layout/swap_connecting.xml diff --git a/app/src/main/res/layout/swap_initial_loading.xml b/app/src/full/res/layout/swap_initial_loading.xml similarity index 100% rename from app/src/main/res/layout/swap_initial_loading.xml rename to app/src/full/res/layout/swap_initial_loading.xml diff --git a/app/src/main/res/layout/swap_join_wifi.xml b/app/src/full/res/layout/swap_join_wifi.xml similarity index 100% rename from app/src/main/res/layout/swap_join_wifi.xml rename to app/src/full/res/layout/swap_join_wifi.xml diff --git a/app/src/main/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml similarity index 100% rename from app/src/main/res/layout/swap_nfc.xml rename to app/src/full/res/layout/swap_nfc.xml diff --git a/app/src/main/res/layout/swap_peer_list_item.xml b/app/src/full/res/layout/swap_peer_list_item.xml similarity index 100% rename from app/src/main/res/layout/swap_peer_list_item.xml rename to app/src/full/res/layout/swap_peer_list_item.xml diff --git a/app/src/main/res/layout/swap_select_apps.xml b/app/src/full/res/layout/swap_select_apps.xml similarity index 100% rename from app/src/main/res/layout/swap_select_apps.xml rename to app/src/full/res/layout/swap_select_apps.xml diff --git a/app/src/main/res/layout/swap_send_fdroid.xml b/app/src/full/res/layout/swap_send_fdroid.xml similarity index 100% rename from app/src/main/res/layout/swap_send_fdroid.xml rename to app/src/full/res/layout/swap_send_fdroid.xml diff --git a/app/src/main/res/layout/swap_success.xml b/app/src/full/res/layout/swap_success.xml similarity index 100% rename from app/src/main/res/layout/swap_success.xml rename to app/src/full/res/layout/swap_success.xml diff --git a/app/src/main/res/layout/swap_wifi_qr.xml b/app/src/full/res/layout/swap_wifi_qr.xml similarity index 100% rename from app/src/main/res/layout/swap_wifi_qr.xml rename to app/src/full/res/layout/swap_wifi_qr.xml diff --git a/app/src/main/res/menu/swap_next.xml b/app/src/full/res/menu/swap_next.xml similarity index 100% rename from app/src/main/res/menu/swap_next.xml rename to app/src/full/res/menu/swap_next.xml diff --git a/app/src/main/res/menu/swap_next_search.xml b/app/src/full/res/menu/swap_next_search.xml similarity index 100% rename from app/src/main/res/menu/swap_next_search.xml rename to app/src/full/res/menu/swap_next_search.xml diff --git a/app/src/main/res/menu/swap_search.xml b/app/src/full/res/menu/swap_search.xml similarity index 100% rename from app/src/main/res/menu/swap_search.xml rename to app/src/full/res/menu/swap_search.xml diff --git a/app/src/main/res/menu/swap_skip.xml b/app/src/full/res/menu/swap_skip.xml similarity index 100% rename from app/src/main/res/menu/swap_skip.xml rename to app/src/full/res/menu/swap_skip.xml diff --git a/app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png b/app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_calculator_launcher.png rename to app/src/full/res/mipmap-hdpi/ic_calculator_launcher.png diff --git a/app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png b/app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_calculator_launcher.png rename to app/src/full/res/mipmap-mdpi/ic_calculator_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png b/app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_calculator_launcher.png rename to app/src/full/res/mipmap-xhdpi/ic_calculator_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png b/app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_calculator_launcher.png rename to app/src/full/res/mipmap-xxhdpi/ic_calculator_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png b/app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_calculator_launcher.png rename to app/src/full/res/mipmap-xxxhdpi/ic_calculator_launcher.png diff --git a/app/src/full/res/values-v17/styles.xml b/app/src/full/res/values-v17/styles.xml new file mode 100644 index 000000000..e2bb070aa --- /dev/null +++ b/app/src/full/res/values-v17/styles.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + diff --git a/app/src/full/res/values-v21/styles.xml b/app/src/full/res/values-v21/styles.xml new file mode 100644 index 000000000..4f1c6edae --- /dev/null +++ b/app/src/full/res/values-v21/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/full/res/values/attrs.xml b/app/src/full/res/values/attrs.xml new file mode 100644 index 000000000..2e1d9cd0b --- /dev/null +++ b/app/src/full/res/values/attrs.xml @@ -0,0 +1,6 @@ + + + + 1337 + + diff --git a/app/src/full/res/values/colors.xml b/app/src/full/res/values/colors.xml new file mode 100644 index 000000000..fe1fee70e --- /dev/null +++ b/app/src/full/res/values/colors.xml @@ -0,0 +1,13 @@ + + + + #ff7900 + #27aae1 + #1c6bbc + #ff21488c + #00b9e6 + #bbbbbb + #4a4a4a + #bbbbbb + + diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml new file mode 100644 index 000000000..ea34ac0f7 --- /dev/null +++ b/app/src/full/res/values/styles.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index dea7e3b8b..457f02c1e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,4 +1,26 @@ + - - - - - - - - - - - + android:supportsRtl="true"> - - - - - - - - - @@ -279,23 +266,16 @@ android:name=".DeleteCacheService" android:permission="android.permission.BIND_JOB_SERVICE" android:exported="false"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 185a1e364..543a9a1b6 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 @@ -44,6 +44,7 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem; import org.fdroid.fdroid.AppDetails2; import org.fdroid.fdroid.AppUpdateStatusManager; import org.fdroid.fdroid.AppUpdateStatusManager.AppUpdateStatus; +import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NfcHelper; import org.fdroid.fdroid.Preferences; @@ -114,14 +115,17 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB updatesBadge = new TextBadgeItem().hide(false); bottomNavigation = (BottomNavigationBar) findViewById(R.id.bottom_navigation); + if (BuildConfig.FLAVOR.startsWith("full")) { + bottomNavigation + .addItem(new BottomNavigationItem(R.drawable.ic_latest, R.string.main_menu__latest_apps)) + .addItem(new BottomNavigationItem(R.drawable.ic_categories, R.string.main_menu__categories)) + .addItem(new BottomNavigationItem(R.drawable.ic_nearby, R.string.main_menu__swap_nearby)); + } bottomNavigation.setTabSelectedListener(this) .setBarBackgroundColor(getBottomNavigationBackgroundColorResId()) .setInActiveColor(R.color.bottom_nav_items) .setActiveColor(android.R.color.white) .setMode(BottomNavigationBar.MODE_FIXED) - .addItem(new BottomNavigationItem(R.drawable.ic_latest, R.string.main_menu__latest_apps)) - .addItem(new BottomNavigationItem(R.drawable.ic_categories, R.string.main_menu__categories)) - .addItem(new BottomNavigationItem(R.drawable.ic_nearby, R.string.main_menu__swap_nearby)) .addItem(new BottomNavigationItem(R.drawable.ic_updates, R.string.updates).setBadgeItem(updatesBadge)) .addItem(new BottomNavigationItem(R.drawable.ic_settings, R.string.menu_settings)) .initialise(); diff --git a/app/src/main/res/values-v17/styles.xml b/app/src/main/res/values-v17/styles.xml index 79d23f125..5437f3bff 100644 --- a/app/src/main/res/values-v17/styles.xml +++ b/app/src/main/res/values-v17/styles.xml @@ -13,29 +13,4 @@ - - - - - - - - - diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index c3841ddae..19fabb1d1 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -18,10 +18,6 @@ @transition/shared_elements - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -