diff --git a/.gitignore b/.gitignore index 9708725fd..37ca373e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,43 @@ -/local.properties -/bin/ -/gen/ -/build/ -/.gradle/ -/build.xml +# Built application files +*.apk +*.ap_ + +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +build.xml + +# Gradle files +.gradle/ +build/ + +# Gradle wrapper +gradlew +gradlew.bat +gradle-wrapper.jar +gradle-wrapper.properties + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Editor swap/save files *~ -/.idea/ +*.swp + +# More IDE stuff +.idea/ *.iml out -/.settings/ +.settings/ diff --git a/.classpath b/F-Droid/.classpath similarity index 91% rename from .classpath rename to F-Droid/.classpath index b6c82120d..c793f7ca1 100644 --- a/.classpath +++ b/F-Droid/.classpath @@ -4,7 +4,7 @@ - + diff --git a/.project b/F-Droid/.project similarity index 100% rename from .project rename to F-Droid/.project diff --git a/AndroidManifest.xml b/F-Droid/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to F-Droid/AndroidManifest.xml diff --git a/F-Droid/ant-prepare.sh b/F-Droid/ant-prepare.sh new file mode 100755 index 000000000..0eaa3c23b --- /dev/null +++ b/F-Droid/ant-prepare.sh @@ -0,0 +1,34 @@ +#!/bin/bash -ex + +EXTERN=../extern + +place_support_v4() { + mkdir -p $1/libs + cp libs/android-support-v4.jar $1/libs/ +} + +android update lib-project --path $EXTERN/UniversalImageLoader/library + +android update lib-project --path $EXTERN/AndroidPinning + +android update lib-project --path $EXTERN/MemorizingTrustManager + +android update lib-project --path $EXTERN/libsuperuser/libsuperuser + +android update lib-project --path $EXTERN/zxing-core + +android update lib-project --path $EXTERN/android-support-v4-preferencefragment +place_support_v4 $EXTERN/android-support-v4-preferencefragment + +android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19 +place_support_v4 $EXTERN/Support/v7/appcompat + +android update project --path . --name F-Droid + +{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null + +# technically optional, needed for the tests +cd test +android update test-project --path . --main .. + +{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null diff --git a/ant.properties b/F-Droid/ant.properties similarity index 100% rename from ant.properties rename to F-Droid/ant.properties diff --git a/assets/index.template.html b/F-Droid/assets/index.template.html similarity index 100% rename from assets/index.template.html rename to F-Droid/assets/index.template.html diff --git a/assets/swap-icon.png b/F-Droid/assets/swap-icon.png similarity index 100% rename from assets/swap-icon.png rename to F-Droid/assets/swap-icon.png diff --git a/assets/swap-icon.svg b/F-Droid/assets/swap-icon.svg similarity index 100% rename from assets/swap-icon.svg rename to F-Droid/assets/swap-icon.svg diff --git a/assets/swap-tick-done.png b/F-Droid/assets/swap-tick-done.png similarity index 100% rename from assets/swap-tick-done.png rename to F-Droid/assets/swap-tick-done.png diff --git a/assets/swap-tick-not-done.png b/F-Droid/assets/swap-tick-not-done.png similarity index 100% rename from assets/swap-tick-not-done.png rename to F-Droid/assets/swap-tick-not-done.png diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle new file mode 100644 index 000000000..d656cee91 --- /dev/null +++ b/F-Droid/build.gradle @@ -0,0 +1,72 @@ +apply plugin: 'android' + +dependencies { + compile project(':support-v4') + compile project(':support-appcompat-v7') + compile project(':extern:AndroidPinning') + compile project(':extern:UniversalImageLoader:library') + compile project(':extern:MemorizingTrustManager') + compile project(':extern:libsuperuser:libsuperuser') + compile project(':extern:nanohttpd:core') + compile project(':extern:jmdns') + compile project(':extern:zipsigner') + compile project(':extern:zxing-core') + compile( project(':extern:android-support-v4-preferencefragment') ) { + exclude module: 'support-v4' + } +} + +android { + compileSdkVersion 21 + buildToolsVersion toolVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + instrumentTest.setRoot('test') + } + + buildTypes { + release { + minifyEnabled false + } + } + + compileOptions.encoding = "UTF-8" + + lintOptions { + abortOnError false + } + +} + +// TODO: This person took the example code below from another blogpost online, however +// I lost the reference to it: +// http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation +android.applicationVariants.all { variant -> + + task("generate${variant.name}Javadoc", type: Javadoc) { + title = "$name $version API" + description "Generates Javadoc for F-Droid." + source = variant.javaCompile.source + ext.androidJar = "$sdkLoc/platforms/${android.compileSdkVersion}/android.jar" + classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) + options.links("http://docs.oracle.com/javase/7/docs/api/"); + options.links("http://d.android.com/reference/"); + exclude '**/BuildConfig.java' + exclude '**/R.java' + } +} diff --git a/jenkins-build b/F-Droid/jenkins-build similarity index 100% rename from jenkins-build rename to F-Droid/jenkins-build diff --git a/libs/android-support-v4.jar b/F-Droid/libs/android-support-v4.jar similarity index 100% rename from libs/android-support-v4.jar rename to F-Droid/libs/android-support-v4.jar diff --git a/libs/android-support-v4.jar.LICENSE b/F-Droid/libs/android-support-v4.jar.LICENSE similarity index 100% rename from libs/android-support-v4.jar.LICENSE rename to F-Droid/libs/android-support-v4.jar.LICENSE diff --git a/libs/android-support-v4.jar.README b/F-Droid/libs/android-support-v4.jar.README similarity index 100% rename from libs/android-support-v4.jar.README rename to F-Droid/libs/android-support-v4.jar.README diff --git a/libs/android-support-v4.jar.properties b/F-Droid/libs/android-support-v4.jar.properties similarity index 100% rename from libs/android-support-v4.jar.properties rename to F-Droid/libs/android-support-v4.jar.properties diff --git a/lint.xml b/F-Droid/lint.xml similarity index 100% rename from lint.xml rename to F-Droid/lint.xml diff --git a/test/proguard-project.txt b/F-Droid/proguard-project.txt similarity index 100% rename from test/proguard-project.txt rename to F-Droid/proguard-project.txt diff --git a/F-Droid/project.properties b/F-Droid/project.properties new file mode 100644 index 000000000..b37ddfb4e --- /dev/null +++ b/F-Droid/project.properties @@ -0,0 +1,12 @@ +target=android-21 + +android.library.reference.1=../extern/UniversalImageLoader/library +android.library.reference.2=../extern/MemorizingTrustManager +android.library.reference.3=../extern/AndroidPinning +android.library.reference.4=../extern/libsuperuser/libsuperuser +android.library.reference.5=../extern/zxing-core +android.library.reference.6=../extern/android-support-v4-preferencefragment +android.library.reference.7=../extern/Support/v7/appcompat + +# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/ +source.dir=src;../extern/symlinks-for-ant-and-eclipse diff --git a/res/drawable-hdpi/ic_launcher.png b/F-Droid/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from res/drawable-hdpi/ic_launcher.png rename to F-Droid/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/F-Droid/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-hdpi/ic_menu_refresh.png rename to F-Droid/res/drawable-hdpi/ic_menu_refresh.png diff --git a/res/drawable-hdpi/ic_repo_app_default.png b/F-Droid/res/drawable-hdpi/ic_repo_app_default.png similarity index 100% rename from res/drawable-hdpi/ic_repo_app_default.png rename to F-Droid/res/drawable-hdpi/ic_repo_app_default.png diff --git a/res/drawable-hdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png similarity index 100% rename from res/drawable-hdpi/ic_stat_notify_updates.png rename to F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png diff --git a/res/drawable-hdpi/ic_swap.png b/F-Droid/res/drawable-hdpi/ic_swap.png similarity index 100% rename from res/drawable-hdpi/ic_swap.png rename to F-Droid/res/drawable-hdpi/ic_swap.png diff --git a/res/drawable-hdpi/nfc_touch.png b/F-Droid/res/drawable-hdpi/nfc_touch.png similarity index 100% rename from res/drawable-hdpi/nfc_touch.png rename to F-Droid/res/drawable-hdpi/nfc_touch.png diff --git a/res/drawable-hdpi/swap_success.png b/F-Droid/res/drawable-hdpi/swap_success.png similarity index 100% rename from res/drawable-hdpi/swap_success.png rename to F-Droid/res/drawable-hdpi/swap_success.png diff --git a/res/drawable-hdpi/wifi.png b/F-Droid/res/drawable-hdpi/wifi.png similarity index 100% rename from res/drawable-hdpi/wifi.png rename to F-Droid/res/drawable-hdpi/wifi.png diff --git a/res/drawable-hdpi/wifi_ap_personal.png b/F-Droid/res/drawable-hdpi/wifi_ap_personal.png similarity index 100% rename from res/drawable-hdpi/wifi_ap_personal.png rename to F-Droid/res/drawable-hdpi/wifi_ap_personal.png diff --git a/res/drawable-hdpi/wifi_ap_private.png b/F-Droid/res/drawable-hdpi/wifi_ap_private.png similarity index 100% rename from res/drawable-hdpi/wifi_ap_private.png rename to F-Droid/res/drawable-hdpi/wifi_ap_private.png diff --git a/res/drawable-hdpi/wifi_ap_public.png b/F-Droid/res/drawable-hdpi/wifi_ap_public.png similarity index 100% rename from res/drawable-hdpi/wifi_ap_public.png rename to F-Droid/res/drawable-hdpi/wifi_ap_public.png diff --git a/res/drawable-ldpi/ic_launcher.png b/F-Droid/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from res/drawable-ldpi/ic_launcher.png rename to F-Droid/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-ldpi/ic_menu_refresh.png b/F-Droid/res/drawable-ldpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-ldpi/ic_menu_refresh.png rename to F-Droid/res/drawable-ldpi/ic_menu_refresh.png diff --git a/res/drawable-ldpi/ic_repo_app_default.png b/F-Droid/res/drawable-ldpi/ic_repo_app_default.png similarity index 100% rename from res/drawable-ldpi/ic_repo_app_default.png rename to F-Droid/res/drawable-ldpi/ic_repo_app_default.png diff --git a/res/drawable-ldpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png similarity index 100% rename from res/drawable-ldpi/ic_stat_notify_updates.png rename to F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png diff --git a/res/drawable-ldpi/ic_swap.png b/F-Droid/res/drawable-ldpi/ic_swap.png similarity index 100% rename from res/drawable-ldpi/ic_swap.png rename to F-Droid/res/drawable-ldpi/ic_swap.png diff --git a/res/drawable-ldpi/nfc_touch.png b/F-Droid/res/drawable-ldpi/nfc_touch.png similarity index 100% rename from res/drawable-ldpi/nfc_touch.png rename to F-Droid/res/drawable-ldpi/nfc_touch.png diff --git a/res/drawable-ldpi/swap_success.png b/F-Droid/res/drawable-ldpi/swap_success.png similarity index 100% rename from res/drawable-ldpi/swap_success.png rename to F-Droid/res/drawable-ldpi/swap_success.png diff --git a/res/drawable-ldpi/wifi.png b/F-Droid/res/drawable-ldpi/wifi.png similarity index 100% rename from res/drawable-ldpi/wifi.png rename to F-Droid/res/drawable-ldpi/wifi.png diff --git a/res/drawable-ldpi/wifi_ap_personal.png b/F-Droid/res/drawable-ldpi/wifi_ap_personal.png similarity index 100% rename from res/drawable-ldpi/wifi_ap_personal.png rename to F-Droid/res/drawable-ldpi/wifi_ap_personal.png diff --git a/res/drawable-ldpi/wifi_ap_private.png b/F-Droid/res/drawable-ldpi/wifi_ap_private.png similarity index 100% rename from res/drawable-ldpi/wifi_ap_private.png rename to F-Droid/res/drawable-ldpi/wifi_ap_private.png diff --git a/res/drawable-ldpi/wifi_ap_public.png b/F-Droid/res/drawable-ldpi/wifi_ap_public.png similarity index 100% rename from res/drawable-ldpi/wifi_ap_public.png rename to F-Droid/res/drawable-ldpi/wifi_ap_public.png diff --git a/res/drawable-mdpi/ic_launcher.png b/F-Droid/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from res/drawable-mdpi/ic_launcher.png rename to F-Droid/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/F-Droid/res/drawable-mdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-mdpi/ic_menu_refresh.png rename to F-Droid/res/drawable-mdpi/ic_menu_refresh.png diff --git a/res/drawable-mdpi/ic_repo_app_default.png b/F-Droid/res/drawable-mdpi/ic_repo_app_default.png similarity index 100% rename from res/drawable-mdpi/ic_repo_app_default.png rename to F-Droid/res/drawable-mdpi/ic_repo_app_default.png diff --git a/res/drawable-mdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png similarity index 100% rename from res/drawable-mdpi/ic_stat_notify_updates.png rename to F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png diff --git a/res/drawable-mdpi/ic_swap.png b/F-Droid/res/drawable-mdpi/ic_swap.png similarity index 100% rename from res/drawable-mdpi/ic_swap.png rename to F-Droid/res/drawable-mdpi/ic_swap.png diff --git a/res/drawable-mdpi/nfc_touch.png b/F-Droid/res/drawable-mdpi/nfc_touch.png similarity index 100% rename from res/drawable-mdpi/nfc_touch.png rename to F-Droid/res/drawable-mdpi/nfc_touch.png diff --git a/res/drawable-mdpi/swap_success.png b/F-Droid/res/drawable-mdpi/swap_success.png similarity index 100% rename from res/drawable-mdpi/swap_success.png rename to F-Droid/res/drawable-mdpi/swap_success.png diff --git a/res/drawable-mdpi/wifi.png b/F-Droid/res/drawable-mdpi/wifi.png similarity index 100% rename from res/drawable-mdpi/wifi.png rename to F-Droid/res/drawable-mdpi/wifi.png diff --git a/res/drawable-mdpi/wifi_ap_personal.png b/F-Droid/res/drawable-mdpi/wifi_ap_personal.png similarity index 100% rename from res/drawable-mdpi/wifi_ap_personal.png rename to F-Droid/res/drawable-mdpi/wifi_ap_personal.png diff --git a/res/drawable-mdpi/wifi_ap_private.png b/F-Droid/res/drawable-mdpi/wifi_ap_private.png similarity index 100% rename from res/drawable-mdpi/wifi_ap_private.png rename to F-Droid/res/drawable-mdpi/wifi_ap_private.png diff --git a/res/drawable-mdpi/wifi_ap_public.png b/F-Droid/res/drawable-mdpi/wifi_ap_public.png similarity index 100% rename from res/drawable-mdpi/wifi_ap_public.png rename to F-Droid/res/drawable-mdpi/wifi_ap_public.png diff --git a/res/drawable-xhdpi/ic_launcher.png b/F-Droid/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher.png rename to F-Droid/res/drawable-xhdpi/ic_launcher.png diff --git a/res/drawable-xhdpi/ic_menu_refresh.png b/F-Droid/res/drawable-xhdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_refresh.png rename to F-Droid/res/drawable-xhdpi/ic_menu_refresh.png diff --git a/res/drawable-xhdpi/ic_repo_app_default.png b/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png similarity index 100% rename from res/drawable-xhdpi/ic_repo_app_default.png rename to F-Droid/res/drawable-xhdpi/ic_repo_app_default.png diff --git a/res/drawable-xhdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_notify_updates.png rename to F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png diff --git a/res/drawable-xhdpi/ic_swap.png b/F-Droid/res/drawable-xhdpi/ic_swap.png similarity index 100% rename from res/drawable-xhdpi/ic_swap.png rename to F-Droid/res/drawable-xhdpi/ic_swap.png diff --git a/res/drawable-xhdpi/nfc_touch.png b/F-Droid/res/drawable-xhdpi/nfc_touch.png similarity index 100% rename from res/drawable-xhdpi/nfc_touch.png rename to F-Droid/res/drawable-xhdpi/nfc_touch.png diff --git a/res/drawable-xhdpi/swap_success.png b/F-Droid/res/drawable-xhdpi/swap_success.png similarity index 100% rename from res/drawable-xhdpi/swap_success.png rename to F-Droid/res/drawable-xhdpi/swap_success.png diff --git a/res/drawable-xhdpi/wifi.png b/F-Droid/res/drawable-xhdpi/wifi.png similarity index 100% rename from res/drawable-xhdpi/wifi.png rename to F-Droid/res/drawable-xhdpi/wifi.png diff --git a/res/drawable-xhdpi/wifi_ap_personal.png b/F-Droid/res/drawable-xhdpi/wifi_ap_personal.png similarity index 100% rename from res/drawable-xhdpi/wifi_ap_personal.png rename to F-Droid/res/drawable-xhdpi/wifi_ap_personal.png diff --git a/res/drawable-xhdpi/wifi_ap_private.png b/F-Droid/res/drawable-xhdpi/wifi_ap_private.png similarity index 100% rename from res/drawable-xhdpi/wifi_ap_private.png rename to F-Droid/res/drawable-xhdpi/wifi_ap_private.png diff --git a/res/drawable-xhdpi/wifi_ap_public.png b/F-Droid/res/drawable-xhdpi/wifi_ap_public.png similarity index 100% rename from res/drawable-xhdpi/wifi_ap_public.png rename to F-Droid/res/drawable-xhdpi/wifi_ap_public.png diff --git a/res/drawable-xxhdpi/ic_launcher.png b/F-Droid/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher.png rename to F-Droid/res/drawable-xxhdpi/ic_launcher.png diff --git a/res/drawable-xxhdpi/ic_repo_app_default.png b/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png similarity index 100% rename from res/drawable-xxhdpi/ic_repo_app_default.png rename to F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png diff --git a/res/drawable-xxhdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png similarity index 100% rename from res/drawable-xxhdpi/ic_stat_notify_updates.png rename to F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png diff --git a/res/drawable/ic_swap.png b/F-Droid/res/drawable/ic_swap.png similarity index 100% rename from res/drawable/ic_swap.png rename to F-Droid/res/drawable/ic_swap.png diff --git a/res/drawable/nfc_touch.png b/F-Droid/res/drawable/nfc_touch.png similarity index 100% rename from res/drawable/nfc_touch.png rename to F-Droid/res/drawable/nfc_touch.png diff --git a/res/drawable/swap_action_button_skin.xml b/F-Droid/res/drawable/swap_action_button_skin.xml similarity index 100% rename from res/drawable/swap_action_button_skin.xml rename to F-Droid/res/drawable/swap_action_button_skin.xml diff --git a/res/drawable/swap_button_normal.xml b/F-Droid/res/drawable/swap_button_normal.xml similarity index 100% rename from res/drawable/swap_button_normal.xml rename to F-Droid/res/drawable/swap_button_normal.xml diff --git a/res/drawable/swap_button_pressed.xml b/F-Droid/res/drawable/swap_button_pressed.xml similarity index 100% rename from res/drawable/swap_button_pressed.xml rename to F-Droid/res/drawable/swap_button_pressed.xml diff --git a/res/drawable/swap_button_skin.xml b/F-Droid/res/drawable/swap_button_skin.xml similarity index 100% rename from res/drawable/swap_button_skin.xml rename to F-Droid/res/drawable/swap_button_skin.xml diff --git a/res/drawable/swap_confirm_button_skin.xml b/F-Droid/res/drawable/swap_confirm_button_skin.xml similarity index 100% rename from res/drawable/swap_confirm_button_skin.xml rename to F-Droid/res/drawable/swap_confirm_button_skin.xml diff --git a/res/drawable/swap_deny_button_skin.xml b/F-Droid/res/drawable/swap_deny_button_skin.xml similarity index 100% rename from res/drawable/swap_deny_button_skin.xml rename to F-Droid/res/drawable/swap_deny_button_skin.xml diff --git a/res/drawable/swap_nfc_icon.png b/F-Droid/res/drawable/swap_nfc_icon.png similarity index 100% rename from res/drawable/swap_nfc_icon.png rename to F-Droid/res/drawable/swap_nfc_icon.png diff --git a/res/drawable/swap_qr_example.png b/F-Droid/res/drawable/swap_qr_example.png similarity index 100% rename from res/drawable/swap_qr_example.png rename to F-Droid/res/drawable/swap_qr_example.png diff --git a/res/drawable/swap_start_button_skin.xml b/F-Droid/res/drawable/swap_start_button_skin.xml similarity index 100% rename from res/drawable/swap_start_button_skin.xml rename to F-Droid/res/drawable/swap_start_button_skin.xml diff --git a/res/drawable/swap_success.png b/F-Droid/res/drawable/swap_success.png similarity index 100% rename from res/drawable/swap_success.png rename to F-Droid/res/drawable/swap_success.png diff --git a/res/drawable/swap_wifi_likely_to_work.xml b/F-Droid/res/drawable/swap_wifi_likely_to_work.xml similarity index 100% rename from res/drawable/swap_wifi_likely_to_work.xml rename to F-Droid/res/drawable/swap_wifi_likely_to_work.xml diff --git a/res/drawable/swap_wifi_may_work.xml b/F-Droid/res/drawable/swap_wifi_may_work.xml similarity index 100% rename from res/drawable/swap_wifi_may_work.xml rename to F-Droid/res/drawable/swap_wifi_may_work.xml diff --git a/res/drawable/swap_window_background.xml b/F-Droid/res/drawable/swap_window_background.xml similarity index 100% rename from res/drawable/swap_window_background.xml rename to F-Droid/res/drawable/swap_window_background.xml diff --git a/res/drawable/wifi.png b/F-Droid/res/drawable/wifi.png similarity index 100% rename from res/drawable/wifi.png rename to F-Droid/res/drawable/wifi.png diff --git a/res/drawable/wifi_ap_personal.png b/F-Droid/res/drawable/wifi_ap_personal.png similarity index 100% rename from res/drawable/wifi_ap_personal.png rename to F-Droid/res/drawable/wifi_ap_personal.png diff --git a/res/drawable/wifi_ap_private.png b/F-Droid/res/drawable/wifi_ap_private.png similarity index 100% rename from res/drawable/wifi_ap_private.png rename to F-Droid/res/drawable/wifi_ap_private.png diff --git a/res/drawable/wifi_ap_public.png b/F-Droid/res/drawable/wifi_ap_public.png similarity index 100% rename from res/drawable/wifi_ap_public.png rename to F-Droid/res/drawable/wifi_ap_public.png diff --git a/res/layout-land/app_details.xml b/F-Droid/res/layout-land/app_details.xml similarity index 100% rename from res/layout-land/app_details.xml rename to F-Droid/res/layout-land/app_details.xml diff --git a/res/layout-v11/select_local_apps_list_item.xml b/F-Droid/res/layout-v11/select_local_apps_list_item.xml similarity index 100% rename from res/layout-v11/select_local_apps_list_item.xml rename to F-Droid/res/layout-v11/select_local_apps_list_item.xml diff --git a/res/layout/about.xml b/F-Droid/res/layout/about.xml similarity index 100% rename from res/layout/about.xml rename to F-Droid/res/layout/about.xml diff --git a/res/layout/addrepo.xml b/F-Droid/res/layout/addrepo.xml similarity index 100% rename from res/layout/addrepo.xml rename to F-Droid/res/layout/addrepo.xml diff --git a/res/layout/apklistitem.xml b/F-Droid/res/layout/apklistitem.xml similarity index 100% rename from res/layout/apklistitem.xml rename to F-Droid/res/layout/apklistitem.xml diff --git a/res/layout/app_details.xml b/F-Droid/res/layout/app_details.xml similarity index 100% rename from res/layout/app_details.xml rename to F-Droid/res/layout/app_details.xml diff --git a/res/layout/app_details_header.xml b/F-Droid/res/layout/app_details_header.xml similarity index 100% rename from res/layout/app_details_header.xml rename to F-Droid/res/layout/app_details_header.xml diff --git a/res/layout/app_details_summary.xml b/F-Droid/res/layout/app_details_summary.xml similarity index 100% rename from res/layout/app_details_summary.xml rename to F-Droid/res/layout/app_details_summary.xml diff --git a/res/layout/appinfo.xml b/F-Droid/res/layout/appinfo.xml similarity index 100% rename from res/layout/appinfo.xml rename to F-Droid/res/layout/appinfo.xml diff --git a/res/layout/applistitem.xml b/F-Droid/res/layout/applistitem.xml similarity index 100% rename from res/layout/applistitem.xml rename to F-Droid/res/layout/applistitem.xml diff --git a/res/layout/fdroid.xml b/F-Droid/res/layout/fdroid.xml similarity index 100% rename from res/layout/fdroid.xml rename to F-Droid/res/layout/fdroid.xml diff --git a/res/layout/list_content.xml b/F-Droid/res/layout/list_content.xml similarity index 100% rename from res/layout/list_content.xml rename to F-Droid/res/layout/list_content.xml diff --git a/res/layout/local_repo_activity.xml b/F-Droid/res/layout/local_repo_activity.xml similarity index 100% rename from res/layout/local_repo_activity.xml rename to F-Droid/res/layout/local_repo_activity.xml diff --git a/res/layout/qr_wizard_activity.xml b/F-Droid/res/layout/qr_wizard_activity.xml similarity index 100% rename from res/layout/qr_wizard_activity.xml rename to F-Droid/res/layout/qr_wizard_activity.xml diff --git a/res/layout/repo_item.xml b/F-Droid/res/layout/repo_item.xml similarity index 100% rename from res/layout/repo_item.xml rename to F-Droid/res/layout/repo_item.xml diff --git a/res/layout/repodetails.xml b/F-Droid/res/layout/repodetails.xml similarity index 100% rename from res/layout/repodetails.xml rename to F-Droid/res/layout/repodetails.xml diff --git a/res/layout/repodiscoveryitem.xml b/F-Droid/res/layout/repodiscoveryitem.xml similarity index 100% rename from res/layout/repodiscoveryitem.xml rename to F-Droid/res/layout/repodiscoveryitem.xml diff --git a/res/layout/repodiscoverylist.xml b/F-Droid/res/layout/repodiscoverylist.xml similarity index 100% rename from res/layout/repodiscoverylist.xml rename to F-Droid/res/layout/repodiscoverylist.xml diff --git a/res/layout/repolisticons.xml b/F-Droid/res/layout/repolisticons.xml similarity index 100% rename from res/layout/repolisticons.xml rename to F-Droid/res/layout/repolisticons.xml diff --git a/res/layout/searchresults.xml b/F-Droid/res/layout/searchresults.xml similarity index 100% rename from res/layout/searchresults.xml rename to F-Droid/res/layout/searchresults.xml diff --git a/res/layout/select_local_apps_activity.xml b/F-Droid/res/layout/select_local_apps_activity.xml similarity index 100% rename from res/layout/select_local_apps_activity.xml rename to F-Droid/res/layout/select_local_apps_activity.xml diff --git a/res/layout/select_local_apps_list_item.xml b/F-Droid/res/layout/select_local_apps_list_item.xml similarity index 100% rename from res/layout/select_local_apps_list_item.xml rename to F-Droid/res/layout/select_local_apps_list_item.xml diff --git a/res/layout/swap_blank.xml b/F-Droid/res/layout/swap_blank.xml similarity index 100% rename from res/layout/swap_blank.xml rename to F-Droid/res/layout/swap_blank.xml diff --git a/res/layout/swap_confirm_receive.xml b/F-Droid/res/layout/swap_confirm_receive.xml similarity index 100% rename from res/layout/swap_confirm_receive.xml rename to F-Droid/res/layout/swap_confirm_receive.xml diff --git a/res/layout/swap_create_header.xml b/F-Droid/res/layout/swap_create_header.xml similarity index 100% rename from res/layout/swap_create_header.xml rename to F-Droid/res/layout/swap_create_header.xml diff --git a/res/layout/swap_join_wifi.xml b/F-Droid/res/layout/swap_join_wifi.xml similarity index 100% rename from res/layout/swap_join_wifi.xml rename to F-Droid/res/layout/swap_join_wifi.xml diff --git a/res/layout/swap_learn_about_wifi.xml b/F-Droid/res/layout/swap_learn_about_wifi.xml similarity index 100% rename from res/layout/swap_learn_about_wifi.xml rename to F-Droid/res/layout/swap_learn_about_wifi.xml diff --git a/res/layout/swap_nfc.xml b/F-Droid/res/layout/swap_nfc.xml similarity index 100% rename from res/layout/swap_nfc.xml rename to F-Droid/res/layout/swap_nfc.xml diff --git a/res/layout/swap_success_header.xml b/F-Droid/res/layout/swap_success_header.xml similarity index 100% rename from res/layout/swap_success_header.xml rename to F-Droid/res/layout/swap_success_header.xml diff --git a/res/layout/swap_wifi_qr.xml b/F-Droid/res/layout/swap_wifi_qr.xml similarity index 100% rename from res/layout/swap_wifi_qr.xml rename to F-Droid/res/layout/swap_wifi_qr.xml diff --git a/res/menu/local_repo_activity.xml b/F-Droid/res/menu/local_repo_activity.xml similarity index 100% rename from res/menu/local_repo_activity.xml rename to F-Droid/res/menu/local_repo_activity.xml diff --git a/res/menu/main.xml b/F-Droid/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to F-Droid/res/menu/main.xml diff --git a/res/menu/manage_repo_context.xml b/F-Droid/res/menu/manage_repo_context.xml similarity index 100% rename from res/menu/manage_repo_context.xml rename to F-Droid/res/menu/manage_repo_context.xml diff --git a/res/menu/manage_repos.xml b/F-Droid/res/menu/manage_repos.xml similarity index 100% rename from res/menu/manage_repos.xml rename to F-Droid/res/menu/manage_repos.xml diff --git a/res/menu/select_local_apps_action_mode.xml b/F-Droid/res/menu/select_local_apps_action_mode.xml similarity index 100% rename from res/menu/select_local_apps_action_mode.xml rename to F-Droid/res/menu/select_local_apps_action_mode.xml diff --git a/res/menu/select_local_apps_activity.xml b/F-Droid/res/menu/select_local_apps_activity.xml similarity index 100% rename from res/menu/select_local_apps_activity.xml rename to F-Droid/res/menu/select_local_apps_activity.xml diff --git a/res/menu/swap_next.xml b/F-Droid/res/menu/swap_next.xml similarity index 100% rename from res/menu/swap_next.xml rename to F-Droid/res/menu/swap_next.xml diff --git a/res/menu/swap_skip.xml b/F-Droid/res/menu/swap_skip.xml similarity index 100% rename from res/menu/swap_skip.xml rename to F-Droid/res/menu/swap_skip.xml diff --git a/res/values-ar/array.xml b/F-Droid/res/values-ar/array.xml similarity index 100% rename from res/values-ar/array.xml rename to F-Droid/res/values-ar/array.xml diff --git a/res/values-ar/strings.xml b/F-Droid/res/values-ar/strings.xml similarity index 100% rename from res/values-ar/strings.xml rename to F-Droid/res/values-ar/strings.xml diff --git a/res/values-bg/array.xml b/F-Droid/res/values-bg/array.xml similarity index 100% rename from res/values-bg/array.xml rename to F-Droid/res/values-bg/array.xml diff --git a/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml similarity index 100% rename from res/values-bg/strings.xml rename to F-Droid/res/values-bg/strings.xml diff --git a/res/values-ca/array.xml b/F-Droid/res/values-ca/array.xml similarity index 100% rename from res/values-ca/array.xml rename to F-Droid/res/values-ca/array.xml diff --git a/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to F-Droid/res/values-ca/strings.xml diff --git a/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to F-Droid/res/values-cs/strings.xml diff --git a/res/values-de/array.xml b/F-Droid/res/values-de/array.xml similarity index 100% rename from res/values-de/array.xml rename to F-Droid/res/values-de/array.xml diff --git a/res/values-de/default_repo.xml b/F-Droid/res/values-de/default_repo.xml similarity index 100% rename from res/values-de/default_repo.xml rename to F-Droid/res/values-de/default_repo.xml diff --git a/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to F-Droid/res/values-de/strings.xml diff --git a/res/values-el/array.xml b/F-Droid/res/values-el/array.xml similarity index 100% rename from res/values-el/array.xml rename to F-Droid/res/values-el/array.xml diff --git a/res/values-el/default_repo.xml b/F-Droid/res/values-el/default_repo.xml similarity index 100% rename from res/values-el/default_repo.xml rename to F-Droid/res/values-el/default_repo.xml diff --git a/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml similarity index 100% rename from res/values-el/strings.xml rename to F-Droid/res/values-el/strings.xml diff --git a/res/values-en-rGB/strings.xml b/F-Droid/res/values-en-rGB/strings.xml similarity index 100% rename from res/values-en-rGB/strings.xml rename to F-Droid/res/values-en-rGB/strings.xml diff --git a/res/values-eo/array.xml b/F-Droid/res/values-eo/array.xml similarity index 100% rename from res/values-eo/array.xml rename to F-Droid/res/values-eo/array.xml diff --git a/res/values-eo/strings.xml b/F-Droid/res/values-eo/strings.xml similarity index 100% rename from res/values-eo/strings.xml rename to F-Droid/res/values-eo/strings.xml diff --git a/res/values-es/array.xml b/F-Droid/res/values-es/array.xml similarity index 100% rename from res/values-es/array.xml rename to F-Droid/res/values-es/array.xml diff --git a/res/values-es/default_repo.xml b/F-Droid/res/values-es/default_repo.xml similarity index 100% rename from res/values-es/default_repo.xml rename to F-Droid/res/values-es/default_repo.xml diff --git a/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to F-Droid/res/values-es/strings.xml diff --git a/res/values-eu/array.xml b/F-Droid/res/values-eu/array.xml similarity index 100% rename from res/values-eu/array.xml rename to F-Droid/res/values-eu/array.xml diff --git a/res/values-eu/default_repo.xml b/F-Droid/res/values-eu/default_repo.xml similarity index 100% rename from res/values-eu/default_repo.xml rename to F-Droid/res/values-eu/default_repo.xml diff --git a/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml similarity index 100% rename from res/values-eu/strings.xml rename to F-Droid/res/values-eu/strings.xml diff --git a/res/values-fa/array.xml b/F-Droid/res/values-fa/array.xml similarity index 100% rename from res/values-fa/array.xml rename to F-Droid/res/values-fa/array.xml diff --git a/res/values-fa/strings.xml b/F-Droid/res/values-fa/strings.xml similarity index 100% rename from res/values-fa/strings.xml rename to F-Droid/res/values-fa/strings.xml diff --git a/res/values-fi/array.xml b/F-Droid/res/values-fi/array.xml similarity index 100% rename from res/values-fi/array.xml rename to F-Droid/res/values-fi/array.xml diff --git a/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml similarity index 100% rename from res/values-fi/strings.xml rename to F-Droid/res/values-fi/strings.xml diff --git a/res/values-fr/array.xml b/F-Droid/res/values-fr/array.xml similarity index 100% rename from res/values-fr/array.xml rename to F-Droid/res/values-fr/array.xml diff --git a/res/values-fr/default_repo.xml b/F-Droid/res/values-fr/default_repo.xml similarity index 100% rename from res/values-fr/default_repo.xml rename to F-Droid/res/values-fr/default_repo.xml diff --git a/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to F-Droid/res/values-fr/strings.xml diff --git a/res/values-gl/array.xml b/F-Droid/res/values-gl/array.xml similarity index 100% rename from res/values-gl/array.xml rename to F-Droid/res/values-gl/array.xml diff --git a/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml similarity index 100% rename from res/values-gl/strings.xml rename to F-Droid/res/values-gl/strings.xml diff --git a/res/values-gu/array.xml b/F-Droid/res/values-gu/array.xml similarity index 100% rename from res/values-gu/array.xml rename to F-Droid/res/values-gu/array.xml diff --git a/res/values-gu/strings.xml b/F-Droid/res/values-gu/strings.xml similarity index 100% rename from res/values-gu/strings.xml rename to F-Droid/res/values-gu/strings.xml diff --git a/res/values-he/array.xml b/F-Droid/res/values-he/array.xml similarity index 100% rename from res/values-he/array.xml rename to F-Droid/res/values-he/array.xml diff --git a/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml similarity index 100% rename from res/values-he/strings.xml rename to F-Droid/res/values-he/strings.xml diff --git a/res/values-hu/array.xml b/F-Droid/res/values-hu/array.xml similarity index 100% rename from res/values-hu/array.xml rename to F-Droid/res/values-hu/array.xml diff --git a/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to F-Droid/res/values-hu/strings.xml diff --git a/res/values-it/array.xml b/F-Droid/res/values-it/array.xml similarity index 100% rename from res/values-it/array.xml rename to F-Droid/res/values-it/array.xml diff --git a/res/values-it/default_repo.xml b/F-Droid/res/values-it/default_repo.xml similarity index 100% rename from res/values-it/default_repo.xml rename to F-Droid/res/values-it/default_repo.xml diff --git a/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to F-Droid/res/values-it/strings.xml diff --git a/res/values-ja/array.xml b/F-Droid/res/values-ja/array.xml similarity index 100% rename from res/values-ja/array.xml rename to F-Droid/res/values-ja/array.xml diff --git a/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml similarity index 100% rename from res/values-ja/strings.xml rename to F-Droid/res/values-ja/strings.xml diff --git a/res/values-ko/array.xml b/F-Droid/res/values-ko/array.xml similarity index 100% rename from res/values-ko/array.xml rename to F-Droid/res/values-ko/array.xml diff --git a/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to F-Droid/res/values-ko/strings.xml diff --git a/res/values-lt/array.xml b/F-Droid/res/values-lt/array.xml similarity index 100% rename from res/values-lt/array.xml rename to F-Droid/res/values-lt/array.xml diff --git a/res/values-lt/strings.xml b/F-Droid/res/values-lt/strings.xml similarity index 100% rename from res/values-lt/strings.xml rename to F-Droid/res/values-lt/strings.xml diff --git a/res/values-nb/array.xml b/F-Droid/res/values-nb/array.xml similarity index 100% rename from res/values-nb/array.xml rename to F-Droid/res/values-nb/array.xml diff --git a/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml similarity index 100% rename from res/values-nb/strings.xml rename to F-Droid/res/values-nb/strings.xml diff --git a/res/values-nl/array.xml b/F-Droid/res/values-nl/array.xml similarity index 100% rename from res/values-nl/array.xml rename to F-Droid/res/values-nl/array.xml diff --git a/res/values-nl/default_repo.xml b/F-Droid/res/values-nl/default_repo.xml similarity index 100% rename from res/values-nl/default_repo.xml rename to F-Droid/res/values-nl/default_repo.xml diff --git a/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to F-Droid/res/values-nl/strings.xml diff --git a/res/values-pl/array.xml b/F-Droid/res/values-pl/array.xml similarity index 100% rename from res/values-pl/array.xml rename to F-Droid/res/values-pl/array.xml diff --git a/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to F-Droid/res/values-pl/strings.xml diff --git a/res/values-pt-rBR/array.xml b/F-Droid/res/values-pt-rBR/array.xml similarity index 100% rename from res/values-pt-rBR/array.xml rename to F-Droid/res/values-pt-rBR/array.xml diff --git a/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml similarity index 100% rename from res/values-pt-rBR/strings.xml rename to F-Droid/res/values-pt-rBR/strings.xml diff --git a/res/values-ro/array.xml b/F-Droid/res/values-ro/array.xml similarity index 100% rename from res/values-ro/array.xml rename to F-Droid/res/values-ro/array.xml diff --git a/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml similarity index 100% rename from res/values-ro/strings.xml rename to F-Droid/res/values-ro/strings.xml diff --git a/res/values-ru/array.xml b/F-Droid/res/values-ru/array.xml similarity index 100% rename from res/values-ru/array.xml rename to F-Droid/res/values-ru/array.xml diff --git a/res/values-ru/default_repo.xml b/F-Droid/res/values-ru/default_repo.xml similarity index 100% rename from res/values-ru/default_repo.xml rename to F-Droid/res/values-ru/default_repo.xml diff --git a/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to F-Droid/res/values-ru/strings.xml diff --git a/res/values-sl/array.xml b/F-Droid/res/values-sl/array.xml similarity index 100% rename from res/values-sl/array.xml rename to F-Droid/res/values-sl/array.xml diff --git a/res/values-sl/strings.xml b/F-Droid/res/values-sl/strings.xml similarity index 100% rename from res/values-sl/strings.xml rename to F-Droid/res/values-sl/strings.xml diff --git a/res/values-sr/array.xml b/F-Droid/res/values-sr/array.xml similarity index 100% rename from res/values-sr/array.xml rename to F-Droid/res/values-sr/array.xml diff --git a/res/values-sr/default_repo.xml b/F-Droid/res/values-sr/default_repo.xml similarity index 100% rename from res/values-sr/default_repo.xml rename to F-Droid/res/values-sr/default_repo.xml diff --git a/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml similarity index 100% rename from res/values-sr/strings.xml rename to F-Droid/res/values-sr/strings.xml diff --git a/res/values-sv/array.xml b/F-Droid/res/values-sv/array.xml similarity index 100% rename from res/values-sv/array.xml rename to F-Droid/res/values-sv/array.xml diff --git a/res/values-sv/default_repo.xml b/F-Droid/res/values-sv/default_repo.xml similarity index 100% rename from res/values-sv/default_repo.xml rename to F-Droid/res/values-sv/default_repo.xml diff --git a/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml similarity index 100% rename from res/values-sv/strings.xml rename to F-Droid/res/values-sv/strings.xml diff --git a/res/values-tr/array.xml b/F-Droid/res/values-tr/array.xml similarity index 100% rename from res/values-tr/array.xml rename to F-Droid/res/values-tr/array.xml diff --git a/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml similarity index 100% rename from res/values-tr/strings.xml rename to F-Droid/res/values-tr/strings.xml diff --git a/res/values-ug/array.xml b/F-Droid/res/values-ug/array.xml similarity index 100% rename from res/values-ug/array.xml rename to F-Droid/res/values-ug/array.xml diff --git a/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml similarity index 100% rename from res/values-ug/strings.xml rename to F-Droid/res/values-ug/strings.xml diff --git a/res/values-uk/array.xml b/F-Droid/res/values-uk/array.xml similarity index 100% rename from res/values-uk/array.xml rename to F-Droid/res/values-uk/array.xml diff --git a/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml similarity index 100% rename from res/values-uk/strings.xml rename to F-Droid/res/values-uk/strings.xml diff --git a/res/values-v11/styles.xml b/F-Droid/res/values-v11/styles.xml similarity index 100% rename from res/values-v11/styles.xml rename to F-Droid/res/values-v11/styles.xml diff --git a/res/values-zh-rCN/array.xml b/F-Droid/res/values-zh-rCN/array.xml similarity index 100% rename from res/values-zh-rCN/array.xml rename to F-Droid/res/values-zh-rCN/array.xml diff --git a/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to F-Droid/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rHK/array.xml b/F-Droid/res/values-zh-rHK/array.xml similarity index 100% rename from res/values-zh-rHK/array.xml rename to F-Droid/res/values-zh-rHK/array.xml diff --git a/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml similarity index 100% rename from res/values-zh-rHK/strings.xml rename to F-Droid/res/values-zh-rHK/strings.xml diff --git a/res/values-zh/array.xml b/F-Droid/res/values-zh/array.xml similarity index 100% rename from res/values-zh/array.xml rename to F-Droid/res/values-zh/array.xml diff --git a/res/values-zh/strings.xml b/F-Droid/res/values-zh/strings.xml similarity index 100% rename from res/values-zh/strings.xml rename to F-Droid/res/values-zh/strings.xml diff --git a/res/values/array.xml b/F-Droid/res/values/array.xml similarity index 100% rename from res/values/array.xml rename to F-Droid/res/values/array.xml diff --git a/res/values/colors.xml b/F-Droid/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to F-Droid/res/values/colors.xml diff --git a/res/values/default_repo.xml b/F-Droid/res/values/default_repo.xml similarity index 100% rename from res/values/default_repo.xml rename to F-Droid/res/values/default_repo.xml diff --git a/res/values/dimens.xml b/F-Droid/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to F-Droid/res/values/dimens.xml diff --git a/res/values/ids.xml b/F-Droid/res/values/ids.xml similarity index 100% rename from res/values/ids.xml rename to F-Droid/res/values/ids.xml diff --git a/res/values/no_trans.xml b/F-Droid/res/values/no_trans.xml similarity index 100% rename from res/values/no_trans.xml rename to F-Droid/res/values/no_trans.xml diff --git a/res/values/strings.xml b/F-Droid/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to F-Droid/res/values/strings.xml diff --git a/res/values/styles.xml b/F-Droid/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to F-Droid/res/values/styles.xml diff --git a/res/xml/preferences.xml b/F-Droid/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to F-Droid/res/xml/preferences.xml diff --git a/res/xml/searchable.xml b/F-Droid/res/xml/searchable.xml similarity index 100% rename from res/xml/searchable.xml rename to F-Droid/res/xml/searchable.xml diff --git a/src/android/content/pm/IPackageDeleteObserver.java b/F-Droid/src/android/content/pm/IPackageDeleteObserver.java similarity index 100% rename from src/android/content/pm/IPackageDeleteObserver.java rename to F-Droid/src/android/content/pm/IPackageDeleteObserver.java diff --git a/src/android/content/pm/IPackageInstallObserver.java b/F-Droid/src/android/content/pm/IPackageInstallObserver.java similarity index 100% rename from src/android/content/pm/IPackageInstallObserver.java rename to F-Droid/src/android/content/pm/IPackageInstallObserver.java diff --git a/src/com/google/zxing/encode/Contents.java b/F-Droid/src/com/google/zxing/encode/Contents.java similarity index 100% rename from src/com/google/zxing/encode/Contents.java rename to F-Droid/src/com/google/zxing/encode/Contents.java diff --git a/src/com/google/zxing/encode/QRCodeEncoder.java b/F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java similarity index 100% rename from src/com/google/zxing/encode/QRCodeEncoder.java rename to F-Droid/src/com/google/zxing/encode/QRCodeEncoder.java diff --git a/src/com/google/zxing/integration/android/IntentIntegrator.java b/F-Droid/src/com/google/zxing/integration/android/IntentIntegrator.java similarity index 100% rename from src/com/google/zxing/integration/android/IntentIntegrator.java rename to F-Droid/src/com/google/zxing/integration/android/IntentIntegrator.java diff --git a/src/com/google/zxing/integration/android/IntentResult.java b/F-Droid/src/com/google/zxing/integration/android/IntentResult.java similarity index 100% rename from src/com/google/zxing/integration/android/IntentResult.java rename to F-Droid/src/com/google/zxing/integration/android/IntentResult.java diff --git a/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java similarity index 100% rename from src/org/fdroid/fdroid/AppDetails.java rename to F-Droid/src/org/fdroid/fdroid/AppDetails.java diff --git a/src/org/fdroid/fdroid/AppFilter.java b/F-Droid/src/org/fdroid/fdroid/AppFilter.java similarity index 100% rename from src/org/fdroid/fdroid/AppFilter.java rename to F-Droid/src/org/fdroid/fdroid/AppFilter.java diff --git a/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java similarity index 100% rename from src/org/fdroid/fdroid/CompatibilityChecker.java rename to F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java diff --git a/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java similarity index 100% rename from src/org/fdroid/fdroid/FDroid.java rename to F-Droid/src/org/fdroid/fdroid/FDroid.java diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java similarity index 100% rename from src/org/fdroid/fdroid/FDroidApp.java rename to F-Droid/src/org/fdroid/fdroid/FDroidApp.java diff --git a/src/org/fdroid/fdroid/FDroidCertPins.java b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java similarity index 100% rename from src/org/fdroid/fdroid/FDroidCertPins.java rename to F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java diff --git a/src/org/fdroid/fdroid/Hasher.java b/F-Droid/src/org/fdroid/fdroid/Hasher.java similarity index 100% rename from src/org/fdroid/fdroid/Hasher.java rename to F-Droid/src/org/fdroid/fdroid/Hasher.java diff --git a/src/org/fdroid/fdroid/NfcHelper.java b/F-Droid/src/org/fdroid/fdroid/NfcHelper.java similarity index 100% rename from src/org/fdroid/fdroid/NfcHelper.java rename to F-Droid/src/org/fdroid/fdroid/NfcHelper.java diff --git a/src/org/fdroid/fdroid/NfcNotEnabledActivity.java b/F-Droid/src/org/fdroid/fdroid/NfcNotEnabledActivity.java similarity index 100% rename from src/org/fdroid/fdroid/NfcNotEnabledActivity.java rename to F-Droid/src/org/fdroid/fdroid/NfcNotEnabledActivity.java diff --git a/src/org/fdroid/fdroid/PackageAddedReceiver.java b/F-Droid/src/org/fdroid/fdroid/PackageAddedReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/PackageAddedReceiver.java rename to F-Droid/src/org/fdroid/fdroid/PackageAddedReceiver.java diff --git a/src/org/fdroid/fdroid/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/PackageReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/PackageReceiver.java rename to F-Droid/src/org/fdroid/fdroid/PackageReceiver.java diff --git a/src/org/fdroid/fdroid/PackageRemovedReceiver.java b/F-Droid/src/org/fdroid/fdroid/PackageRemovedReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/PackageRemovedReceiver.java rename to F-Droid/src/org/fdroid/fdroid/PackageRemovedReceiver.java diff --git a/src/org/fdroid/fdroid/PackageUpgradedReceiver.java b/F-Droid/src/org/fdroid/fdroid/PackageUpgradedReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/PackageUpgradedReceiver.java rename to F-Droid/src/org/fdroid/fdroid/PackageUpgradedReceiver.java diff --git a/src/org/fdroid/fdroid/Permission.java b/F-Droid/src/org/fdroid/fdroid/Permission.java similarity index 100% rename from src/org/fdroid/fdroid/Permission.java rename to F-Droid/src/org/fdroid/fdroid/Permission.java diff --git a/src/org/fdroid/fdroid/Preferences.java b/F-Droid/src/org/fdroid/fdroid/Preferences.java similarity index 100% rename from src/org/fdroid/fdroid/Preferences.java rename to F-Droid/src/org/fdroid/fdroid/Preferences.java diff --git a/src/org/fdroid/fdroid/PreferencesActivity.java b/F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java similarity index 100% rename from src/org/fdroid/fdroid/PreferencesActivity.java rename to F-Droid/src/org/fdroid/fdroid/PreferencesActivity.java diff --git a/src/org/fdroid/fdroid/ProgressListener.java b/F-Droid/src/org/fdroid/fdroid/ProgressListener.java similarity index 100% rename from src/org/fdroid/fdroid/ProgressListener.java rename to F-Droid/src/org/fdroid/fdroid/ProgressListener.java diff --git a/src/org/fdroid/fdroid/QrGenAsyncTask.java b/F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java similarity index 100% rename from src/org/fdroid/fdroid/QrGenAsyncTask.java rename to F-Droid/src/org/fdroid/fdroid/QrGenAsyncTask.java diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java similarity index 100% rename from src/org/fdroid/fdroid/RepoXMLHandler.java rename to F-Droid/src/org/fdroid/fdroid/RepoXMLHandler.java diff --git a/src/org/fdroid/fdroid/SearchResults.java b/F-Droid/src/org/fdroid/fdroid/SearchResults.java similarity index 100% rename from src/org/fdroid/fdroid/SearchResults.java rename to F-Droid/src/org/fdroid/fdroid/SearchResults.java diff --git a/src/org/fdroid/fdroid/StartupReceiver.java b/F-Droid/src/org/fdroid/fdroid/StartupReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/StartupReceiver.java rename to F-Droid/src/org/fdroid/fdroid/StartupReceiver.java diff --git a/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java similarity index 100% rename from src/org/fdroid/fdroid/UpdateService.java rename to F-Droid/src/org/fdroid/fdroid/UpdateService.java diff --git a/src/org/fdroid/fdroid/Utils.java b/F-Droid/src/org/fdroid/fdroid/Utils.java similarity index 100% rename from src/org/fdroid/fdroid/Utils.java rename to F-Droid/src/org/fdroid/fdroid/Utils.java diff --git a/src/org/fdroid/fdroid/WifiStateChangeReceiver.java b/F-Droid/src/org/fdroid/fdroid/WifiStateChangeReceiver.java similarity index 100% rename from src/org/fdroid/fdroid/WifiStateChangeReceiver.java rename to F-Droid/src/org/fdroid/fdroid/WifiStateChangeReceiver.java diff --git a/src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java similarity index 100% rename from src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java rename to F-Droid/src/org/fdroid/fdroid/compat/ArrayAdapterCompat.java diff --git a/src/org/fdroid/fdroid/compat/ClipboardCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java similarity index 100% rename from src/org/fdroid/fdroid/compat/ClipboardCompat.java rename to F-Droid/src/org/fdroid/fdroid/compat/ClipboardCompat.java diff --git a/src/org/fdroid/fdroid/compat/Compatibility.java b/F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java similarity index 100% rename from src/org/fdroid/fdroid/compat/Compatibility.java rename to F-Droid/src/org/fdroid/fdroid/compat/Compatibility.java diff --git a/src/org/fdroid/fdroid/compat/LayoutCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java similarity index 100% rename from src/org/fdroid/fdroid/compat/LayoutCompat.java rename to F-Droid/src/org/fdroid/fdroid/compat/LayoutCompat.java diff --git a/src/org/fdroid/fdroid/compat/PRNGFixes.java b/F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java similarity index 100% rename from src/org/fdroid/fdroid/compat/PRNGFixes.java rename to F-Droid/src/org/fdroid/fdroid/compat/PRNGFixes.java diff --git a/src/org/fdroid/fdroid/compat/PackageManagerCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java similarity index 100% rename from src/org/fdroid/fdroid/compat/PackageManagerCompat.java rename to F-Droid/src/org/fdroid/fdroid/compat/PackageManagerCompat.java diff --git a/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java similarity index 100% rename from src/org/fdroid/fdroid/compat/SupportedArchitectures.java rename to F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java diff --git a/src/org/fdroid/fdroid/compat/SwitchCompat.java b/F-Droid/src/org/fdroid/fdroid/compat/SwitchCompat.java similarity index 100% rename from src/org/fdroid/fdroid/compat/SwitchCompat.java rename to F-Droid/src/org/fdroid/fdroid/compat/SwitchCompat.java diff --git a/src/org/fdroid/fdroid/compat/TabManager.java b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java similarity index 100% rename from src/org/fdroid/fdroid/compat/TabManager.java rename to F-Droid/src/org/fdroid/fdroid/compat/TabManager.java diff --git a/src/org/fdroid/fdroid/data/Apk.java b/F-Droid/src/org/fdroid/fdroid/data/Apk.java similarity index 100% rename from src/org/fdroid/fdroid/data/Apk.java rename to F-Droid/src/org/fdroid/fdroid/data/Apk.java diff --git a/src/org/fdroid/fdroid/data/ApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java similarity index 100% rename from src/org/fdroid/fdroid/data/ApkProvider.java rename to F-Droid/src/org/fdroid/fdroid/data/ApkProvider.java diff --git a/src/org/fdroid/fdroid/data/App.java b/F-Droid/src/org/fdroid/fdroid/data/App.java similarity index 100% rename from src/org/fdroid/fdroid/data/App.java rename to F-Droid/src/org/fdroid/fdroid/data/App.java diff --git a/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java similarity index 100% rename from src/org/fdroid/fdroid/data/AppProvider.java rename to F-Droid/src/org/fdroid/fdroid/data/AppProvider.java diff --git a/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java similarity index 100% rename from src/org/fdroid/fdroid/data/DBHelper.java rename to F-Droid/src/org/fdroid/fdroid/data/DBHelper.java diff --git a/src/org/fdroid/fdroid/data/FDroidProvider.java b/F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java similarity index 100% rename from src/org/fdroid/fdroid/data/FDroidProvider.java rename to F-Droid/src/org/fdroid/fdroid/data/FDroidProvider.java diff --git a/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java similarity index 100% rename from src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java rename to F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java diff --git a/src/org/fdroid/fdroid/data/InstalledAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java similarity index 100% rename from src/org/fdroid/fdroid/data/InstalledAppProvider.java rename to F-Droid/src/org/fdroid/fdroid/data/InstalledAppProvider.java diff --git a/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java similarity index 100% rename from src/org/fdroid/fdroid/data/NewRepoConfig.java rename to F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java diff --git a/src/org/fdroid/fdroid/data/QueryBuilder.java b/F-Droid/src/org/fdroid/fdroid/data/QueryBuilder.java similarity index 100% rename from src/org/fdroid/fdroid/data/QueryBuilder.java rename to F-Droid/src/org/fdroid/fdroid/data/QueryBuilder.java diff --git a/src/org/fdroid/fdroid/data/QuerySelection.java b/F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java similarity index 100% rename from src/org/fdroid/fdroid/data/QuerySelection.java rename to F-Droid/src/org/fdroid/fdroid/data/QuerySelection.java diff --git a/src/org/fdroid/fdroid/data/Repo.java b/F-Droid/src/org/fdroid/fdroid/data/Repo.java similarity index 100% rename from src/org/fdroid/fdroid/data/Repo.java rename to F-Droid/src/org/fdroid/fdroid/data/Repo.java diff --git a/src/org/fdroid/fdroid/data/RepoProvider.java b/F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java similarity index 100% rename from src/org/fdroid/fdroid/data/RepoProvider.java rename to F-Droid/src/org/fdroid/fdroid/data/RepoProvider.java diff --git a/src/org/fdroid/fdroid/data/ValueObject.java b/F-Droid/src/org/fdroid/fdroid/data/ValueObject.java similarity index 100% rename from src/org/fdroid/fdroid/data/ValueObject.java rename to F-Droid/src/org/fdroid/fdroid/data/ValueObject.java diff --git a/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java b/F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java similarity index 100% rename from src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java rename to F-Droid/src/org/fdroid/fdroid/installer/CheckRootAsyncTask.java diff --git a/src/org/fdroid/fdroid/installer/DefaultInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java similarity index 100% rename from src/org/fdroid/fdroid/installer/DefaultInstaller.java rename to F-Droid/src/org/fdroid/fdroid/installer/DefaultInstaller.java diff --git a/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java b/F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java similarity index 100% rename from src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java rename to F-Droid/src/org/fdroid/fdroid/installer/DefaultInstallerSdk14.java diff --git a/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java similarity index 100% rename from src/org/fdroid/fdroid/installer/Installer.java rename to F-Droid/src/org/fdroid/fdroid/installer/Installer.java diff --git a/src/org/fdroid/fdroid/installer/RootInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java similarity index 100% rename from src/org/fdroid/fdroid/installer/RootInstaller.java rename to F-Droid/src/org/fdroid/fdroid/installer/RootInstaller.java diff --git a/src/org/fdroid/fdroid/installer/SystemInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java similarity index 100% rename from src/org/fdroid/fdroid/installer/SystemInstaller.java rename to F-Droid/src/org/fdroid/fdroid/installer/SystemInstaller.java diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java similarity index 100% rename from src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java rename to F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoKeyStore.java diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java similarity index 100% rename from src/org/fdroid/fdroid/localrepo/LocalRepoManager.java rename to F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoManager.java diff --git a/src/org/fdroid/fdroid/localrepo/LocalRepoService.java b/F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java similarity index 100% rename from src/org/fdroid/fdroid/localrepo/LocalRepoService.java rename to F-Droid/src/org/fdroid/fdroid/localrepo/LocalRepoService.java diff --git a/src/org/fdroid/fdroid/net/ApkDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java similarity index 100% rename from src/org/fdroid/fdroid/net/ApkDownloader.java rename to F-Droid/src/org/fdroid/fdroid/net/ApkDownloader.java diff --git a/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java b/F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java similarity index 100% rename from src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java rename to F-Droid/src/org/fdroid/fdroid/net/AsyncDownloadWrapper.java diff --git a/src/org/fdroid/fdroid/net/Downloader.java b/F-Droid/src/org/fdroid/fdroid/net/Downloader.java similarity index 100% rename from src/org/fdroid/fdroid/net/Downloader.java rename to F-Droid/src/org/fdroid/fdroid/net/Downloader.java diff --git a/src/org/fdroid/fdroid/net/DownloaderFactory.java b/F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java similarity index 100% rename from src/org/fdroid/fdroid/net/DownloaderFactory.java rename to F-Droid/src/org/fdroid/fdroid/net/DownloaderFactory.java diff --git a/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java similarity index 100% rename from src/org/fdroid/fdroid/net/HttpDownloader.java rename to F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java diff --git a/src/org/fdroid/fdroid/net/IconDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java similarity index 100% rename from src/org/fdroid/fdroid/net/IconDownloader.java rename to F-Droid/src/org/fdroid/fdroid/net/IconDownloader.java diff --git a/src/org/fdroid/fdroid/net/LocalHTTPD.java b/F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java similarity index 100% rename from src/org/fdroid/fdroid/net/LocalHTTPD.java rename to F-Droid/src/org/fdroid/fdroid/net/LocalHTTPD.java diff --git a/src/org/fdroid/fdroid/net/MDnsHelper.java b/F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java similarity index 100% rename from src/org/fdroid/fdroid/net/MDnsHelper.java rename to F-Droid/src/org/fdroid/fdroid/net/MDnsHelper.java diff --git a/src/org/fdroid/fdroid/net/TorHttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/TorHttpDownloader.java similarity index 100% rename from src/org/fdroid/fdroid/net/TorHttpDownloader.java rename to F-Droid/src/org/fdroid/fdroid/net/TorHttpDownloader.java diff --git a/src/org/fdroid/fdroid/net/WifiStateChangeService.java b/F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java similarity index 100% rename from src/org/fdroid/fdroid/net/WifiStateChangeService.java rename to F-Droid/src/org/fdroid/fdroid/net/WifiStateChangeService.java diff --git a/src/org/fdroid/fdroid/updater/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java similarity index 100% rename from src/org/fdroid/fdroid/updater/RepoUpdater.java rename to F-Droid/src/org/fdroid/fdroid/updater/RepoUpdater.java diff --git a/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java similarity index 100% rename from src/org/fdroid/fdroid/updater/SignedRepoUpdater.java rename to F-Droid/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java diff --git a/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java similarity index 100% rename from src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java rename to F-Droid/src/org/fdroid/fdroid/updater/UnsignedRepoUpdater.java diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/AppListAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/AppListAdapter.java diff --git a/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java diff --git a/src/org/fdroid/fdroid/views/AvailableAppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/AvailableAppListAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/AvailableAppListAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/AvailableAppListAdapter.java diff --git a/src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/CanUpdateAppListAdapter.java diff --git a/src/org/fdroid/fdroid/views/InstalledAppListAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/InstalledAppListAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/InstalledAppListAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/InstalledAppListAdapter.java diff --git a/src/org/fdroid/fdroid/views/LocalRepoActivity.java b/F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/LocalRepoActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/LocalRepoActivity.java diff --git a/src/org/fdroid/fdroid/views/ManageReposActivity.java b/F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/ManageReposActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/ManageReposActivity.java diff --git a/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/QrWizardDownloadActivity.java diff --git a/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java b/F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/QrWizardWifiNetworkActivity.java diff --git a/src/org/fdroid/fdroid/views/RepoAdapter.java b/F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java similarity index 100% rename from src/org/fdroid/fdroid/views/RepoAdapter.java rename to F-Droid/src/org/fdroid/fdroid/views/RepoAdapter.java diff --git a/src/org/fdroid/fdroid/views/RepoDetailsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/RepoDetailsActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/RepoDetailsActivity.java diff --git a/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java b/F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java diff --git a/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/AppListFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/PreferenceFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java diff --git a/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/fragments/ThemeableListFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/ConfirmReceiveSwapFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/ConnectSwapActivity.java diff --git a/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/JoinWifiFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/NfcSwapFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/SelectAppsFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/StartSwapFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/StartSwapFragment.java diff --git a/src/org/fdroid/fdroid/views/swap/SwapActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/SwapActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/SwapActivity.java diff --git a/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppListActivity.java diff --git a/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/SwapProcessManager.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/SwapProcessManager.java diff --git a/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java b/F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java similarity index 100% rename from src/org/fdroid/fdroid/views/swap/WifiQrFragment.java rename to F-Droid/src/org/fdroid/fdroid/views/swap/WifiQrFragment.java diff --git a/test/.classpath b/F-Droid/test/.classpath similarity index 100% rename from test/.classpath rename to F-Droid/test/.classpath diff --git a/test/.gitignore b/F-Droid/test/.gitignore similarity index 100% rename from test/.gitignore rename to F-Droid/test/.gitignore diff --git a/test/.project b/F-Droid/test/.project similarity index 100% rename from test/.project rename to F-Droid/test/.project diff --git a/test/AndroidManifest.xml b/F-Droid/test/AndroidManifest.xml similarity index 100% rename from test/AndroidManifest.xml rename to F-Droid/test/AndroidManifest.xml diff --git a/test/ant.properties b/F-Droid/test/ant.properties similarity index 100% rename from test/ant.properties rename to F-Droid/test/ant.properties diff --git a/test/assets/masterKeyIndex.jar b/F-Droid/test/assets/masterKeyIndex.jar similarity index 100% rename from test/assets/masterKeyIndex.jar rename to F-Droid/test/assets/masterKeyIndex.jar diff --git a/test/assets/simpleIndex.jar b/F-Droid/test/assets/simpleIndex.jar similarity index 100% rename from test/assets/simpleIndex.jar rename to F-Droid/test/assets/simpleIndex.jar diff --git a/test/assets/simpleIndex.xml b/F-Droid/test/assets/simpleIndex.xml similarity index 100% rename from test/assets/simpleIndex.xml rename to F-Droid/test/assets/simpleIndex.xml diff --git a/test/assets/simpleIndexWithCorruptedCertificate.jar b/F-Droid/test/assets/simpleIndexWithCorruptedCertificate.jar similarity index 100% rename from test/assets/simpleIndexWithCorruptedCertificate.jar rename to F-Droid/test/assets/simpleIndexWithCorruptedCertificate.jar diff --git a/test/assets/simpleIndexWithCorruptedEverything.jar b/F-Droid/test/assets/simpleIndexWithCorruptedEverything.jar similarity index 100% rename from test/assets/simpleIndexWithCorruptedEverything.jar rename to F-Droid/test/assets/simpleIndexWithCorruptedEverything.jar diff --git a/test/assets/simpleIndexWithCorruptedManifest.jar b/F-Droid/test/assets/simpleIndexWithCorruptedManifest.jar similarity index 100% rename from test/assets/simpleIndexWithCorruptedManifest.jar rename to F-Droid/test/assets/simpleIndexWithCorruptedManifest.jar diff --git a/test/assets/simpleIndexWithCorruptedSignature.jar b/F-Droid/test/assets/simpleIndexWithCorruptedSignature.jar similarity index 100% rename from test/assets/simpleIndexWithCorruptedSignature.jar rename to F-Droid/test/assets/simpleIndexWithCorruptedSignature.jar diff --git a/test/assets/simpleIndexWithoutSignature.jar b/F-Droid/test/assets/simpleIndexWithoutSignature.jar similarity index 100% rename from test/assets/simpleIndexWithoutSignature.jar rename to F-Droid/test/assets/simpleIndexWithoutSignature.jar diff --git a/test/custom_rules.xml b/F-Droid/test/custom_rules.xml similarity index 100% rename from test/custom_rules.xml rename to F-Droid/test/custom_rules.xml diff --git a/test/libs/android-junit-report-1.5.8.README b/F-Droid/test/libs/android-junit-report-1.5.8.README similarity index 100% rename from test/libs/android-junit-report-1.5.8.README rename to F-Droid/test/libs/android-junit-report-1.5.8.README diff --git a/test/libs/android-junit-report-1.5.8.jar b/F-Droid/test/libs/android-junit-report-1.5.8.jar similarity index 100% rename from test/libs/android-junit-report-1.5.8.jar rename to F-Droid/test/libs/android-junit-report-1.5.8.jar diff --git a/test/libs/commons-io-2.2.jar b/F-Droid/test/libs/commons-io-2.2.jar similarity index 100% rename from test/libs/commons-io-2.2.jar rename to F-Droid/test/libs/commons-io-2.2.jar diff --git a/test/libs/commons-io-2.2.jar.README b/F-Droid/test/libs/commons-io-2.2.jar.README similarity index 100% rename from test/libs/commons-io-2.2.jar.README rename to F-Droid/test/libs/commons-io-2.2.jar.README diff --git a/F-Droid/test/proguard-project.txt b/F-Droid/test/proguard-project.txt new file mode 100644 index 000000000..f2fe1559a --- /dev/null +++ b/F-Droid/test/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/test/project.properties b/F-Droid/test/project.properties similarity index 100% rename from test/project.properties rename to F-Droid/test/project.properties diff --git a/test/src/android/test/ProviderTestCase2MockContext.java b/F-Droid/test/src/android/test/ProviderTestCase2MockContext.java similarity index 100% rename from test/src/android/test/ProviderTestCase2MockContext.java rename to F-Droid/test/src/android/test/ProviderTestCase2MockContext.java diff --git a/test/src/mock/MockCategoryResources.java b/F-Droid/test/src/mock/MockCategoryResources.java similarity index 100% rename from test/src/mock/MockCategoryResources.java rename to F-Droid/test/src/mock/MockCategoryResources.java diff --git a/test/src/mock/MockContextEmptyComponents.java b/F-Droid/test/src/mock/MockContextEmptyComponents.java similarity index 100% rename from test/src/mock/MockContextEmptyComponents.java rename to F-Droid/test/src/mock/MockContextEmptyComponents.java diff --git a/test/src/mock/MockContextSwappableComponents.java b/F-Droid/test/src/mock/MockContextSwappableComponents.java similarity index 100% rename from test/src/mock/MockContextSwappableComponents.java rename to F-Droid/test/src/mock/MockContextSwappableComponents.java diff --git a/test/src/mock/MockEmptyPackageManager.java b/F-Droid/test/src/mock/MockEmptyPackageManager.java similarity index 100% rename from test/src/mock/MockEmptyPackageManager.java rename to F-Droid/test/src/mock/MockEmptyPackageManager.java diff --git a/test/src/mock/MockEmptyResources.java b/F-Droid/test/src/mock/MockEmptyResources.java similarity index 100% rename from test/src/mock/MockEmptyResources.java rename to F-Droid/test/src/mock/MockEmptyResources.java diff --git a/test/src/mock/MockFDroidResources.java b/F-Droid/test/src/mock/MockFDroidResources.java similarity index 100% rename from test/src/mock/MockFDroidResources.java rename to F-Droid/test/src/mock/MockFDroidResources.java diff --git a/test/src/mock/MockInstallablePackageManager.java b/F-Droid/test/src/mock/MockInstallablePackageManager.java similarity index 100% rename from test/src/mock/MockInstallablePackageManager.java rename to F-Droid/test/src/mock/MockInstallablePackageManager.java diff --git a/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/ApkProviderHelperTest.java rename to F-Droid/test/src/org/fdroid/fdroid/ApkProviderHelperTest.java diff --git a/test/src/org/fdroid/fdroid/ApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/ApkProviderTest.java rename to F-Droid/test/src/org/fdroid/fdroid/ApkProviderTest.java diff --git a/test/src/org/fdroid/fdroid/AppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/AppProviderTest.java rename to F-Droid/test/src/org/fdroid/fdroid/AppProviderTest.java diff --git a/test/src/org/fdroid/fdroid/BaseApkProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/BaseApkProviderTest.java rename to F-Droid/test/src/org/fdroid/fdroid/BaseApkProviderTest.java diff --git a/test/src/org/fdroid/fdroid/FDroidProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/FDroidProviderTest.java rename to F-Droid/test/src/org/fdroid/fdroid/FDroidProviderTest.java diff --git a/test/src/org/fdroid/fdroid/FDroidTest.java b/F-Droid/test/src/org/fdroid/fdroid/FDroidTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/FDroidTest.java rename to F-Droid/test/src/org/fdroid/fdroid/FDroidTest.java diff --git a/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/InstalledAppCacheTest.java rename to F-Droid/test/src/org/fdroid/fdroid/InstalledAppCacheTest.java diff --git a/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java b/F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/InstalledAppProviderTest.java rename to F-Droid/test/src/org/fdroid/fdroid/InstalledAppProviderTest.java diff --git a/test/src/org/fdroid/fdroid/TestUtils.java b/F-Droid/test/src/org/fdroid/fdroid/TestUtils.java similarity index 100% rename from test/src/org/fdroid/fdroid/TestUtils.java rename to F-Droid/test/src/org/fdroid/fdroid/TestUtils.java diff --git a/test/src/org/fdroid/fdroid/UtilsTest.java b/F-Droid/test/src/org/fdroid/fdroid/UtilsTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/UtilsTest.java rename to F-Droid/test/src/org/fdroid/fdroid/UtilsTest.java diff --git a/test/src/org/fdroid/fdroid/mock/MockApk.java b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java similarity index 100% rename from test/src/org/fdroid/fdroid/mock/MockApk.java rename to F-Droid/test/src/org/fdroid/fdroid/mock/MockApk.java diff --git a/test/src/org/fdroid/fdroid/mock/MockApp.java b/F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java similarity index 100% rename from test/src/org/fdroid/fdroid/mock/MockApp.java rename to F-Droid/test/src/org/fdroid/fdroid/mock/MockApp.java diff --git a/test/src/org/fdroid/fdroid/mock/MockRepo.java b/F-Droid/test/src/org/fdroid/fdroid/mock/MockRepo.java similarity index 100% rename from test/src/org/fdroid/fdroid/mock/MockRepo.java rename to F-Droid/test/src/org/fdroid/fdroid/mock/MockRepo.java diff --git a/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java b/F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java similarity index 100% rename from test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java rename to F-Droid/test/src/org/fdroid/fdroid/updater/SignedRepoUpdaterTest.java diff --git a/tools/change-package-name.sh b/F-Droid/tools/change-package-name.sh similarity index 100% rename from tools/change-package-name.sh rename to F-Droid/tools/change-package-name.sh diff --git a/tools/fix-ellipsis.sh b/F-Droid/tools/fix-ellipsis.sh similarity index 100% rename from tools/fix-ellipsis.sh rename to F-Droid/tools/fix-ellipsis.sh diff --git a/tools/fix-formats.sh b/F-Droid/tools/fix-formats.sh similarity index 100% rename from tools/fix-formats.sh rename to F-Droid/tools/fix-formats.sh diff --git a/tools/remove-unused-trans.sh b/F-Droid/tools/remove-unused-trans.sh similarity index 100% rename from tools/remove-unused-trans.sh rename to F-Droid/tools/remove-unused-trans.sh diff --git a/tools/zip-build.sh b/F-Droid/tools/zip-build.sh similarity index 100% rename from tools/zip-build.sh rename to F-Droid/tools/zip-build.sh diff --git a/tools/zip-installer b/F-Droid/tools/zip-installer similarity index 100% rename from tools/zip-installer rename to F-Droid/tools/zip-installer diff --git a/tools/zip-uninstaller b/F-Droid/tools/zip-uninstaller similarity index 100% rename from tools/zip-uninstaller rename to F-Droid/tools/zip-uninstaller diff --git a/ant-prepare.sh b/ant-prepare.sh deleted file mode 100755 index c6aa45b4a..000000000 --- a/ant-prepare.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -ex - -place_support_v4() { - mkdir -p $1/libs - cp libs/android-support-v4.jar $1/libs/ -} - -android update lib-project --path extern/UniversalImageLoader/library - -android update lib-project --path extern/AndroidPinning - -android update lib-project --path extern/MemorizingTrustManager - -android update lib-project --path extern/libsuperuser/libsuperuser - -android update lib-project --path extern/zxing-core - -android update lib-project --path extern/android-support-v4-preferencefragment -place_support_v4 extern/android-support-v4-preferencefragment - -android update lib-project --path extern/Support/v7/appcompat --target android-19 -place_support_v4 extern/Support/v7/appcompat - -android update project --path . --name F-Droid - -{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null - -# technically optional, needed for the tests -cd test -android update test-project --path . --main .. - -{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null diff --git a/build.gradle b/build.gradle index d7a2db12b..7a6c0bbb8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,165 +1,72 @@ buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.14.2' - } + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.14.2' + } } +// We need to apply the android plugin to be able to use $android for getSdkPath apply plugin: 'android' allprojects { - ext { - toolVersion = '21.1.1' - sdkLoc = getSdkPath() - } -} - -FileCollection getAndroidPrebuilt(String apiLevel) { - files("$sdkLoc/platforms/android-$apiLevel/android.jar") -} - -dependencies { - compile project(':support-v4') - compile project(':support-appcompat-v7') - compile project(':extern:AndroidPinning') - compile project(':extern:UniversalImageLoader:library') - compile project(':extern:MemorizingTrustManager') - compile project(':extern:libsuperuser:libsuperuser') - compile project(':extern:nanohttpd:core') - compile project(':extern:jmdns') - compile project(':extern:zipsigner') - compile project(':extern:zxing-core') - compile( project(':extern:android-support-v4-preferencefragment') ) { - exclude module: 'support-v4' - } + ext { + toolVersion = '21.1.1' + sdkLoc = getSdkPath() + } } project(':extern:UniversalImageLoader:library') { - buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.10.0' - } - } + buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.10.0' + } + } - apply plugin: 'android-library' + apply plugin: 'android-library' - android { - compileSdkVersion 16 - buildToolsVersion toolVersion + android { + compileSdkVersion 16 + buildToolsVersion toolVersion - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - } - } + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } + } } project(':extern:zipsigner') { - apply plugin: 'java' + apply plugin: 'java' - dependencies { - compile project(':extern:spongycastle:core') - compile project(':extern:spongycastle:pkix') - compile project(':extern:spongycastle:prov') - } + dependencies { + compile project(':extern:spongycastle:core') + compile project(':extern:spongycastle:pkix') + compile project(':extern:spongycastle:prov') + } } -android { - compileSdkVersion 21 - buildToolsVersion toolVersion +project(':support-v4') { - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } + apply plugin: 'maven' - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } + // The support-v4 library assumes certain things are defined in the + // root project (which is usually the android-support project, but + // this time it is the F-Droid project. + rootProject.ext.supportRepoOut = "" - instrumentTest.setRoot('test') - } - - buildTypes { - release { - minifyEnabled false - } - } - - compileOptions.encoding = "UTF-8" - - lintOptions { - abortOnError false - } - -} - -// TODO: This person took the example code below from another blogpost online, however -// I lost the reference to it: -// http://stackoverflow.com/questions/23297562/gradle-javadoc-and-android-documentation -android.applicationVariants.all { variant -> - - task("generate${variant.name}Javadoc", type: Javadoc) { - title = "$name $version API" - description "Generates Javadoc for F-Droid." - source = variant.javaCompile.source - ext.androidJar = "$sdkLoc/platforms/${android.compileSdkVersion}/android.jar" - classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar) - options.links("http://docs.oracle.com/javase/7/docs/api/"); - options.links("http://d.android.com/reference/"); - exclude '**/BuildConfig.java' - exclude '**/R.java' - } -} - -subprojects { - - // The support-v4 library assumes certain things are defined in the - // root project (which is usually the android-support project, but - // this time it is the F-Droid project. - if (project.name.equals("support-v4")) { - apply plugin: 'maven' - rootProject.ext.supportRepoOut = "" - } - - // This is the hacky way which we force the subprojects to use the same build tools: - // http://stackoverflow.com/a/21032272 - afterEvaluate { - android { - - // The android build task only lets you configure the buildToolsVersion once, so if - // we execute the closure below to configure our subprojects, it will fail when it - // hits the second subproject. Therefore, we will only do it once, and I guess the - // android plubin will re-use the existing value I set. - // https://android.googlesource.com/platform/tools/build/+/master/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy - try { - buildToolsVersion toolVersion - logger.info("Set buildToolsVersion to $toolVersion") - } catch (GradleException e) { - logger.info("Tried to set the buildToolsVersion, however we were not allowed to: $e.message") - } - } - } } /** @@ -174,5 +81,32 @@ subprojects { * of this method to reflect that. */ def getSdkPath() { - new File("$android.adbExe/../../").canonicalPath + new File("$android.adbExe/../../").canonicalPath } + +FileCollection getAndroidPrebuilt(String apiLevel) { + files("$sdkLoc/platforms/android-$apiLevel/android.jar") +} + +subprojects { + + // This is the hacky way which we force the subprojects to use the same build tools: + // http://stackoverflow.com/a/21032272 + afterEvaluate { + android { + + // The android build task only lets you configure the buildToolsVersion once, so if + // we execute the closure below to configure our subprojects, it will fail when it + // hits the second subproject. Therefore, we will only do it once, and I guess the + // android plubin will re-use the existing value I set. + // https://android.googlesource.com/platform/tools/build/+/master/gradle/src/main/groovy/com/android/build/gradle/BaseExtension.groovy + try { + buildToolsVersion toolVersion + logger.info("Set buildToolsVersion to $toolVersion") + } catch (GradleException e) { + logger.info("Tried to set the buildToolsVersion, however we were not allowed to: $e.message") + } + } + } +} + diff --git a/project.properties b/project.properties deleted file mode 100644 index 0219876ed..000000000 --- a/project.properties +++ /dev/null @@ -1,12 +0,0 @@ -target=android-21 - -android.library.reference.1=extern/UniversalImageLoader/library -android.library.reference.2=extern/MemorizingTrustManager -android.library.reference.3=extern/AndroidPinning -android.library.reference.4=extern/libsuperuser/libsuperuser -android.library.reference.5=extern/zxing-core -android.library.reference.6=extern/android-support-v4-preferencefragment -android.library.reference.7=extern/Support/v7/appcompat - -# For java libraries, place symlinks in extern/symlinks-for-ant-and-eclipse/ -source.dir=src;extern/symlinks-for-ant-and-eclipse diff --git a/settings.gradle b/settings.gradle index e558f2f78..a8827f7bd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = "F-Droid" +include ':F-Droid:' include ':extern:AndroidPinning' include ':extern:UniversalImageLoader:library'