diff --git a/.gitignore b/.gitignore index 3b739b0bf..692e4a404 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,9 @@ # Gradle .gradle local.properties -/commons/.gradle -/commons/build -/commons/app/build +/.gradle +/build +/app/build # IDE / Text editor files .nb-gradle diff --git a/README.md b/README.md index 536c68da1..b1f94dd4c 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,11 @@ Initially started by the Wikimedia Foundation, this app is now maintained by vol [Download Android Studio][1] (recommended) or [IntelliJ][2]. -1. Clone the repository. -2. Open Android Studio/IntelliJ. Open the project: - ``File`` > ``Open...`` +1. Open Android Studio/IntelliJ. Open the project: + ``File`` > ``New`` > ``Project from Version Control...`` > ``Git`` or - (From Quick Start menu): ``Open an existing Android Studio project`` -3. Navigate to the folder in the cloned repository (named commons). Select ``OK``. + (From Quick Start menu): ``Check out project from Version Control`` +2. Enter ``https://github.com/nicolas-raoul/apps-android-commons/`` as Git Repository URL. Specify a (new) local directory you would like to clone into and select ``OK``. ## Build Manually ## diff --git a/commons/app/build.gradle b/app/build.gradle similarity index 100% rename from commons/app/build.gradle rename to app/build.gradle diff --git a/commons/app/libs/Quadtree-1.0-gitbb3cc76.jar b/app/libs/Quadtree-1.0-gitbb3cc76.jar similarity index 100% rename from commons/app/libs/Quadtree-1.0-gitbb3cc76.jar rename to app/libs/Quadtree-1.0-gitbb3cc76.jar diff --git a/commons/app/proguard-rules.txt b/app/proguard-rules.txt similarity index 100% rename from commons/app/proguard-rules.txt rename to app/proguard-rules.txt diff --git a/commons/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from commons/app/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/commons/app/src/main/assets/fontconfig/fonts.conf b/app/src/main/assets/fontconfig/fonts.conf similarity index 100% rename from commons/app/src/main/assets/fontconfig/fonts.conf rename to app/src/main/assets/fontconfig/fonts.conf diff --git a/commons/app/src/main/assets/fontconfig/fonts/truetype/Ubuntu-R.ttf b/app/src/main/assets/fontconfig/fonts/truetype/Ubuntu-R.ttf similarity index 100% rename from commons/app/src/main/assets/fontconfig/fonts/truetype/Ubuntu-R.ttf rename to app/src/main/assets/fontconfig/fonts/truetype/Ubuntu-R.ttf diff --git a/commons/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/AboutActivity.java rename to app/src/main/java/fr/free/nrw/commons/AboutActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java rename to app/src/main/java/fr/free/nrw/commons/CommonsApplication.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/EventLog.java b/app/src/main/java/fr/free/nrw/commons/EventLog.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/EventLog.java rename to app/src/main/java/fr/free/nrw/commons/EventLog.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/HandlerService.java b/app/src/main/java/fr/free/nrw/commons/HandlerService.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/HandlerService.java rename to app/src/main/java/fr/free/nrw/commons/HandlerService.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/License.java b/app/src/main/java/fr/free/nrw/commons/License.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/License.java rename to app/src/main/java/fr/free/nrw/commons/License.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/LicenseList.java rename to app/src/main/java/fr/free/nrw/commons/LicenseList.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/Media.java rename to app/src/main/java/fr/free/nrw/commons/Media.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java b/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java rename to app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java b/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java rename to app/src/main/java/fr/free/nrw/commons/MediaWikiImageView.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/Prefs.java b/app/src/main/java/fr/free/nrw/commons/Prefs.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/Prefs.java rename to app/src/main/java/fr/free/nrw/commons/Prefs.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java rename to app/src/main/java/fr/free/nrw/commons/SettingsActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/Utils.java rename to app/src/main/java/fr/free/nrw/commons/Utils.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java rename to app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/api/MWApi.java b/app/src/main/java/fr/free/nrw/commons/api/MWApi.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/api/MWApi.java rename to app/src/main/java/fr/free/nrw/commons/api/MWApi.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java rename to app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java rename to app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java rename to app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticator.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java b/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java rename to app/src/main/java/fr/free/nrw/commons/auth/WikiAccountAuthenticatorService.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java b/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/caching/CacheController.java rename to app/src/main/java/fr/free/nrw/commons/caching/CacheController.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java rename to app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/category/Category.java b/app/src/main/java/fr/free/nrw/commons/category/Category.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/category/Category.java rename to app/src/main/java/fr/free/nrw/commons/category/Category.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java rename to app/src/main/java/fr/free/nrw/commons/category/CategoryContentProvider.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java rename to app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java rename to app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java rename to app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsContentProvider.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncAdapter.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java rename to app/src/main/java/fr/free/nrw/commons/contributions/ContributionsSyncService.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java rename to app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java b/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java rename to app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java rename to app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java rename to app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java rename to app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java rename to app/src/main/java/fr/free/nrw/commons/media/MediaDetailSpacer.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java b/app/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java rename to app/src/main/java/fr/free/nrw/commons/modifications/CategoryModifier.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java rename to app/src/main/java/fr/free/nrw/commons/modifications/ModificationsContentProvider.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java rename to app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java rename to app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncService.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java b/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java rename to app/src/main/java/fr/free/nrw/commons/modifications/ModifierSequence.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java b/app/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java rename to app/src/main/java/fr/free/nrw/commons/modifications/PageModifier.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java b/app/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java rename to app/src/main/java/fr/free/nrw/commons/modifications/TemplateRemoveModifier.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java b/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java rename to app/src/main/java/fr/free/nrw/commons/upload/FileUtils.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java rename to app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java rename to app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java rename to app/src/main/java/fr/free/nrw/commons/upload/MultipleUploadListFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java rename to app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java rename to app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java rename to app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java rename to app/src/main/java/fr/free/nrw/commons/upload/UploadController.java diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java similarity index 100% rename from commons/app/src/main/java/fr/free/nrw/commons/upload/UploadService.java rename to app/src/main/java/fr/free/nrw/commons/upload/UploadService.java diff --git a/commons/app/src/main/res/drawable-hdpi/commons_logo_large.png b/app/src/main/res/drawable-hdpi/commons_logo_large.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/commons_logo_large.png rename to app/src/main/res/drawable-hdpi/commons_logo_large.png diff --git a/commons/app/src/main/res/drawable-hdpi/ic_action_search.png b/app/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/ic_action_search.png rename to app/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/commons/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/ic_launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/commons/app/src/main/res/drawable-hdpi/ic_menu_download.png b/app/src/main/res/drawable-hdpi/ic_menu_download.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/ic_menu_download.png rename to app/src/main/res/drawable-hdpi/ic_menu_download.png diff --git a/commons/app/src/main/res/drawable-hdpi/social_send_now.png b/app/src/main/res/drawable-hdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/social_send_now.png rename to app/src/main/res/drawable-hdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-hdpi/welcome_copyright.png b/app/src/main/res/drawable-hdpi/welcome_copyright.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/welcome_copyright.png rename to app/src/main/res/drawable-hdpi/welcome_copyright.png diff --git a/commons/app/src/main/res/drawable-hdpi/welcome_wikipedia.png b/app/src/main/res/drawable-hdpi/welcome_wikipedia.png similarity index 100% rename from commons/app/src/main/res/drawable-hdpi/welcome_wikipedia.png rename to app/src/main/res/drawable-hdpi/welcome_wikipedia.png diff --git a/commons/app/src/main/res/drawable-ldpi/welcome_copyright.png b/app/src/main/res/drawable-ldpi/welcome_copyright.png similarity index 100% rename from commons/app/src/main/res/drawable-ldpi/welcome_copyright.png rename to app/src/main/res/drawable-ldpi/welcome_copyright.png diff --git a/commons/app/src/main/res/drawable-ldpi/welcome_wikipedia.png b/app/src/main/res/drawable-ldpi/welcome_wikipedia.png similarity index 100% rename from commons/app/src/main/res/drawable-ldpi/welcome_wikipedia.png rename to app/src/main/res/drawable-ldpi/welcome_wikipedia.png diff --git a/commons/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png rename to app/src/main/res/drawable-ldrtl-hdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png rename to app/src/main/res/drawable-ldrtl-mdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png b/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png rename to app/src/main/res/drawable-ldrtl-xhdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-mdpi/ic_action_search.png b/app/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/ic_action_search.png rename to app/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/commons/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/ic_launcher.png rename to app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/commons/app/src/main/res/drawable-mdpi/ic_menu_download.png b/app/src/main/res/drawable-mdpi/ic_menu_download.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/ic_menu_download.png rename to app/src/main/res/drawable-mdpi/ic_menu_download.png diff --git a/commons/app/src/main/res/drawable-mdpi/social_send_now.png b/app/src/main/res/drawable-mdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/social_send_now.png rename to app/src/main/res/drawable-mdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-mdpi/welcome_copyright.png b/app/src/main/res/drawable-mdpi/welcome_copyright.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/welcome_copyright.png rename to app/src/main/res/drawable-mdpi/welcome_copyright.png diff --git a/commons/app/src/main/res/drawable-mdpi/welcome_wikipedia.png b/app/src/main/res/drawable-mdpi/welcome_wikipedia.png similarity index 100% rename from commons/app/src/main/res/drawable-mdpi/welcome_wikipedia.png rename to app/src/main/res/drawable-mdpi/welcome_wikipedia.png diff --git a/commons/app/src/main/res/drawable-xhdpi/ic_action_search.png b/app/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/ic_action_search.png rename to app/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/commons/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/ic_launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/commons/app/src/main/res/drawable-xhdpi/ic_menu_download.png b/app/src/main/res/drawable-xhdpi/ic_menu_download.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/ic_menu_download.png rename to app/src/main/res/drawable-xhdpi/ic_menu_download.png diff --git a/commons/app/src/main/res/drawable-xhdpi/social_send_now.png b/app/src/main/res/drawable-xhdpi/social_send_now.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/social_send_now.png rename to app/src/main/res/drawable-xhdpi/social_send_now.png diff --git a/commons/app/src/main/res/drawable-xhdpi/welcome_copyright.png b/app/src/main/res/drawable-xhdpi/welcome_copyright.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/welcome_copyright.png rename to app/src/main/res/drawable-xhdpi/welcome_copyright.png diff --git a/commons/app/src/main/res/drawable-xhdpi/welcome_wikipedia.png b/app/src/main/res/drawable-xhdpi/welcome_wikipedia.png similarity index 100% rename from commons/app/src/main/res/drawable-xhdpi/welcome_wikipedia.png rename to app/src/main/res/drawable-xhdpi/welcome_wikipedia.png diff --git a/commons/app/src/main/res/drawable/action_bar_translucent.xml b/app/src/main/res/drawable/action_bar_translucent.xml similarity index 100% rename from commons/app/src/main/res/drawable/action_bar_translucent.xml rename to app/src/main/res/drawable/action_bar_translucent.xml diff --git a/commons/app/src/main/res/drawable/actionbar_top_shadow.xml b/app/src/main/res/drawable/actionbar_top_shadow.xml similarity index 100% rename from commons/app/src/main/res/drawable/actionbar_top_shadow.xml rename to app/src/main/res/drawable/actionbar_top_shadow.xml diff --git a/commons/app/src/main/res/drawable/ic_download.png b/app/src/main/res/drawable/ic_download.png similarity index 100% rename from commons/app/src/main/res/drawable/ic_download.png rename to app/src/main/res/drawable/ic_download.png diff --git a/commons/app/src/main/res/drawable/media_info_shadow.xml b/app/src/main/res/drawable/media_info_shadow.xml similarity index 100% rename from commons/app/src/main/res/drawable/media_info_shadow.xml rename to app/src/main/res/drawable/media_info_shadow.xml diff --git a/commons/app/src/main/res/drawable/share_overlay_background_gradient.xml b/app/src/main/res/drawable/share_overlay_background_gradient.xml similarity index 100% rename from commons/app/src/main/res/drawable/share_overlay_background_gradient.xml rename to app/src/main/res/drawable/share_overlay_background_gradient.xml diff --git a/commons/app/src/main/res/layout-land/welcome_copyright.xml b/app/src/main/res/layout-land/welcome_copyright.xml similarity index 100% rename from commons/app/src/main/res/layout-land/welcome_copyright.xml rename to app/src/main/res/layout-land/welcome_copyright.xml diff --git a/commons/app/src/main/res/layout-land/welcome_final.xml b/app/src/main/res/layout-land/welcome_final.xml similarity index 100% rename from commons/app/src/main/res/layout-land/welcome_final.xml rename to app/src/main/res/layout-land/welcome_final.xml diff --git a/commons/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml similarity index 100% rename from commons/app/src/main/res/layout-land/welcome_wikipedia.xml rename to app/src/main/res/layout-land/welcome_wikipedia.xml diff --git a/commons/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_about.xml rename to app/src/main/res/layout/activity_about.xml diff --git a/commons/app/src/main/res/layout/activity_campaigns.xml b/app/src/main/res/layout/activity_campaigns.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_campaigns.xml rename to app/src/main/res/layout/activity_campaigns.xml diff --git a/commons/app/src/main/res/layout/activity_contributions.xml b/app/src/main/res/layout/activity_contributions.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_contributions.xml rename to app/src/main/res/layout/activity_contributions.xml diff --git a/commons/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_login.xml rename to app/src/main/res/layout/activity_login.xml diff --git a/commons/app/src/main/res/layout/activity_multiple_uploads.xml b/app/src/main/res/layout/activity_multiple_uploads.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_multiple_uploads.xml rename to app/src/main/res/layout/activity_multiple_uploads.xml diff --git a/commons/app/src/main/res/layout/activity_post_upload.xml b/app/src/main/res/layout/activity_post_upload.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_post_upload.xml rename to app/src/main/res/layout/activity_post_upload.xml diff --git a/commons/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_share.xml rename to app/src/main/res/layout/activity_share.xml diff --git a/commons/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml similarity index 100% rename from commons/app/src/main/res/layout/activity_welcome.xml rename to app/src/main/res/layout/activity_welcome.xml diff --git a/commons/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml similarity index 100% rename from commons/app/src/main/res/layout/detail_category_item.xml rename to app/src/main/res/layout/detail_category_item.xml diff --git a/commons/app/src/main/res/layout/fragment_campaigns.xml b/app/src/main/res/layout/fragment_campaigns.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_campaigns.xml rename to app/src/main/res/layout/fragment_campaigns.xml diff --git a/commons/app/src/main/res/layout/fragment_categorization.xml b/app/src/main/res/layout/fragment_categorization.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_categorization.xml rename to app/src/main/res/layout/fragment_categorization.xml diff --git a/commons/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_contributions.xml rename to app/src/main/res/layout/fragment_contributions.xml diff --git a/commons/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_media_detail.xml rename to app/src/main/res/layout/fragment_media_detail.xml diff --git a/commons/app/src/main/res/layout/fragment_media_detail_pager.xml b/app/src/main/res/layout/fragment_media_detail_pager.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_media_detail_pager.xml rename to app/src/main/res/layout/fragment_media_detail_pager.xml diff --git a/commons/app/src/main/res/layout/fragment_multiple_uploads_list.xml b/app/src/main/res/layout/fragment_multiple_uploads_list.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_multiple_uploads_list.xml rename to app/src/main/res/layout/fragment_multiple_uploads_list.xml diff --git a/commons/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml similarity index 100% rename from commons/app/src/main/res/layout/fragment_single_upload.xml rename to app/src/main/res/layout/fragment_single_upload.xml diff --git a/commons/app/src/main/res/layout/layout_campaign_item.xml b/app/src/main/res/layout/layout_campaign_item.xml similarity index 100% rename from commons/app/src/main/res/layout/layout_campaign_item.xml rename to app/src/main/res/layout/layout_campaign_item.xml diff --git a/commons/app/src/main/res/layout/layout_categories_item.xml b/app/src/main/res/layout/layout_categories_item.xml similarity index 100% rename from commons/app/src/main/res/layout/layout_categories_item.xml rename to app/src/main/res/layout/layout_categories_item.xml diff --git a/commons/app/src/main/res/layout/layout_contribution.xml b/app/src/main/res/layout/layout_contribution.xml similarity index 100% rename from commons/app/src/main/res/layout/layout_contribution.xml rename to app/src/main/res/layout/layout_contribution.xml diff --git a/commons/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml similarity index 100% rename from commons/app/src/main/res/layout/layout_upload_item.xml rename to app/src/main/res/layout/layout_upload_item.xml diff --git a/commons/app/src/main/res/layout/login.xml b/app/src/main/res/layout/login.xml similarity index 100% rename from commons/app/src/main/res/layout/login.xml rename to app/src/main/res/layout/login.xml diff --git a/commons/app/src/main/res/layout/welcome_copyright.xml b/app/src/main/res/layout/welcome_copyright.xml similarity index 100% rename from commons/app/src/main/res/layout/welcome_copyright.xml rename to app/src/main/res/layout/welcome_copyright.xml diff --git a/commons/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml similarity index 100% rename from commons/app/src/main/res/layout/welcome_final.xml rename to app/src/main/res/layout/welcome_final.xml diff --git a/commons/app/src/main/res/layout/welcome_wikipedia.xml b/app/src/main/res/layout/welcome_wikipedia.xml similarity index 100% rename from commons/app/src/main/res/layout/welcome_wikipedia.xml rename to app/src/main/res/layout/welcome_wikipedia.xml diff --git a/commons/app/src/main/res/menu/activity_login.xml b/app/src/main/res/menu/activity_login.xml similarity index 100% rename from commons/app/src/main/res/menu/activity_login.xml rename to app/src/main/res/menu/activity_login.xml diff --git a/commons/app/src/main/res/menu/activity_share.xml b/app/src/main/res/menu/activity_share.xml similarity index 100% rename from commons/app/src/main/res/menu/activity_share.xml rename to app/src/main/res/menu/activity_share.xml diff --git a/commons/app/src/main/res/menu/fragment_categorization.xml b/app/src/main/res/menu/fragment_categorization.xml similarity index 100% rename from commons/app/src/main/res/menu/fragment_categorization.xml rename to app/src/main/res/menu/fragment_categorization.xml diff --git a/commons/app/src/main/res/menu/fragment_contributions_list.xml b/app/src/main/res/menu/fragment_contributions_list.xml similarity index 100% rename from commons/app/src/main/res/menu/fragment_contributions_list.xml rename to app/src/main/res/menu/fragment_contributions_list.xml diff --git a/commons/app/src/main/res/menu/fragment_image_detail.xml b/app/src/main/res/menu/fragment_image_detail.xml similarity index 100% rename from commons/app/src/main/res/menu/fragment_image_detail.xml rename to app/src/main/res/menu/fragment_image_detail.xml diff --git a/commons/app/src/main/res/menu/fragment_multiple_upload_list.xml b/app/src/main/res/menu/fragment_multiple_upload_list.xml similarity index 100% rename from commons/app/src/main/res/menu/fragment_multiple_upload_list.xml rename to app/src/main/res/menu/fragment_multiple_upload_list.xml diff --git a/commons/app/src/main/res/values-af/error.xml b/app/src/main/res/values-af/error.xml similarity index 100% rename from commons/app/src/main/res/values-af/error.xml rename to app/src/main/res/values-af/error.xml diff --git a/commons/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml similarity index 100% rename from commons/app/src/main/res/values-af/strings.xml rename to app/src/main/res/values-af/strings.xml diff --git a/commons/app/src/main/res/values-ar/error.xml b/app/src/main/res/values-ar/error.xml similarity index 100% rename from commons/app/src/main/res/values-ar/error.xml rename to app/src/main/res/values-ar/error.xml diff --git a/commons/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/commons/app/src/main/res/values-az/error.xml b/app/src/main/res/values-az/error.xml similarity index 100% rename from commons/app/src/main/res/values-az/error.xml rename to app/src/main/res/values-az/error.xml diff --git a/commons/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml similarity index 100% rename from commons/app/src/main/res/values-az/strings.xml rename to app/src/main/res/values-az/strings.xml diff --git a/commons/app/src/main/res/values-bn/error.xml b/app/src/main/res/values-bn/error.xml similarity index 100% rename from commons/app/src/main/res/values-bn/error.xml rename to app/src/main/res/values-bn/error.xml diff --git a/commons/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml similarity index 100% rename from commons/app/src/main/res/values-bn/strings.xml rename to app/src/main/res/values-bn/strings.xml diff --git a/commons/app/src/main/res/values-br/error.xml b/app/src/main/res/values-br/error.xml similarity index 100% rename from commons/app/src/main/res/values-br/error.xml rename to app/src/main/res/values-br/error.xml diff --git a/commons/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml similarity index 100% rename from commons/app/src/main/res/values-br/strings.xml rename to app/src/main/res/values-br/strings.xml diff --git a/commons/app/src/main/res/values-ca/error.xml b/app/src/main/res/values-ca/error.xml similarity index 100% rename from commons/app/src/main/res/values-ca/error.xml rename to app/src/main/res/values-ca/error.xml diff --git a/commons/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/commons/app/src/main/res/values-cs/error.xml b/app/src/main/res/values-cs/error.xml similarity index 100% rename from commons/app/src/main/res/values-cs/error.xml rename to app/src/main/res/values-cs/error.xml diff --git a/commons/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml similarity index 100% rename from commons/app/src/main/res/values-cs/strings.xml rename to app/src/main/res/values-cs/strings.xml diff --git a/commons/app/src/main/res/values-cy/error.xml b/app/src/main/res/values-cy/error.xml similarity index 100% rename from commons/app/src/main/res/values-cy/error.xml rename to app/src/main/res/values-cy/error.xml diff --git a/commons/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml similarity index 100% rename from commons/app/src/main/res/values-cy/strings.xml rename to app/src/main/res/values-cy/strings.xml diff --git a/commons/app/src/main/res/values-da/error.xml b/app/src/main/res/values-da/error.xml similarity index 100% rename from commons/app/src/main/res/values-da/error.xml rename to app/src/main/res/values-da/error.xml diff --git a/commons/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from commons/app/src/main/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/commons/app/src/main/res/values-de/error.xml b/app/src/main/res/values-de/error.xml similarity index 100% rename from commons/app/src/main/res/values-de/error.xml rename to app/src/main/res/values-de/error.xml diff --git a/commons/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from commons/app/src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/commons/app/src/main/res/values-el/error.xml b/app/src/main/res/values-el/error.xml similarity index 100% rename from commons/app/src/main/res/values-el/error.xml rename to app/src/main/res/values-el/error.xml diff --git a/commons/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from commons/app/src/main/res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/commons/app/src/main/res/values-es/error.xml b/app/src/main/res/values-es/error.xml similarity index 100% rename from commons/app/src/main/res/values-es/error.xml rename to app/src/main/res/values-es/error.xml diff --git a/commons/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from commons/app/src/main/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/commons/app/src/main/res/values-eu/error.xml b/app/src/main/res/values-eu/error.xml similarity index 100% rename from commons/app/src/main/res/values-eu/error.xml rename to app/src/main/res/values-eu/error.xml diff --git a/commons/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml similarity index 100% rename from commons/app/src/main/res/values-eu/strings.xml rename to app/src/main/res/values-eu/strings.xml diff --git a/commons/app/src/main/res/values-fa/error.xml b/app/src/main/res/values-fa/error.xml similarity index 100% rename from commons/app/src/main/res/values-fa/error.xml rename to app/src/main/res/values-fa/error.xml diff --git a/commons/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from commons/app/src/main/res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/commons/app/src/main/res/values-fi/error.xml b/app/src/main/res/values-fi/error.xml similarity index 100% rename from commons/app/src/main/res/values-fi/error.xml rename to app/src/main/res/values-fi/error.xml diff --git a/commons/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml similarity index 100% rename from commons/app/src/main/res/values-fi/strings.xml rename to app/src/main/res/values-fi/strings.xml diff --git a/commons/app/src/main/res/values-fo/error.xml b/app/src/main/res/values-fo/error.xml similarity index 100% rename from commons/app/src/main/res/values-fo/error.xml rename to app/src/main/res/values-fo/error.xml diff --git a/commons/app/src/main/res/values-fo/strings.xml b/app/src/main/res/values-fo/strings.xml similarity index 100% rename from commons/app/src/main/res/values-fo/strings.xml rename to app/src/main/res/values-fo/strings.xml diff --git a/commons/app/src/main/res/values-fr/error.xml b/app/src/main/res/values-fr/error.xml similarity index 100% rename from commons/app/src/main/res/values-fr/error.xml rename to app/src/main/res/values-fr/error.xml diff --git a/commons/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from commons/app/src/main/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/commons/app/src/main/res/values-gl/error.xml b/app/src/main/res/values-gl/error.xml similarity index 100% rename from commons/app/src/main/res/values-gl/error.xml rename to app/src/main/res/values-gl/error.xml diff --git a/commons/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml similarity index 100% rename from commons/app/src/main/res/values-gl/strings.xml rename to app/src/main/res/values-gl/strings.xml diff --git a/commons/app/src/main/res/values-gu/error.xml b/app/src/main/res/values-gu/error.xml similarity index 100% rename from commons/app/src/main/res/values-gu/error.xml rename to app/src/main/res/values-gu/error.xml diff --git a/commons/app/src/main/res/values-he/error.xml b/app/src/main/res/values-he/error.xml similarity index 100% rename from commons/app/src/main/res/values-he/error.xml rename to app/src/main/res/values-he/error.xml diff --git a/commons/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml similarity index 100% rename from commons/app/src/main/res/values-he/strings.xml rename to app/src/main/res/values-he/strings.xml diff --git a/commons/app/src/main/res/values-hu/error.xml b/app/src/main/res/values-hu/error.xml similarity index 100% rename from commons/app/src/main/res/values-hu/error.xml rename to app/src/main/res/values-hu/error.xml diff --git a/commons/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml similarity index 100% rename from commons/app/src/main/res/values-hu/strings.xml rename to app/src/main/res/values-hu/strings.xml diff --git a/commons/app/src/main/res/values-ia/error.xml b/app/src/main/res/values-ia/error.xml similarity index 100% rename from commons/app/src/main/res/values-ia/error.xml rename to app/src/main/res/values-ia/error.xml diff --git a/commons/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ia/strings.xml rename to app/src/main/res/values-ia/strings.xml diff --git a/commons/app/src/main/res/values-id/error.xml b/app/src/main/res/values-id/error.xml similarity index 100% rename from commons/app/src/main/res/values-id/error.xml rename to app/src/main/res/values-id/error.xml diff --git a/commons/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml similarity index 100% rename from commons/app/src/main/res/values-id/strings.xml rename to app/src/main/res/values-id/strings.xml diff --git a/commons/app/src/main/res/values-it/error.xml b/app/src/main/res/values-it/error.xml similarity index 100% rename from commons/app/src/main/res/values-it/error.xml rename to app/src/main/res/values-it/error.xml diff --git a/commons/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from commons/app/src/main/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/commons/app/src/main/res/values-iw/error.xml b/app/src/main/res/values-iw/error.xml similarity index 100% rename from commons/app/src/main/res/values-iw/error.xml rename to app/src/main/res/values-iw/error.xml diff --git a/commons/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml similarity index 100% rename from commons/app/src/main/res/values-iw/strings.xml rename to app/src/main/res/values-iw/strings.xml diff --git a/commons/app/src/main/res/values-ja/error.xml b/app/src/main/res/values-ja/error.xml similarity index 100% rename from commons/app/src/main/res/values-ja/error.xml rename to app/src/main/res/values-ja/error.xml diff --git a/commons/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ja/strings.xml rename to app/src/main/res/values-ja/strings.xml diff --git a/commons/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ka/strings.xml rename to app/src/main/res/values-ka/strings.xml diff --git a/commons/app/src/main/res/values-km/error.xml b/app/src/main/res/values-km/error.xml similarity index 100% rename from commons/app/src/main/res/values-km/error.xml rename to app/src/main/res/values-km/error.xml diff --git a/commons/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml similarity index 100% rename from commons/app/src/main/res/values-km/strings.xml rename to app/src/main/res/values-km/strings.xml diff --git a/commons/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml similarity index 100% rename from commons/app/src/main/res/values-kn/strings.xml rename to app/src/main/res/values-kn/strings.xml diff --git a/commons/app/src/main/res/values-ko/error.xml b/app/src/main/res/values-ko/error.xml similarity index 100% rename from commons/app/src/main/res/values-ko/error.xml rename to app/src/main/res/values-ko/error.xml diff --git a/commons/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml diff --git a/commons/app/src/main/res/values-ky/error.xml b/app/src/main/res/values-ky/error.xml similarity index 100% rename from commons/app/src/main/res/values-ky/error.xml rename to app/src/main/res/values-ky/error.xml diff --git a/commons/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ky/strings.xml rename to app/src/main/res/values-ky/strings.xml diff --git a/commons/app/src/main/res/values-la/error.xml b/app/src/main/res/values-la/error.xml similarity index 100% rename from commons/app/src/main/res/values-la/error.xml rename to app/src/main/res/values-la/error.xml diff --git a/commons/app/src/main/res/values-la/strings.xml b/app/src/main/res/values-la/strings.xml similarity index 100% rename from commons/app/src/main/res/values-la/strings.xml rename to app/src/main/res/values-la/strings.xml diff --git a/commons/app/src/main/res/values-lb/error.xml b/app/src/main/res/values-lb/error.xml similarity index 100% rename from commons/app/src/main/res/values-lb/error.xml rename to app/src/main/res/values-lb/error.xml diff --git a/commons/app/src/main/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml similarity index 100% rename from commons/app/src/main/res/values-lb/strings.xml rename to app/src/main/res/values-lb/strings.xml diff --git a/commons/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml similarity index 100% rename from commons/app/src/main/res/values-lt/strings.xml rename to app/src/main/res/values-lt/strings.xml diff --git a/commons/app/src/main/res/values-lv/error.xml b/app/src/main/res/values-lv/error.xml similarity index 100% rename from commons/app/src/main/res/values-lv/error.xml rename to app/src/main/res/values-lv/error.xml diff --git a/commons/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml similarity index 100% rename from commons/app/src/main/res/values-lv/strings.xml rename to app/src/main/res/values-lv/strings.xml diff --git a/commons/app/src/main/res/values-mk/error.xml b/app/src/main/res/values-mk/error.xml similarity index 100% rename from commons/app/src/main/res/values-mk/error.xml rename to app/src/main/res/values-mk/error.xml diff --git a/commons/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml similarity index 100% rename from commons/app/src/main/res/values-mk/strings.xml rename to app/src/main/res/values-mk/strings.xml diff --git a/commons/app/src/main/res/values-ml/error.xml b/app/src/main/res/values-ml/error.xml similarity index 100% rename from commons/app/src/main/res/values-ml/error.xml rename to app/src/main/res/values-ml/error.xml diff --git a/commons/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ml/strings.xml rename to app/src/main/res/values-ml/strings.xml diff --git a/commons/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml similarity index 100% rename from commons/app/src/main/res/values-mn/strings.xml rename to app/src/main/res/values-mn/strings.xml diff --git a/commons/app/src/main/res/values-mr/error.xml b/app/src/main/res/values-mr/error.xml similarity index 100% rename from commons/app/src/main/res/values-mr/error.xml rename to app/src/main/res/values-mr/error.xml diff --git a/commons/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml similarity index 100% rename from commons/app/src/main/res/values-mr/strings.xml rename to app/src/main/res/values-mr/strings.xml diff --git a/commons/app/src/main/res/values-ms/error.xml b/app/src/main/res/values-ms/error.xml similarity index 100% rename from commons/app/src/main/res/values-ms/error.xml rename to app/src/main/res/values-ms/error.xml diff --git a/commons/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ms/strings.xml rename to app/src/main/res/values-ms/strings.xml diff --git a/commons/app/src/main/res/values-mt/error.xml b/app/src/main/res/values-mt/error.xml similarity index 100% rename from commons/app/src/main/res/values-mt/error.xml rename to app/src/main/res/values-mt/error.xml diff --git a/commons/app/src/main/res/values-mt/strings.xml b/app/src/main/res/values-mt/strings.xml similarity index 100% rename from commons/app/src/main/res/values-mt/strings.xml rename to app/src/main/res/values-mt/strings.xml diff --git a/commons/app/src/main/res/values-nb/error.xml b/app/src/main/res/values-nb/error.xml similarity index 100% rename from commons/app/src/main/res/values-nb/error.xml rename to app/src/main/res/values-nb/error.xml diff --git a/commons/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml similarity index 100% rename from commons/app/src/main/res/values-nb/strings.xml rename to app/src/main/res/values-nb/strings.xml diff --git a/commons/app/src/main/res/values-ne/error.xml b/app/src/main/res/values-ne/error.xml similarity index 100% rename from commons/app/src/main/res/values-ne/error.xml rename to app/src/main/res/values-ne/error.xml diff --git a/commons/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ne/strings.xml rename to app/src/main/res/values-ne/strings.xml diff --git a/commons/app/src/main/res/values-nl/error.xml b/app/src/main/res/values-nl/error.xml similarity index 100% rename from commons/app/src/main/res/values-nl/error.xml rename to app/src/main/res/values-nl/error.xml diff --git a/commons/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from commons/app/src/main/res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/commons/app/src/main/res/values-oc/error.xml b/app/src/main/res/values-oc/error.xml similarity index 100% rename from commons/app/src/main/res/values-oc/error.xml rename to app/src/main/res/values-oc/error.xml diff --git a/commons/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml similarity index 100% rename from commons/app/src/main/res/values-oc/strings.xml rename to app/src/main/res/values-oc/strings.xml diff --git a/commons/app/src/main/res/values-or/error.xml b/app/src/main/res/values-or/error.xml similarity index 100% rename from commons/app/src/main/res/values-or/error.xml rename to app/src/main/res/values-or/error.xml diff --git a/commons/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml similarity index 100% rename from commons/app/src/main/res/values-or/strings.xml rename to app/src/main/res/values-or/strings.xml diff --git a/commons/app/src/main/res/values-pa/error.xml b/app/src/main/res/values-pa/error.xml similarity index 100% rename from commons/app/src/main/res/values-pa/error.xml rename to app/src/main/res/values-pa/error.xml diff --git a/commons/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml similarity index 100% rename from commons/app/src/main/res/values-pa/strings.xml rename to app/src/main/res/values-pa/strings.xml diff --git a/commons/app/src/main/res/values-pl/error.xml b/app/src/main/res/values-pl/error.xml similarity index 100% rename from commons/app/src/main/res/values-pl/error.xml rename to app/src/main/res/values-pl/error.xml diff --git a/commons/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 100% rename from commons/app/src/main/res/values-pl/strings.xml rename to app/src/main/res/values-pl/strings.xml diff --git a/commons/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ps/strings.xml rename to app/src/main/res/values-ps/strings.xml diff --git a/commons/app/src/main/res/values-pt-rBR/error.xml b/app/src/main/res/values-pt-rBR/error.xml similarity index 100% rename from commons/app/src/main/res/values-pt-rBR/error.xml rename to app/src/main/res/values-pt-rBR/error.xml diff --git a/commons/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from commons/app/src/main/res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/commons/app/src/main/res/values-pt/error.xml b/app/src/main/res/values-pt/error.xml similarity index 100% rename from commons/app/src/main/res/values-pt/error.xml rename to app/src/main/res/values-pt/error.xml diff --git a/commons/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml similarity index 100% rename from commons/app/src/main/res/values-pt/strings.xml rename to app/src/main/res/values-pt/strings.xml diff --git a/commons/app/src/main/res/values-qq/error.xml b/app/src/main/res/values-qq/error.xml similarity index 100% rename from commons/app/src/main/res/values-qq/error.xml rename to app/src/main/res/values-qq/error.xml diff --git a/commons/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml similarity index 100% rename from commons/app/src/main/res/values-qq/strings.xml rename to app/src/main/res/values-qq/strings.xml diff --git a/commons/app/src/main/res/values-ro/error.xml b/app/src/main/res/values-ro/error.xml similarity index 100% rename from commons/app/src/main/res/values-ro/error.xml rename to app/src/main/res/values-ro/error.xml diff --git a/commons/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ro/strings.xml rename to app/src/main/res/values-ro/strings.xml diff --git a/commons/app/src/main/res/values-ru/error.xml b/app/src/main/res/values-ru/error.xml similarity index 100% rename from commons/app/src/main/res/values-ru/error.xml rename to app/src/main/res/values-ru/error.xml diff --git a/commons/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/commons/app/src/main/res/values-si/error.xml b/app/src/main/res/values-si/error.xml similarity index 100% rename from commons/app/src/main/res/values-si/error.xml rename to app/src/main/res/values-si/error.xml diff --git a/commons/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml similarity index 100% rename from commons/app/src/main/res/values-si/strings.xml rename to app/src/main/res/values-si/strings.xml diff --git a/commons/app/src/main/res/values-sk/error.xml b/app/src/main/res/values-sk/error.xml similarity index 100% rename from commons/app/src/main/res/values-sk/error.xml rename to app/src/main/res/values-sk/error.xml diff --git a/commons/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml similarity index 100% rename from commons/app/src/main/res/values-sk/strings.xml rename to app/src/main/res/values-sk/strings.xml diff --git a/commons/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml similarity index 100% rename from commons/app/src/main/res/values-su/strings.xml rename to app/src/main/res/values-su/strings.xml diff --git a/commons/app/src/main/res/values-sv/error.xml b/app/src/main/res/values-sv/error.xml similarity index 100% rename from commons/app/src/main/res/values-sv/error.xml rename to app/src/main/res/values-sv/error.xml diff --git a/commons/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from commons/app/src/main/res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/commons/app/src/main/res/values-sw/error.xml b/app/src/main/res/values-sw/error.xml similarity index 100% rename from commons/app/src/main/res/values-sw/error.xml rename to app/src/main/res/values-sw/error.xml diff --git a/commons/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml similarity index 100% rename from commons/app/src/main/res/values-ta/strings.xml rename to app/src/main/res/values-ta/strings.xml diff --git a/commons/app/src/main/res/values-te/error.xml b/app/src/main/res/values-te/error.xml similarity index 100% rename from commons/app/src/main/res/values-te/error.xml rename to app/src/main/res/values-te/error.xml diff --git a/commons/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml similarity index 100% rename from commons/app/src/main/res/values-te/strings.xml rename to app/src/main/res/values-te/strings.xml diff --git a/commons/app/src/main/res/values-tr/error.xml b/app/src/main/res/values-tr/error.xml similarity index 100% rename from commons/app/src/main/res/values-tr/error.xml rename to app/src/main/res/values-tr/error.xml diff --git a/commons/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from commons/app/src/main/res/values-tr/strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/commons/app/src/main/res/values-uk/error.xml b/app/src/main/res/values-uk/error.xml similarity index 100% rename from commons/app/src/main/res/values-uk/error.xml rename to app/src/main/res/values-uk/error.xml diff --git a/commons/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from commons/app/src/main/res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/commons/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml similarity index 100% rename from commons/app/src/main/res/values-v14/styles.xml rename to app/src/main/res/values-v14/styles.xml diff --git a/commons/app/src/main/res/values-v9/styles.xml b/app/src/main/res/values-v9/styles.xml similarity index 100% rename from commons/app/src/main/res/values-v9/styles.xml rename to app/src/main/res/values-v9/styles.xml diff --git a/commons/app/src/main/res/values-vi/error.xml b/app/src/main/res/values-vi/error.xml similarity index 100% rename from commons/app/src/main/res/values-vi/error.xml rename to app/src/main/res/values-vi/error.xml diff --git a/commons/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from commons/app/src/main/res/values-vi/strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/commons/app/src/main/res/values-yi/error.xml b/app/src/main/res/values-yi/error.xml similarity index 100% rename from commons/app/src/main/res/values-yi/error.xml rename to app/src/main/res/values-yi/error.xml diff --git a/commons/app/src/main/res/values-yi/strings.xml b/app/src/main/res/values-yi/strings.xml similarity index 100% rename from commons/app/src/main/res/values-yi/strings.xml rename to app/src/main/res/values-yi/strings.xml diff --git a/commons/app/src/main/res/values-zh-rCN/error.xml b/app/src/main/res/values-zh-rCN/error.xml similarity index 100% rename from commons/app/src/main/res/values-zh-rCN/error.xml rename to app/src/main/res/values-zh-rCN/error.xml diff --git a/commons/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from commons/app/src/main/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/commons/app/src/main/res/values-zh-rTW/error.xml b/app/src/main/res/values-zh-rTW/error.xml similarity index 100% rename from commons/app/src/main/res/values-zh-rTW/error.xml rename to app/src/main/res/values-zh-rTW/error.xml diff --git a/commons/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from commons/app/src/main/res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/commons/app/src/main/res/values-zh/error.xml b/app/src/main/res/values-zh/error.xml similarity index 100% rename from commons/app/src/main/res/values-zh/error.xml rename to app/src/main/res/values-zh/error.xml diff --git a/commons/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml similarity index 100% rename from commons/app/src/main/res/values-zh/strings.xml rename to app/src/main/res/values-zh/strings.xml diff --git a/commons/app/src/main/res/values/error.xml b/app/src/main/res/values/error.xml similarity index 100% rename from commons/app/src/main/res/values/error.xml rename to app/src/main/res/values/error.xml diff --git a/commons/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from commons/app/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/commons/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from commons/app/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/commons/app/src/main/res/values/views.xml b/app/src/main/res/values/views.xml similarity index 100% rename from commons/app/src/main/res/values/views.xml rename to app/src/main/res/values/views.xml diff --git a/commons/app/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml similarity index 100% rename from commons/app/src/main/res/xml/authenticator.xml rename to app/src/main/res/xml/authenticator.xml diff --git a/commons/app/src/main/res/xml/campaigns_sync_adapter.xml b/app/src/main/res/xml/campaigns_sync_adapter.xml similarity index 100% rename from commons/app/src/main/res/xml/campaigns_sync_adapter.xml rename to app/src/main/res/xml/campaigns_sync_adapter.xml diff --git a/commons/app/src/main/res/xml/contributions_sync_adapter.xml b/app/src/main/res/xml/contributions_sync_adapter.xml similarity index 100% rename from commons/app/src/main/res/xml/contributions_sync_adapter.xml rename to app/src/main/res/xml/contributions_sync_adapter.xml diff --git a/commons/app/src/main/res/xml/modifications_sync_adapter.xml b/app/src/main/res/xml/modifications_sync_adapter.xml similarity index 100% rename from commons/app/src/main/res/xml/modifications_sync_adapter.xml rename to app/src/main/res/xml/modifications_sync_adapter.xml diff --git a/commons/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from commons/app/src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/commons/app/src/main/res/xml/wikimedia_licenses.xml b/app/src/main/res/xml/wikimedia_licenses.xml similarity index 100% rename from commons/app/src/main/res/xml/wikimedia_licenses.xml rename to app/src/main/res/xml/wikimedia_licenses.xml diff --git a/commons/build.gradle b/build.gradle similarity index 100% rename from commons/build.gradle rename to build.gradle diff --git a/disable-campaigns.patch b/disable-campaigns.patch index a56ea52f8..586abe1d5 100644 --- a/disable-campaigns.patch +++ b/disable-campaigns.patch @@ -1,7 +1,7 @@ -diff --git a/commons/AndroidManifest.xml b/commons/AndroidManifest.xml +diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5ad1c77..50b16ff 100644 ---- a/commons/AndroidManifest.xml -+++ b/commons/AndroidManifest.xml +--- a/app/src/main/AndroidManifest.xml ++++ b/app/src/main/AndroidManifest.xml @@ -82,14 +82,6 @@ android:label="@string/title_activity_settings" /> diff --git a/find-broken-strings-variables.sh b/find-broken-strings-variables.sh index bd8d80a15..7110fb4ab 100755 --- a/find-broken-strings-variables.sh +++ b/find-broken-strings-variables.sh @@ -2,11 +2,11 @@ # Spot malformed string replacement patterns in Android localization files. # First install Lint from the Android SDK -grep -R "%1$ s" commons/res/values* -grep -R "%1$ d" commons/res/values* -grep -R "%1" commons/res/values* | grep -v "%1\\$" +grep -R "%1$ s" res/values* +grep -R "%1$ d" res/values* +grep -R "%1" res/values* | grep -v "%1\\$" -grep -RH '%' commons/res/values* | +grep -RH '%' res/values* | sed -e 's/%/\n%/g' | # Split lines that contain several expressions grep '%' | # Filter out lines that do not contain expressions grep -v ' % ' | # Lone % character, not a variable @@ -23,10 +23,10 @@ grep -RH '%' commons/res/values* | grep -v '%20' # Ignore URL whitespace exit # Double-width percent sign -grep -R '％' commons/res/values* +grep -R '％' res/values* # Broken CDATA syntax -grep -R "CDATA " commons/res/values* +grep -R "CDATA " res/values* # Android SDK Lint (does not detect most syntax errors) lint --check StringFormatInvalid commons diff --git a/commons/gradle.properties b/gradle.properties similarity index 100% rename from commons/gradle.properties rename to gradle.properties diff --git a/commons/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from commons/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/commons/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from commons/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/commons/gradlew b/gradlew similarity index 100% rename from commons/gradlew rename to gradlew diff --git a/commons/gradlew.bat b/gradlew.bat similarity index 100% rename from commons/gradlew.bat rename to gradlew.bat diff --git a/commons/res/values-br/strings.xml b/res/values-br/strings.xml similarity index 100% rename from commons/res/values-br/strings.xml rename to res/values-br/strings.xml diff --git a/commons/res/values-ca/strings.xml b/res/values-ca/strings.xml similarity index 100% rename from commons/res/values-ca/strings.xml rename to res/values-ca/strings.xml diff --git a/commons/res/values-cs/strings.xml b/res/values-cs/strings.xml similarity index 100% rename from commons/res/values-cs/strings.xml rename to res/values-cs/strings.xml diff --git a/commons/res/values-cy/strings.xml b/res/values-cy/strings.xml similarity index 100% rename from commons/res/values-cy/strings.xml rename to res/values-cy/strings.xml diff --git a/commons/res/values-da/strings.xml b/res/values-da/strings.xml similarity index 100% rename from commons/res/values-da/strings.xml rename to res/values-da/strings.xml diff --git a/commons/res/values-de/strings.xml b/res/values-de/strings.xml similarity index 100% rename from commons/res/values-de/strings.xml rename to res/values-de/strings.xml diff --git a/commons/res/values-el/strings.xml b/res/values-el/strings.xml similarity index 100% rename from commons/res/values-el/strings.xml rename to res/values-el/strings.xml diff --git a/commons/res/values-es/strings.xml b/res/values-es/strings.xml similarity index 100% rename from commons/res/values-es/strings.xml rename to res/values-es/strings.xml diff --git a/commons/res/values-fi/strings.xml b/res/values-fi/strings.xml similarity index 100% rename from commons/res/values-fi/strings.xml rename to res/values-fi/strings.xml diff --git a/commons/res/values-fo/strings.xml b/res/values-fo/strings.xml similarity index 100% rename from commons/res/values-fo/strings.xml rename to res/values-fo/strings.xml diff --git a/commons/res/values-fr/strings.xml b/res/values-fr/strings.xml similarity index 100% rename from commons/res/values-fr/strings.xml rename to res/values-fr/strings.xml diff --git a/commons/res/values-gl/strings.xml b/res/values-gl/strings.xml similarity index 100% rename from commons/res/values-gl/strings.xml rename to res/values-gl/strings.xml diff --git a/commons/res/values-id/strings.xml b/res/values-id/strings.xml similarity index 100% rename from commons/res/values-id/strings.xml rename to res/values-id/strings.xml diff --git a/commons/res/values-it/strings.xml b/res/values-it/strings.xml similarity index 100% rename from commons/res/values-it/strings.xml rename to res/values-it/strings.xml diff --git a/commons/res/values-ja/strings.xml b/res/values-ja/strings.xml similarity index 100% rename from commons/res/values-ja/strings.xml rename to res/values-ja/strings.xml diff --git a/commons/res/values-ka/strings.xml b/res/values-ka/strings.xml similarity index 100% rename from commons/res/values-ka/strings.xml rename to res/values-ka/strings.xml diff --git a/commons/res/values-km/strings.xml b/res/values-km/strings.xml similarity index 100% rename from commons/res/values-km/strings.xml rename to res/values-km/strings.xml diff --git a/commons/res/values-ko/strings.xml b/res/values-ko/strings.xml similarity index 100% rename from commons/res/values-ko/strings.xml rename to res/values-ko/strings.xml diff --git a/commons/res/values-ky/strings.xml b/res/values-ky/strings.xml similarity index 100% rename from commons/res/values-ky/strings.xml rename to res/values-ky/strings.xml diff --git a/commons/res/values-la/strings.xml b/res/values-la/strings.xml similarity index 100% rename from commons/res/values-la/strings.xml rename to res/values-la/strings.xml diff --git a/commons/res/values-lb/strings.xml b/res/values-lb/strings.xml similarity index 100% rename from commons/res/values-lb/strings.xml rename to res/values-lb/strings.xml diff --git a/commons/res/values-mk/strings.xml b/res/values-mk/strings.xml similarity index 100% rename from commons/res/values-mk/strings.xml rename to res/values-mk/strings.xml diff --git a/commons/res/values-ml/strings.xml b/res/values-ml/strings.xml similarity index 100% rename from commons/res/values-ml/strings.xml rename to res/values-ml/strings.xml diff --git a/commons/res/values-ms/strings.xml b/res/values-ms/strings.xml similarity index 100% rename from commons/res/values-ms/strings.xml rename to res/values-ms/strings.xml diff --git a/commons/res/values-mt/strings.xml b/res/values-mt/strings.xml similarity index 100% rename from commons/res/values-mt/strings.xml rename to res/values-mt/strings.xml diff --git a/commons/res/values-nb/strings.xml b/res/values-nb/strings.xml similarity index 100% rename from commons/res/values-nb/strings.xml rename to res/values-nb/strings.xml diff --git a/commons/res/values-ne/strings.xml b/res/values-ne/strings.xml similarity index 100% rename from commons/res/values-ne/strings.xml rename to res/values-ne/strings.xml diff --git a/commons/res/values-nl/strings.xml b/res/values-nl/strings.xml similarity index 100% rename from commons/res/values-nl/strings.xml rename to res/values-nl/strings.xml diff --git a/commons/res/values-oc/strings.xml b/res/values-oc/strings.xml similarity index 100% rename from commons/res/values-oc/strings.xml rename to res/values-oc/strings.xml diff --git a/commons/res/values-or/strings.xml b/res/values-or/strings.xml similarity index 100% rename from commons/res/values-or/strings.xml rename to res/values-or/strings.xml diff --git a/commons/res/values-pa/strings.xml b/res/values-pa/strings.xml similarity index 100% rename from commons/res/values-pa/strings.xml rename to res/values-pa/strings.xml diff --git a/commons/res/values-pl/strings.xml b/res/values-pl/strings.xml similarity index 100% rename from commons/res/values-pl/strings.xml rename to res/values-pl/strings.xml diff --git a/commons/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml similarity index 100% rename from commons/res/values-pt-rBR/strings.xml rename to res/values-pt-rBR/strings.xml diff --git a/commons/res/values-pt/strings.xml b/res/values-pt/strings.xml similarity index 100% rename from commons/res/values-pt/strings.xml rename to res/values-pt/strings.xml diff --git a/commons/res/values-qq/strings.xml b/res/values-qq/strings.xml similarity index 100% rename from commons/res/values-qq/strings.xml rename to res/values-qq/strings.xml diff --git a/commons/res/values-ro/strings.xml b/res/values-ro/strings.xml similarity index 100% rename from commons/res/values-ro/strings.xml rename to res/values-ro/strings.xml diff --git a/commons/res/values-ru/strings.xml b/res/values-ru/strings.xml similarity index 100% rename from commons/res/values-ru/strings.xml rename to res/values-ru/strings.xml diff --git a/commons/res/values-sk/strings.xml b/res/values-sk/strings.xml similarity index 100% rename from commons/res/values-sk/strings.xml rename to res/values-sk/strings.xml diff --git a/commons/res/values-su/strings.xml b/res/values-su/strings.xml similarity index 100% rename from commons/res/values-su/strings.xml rename to res/values-su/strings.xml diff --git a/commons/res/values-sv/strings.xml b/res/values-sv/strings.xml similarity index 100% rename from commons/res/values-sv/strings.xml rename to res/values-sv/strings.xml diff --git a/commons/res/values-te/strings.xml b/res/values-te/strings.xml similarity index 100% rename from commons/res/values-te/strings.xml rename to res/values-te/strings.xml diff --git a/commons/res/values-tr/strings.xml b/res/values-tr/strings.xml similarity index 100% rename from commons/res/values-tr/strings.xml rename to res/values-tr/strings.xml diff --git a/commons/res/values-uk/strings.xml b/res/values-uk/strings.xml similarity index 100% rename from commons/res/values-uk/strings.xml rename to res/values-uk/strings.xml diff --git a/commons/res/values-vi/strings.xml b/res/values-vi/strings.xml similarity index 100% rename from commons/res/values-vi/strings.xml rename to res/values-vi/strings.xml diff --git a/commons/res/values-yi/strings.xml b/res/values-yi/strings.xml similarity index 100% rename from commons/res/values-yi/strings.xml rename to res/values-yi/strings.xml diff --git a/commons/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml similarity index 100% rename from commons/res/values-zh-rCN/strings.xml rename to res/values-zh-rCN/strings.xml diff --git a/commons/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml similarity index 100% rename from commons/res/values-zh-rTW/strings.xml rename to res/values-zh-rTW/strings.xml diff --git a/commons/res/values-zh/strings.xml b/res/values-zh/strings.xml similarity index 100% rename from commons/res/values-zh/strings.xml rename to res/values-zh/strings.xml diff --git a/commons/res/values/strings.xml b/res/values/strings.xml similarity index 100% rename from commons/res/values/strings.xml rename to res/values/strings.xml diff --git a/commons/settings.gradle b/settings.gradle similarity index 100% rename from commons/settings.gradle rename to settings.gradle diff --git a/update-license-info/Makefile b/update-license-info/Makefile index a234667a5..a6c96ee2a 100644 --- a/update-license-info/Makefile +++ b/update-license-info/Makefile @@ -1,9 +1,9 @@ .FAKE : build update clean install -build : ../commons/res/xml/wikimedia_licenses.xml +build : ../app/src/main/res/xml/wikimedia_licenses.xml -../commons/res/xml/wikimedia_licenses.xml : licenses.php mediawiki-extensions-UploadWizard - php licenses.php > ../commons/res/xml/wikimedia_licenses.xml +../app/src/main/res/xml/wikimedia_licenses.xml : licenses.php mediawiki-extensions-UploadWizard + php licenses.php > ../app/src/main/res/xml/wikimedia_licenses.xml mediawiki-extensions-UploadWizard : update diff --git a/upload-to-commons.patch b/upload-to-commons.patch index b96e0a4db..4f73a740b 100644 --- a/upload-to-commons.patch +++ b/upload-to-commons.patch @@ -1,7 +1,7 @@ -diff --git a/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java +diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 3fe594d..8306000 100644 ---- a/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java -+++ b/commons/src/main/java/fr/free/nrw/commons/CommonsApplication.java +--- a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java ++++ b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -45,11 +45,12 @@ public class CommonsApplication extends Application { private MWApi api;