diff --git a/.drone.yml b/.drone.yml index 1a0b70201cad..86c64520b324 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,9 +19,9 @@ steps: commands: - scripts/checkIfRunDrone.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST || exit 0 - emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 & - - sed -i s'#false#true#'g src/main/res/values/setup.xml + - sed -i s'#false#true#'g app/src/main/res/values/setup.xml - sed -i s"#server#server#" gradle.properties - - sed -i s"#1#5#" ./src/androidTest/java/com/nextcloud/client/RetryTestRule.kt + - sed -i s"#1#5#" ./app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt - ./gradlew assembleGplay - ./gradlew assembleGplayDebug - scripts/wait_for_emulator.sh @@ -101,8 +101,8 @@ steps: commands: - scripts/checkIfRunDrone.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST || exit 0 - emulator -avd android -no-snapshot -gpu swiftshader_indirect -no-window -no-audio -skin 500x833 & - - sed -i s'#false#true#'g src/main/res/values/setup.xml - - sed -i s"#1#5#" ./src/androidTest/java/com/nextcloud/client/RetryTestRule.kt + - sed -i s'#false#true#'g app/src/main/res/values/setup.xml + - sed -i s"#1#5#" ./app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt - ./gradlew assembleGplay - ./gradlew assembleGplayDebug - scripts/wait_for_emulator.sh diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 000000000000..7cc82b2f595a --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,350 @@ +import com.github.spotbugs.snom.SpotBugsTask + +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' +apply plugin: 'checkstyle' +apply plugin: 'pmd' +apply plugin: 'com.hiya.jacoco-android' +apply plugin: 'com.github.spotbugs' +apply plugin: 'io.gitlab.arturbosch.detekt' +apply plugin: 'com.github.spotbugs' + +// semantic versioning for version code +def versionMajor = 3 +def versionMinor = 16 +def versionPatch = 0 +def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable + +android { + lintOptions { + checkGeneratedSources = true + abortOnError false + htmlReport true + htmlOutput file("$project.buildDir/reports/lint/lint.html") + disable 'MissingTranslation', + 'GradleDependency', + 'VectorPath', + 'IconMissingDensityFolder', + 'IconDensities', + 'GoogleAppIndexingWarning', + 'MissingDefaultResource', + 'InvalidPeriodicWorkRequestInterval' // crashes due to a bug in lint itself + } + + dexOptions { + javaMaxHeapSize "4g" + } + + compileSdkVersion 29 + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 29 + + // arguments to be passed to functional tests + testInstrumentationRunner "com.nextcloud.client.ScreenshotTestRunner" + testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}" + testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}" + testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}" + testInstrumentationRunnerArguments disableAnalytics: 'true' + + multiDexEnabled true + + versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild + + if (versionBuild > 89) { + versionName "${versionMajor}.${versionMinor}.${versionPatch}" + } else if (versionBuild > 50) { + versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50) + } else { + versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1) + } + + // adapt structure from Eclipse to Gradle/Android Studio expectations; + // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure + + flavorDimensions "default" + + buildTypes { + debug { + testCoverageEnabled (project.hasProperty('coverage')) + } + } + + productFlavors { + // used for f-droid + generic { + applicationId 'com.nextcloud.client' + dimension "default" + } + + gplay { + applicationId 'com.nextcloud.client' + dimension "default" + } + + versionDev { + applicationId "com.nextcloud.android.beta" + dimension "default" + versionCode 20200129 + versionName "20200129" + } + + qa { + applicationId "com.nextcloud.android.qa" + dimension "default" + versionCode 1 + versionName "1" + } + } + + testOptions { + unitTests.returnDefaultValues = true + animationsDisabled true + } + } + + // adapt structure from Eclipse to Gradle/Android Studio expectations; + // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure + + dexOptions { + // Skip pre-dexing when running on CI or when disabled via -D pre-dex=false. + preDexLibraries = preDexEnabled && !ciBuild + } + + packagingOptions { + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/LICENSE' + } + + tasks.register("checkstyle", Checkstyle) { + configFile = file("${rootProject.projectDir}/checkstyle.xml") + configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath + source 'src' + include '**/*.java' + exclude '**/gen/**' + classpath = files() + } + + tasks.register("pmd", Pmd) { + ruleSetFiles = files("${project.rootDir}/ruleset.xml") + ignoreFailures = true // should continue checking + ruleSets = [] + + source 'src' + include '**/*.java' + exclude '**/gen/**' + + reports { + xml.enabled = false + html.enabled = true + xml { + destination = file("$project.buildDir/reports/pmd/pmd.xml") + } + html { + destination = file("$project.buildDir/reports/pmd/pmd.html") + } + } + } + + android.applicationVariants.all { variant -> + String variantName = variant.name + String capVariantName = variantName.substring(0, 1).toUpperCase() + variantName.substring(1) + tasks.register("spotbugs${capVariantName}Report", SpotBugsTask) { + ignoreFailures = true // should continue checking + effort = "max" + reportLevel = "medium" + classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/") + excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") + + reports { + xml.enabled = false + html { + enabled = true + destination = file("$project.buildDir/reports/spotbugs/spotbugs.html") + } + } + } + } + + check.dependsOn 'checkstyle', 'spotbugsGplayDebugReport', 'pmd', 'lint', 'ktlint', 'detekt' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + buildFeatures { + dataBinding true + viewBinding true + } +} + +configurations { + all { + exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly + + // check for updates every build + resolutionStrategy { + cacheChangingModulesFor 0, 'seconds' + exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" + } + } +} + +configurations.all { + resolutionStrategy { + cacheChangingModulesFor 0, 'seconds' + force 'org.objenesis:objenesis:2.6' + } + +} + +dependencies { + implementation 'androidx.multidex:multidex:2.0.1' + genericImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" + gplayImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" + versionDevImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" + qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" + + // upon each update first test: new registration, receive push + gplayImplementation "com.google.firebase:firebase-messaging:20.1.3" + + kapt 'javax.xml.bind:jaxb-api:2.3.1' + kapt 'org.glassfish.jaxb:jaxb-core:2.3.0.1' + kapt 'org.glassfish.jaxb:jaxb-runtime:2.3.3' + + annotationProcessor 'javax.xml.bind:jaxb-api:2.3.1' + annotationProcessor 'org.glassfish.jaxb:jaxb-core:2.3.0.1' + annotationProcessor 'org.glassfish.jaxb:jaxb-runtime:2.3.3' + + compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' // remove after entire switch to lib v2 + implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 + implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.1' // remove after entire switch to lib v2 + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.3.0' + implementation 'com.jakewharton:disklrucache:2.0.2' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.3.2' + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" + implementation "androidx.work:work-runtime:2.4.0" + implementation "androidx.work:work-runtime-ktx:2.4.0" + implementation "androidx.fragment:fragment:1.2.5" + implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7 + compileOnly 'com.google.code.findbugs:annotations:3.0.1u2' + implementation 'commons-io:commons-io:2.8.0' + implementation "com.jakewharton:butterknife:$butterknifeVersion" + kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion" + implementation 'org.greenrobot:eventbus:3.2.0' + implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.2' + implementation 'org.lukhnos:nnio:0.2' + implementation 'org.bouncycastle:bcpkix-jdk15to18:1.68' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.afollestad:sectioned-recyclerview:0.5.0' + implementation 'com.github.chrisbanes:PhotoView:2.3.0' + implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.21' + implementation 'com.github.tobiaskaminsky:qrcodescanner:0.1.2.2' // 'com.github.blikoon:QRCodeScanner:0.1.2' + implementation 'com.google.android:flexbox:2.0.1' + implementation 'org.parceler:parceler-api:1.1.13' + kapt 'org.parceler:parceler:1.1.13' + implementation('com.github.bumptech.glide:glide:3.8.0') { + exclude group: "com.android.support" + } + implementation 'com.caverock:androidsvg:1.4' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.vanniktech:emoji-google:0.7.0' + + implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:4.1.0' + implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido2:4.1.0' + + spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' + spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7' + + implementation "com.google.dagger:dagger:$daggerVersion" + implementation "com.google.dagger:dagger-android:$daggerVersion" + implementation "com.google.dagger:dagger-android-support:$daggerVersion" + kapt "com.google.dagger:dagger-compiler:$daggerVersion" + kapt "com.google.dagger:dagger-android-processor:$daggerVersion" + + ktlint "com.pinterest:ktlint:0.40.0" + implementation 'org.conscrypt:conscrypt-android:2.5.1' + + // Shimmer animation + implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0' + + // dependencies for markdown rendering + implementation "io.noties.markwon:core:$markwonVersion" + implementation "io.noties.markwon:ext-strikethrough:$markwonVersion" + implementation "io.noties.markwon:ext-tables:$markwonVersion" + implementation "io.noties.markwon:ext-tasklist:$markwonVersion" + implementation "io.noties.markwon:html:$markwonVersion" + + implementation "io.noties.markwon:syntax-highlight:$markwonVersion" + implementation "io.noties:prism4j:$prismVersion" + kapt "io.noties:prism4j-bundler:$prismVersion" + + // dependencies for local unit tests + testImplementation 'junit:junit:4.13.2' + testImplementation "org.mockito:mockito-core:$mockitoVersion" + testImplementation 'androidx.test:core:1.3.0' + testImplementation "org.powermock:powermock-core:$powermockVersion" + testImplementation "org.powermock:powermock-module-junit4:$powermockVersion" + testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" + testImplementation 'org.json:json:20201115' + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + testImplementation 'androidx.arch.core:core-testing:2.1.0' + testImplementation "io.mockk:mockk:$mockkVersion" + testImplementation "io.mockk:mockk-android:$mockkVersion" + + // dependencies for instrumented tests + // JUnit4 Rules + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test:rules:1.3.0' + // Android JUnit Runner + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestUtil 'androidx.test:orchestrator:1.3.0' + + // Espresso core + androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" + androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" + androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion" + androidTestImplementation "androidx.test.espresso:espresso-accessibility:$espressoVersion" + + // Mocking support + androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older + androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + androidTestImplementation "org.mockito:mockito-core:$mockitoVersion" + androidTestImplementation("org.mockito:mockito-android:$mockitoVersion") { + exclude group: "net.bytebuddy", module: "byte-buddy-android" + } + androidTestImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" + androidTestImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion" + androidTestImplementation "io.mockk:mockk-android:1.10.4" + androidTestImplementation 'androidx.arch.core:core-testing:2.0.1' + + // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests + // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' + // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details + //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}" + androidTestImplementation 'tools.fastlane:screengrab:2.0.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2') + + implementation "com.github.stateless4j:stateless4j:2.6.0" +} + +spotbugs { + toolVersion = '3.1.12' +} + +android.applicationVariants.all { variant -> + variant.outputs.all { output -> + outputFileName = "${output.baseName}-${variant.versionCode}.apk" + } +} diff --git a/app/checkstyle.xml b/app/checkstyle.xml new file mode 100644 index 000000000000..e32ed1b7a134 --- /dev/null +++ b/app/checkstyle.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/lint.xml b/app/lint.xml new file mode 100644 index 000000000000..01ced7493251 --- /dev/null +++ b/app/lint.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml similarity index 100% rename from src/androidTest/AndroidManifest.xml rename to app/src/androidTest/AndroidManifest.xml diff --git a/src/androidTest/assets/christine.jpg b/app/src/androidTest/assets/christine.jpg similarity index 100% rename from src/androidTest/assets/christine.jpg rename to app/src/androidTest/assets/christine.jpg diff --git a/src/androidTest/assets/decrypted.json b/app/src/androidTest/assets/decrypted.json similarity index 100% rename from src/androidTest/assets/decrypted.json rename to app/src/androidTest/assets/decrypted.json diff --git a/src/androidTest/assets/encrypted.json b/app/src/androidTest/assets/encrypted.json similarity index 100% rename from src/androidTest/assets/encrypted.json rename to app/src/androidTest/assets/encrypted.json diff --git a/src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r b/app/src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r similarity index 100% rename from src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r rename to app/src/androidTest/assets/encrypted/ia7OEEEyXMoRa1QWQk8r diff --git a/src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo b/app/src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo similarity index 100% rename from src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo rename to app/src/androidTest/assets/encrypted/n9WXAIXO2wRY4R8nXwmo diff --git a/src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r b/app/src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r similarity index 100% rename from src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r rename to app/src/androidTest/assets/ia7OEEEyXMoRa1QWQk8r diff --git a/src/androidTest/assets/image.jpg b/app/src/androidTest/assets/image.jpg similarity index 100% rename from src/androidTest/assets/image.jpg rename to app/src/androidTest/assets/image.jpg diff --git a/src/androidTest/assets/imageFile.png b/app/src/androidTest/assets/imageFile.png similarity index 100% rename from src/androidTest/assets/imageFile.png rename to app/src/androidTest/assets/imageFile.png diff --git a/src/androidTest/assets/java.md b/app/src/androidTest/assets/java.md similarity index 100% rename from src/androidTest/assets/java.md rename to app/src/androidTest/assets/java.md diff --git a/src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo b/app/src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo similarity index 100% rename from src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo rename to app/src/androidTest/assets/n9WXAIXO2wRY4R8nXwmo diff --git a/src/androidTest/assets/paulette.jpg b/app/src/androidTest/assets/paulette.jpg similarity index 100% rename from src/androidTest/assets/paulette.jpg rename to app/src/androidTest/assets/paulette.jpg diff --git a/src/androidTest/assets/srEPevoPqPZpPEaeDnS3 b/app/src/androidTest/assets/srEPevoPqPZpPEaeDnS3 similarity index 100% rename from src/androidTest/assets/srEPevoPqPZpPEaeDnS3 rename to app/src/androidTest/assets/srEPevoPqPZpPEaeDnS3 diff --git a/src/androidTest/assets/vcard.vcf b/app/src/androidTest/assets/vcard.vcf similarity index 100% rename from src/androidTest/assets/vcard.vcf rename to app/src/androidTest/assets/vcard.vcf diff --git a/src/androidTest/assets/videoFile.mp4 b/app/src/androidTest/assets/videoFile.mp4 similarity index 100% rename from src/androidTest/assets/videoFile.mp4 rename to app/src/androidTest/assets/videoFile.mp4 diff --git a/src/androidTest/disabledTests/AuthenticatorActivityTest.java b/app/src/androidTest/disabledTests/AuthenticatorActivityTest.java similarity index 100% rename from src/androidTest/disabledTests/AuthenticatorActivityTest.java rename to app/src/androidTest/disabledTests/AuthenticatorActivityTest.java diff --git a/src/androidTest/disabledTests/uiautomator/InitialTest.java b/app/src/androidTest/disabledTests/uiautomator/InitialTest.java similarity index 100% rename from src/androidTest/disabledTests/uiautomator/InitialTest.java rename to app/src/androidTest/disabledTests/uiautomator/InitialTest.java diff --git a/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/ActivitiesActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/AuthenticatorActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/CommunityActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java b/app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java rename to app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java diff --git a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java b/app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java rename to app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityScreenshotIT.java diff --git a/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/FirstRunActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt b/app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/RetryTestRule.kt rename to app/src/androidTest/java/com/nextcloud/client/RetryTestRule.kt diff --git a/src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java b/app/src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java rename to app/src/androidTest/java/com/nextcloud/client/ScreenshotTestRunner.java diff --git a/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/SettingsActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/SettingsActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/SyncedFoldersActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java b/app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java rename to app/src/androidTest/java/com/nextcloud/client/UploadListActivityActivityIT.java diff --git a/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt b/app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt rename to app/src/androidTest/java/com/nextcloud/client/account/AnonymousUserTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt b/app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt rename to app/src/androidTest/java/com/nextcloud/client/account/MockUserTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java b/app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java rename to app/src/androidTest/java/com/nextcloud/client/account/OwnCloudClientManagerTest.java diff --git a/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt b/app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt rename to app/src/androidTest/java/com/nextcloud/client/account/RegisteredUserTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java b/app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java similarity index 100% rename from src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java rename to app/src/androidTest/java/com/nextcloud/client/account/UserAccountManagerImplTest.java diff --git a/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt b/app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt rename to app/src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt rename to app/src/androidTest/java/com/nextcloud/client/files/DeepLinkHandlerTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt rename to app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt rename to app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt rename to app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt rename to app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt b/app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt rename to app/src/androidTest/java/com/nextcloud/client/integrations/deck/DeckApiTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt rename to app/src/androidTest/java/com/nextcloud/client/jobs/BackgroundJobManagerTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt b/app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt rename to app/src/androidTest/java/com/nextcloud/client/jobs/ContactsBackupIT.kt diff --git a/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt b/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt rename to app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsDbTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt rename to app/src/androidTest/java/com/nextcloud/client/migrations/MigrationsManagerTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt b/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt rename to app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferences.kt diff --git a/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt b/app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt rename to app/src/androidTest/java/com/nextcloud/client/migrations/MockSharedPreferencesTest.kt diff --git a/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt b/app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt rename to app/src/androidTest/java/com/nextcloud/client/network/ConnectivityServiceImplIT.kt diff --git a/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt b/app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt rename to app/src/androidTest/java/com/nextcloud/ui/SetStatusDialogFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/AbstractIT.java rename to app/src/androidTest/java/com/owncloud/android/AbstractIT.java diff --git a/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java rename to app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java diff --git a/src/androidTest/java/com/owncloud/android/DownloadIT.java b/app/src/androidTest/java/com/owncloud/android/DownloadIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/DownloadIT.java rename to app/src/androidTest/java/com/owncloud/android/DownloadIT.java diff --git a/src/androidTest/java/com/owncloud/android/FileIT.java b/app/src/androidTest/java/com/owncloud/android/FileIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/FileIT.java rename to app/src/androidTest/java/com/owncloud/android/FileIT.java diff --git a/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java b/app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ScreenshotsIT.java rename to app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java diff --git a/src/androidTest/java/com/owncloud/android/UploadIT.java b/app/src/androidTest/java/com/owncloud/android/UploadIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/UploadIT.java rename to app/src/androidTest/java/com/owncloud/android/UploadIT.java diff --git a/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/authentication/AuthenticatorActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt b/app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt rename to app/src/androidTest/java/com/owncloud/android/datamodel/ArbitraryDataProviderIT.kt diff --git a/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java rename to app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentProviderClientIT.java diff --git a/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.java b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.java rename to app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerContentResolverIT.java diff --git a/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java b/app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java rename to app/src/androidTest/java/com/owncloud/android/datamodel/FileDataStorageManagerIT.java diff --git a/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt b/app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt rename to app/src/androidTest/java/com/owncloud/android/datamodel/OCCapabilityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java b/app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java rename to app/src/androidTest/java/com/owncloud/android/datamodel/OCFileUnitTest.java diff --git a/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java b/app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java rename to app/src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java diff --git a/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt rename to app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt diff --git a/src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java b/app/src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java rename to app/src/androidTest/java/com/owncloud/android/operations/RemoveFileOperationIT.java diff --git a/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt b/app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt rename to app/src/androidTest/java/com/owncloud/android/providers/DocumentsProviderUtils.kt diff --git a/src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt b/app/src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt rename to app/src/androidTest/java/com/owncloud/android/providers/DocumentsStorageProviderIT.kt diff --git a/src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt b/app/src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt rename to app/src/androidTest/java/com/owncloud/android/providers/UsersAndGroupsSearchProviderIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/LoginIT.java b/app/src/androidTest/java/com/owncloud/android/ui/LoginIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/LoginIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/LoginIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/activity/ContactsPreferenceActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/DrawerActivityIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/FileDisplayActivityTest.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/FolderPickerActivityIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/ManageAccountsActivityIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/activity/PassCodeActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java b/app/src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/activity/UserInfoActivityIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java b/app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java rename to app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt b/app/src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt rename to app/src/androidTest/java/com/owncloud/android/ui/dialog/SendFilesDialogTest.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt b/app/src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt rename to app/src/androidTest/java/com/owncloud/android/ui/dialog/SendShareDialogTest.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java b/app/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java rename to app/src/androidTest/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragmentTest.java diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/ContactListFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/ContactListFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/ContactListFragmentIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/ContactListFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailFragmentStaticServerIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/helpers/FileOperationsHelperIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/helpers/FileOperationsHelperIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/helpers/FileOperationsHelperIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/helpers/FileOperationsHelperIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageFragmentIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageFragmentIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageFragmentIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewImageFragmentIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/preview/PreviewTextFileFragmentTest.java b/app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewTextFileFragmentTest.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/preview/PreviewTextFileFragmentTest.java rename to app/src/androidTest/java/com/owncloud/android/ui/preview/PreviewTextFileFragmentTest.java diff --git a/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt rename to app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt diff --git a/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt b/app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt rename to app/src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt diff --git a/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java b/app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java rename to app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java diff --git a/src/androidTest/java/com/owncloud/android/util/ErrorMessageAdapterIT.java b/app/src/androidTest/java/com/owncloud/android/util/ErrorMessageAdapterIT.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/util/ErrorMessageAdapterIT.java rename to app/src/androidTest/java/com/owncloud/android/util/ErrorMessageAdapterIT.java diff --git a/src/androidTest/java/com/owncloud/android/util/TestSorting.java b/app/src/androidTest/java/com/owncloud/android/util/TestSorting.java similarity index 100% rename from src/androidTest/java/com/owncloud/android/util/TestSorting.java rename to app/src/androidTest/java/com/owncloud/android/util/TestSorting.java diff --git a/src/androidTest/java/com/owncloud/android/utils/BitmapUtilsIT.kt b/app/src/androidTest/java/com/owncloud/android/utils/BitmapUtilsIT.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/utils/BitmapUtilsIT.kt rename to app/src/androidTest/java/com/owncloud/android/utils/BitmapUtilsIT.kt diff --git a/src/androidTest/java/com/owncloud/android/utils/FileStorageUtilsTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/FileStorageUtilsTest.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/utils/FileStorageUtilsTest.kt rename to app/src/androidTest/java/com/owncloud/android/utils/FileStorageUtilsTest.kt diff --git a/src/androidTest/java/com/owncloud/android/utils/FileUtilTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/FileUtilTest.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/utils/FileUtilTest.kt rename to app/src/androidTest/java/com/owncloud/android/utils/FileUtilTest.kt diff --git a/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt b/app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt similarity index 100% rename from src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt rename to app/src/androidTest/java/com/owncloud/android/utils/SyncedFolderUtilsTest.kt diff --git a/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml similarity index 100% rename from src/debug/AndroidManifest.xml rename to app/src/debug/AndroidManifest.xml diff --git a/src/debug/java/com/nextcloud/client/TestActivity.kt b/app/src/debug/java/com/nextcloud/client/TestActivity.kt similarity index 100% rename from src/debug/java/com/nextcloud/client/TestActivity.kt rename to app/src/debug/java/com/nextcloud/client/TestActivity.kt diff --git a/src/debug/java/com/nextcloud/client/di/BuildTypeComponentsModule.java b/app/src/debug/java/com/nextcloud/client/di/BuildTypeComponentsModule.java similarity index 100% rename from src/debug/java/com/nextcloud/client/di/BuildTypeComponentsModule.java rename to app/src/debug/java/com/nextcloud/client/di/BuildTypeComponentsModule.java diff --git a/src/debug/res/layout/avatar_fragment.xml b/app/src/debug/res/layout/avatar_fragment.xml similarity index 100% rename from src/debug/res/layout/avatar_fragment.xml rename to app/src/debug/res/layout/avatar_fragment.xml diff --git a/src/generic/fastlane/metadata/android/ar-AR/full_description.txt b/app/src/generic/fastlane/metadata/android/ar-AR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ar-AR/full_description.txt rename to app/src/generic/fastlane/metadata/android/ar-AR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/ar-AR/short_description.txt b/app/src/generic/fastlane/metadata/android/ar-AR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ar-AR/short_description.txt rename to app/src/generic/fastlane/metadata/android/ar-AR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/ar-AR/title.txt b/app/src/generic/fastlane/metadata/android/ar-AR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ar-AR/title.txt rename to app/src/generic/fastlane/metadata/android/ar-AR/title.txt diff --git a/src/generic/fastlane/metadata/android/bg-BG/short_description.txt b/app/src/generic/fastlane/metadata/android/bg-BG/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/bg-BG/short_description.txt rename to app/src/generic/fastlane/metadata/android/bg-BG/short_description.txt diff --git a/src/generic/fastlane/metadata/android/bg-BG/title.txt b/app/src/generic/fastlane/metadata/android/bg-BG/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/bg-BG/title.txt rename to app/src/generic/fastlane/metadata/android/bg-BG/title.txt diff --git a/src/generic/fastlane/metadata/android/ca/full_description.txt b/app/src/generic/fastlane/metadata/android/ca/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ca/full_description.txt rename to app/src/generic/fastlane/metadata/android/ca/full_description.txt diff --git a/src/generic/fastlane/metadata/android/ca/short_description.txt b/app/src/generic/fastlane/metadata/android/ca/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ca/short_description.txt rename to app/src/generic/fastlane/metadata/android/ca/short_description.txt diff --git a/src/generic/fastlane/metadata/android/ca/title.txt b/app/src/generic/fastlane/metadata/android/ca/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ca/title.txt rename to app/src/generic/fastlane/metadata/android/ca/title.txt diff --git a/src/generic/fastlane/metadata/android/cs-CZ/full_description.txt b/app/src/generic/fastlane/metadata/android/cs-CZ/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/cs-CZ/full_description.txt rename to app/src/generic/fastlane/metadata/android/cs-CZ/full_description.txt diff --git a/src/generic/fastlane/metadata/android/cs-CZ/short_description.txt b/app/src/generic/fastlane/metadata/android/cs-CZ/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/cs-CZ/short_description.txt rename to app/src/generic/fastlane/metadata/android/cs-CZ/short_description.txt diff --git a/src/generic/fastlane/metadata/android/cs-CZ/title.txt b/app/src/generic/fastlane/metadata/android/cs-CZ/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/cs-CZ/title.txt rename to app/src/generic/fastlane/metadata/android/cs-CZ/title.txt diff --git a/src/generic/fastlane/metadata/android/da-DK/full_description.txt b/app/src/generic/fastlane/metadata/android/da-DK/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/da-DK/full_description.txt rename to app/src/generic/fastlane/metadata/android/da-DK/full_description.txt diff --git a/src/generic/fastlane/metadata/android/da-DK/short_description.txt b/app/src/generic/fastlane/metadata/android/da-DK/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/da-DK/short_description.txt rename to app/src/generic/fastlane/metadata/android/da-DK/short_description.txt diff --git a/src/generic/fastlane/metadata/android/da-DK/title.txt b/app/src/generic/fastlane/metadata/android/da-DK/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/da-DK/title.txt rename to app/src/generic/fastlane/metadata/android/da-DK/title.txt diff --git a/src/generic/fastlane/metadata/android/de-DE/full_description.txt b/app/src/generic/fastlane/metadata/android/de-DE/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/de-DE/full_description.txt rename to app/src/generic/fastlane/metadata/android/de-DE/full_description.txt diff --git a/src/generic/fastlane/metadata/android/de-DE/short_description.txt b/app/src/generic/fastlane/metadata/android/de-DE/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/de-DE/short_description.txt rename to app/src/generic/fastlane/metadata/android/de-DE/short_description.txt diff --git a/src/generic/fastlane/metadata/android/de-DE/title.txt b/app/src/generic/fastlane/metadata/android/de-DE/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/de-DE/title.txt rename to app/src/generic/fastlane/metadata/android/de-DE/title.txt diff --git a/src/generic/fastlane/metadata/android/el-GR/full_description.txt b/app/src/generic/fastlane/metadata/android/el-GR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/el-GR/full_description.txt rename to app/src/generic/fastlane/metadata/android/el-GR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/el-GR/short_description.txt b/app/src/generic/fastlane/metadata/android/el-GR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/el-GR/short_description.txt rename to app/src/generic/fastlane/metadata/android/el-GR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/el-GR/title.txt b/app/src/generic/fastlane/metadata/android/el-GR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/el-GR/title.txt rename to app/src/generic/fastlane/metadata/android/el-GR/title.txt diff --git a/src/generic/fastlane/metadata/android/en-US/full_description.txt b/app/src/generic/fastlane/metadata/android/en-US/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/en-US/full_description.txt rename to app/src/generic/fastlane/metadata/android/en-US/full_description.txt diff --git a/src/generic/fastlane/metadata/android/en-US/short_description.txt b/app/src/generic/fastlane/metadata/android/en-US/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/en-US/short_description.txt rename to app/src/generic/fastlane/metadata/android/en-US/short_description.txt diff --git a/src/generic/fastlane/metadata/android/en-US/title.txt b/app/src/generic/fastlane/metadata/android/en-US/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/en-US/title.txt rename to app/src/generic/fastlane/metadata/android/en-US/title.txt diff --git a/src/generic/fastlane/metadata/android/es-ES/full_description.txt b/app/src/generic/fastlane/metadata/android/es-ES/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/es-ES/full_description.txt rename to app/src/generic/fastlane/metadata/android/es-ES/full_description.txt diff --git a/src/generic/fastlane/metadata/android/es-ES/short_description.txt b/app/src/generic/fastlane/metadata/android/es-ES/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/es-ES/short_description.txt rename to app/src/generic/fastlane/metadata/android/es-ES/short_description.txt diff --git a/src/generic/fastlane/metadata/android/es-ES/title.txt b/app/src/generic/fastlane/metadata/android/es-ES/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/es-ES/title.txt rename to app/src/generic/fastlane/metadata/android/es-ES/title.txt diff --git a/src/generic/fastlane/metadata/android/eu-ES/full_description.txt b/app/src/generic/fastlane/metadata/android/eu-ES/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/eu-ES/full_description.txt rename to app/src/generic/fastlane/metadata/android/eu-ES/full_description.txt diff --git a/src/generic/fastlane/metadata/android/eu-ES/short_description.txt b/app/src/generic/fastlane/metadata/android/eu-ES/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/eu-ES/short_description.txt rename to app/src/generic/fastlane/metadata/android/eu-ES/short_description.txt diff --git a/src/generic/fastlane/metadata/android/eu-ES/title.txt b/app/src/generic/fastlane/metadata/android/eu-ES/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/eu-ES/title.txt rename to app/src/generic/fastlane/metadata/android/eu-ES/title.txt diff --git a/src/generic/fastlane/metadata/android/fa-FA/full_description.txt b/app/src/generic/fastlane/metadata/android/fa-FA/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fa-FA/full_description.txt rename to app/src/generic/fastlane/metadata/android/fa-FA/full_description.txt diff --git a/src/generic/fastlane/metadata/android/fa-FA/short_description.txt b/app/src/generic/fastlane/metadata/android/fa-FA/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fa-FA/short_description.txt rename to app/src/generic/fastlane/metadata/android/fa-FA/short_description.txt diff --git a/src/generic/fastlane/metadata/android/fa-FA/title.txt b/app/src/generic/fastlane/metadata/android/fa-FA/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fa-FA/title.txt rename to app/src/generic/fastlane/metadata/android/fa-FA/title.txt diff --git a/src/generic/fastlane/metadata/android/fi-FI/full_description.txt b/app/src/generic/fastlane/metadata/android/fi-FI/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fi-FI/full_description.txt rename to app/src/generic/fastlane/metadata/android/fi-FI/full_description.txt diff --git a/src/generic/fastlane/metadata/android/fi-FI/short_description.txt b/app/src/generic/fastlane/metadata/android/fi-FI/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fi-FI/short_description.txt rename to app/src/generic/fastlane/metadata/android/fi-FI/short_description.txt diff --git a/src/generic/fastlane/metadata/android/fi-FI/title.txt b/app/src/generic/fastlane/metadata/android/fi-FI/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fi-FI/title.txt rename to app/src/generic/fastlane/metadata/android/fi-FI/title.txt diff --git a/src/generic/fastlane/metadata/android/fr-FR/full_description.txt b/app/src/generic/fastlane/metadata/android/fr-FR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fr-FR/full_description.txt rename to app/src/generic/fastlane/metadata/android/fr-FR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/fr-FR/short_description.txt b/app/src/generic/fastlane/metadata/android/fr-FR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fr-FR/short_description.txt rename to app/src/generic/fastlane/metadata/android/fr-FR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/fr-FR/title.txt b/app/src/generic/fastlane/metadata/android/fr-FR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/fr-FR/title.txt rename to app/src/generic/fastlane/metadata/android/fr-FR/title.txt diff --git a/src/generic/fastlane/metadata/android/is-IS/full_description.txt b/app/src/generic/fastlane/metadata/android/is-IS/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/is-IS/full_description.txt rename to app/src/generic/fastlane/metadata/android/is-IS/full_description.txt diff --git a/src/generic/fastlane/metadata/android/is-IS/short_description.txt b/app/src/generic/fastlane/metadata/android/is-IS/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/is-IS/short_description.txt rename to app/src/generic/fastlane/metadata/android/is-IS/short_description.txt diff --git a/src/generic/fastlane/metadata/android/is-IS/title.txt b/app/src/generic/fastlane/metadata/android/is-IS/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/is-IS/title.txt rename to app/src/generic/fastlane/metadata/android/is-IS/title.txt diff --git a/src/generic/fastlane/metadata/android/it-IT/full_description.txt b/app/src/generic/fastlane/metadata/android/it-IT/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/it-IT/full_description.txt rename to app/src/generic/fastlane/metadata/android/it-IT/full_description.txt diff --git a/src/generic/fastlane/metadata/android/it-IT/short_description.txt b/app/src/generic/fastlane/metadata/android/it-IT/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/it-IT/short_description.txt rename to app/src/generic/fastlane/metadata/android/it-IT/short_description.txt diff --git a/src/generic/fastlane/metadata/android/it-IT/title.txt b/app/src/generic/fastlane/metadata/android/it-IT/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/it-IT/title.txt rename to app/src/generic/fastlane/metadata/android/it-IT/title.txt diff --git a/src/generic/fastlane/metadata/android/ko-KR/full_description.txt b/app/src/generic/fastlane/metadata/android/ko-KR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ko-KR/full_description.txt rename to app/src/generic/fastlane/metadata/android/ko-KR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/ko-KR/short_description.txt b/app/src/generic/fastlane/metadata/android/ko-KR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ko-KR/short_description.txt rename to app/src/generic/fastlane/metadata/android/ko-KR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/ko-KR/title.txt b/app/src/generic/fastlane/metadata/android/ko-KR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/ko-KR/title.txt rename to app/src/generic/fastlane/metadata/android/ko-KR/title.txt diff --git a/src/generic/fastlane/metadata/android/lt-LT/full_description.txt b/app/src/generic/fastlane/metadata/android/lt-LT/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/lt-LT/full_description.txt rename to app/src/generic/fastlane/metadata/android/lt-LT/full_description.txt diff --git a/src/generic/fastlane/metadata/android/lt-LT/short_description.txt b/app/src/generic/fastlane/metadata/android/lt-LT/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/lt-LT/short_description.txt rename to app/src/generic/fastlane/metadata/android/lt-LT/short_description.txt diff --git a/src/generic/fastlane/metadata/android/lt-LT/title.txt b/app/src/generic/fastlane/metadata/android/lt-LT/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/lt-LT/title.txt rename to app/src/generic/fastlane/metadata/android/lt-LT/title.txt diff --git a/src/generic/fastlane/metadata/android/nl-NL/full_description.txt b/app/src/generic/fastlane/metadata/android/nl-NL/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/nl-NL/full_description.txt rename to app/src/generic/fastlane/metadata/android/nl-NL/full_description.txt diff --git a/src/generic/fastlane/metadata/android/nl-NL/short_description.txt b/app/src/generic/fastlane/metadata/android/nl-NL/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/nl-NL/short_description.txt rename to app/src/generic/fastlane/metadata/android/nl-NL/short_description.txt diff --git a/src/generic/fastlane/metadata/android/nl-NL/title.txt b/app/src/generic/fastlane/metadata/android/nl-NL/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/nl-NL/title.txt rename to app/src/generic/fastlane/metadata/android/nl-NL/title.txt diff --git a/src/generic/fastlane/metadata/android/pl-PL/full_description.txt b/app/src/generic/fastlane/metadata/android/pl-PL/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pl-PL/full_description.txt rename to app/src/generic/fastlane/metadata/android/pl-PL/full_description.txt diff --git a/src/generic/fastlane/metadata/android/pl-PL/short_description.txt b/app/src/generic/fastlane/metadata/android/pl-PL/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pl-PL/short_description.txt rename to app/src/generic/fastlane/metadata/android/pl-PL/short_description.txt diff --git a/src/generic/fastlane/metadata/android/pl-PL/title.txt b/app/src/generic/fastlane/metadata/android/pl-PL/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pl-PL/title.txt rename to app/src/generic/fastlane/metadata/android/pl-PL/title.txt diff --git a/src/generic/fastlane/metadata/android/pt-BR/full_description.txt b/app/src/generic/fastlane/metadata/android/pt-BR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-BR/full_description.txt rename to app/src/generic/fastlane/metadata/android/pt-BR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/pt-BR/short_description.txt b/app/src/generic/fastlane/metadata/android/pt-BR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-BR/short_description.txt rename to app/src/generic/fastlane/metadata/android/pt-BR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/pt-BR/title.txt b/app/src/generic/fastlane/metadata/android/pt-BR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-BR/title.txt rename to app/src/generic/fastlane/metadata/android/pt-BR/title.txt diff --git a/src/generic/fastlane/metadata/android/pt-PT/full_description.txt b/app/src/generic/fastlane/metadata/android/pt-PT/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-PT/full_description.txt rename to app/src/generic/fastlane/metadata/android/pt-PT/full_description.txt diff --git a/src/generic/fastlane/metadata/android/pt-PT/short_description.txt b/app/src/generic/fastlane/metadata/android/pt-PT/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-PT/short_description.txt rename to app/src/generic/fastlane/metadata/android/pt-PT/short_description.txt diff --git a/src/generic/fastlane/metadata/android/pt-PT/title.txt b/app/src/generic/fastlane/metadata/android/pt-PT/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/pt-PT/title.txt rename to app/src/generic/fastlane/metadata/android/pt-PT/title.txt diff --git a/src/generic/fastlane/metadata/android/sl-SL/full_description.txt b/app/src/generic/fastlane/metadata/android/sl-SL/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sl-SL/full_description.txt rename to app/src/generic/fastlane/metadata/android/sl-SL/full_description.txt diff --git a/src/generic/fastlane/metadata/android/sl-SL/short_description.txt b/app/src/generic/fastlane/metadata/android/sl-SL/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sl-SL/short_description.txt rename to app/src/generic/fastlane/metadata/android/sl-SL/short_description.txt diff --git a/src/generic/fastlane/metadata/android/sl-SL/title.txt b/app/src/generic/fastlane/metadata/android/sl-SL/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sl-SL/title.txt rename to app/src/generic/fastlane/metadata/android/sl-SL/title.txt diff --git a/src/generic/fastlane/metadata/android/sr-SR/full_description.txt b/app/src/generic/fastlane/metadata/android/sr-SR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sr-SR/full_description.txt rename to app/src/generic/fastlane/metadata/android/sr-SR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/sr-SR/short_description.txt b/app/src/generic/fastlane/metadata/android/sr-SR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sr-SR/short_description.txt rename to app/src/generic/fastlane/metadata/android/sr-SR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/sr-SR/title.txt b/app/src/generic/fastlane/metadata/android/sr-SR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sr-SR/title.txt rename to app/src/generic/fastlane/metadata/android/sr-SR/title.txt diff --git a/src/generic/fastlane/metadata/android/sv-SE/full_description.txt b/app/src/generic/fastlane/metadata/android/sv-SE/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sv-SE/full_description.txt rename to app/src/generic/fastlane/metadata/android/sv-SE/full_description.txt diff --git a/src/generic/fastlane/metadata/android/sv-SE/short_description.txt b/app/src/generic/fastlane/metadata/android/sv-SE/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sv-SE/short_description.txt rename to app/src/generic/fastlane/metadata/android/sv-SE/short_description.txt diff --git a/src/generic/fastlane/metadata/android/sv-SE/title.txt b/app/src/generic/fastlane/metadata/android/sv-SE/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/sv-SE/title.txt rename to app/src/generic/fastlane/metadata/android/sv-SE/title.txt diff --git a/src/generic/fastlane/metadata/android/tr-TR/full_description.txt b/app/src/generic/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/tr-TR/full_description.txt rename to app/src/generic/fastlane/metadata/android/tr-TR/full_description.txt diff --git a/src/generic/fastlane/metadata/android/tr-TR/short_description.txt b/app/src/generic/fastlane/metadata/android/tr-TR/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/tr-TR/short_description.txt rename to app/src/generic/fastlane/metadata/android/tr-TR/short_description.txt diff --git a/src/generic/fastlane/metadata/android/tr-TR/title.txt b/app/src/generic/fastlane/metadata/android/tr-TR/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/tr-TR/title.txt rename to app/src/generic/fastlane/metadata/android/tr-TR/title.txt diff --git a/src/generic/fastlane/metadata/android/uk-UK/full_description.txt b/app/src/generic/fastlane/metadata/android/uk-UK/full_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/uk-UK/full_description.txt rename to app/src/generic/fastlane/metadata/android/uk-UK/full_description.txt diff --git a/src/generic/fastlane/metadata/android/uk-UK/short_description.txt b/app/src/generic/fastlane/metadata/android/uk-UK/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/uk-UK/short_description.txt rename to app/src/generic/fastlane/metadata/android/uk-UK/short_description.txt diff --git a/src/generic/fastlane/metadata/android/uk-UK/title.txt b/app/src/generic/fastlane/metadata/android/uk-UK/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/uk-UK/title.txt rename to app/src/generic/fastlane/metadata/android/uk-UK/title.txt diff --git a/src/generic/fastlane/metadata/android/vi-VI/short_description.txt b/app/src/generic/fastlane/metadata/android/vi-VI/short_description.txt similarity index 100% rename from src/generic/fastlane/metadata/android/vi-VI/short_description.txt rename to app/src/generic/fastlane/metadata/android/vi-VI/short_description.txt diff --git a/src/generic/fastlane/metadata/android/vi-VI/title.txt b/app/src/generic/fastlane/metadata/android/vi-VI/title.txt similarity index 100% rename from src/generic/fastlane/metadata/android/vi-VI/title.txt rename to app/src/generic/fastlane/metadata/android/vi-VI/title.txt diff --git a/src/generic/google-services.json b/app/src/generic/google-services.json similarity index 100% rename from src/generic/google-services.json rename to app/src/generic/google-services.json diff --git a/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java similarity index 100% rename from src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java rename to app/src/generic/java/com/nextcloud/client/di/VariantComponentsModule.java diff --git a/src/generic/java/com/owncloud/android/utils/PushUtils.java b/app/src/generic/java/com/owncloud/android/utils/PushUtils.java similarity index 100% rename from src/generic/java/com/owncloud/android/utils/PushUtils.java rename to app/src/generic/java/com/owncloud/android/utils/PushUtils.java diff --git a/src/generic/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java similarity index 100% rename from src/generic/java/com/owncloud/android/utils/SecurityUtils.java rename to app/src/generic/java/com/owncloud/android/utils/SecurityUtils.java diff --git a/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml similarity index 100% rename from src/gplay/AndroidManifest.xml rename to app/src/gplay/AndroidManifest.xml diff --git a/src/gplay/google-services.json b/app/src/gplay/google-services.json similarity index 100% rename from src/gplay/google-services.json rename to app/src/gplay/google-services.json diff --git a/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java similarity index 100% rename from src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java rename to app/src/gplay/java/com/nextcloud/client/di/VariantComponentsModule.java diff --git a/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java b/app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java similarity index 100% rename from src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java rename to app/src/gplay/java/com/owncloud/android/authentication/ModifiedAuthenticatorActivity.java diff --git a/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java b/app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java similarity index 100% rename from src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java rename to app/src/gplay/java/com/owncloud/android/services/firebase/NCFirebaseMessagingService.java diff --git a/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.java b/app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.java similarity index 100% rename from src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.java rename to app/src/gplay/java/com/owncloud/android/utils/GooglePlayUtils.java diff --git a/src/gplay/java/com/owncloud/android/utils/PushUtils.java b/app/src/gplay/java/com/owncloud/android/utils/PushUtils.java similarity index 100% rename from src/gplay/java/com/owncloud/android/utils/PushUtils.java rename to app/src/gplay/java/com/owncloud/android/utils/PushUtils.java diff --git a/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java similarity index 100% rename from src/gplay/java/com/owncloud/android/utils/SecurityUtils.java rename to app/src/gplay/java/com/owncloud/android/utils/SecurityUtils.java diff --git a/src/gplay/res/values/setup.xml b/app/src/gplay/res/values/setup.xml similarity index 100% rename from src/gplay/res/values/setup.xml rename to app/src/gplay/res/values/setup.xml diff --git a/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl b/app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl similarity index 100% rename from src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl rename to app/src/main/aidl/com/nextcloud/android/sso/aidl/IInputStreamService.aidl diff --git a/src/main/ic_launcher-web-round.png b/app/src/main/ic_launcher-web-round.png similarity index 100% rename from src/main/ic_launcher-web-round.png rename to app/src/main/ic_launcher-web-round.png diff --git a/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png similarity index 100% rename from src/main/ic_launcher-web.png rename to app/src/main/ic_launcher-web.png diff --git a/src/main/java/com/nextcloud/android/sso/Constants.java b/app/src/main/java/com/nextcloud/android/sso/Constants.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/Constants.java rename to app/src/main/java/com/nextcloud/android/sso/Constants.java diff --git a/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java b/app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/InputStreamBinder.java rename to app/src/main/java/com/nextcloud/android/sso/InputStreamBinder.java diff --git a/src/main/java/com/nextcloud/android/sso/PlainHeader.java b/app/src/main/java/com/nextcloud/android/sso/PlainHeader.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/PlainHeader.java rename to app/src/main/java/com/nextcloud/android/sso/PlainHeader.java diff --git a/src/main/java/com/nextcloud/android/sso/Response.java b/app/src/main/java/com/nextcloud/android/sso/Response.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/Response.java rename to app/src/main/java/com/nextcloud/android/sso/Response.java diff --git a/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java b/app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java rename to app/src/main/java/com/nextcloud/android/sso/aidl/IThreadListener.java diff --git a/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java b/app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java rename to app/src/main/java/com/nextcloud/android/sso/aidl/NextcloudRequest.java diff --git a/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java b/app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java similarity index 100% rename from src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java rename to app/src/main/java/com/nextcloud/android/sso/aidl/ParcelFileDescriptorUtil.java diff --git a/src/main/java/com/nextcloud/client/account/AnonymousUser.kt b/app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt similarity index 100% rename from src/main/java/com/nextcloud/client/account/AnonymousUser.kt rename to app/src/main/java/com/nextcloud/client/account/AnonymousUser.kt diff --git a/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java b/app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java similarity index 100% rename from src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java rename to app/src/main/java/com/nextcloud/client/account/CurrentAccountProvider.java diff --git a/src/main/java/com/nextcloud/client/account/MockUser.kt b/app/src/main/java/com/nextcloud/client/account/MockUser.kt similarity index 100% rename from src/main/java/com/nextcloud/client/account/MockUser.kt rename to app/src/main/java/com/nextcloud/client/account/MockUser.kt diff --git a/src/main/java/com/nextcloud/client/account/RegisteredUser.kt b/app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt similarity index 100% rename from src/main/java/com/nextcloud/client/account/RegisteredUser.kt rename to app/src/main/java/com/nextcloud/client/account/RegisteredUser.kt diff --git a/src/main/java/com/nextcloud/client/account/Server.kt b/app/src/main/java/com/nextcloud/client/account/Server.kt similarity index 100% rename from src/main/java/com/nextcloud/client/account/Server.kt rename to app/src/main/java/com/nextcloud/client/account/Server.kt diff --git a/src/main/java/com/nextcloud/client/account/User.kt b/app/src/main/java/com/nextcloud/client/account/User.kt similarity index 100% rename from src/main/java/com/nextcloud/client/account/User.kt rename to app/src/main/java/com/nextcloud/client/account/User.kt diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManager.java b/app/src/main/java/com/nextcloud/client/account/UserAccountManager.java similarity index 100% rename from src/main/java/com/nextcloud/client/account/UserAccountManager.java rename to app/src/main/java/com/nextcloud/client/account/UserAccountManager.java diff --git a/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java b/app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java rename to app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java diff --git a/src/main/java/com/nextcloud/client/appinfo/AppInfo.java b/app/src/main/java/com/nextcloud/client/appinfo/AppInfo.java similarity index 100% rename from src/main/java/com/nextcloud/client/appinfo/AppInfo.java rename to app/src/main/java/com/nextcloud/client/appinfo/AppInfo.java diff --git a/src/main/java/com/nextcloud/client/appinfo/AppInfoImpl.java b/app/src/main/java/com/nextcloud/client/appinfo/AppInfoImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/appinfo/AppInfoImpl.java rename to app/src/main/java/com/nextcloud/client/appinfo/AppInfoImpl.java diff --git a/src/main/java/com/nextcloud/client/appinfo/AppInfoModule.java b/app/src/main/java/com/nextcloud/client/appinfo/AppInfoModule.java similarity index 100% rename from src/main/java/com/nextcloud/client/appinfo/AppInfoModule.java rename to app/src/main/java/com/nextcloud/client/appinfo/AppInfoModule.java diff --git a/src/main/java/com/nextcloud/client/core/AsyncRunner.kt b/app/src/main/java/com/nextcloud/client/core/AsyncRunner.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/AsyncRunner.kt rename to app/src/main/java/com/nextcloud/client/core/AsyncRunner.kt diff --git a/src/main/java/com/nextcloud/client/core/Cancellable.kt b/app/src/main/java/com/nextcloud/client/core/Cancellable.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/Cancellable.kt rename to app/src/main/java/com/nextcloud/client/core/Cancellable.kt diff --git a/src/main/java/com/nextcloud/client/core/Clock.kt b/app/src/main/java/com/nextcloud/client/core/Clock.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/Clock.kt rename to app/src/main/java/com/nextcloud/client/core/Clock.kt diff --git a/src/main/java/com/nextcloud/client/core/ClockImpl.kt b/app/src/main/java/com/nextcloud/client/core/ClockImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/ClockImpl.kt rename to app/src/main/java/com/nextcloud/client/core/ClockImpl.kt diff --git a/src/main/java/com/nextcloud/client/core/LocalBinder.kt b/app/src/main/java/com/nextcloud/client/core/LocalBinder.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/LocalBinder.kt rename to app/src/main/java/com/nextcloud/client/core/LocalBinder.kt diff --git a/src/main/java/com/nextcloud/client/core/LocalConnection.kt b/app/src/main/java/com/nextcloud/client/core/LocalConnection.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/LocalConnection.kt rename to app/src/main/java/com/nextcloud/client/core/LocalConnection.kt diff --git a/src/main/java/com/nextcloud/client/core/ManualAsyncRunner.kt b/app/src/main/java/com/nextcloud/client/core/ManualAsyncRunner.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/ManualAsyncRunner.kt rename to app/src/main/java/com/nextcloud/client/core/ManualAsyncRunner.kt diff --git a/src/main/java/com/nextcloud/client/core/Task.kt b/app/src/main/java/com/nextcloud/client/core/Task.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/Task.kt rename to app/src/main/java/com/nextcloud/client/core/Task.kt diff --git a/src/main/java/com/nextcloud/client/core/ThreadPoolAsyncRunner.kt b/app/src/main/java/com/nextcloud/client/core/ThreadPoolAsyncRunner.kt similarity index 100% rename from src/main/java/com/nextcloud/client/core/ThreadPoolAsyncRunner.kt rename to app/src/main/java/com/nextcloud/client/core/ThreadPoolAsyncRunner.kt diff --git a/src/main/java/com/nextcloud/client/device/BatteryStatus.kt b/app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt similarity index 100% rename from src/main/java/com/nextcloud/client/device/BatteryStatus.kt rename to app/src/main/java/com/nextcloud/client/device/BatteryStatus.kt diff --git a/src/main/java/com/nextcloud/client/device/DeviceInfo.kt b/app/src/main/java/com/nextcloud/client/device/DeviceInfo.kt similarity index 100% rename from src/main/java/com/nextcloud/client/device/DeviceInfo.kt rename to app/src/main/java/com/nextcloud/client/device/DeviceInfo.kt diff --git a/src/main/java/com/nextcloud/client/device/DeviceModule.kt b/app/src/main/java/com/nextcloud/client/device/DeviceModule.kt similarity index 100% rename from src/main/java/com/nextcloud/client/device/DeviceModule.kt rename to app/src/main/java/com/nextcloud/client/device/DeviceModule.kt diff --git a/src/main/java/com/nextcloud/client/device/Package.md b/app/src/main/java/com/nextcloud/client/device/Package.md similarity index 100% rename from src/main/java/com/nextcloud/client/device/Package.md rename to app/src/main/java/com/nextcloud/client/device/Package.md diff --git a/src/main/java/com/nextcloud/client/device/PowerManagementService.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt similarity index 100% rename from src/main/java/com/nextcloud/client/device/PowerManagementService.kt rename to app/src/main/java/com/nextcloud/client/device/PowerManagementService.kt diff --git a/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt b/app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt rename to app/src/main/java/com/nextcloud/client/device/PowerManagementServiceImpl.kt diff --git a/src/main/java/com/nextcloud/client/di/ActivityInjector.java b/app/src/main/java/com/nextcloud/client/di/ActivityInjector.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/ActivityInjector.java rename to app/src/main/java/com/nextcloud/client/di/ActivityInjector.java diff --git a/src/main/java/com/nextcloud/client/di/AppComponent.java b/app/src/main/java/com/nextcloud/client/di/AppComponent.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/AppComponent.java rename to app/src/main/java/com/nextcloud/client/di/AppComponent.java diff --git a/src/main/java/com/nextcloud/client/di/AppModule.java b/app/src/main/java/com/nextcloud/client/di/AppModule.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/AppModule.java rename to app/src/main/java/com/nextcloud/client/di/AppModule.java diff --git a/src/main/java/com/nextcloud/client/di/ComponentsModule.java b/app/src/main/java/com/nextcloud/client/di/ComponentsModule.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/ComponentsModule.java rename to app/src/main/java/com/nextcloud/client/di/ComponentsModule.java diff --git a/src/main/java/com/nextcloud/client/di/FragmentInjector.java b/app/src/main/java/com/nextcloud/client/di/FragmentInjector.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/FragmentInjector.java rename to app/src/main/java/com/nextcloud/client/di/FragmentInjector.java diff --git a/src/main/java/com/nextcloud/client/di/Injectable.java b/app/src/main/java/com/nextcloud/client/di/Injectable.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/Injectable.java rename to app/src/main/java/com/nextcloud/client/di/Injectable.java diff --git a/src/main/java/com/nextcloud/client/di/InjectorNotFoundException.java b/app/src/main/java/com/nextcloud/client/di/InjectorNotFoundException.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/InjectorNotFoundException.java rename to app/src/main/java/com/nextcloud/client/di/InjectorNotFoundException.java diff --git a/src/main/java/com/nextcloud/client/di/ViewModelFactory.kt b/app/src/main/java/com/nextcloud/client/di/ViewModelFactory.kt similarity index 100% rename from src/main/java/com/nextcloud/client/di/ViewModelFactory.kt rename to app/src/main/java/com/nextcloud/client/di/ViewModelFactory.kt diff --git a/src/main/java/com/nextcloud/client/di/ViewModelKey.kt b/app/src/main/java/com/nextcloud/client/di/ViewModelKey.kt similarity index 100% rename from src/main/java/com/nextcloud/client/di/ViewModelKey.kt rename to app/src/main/java/com/nextcloud/client/di/ViewModelKey.kt diff --git a/src/main/java/com/nextcloud/client/di/ViewModelModule.kt b/app/src/main/java/com/nextcloud/client/di/ViewModelModule.kt similarity index 100% rename from src/main/java/com/nextcloud/client/di/ViewModelModule.kt rename to app/src/main/java/com/nextcloud/client/di/ViewModelModule.kt diff --git a/src/main/java/com/nextcloud/client/di/package-info.java b/app/src/main/java/com/nextcloud/client/di/package-info.java similarity index 100% rename from src/main/java/com/nextcloud/client/di/package-info.java rename to app/src/main/java/com/nextcloud/client/di/package-info.java diff --git a/src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt b/app/src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt similarity index 100% rename from src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt rename to app/src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt diff --git a/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt b/app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt similarity index 100% rename from src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt rename to app/src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmActivity.kt b/app/src/main/java/com/nextcloud/client/etm/EtmActivity.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmActivity.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmActivity.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmBaseFragment.kt b/app/src/main/java/com/nextcloud/client/etm/EtmBaseFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmBaseFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmBaseFragment.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmMenuAdapter.kt b/app/src/main/java/com/nextcloud/client/etm/EtmMenuAdapter.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmMenuAdapter.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmMenuAdapter.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmMenuEntry.kt b/app/src/main/java/com/nextcloud/client/etm/EtmMenuEntry.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmMenuEntry.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmMenuEntry.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmMenuFragment.kt b/app/src/main/java/com/nextcloud/client/etm/EtmMenuFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmMenuFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmMenuFragment.kt diff --git a/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt b/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/EtmViewModel.kt rename to app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt diff --git a/src/main/java/com/nextcloud/client/etm/pages/EtmAccountsFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmAccountsFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/pages/EtmAccountsFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/pages/EtmAccountsFragment.kt diff --git a/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/pages/EtmBackgroundJobsFragment.kt diff --git a/src/main/java/com/nextcloud/client/etm/pages/EtmDownloaderFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmDownloaderFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/pages/EtmDownloaderFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/pages/EtmDownloaderFragment.kt diff --git a/src/main/java/com/nextcloud/client/etm/pages/EtmMigrations.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmMigrations.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/pages/EtmMigrations.kt rename to app/src/main/java/com/nextcloud/client/etm/pages/EtmMigrations.kt diff --git a/src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt rename to app/src/main/java/com/nextcloud/client/etm/pages/EtmPreferencesFragment.kt diff --git a/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt b/app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt rename to app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/Direction.kt b/app/src/main/java/com/nextcloud/client/files/downloader/Direction.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/Direction.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/Direction.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt b/app/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/DownloaderService.kt b/app/src/main/java/com/nextcloud/client/files/downloader/DownloaderService.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/DownloaderService.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/DownloaderService.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/Registry.kt b/app/src/main/java/com/nextcloud/client/files/downloader/Registry.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/Registry.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/Registry.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/Request.kt b/app/src/main/java/com/nextcloud/client/files/downloader/Request.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/Request.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/Request.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/Transfer.kt b/app/src/main/java/com/nextcloud/client/files/downloader/Transfer.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/Transfer.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/Transfer.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/TransferManager.kt b/app/src/main/java/com/nextcloud/client/files/downloader/TransferManager.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/TransferManager.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/TransferManager.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/TransferManagerConnection.kt b/app/src/main/java/com/nextcloud/client/files/downloader/TransferManagerConnection.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/TransferManagerConnection.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/TransferManagerConnection.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/TransferManagerImpl.kt b/app/src/main/java/com/nextcloud/client/files/downloader/TransferManagerImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/TransferManagerImpl.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/TransferManagerImpl.kt diff --git a/src/main/java/com/nextcloud/client/files/downloader/TransferState.kt b/app/src/main/java/com/nextcloud/client/files/downloader/TransferState.kt similarity index 100% rename from src/main/java/com/nextcloud/client/files/downloader/TransferState.kt rename to app/src/main/java/com/nextcloud/client/files/downloader/TransferState.kt diff --git a/src/main/java/com/nextcloud/client/integrations/IntegrationsModule.kt b/app/src/main/java/com/nextcloud/client/integrations/IntegrationsModule.kt similarity index 100% rename from src/main/java/com/nextcloud/client/integrations/IntegrationsModule.kt rename to app/src/main/java/com/nextcloud/client/integrations/IntegrationsModule.kt diff --git a/src/main/java/com/nextcloud/client/integrations/Package.md b/app/src/main/java/com/nextcloud/client/integrations/Package.md similarity index 100% rename from src/main/java/com/nextcloud/client/integrations/Package.md rename to app/src/main/java/com/nextcloud/client/integrations/Package.md diff --git a/src/main/java/com/nextcloud/client/integrations/deck/DeckApi.java b/app/src/main/java/com/nextcloud/client/integrations/deck/DeckApi.java similarity index 100% rename from src/main/java/com/nextcloud/client/integrations/deck/DeckApi.java rename to app/src/main/java/com/nextcloud/client/integrations/deck/DeckApi.java diff --git a/src/main/java/com/nextcloud/client/integrations/deck/DeckApiImpl.java b/app/src/main/java/com/nextcloud/client/integrations/deck/DeckApiImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/integrations/deck/DeckApiImpl.java rename to app/src/main/java/com/nextcloud/client/integrations/deck/DeckApiImpl.java diff --git a/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt b/app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/AccountRemovalWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt rename to app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt diff --git a/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt rename to app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManager.kt diff --git a/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt rename to app/src/main/java/com/nextcloud/client/jobs/BackgroundJobManagerImpl.kt diff --git a/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/ContactsImportWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/ContentObserverWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/JobInfo.kt b/app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/JobInfo.kt rename to app/src/main/java/com/nextcloud/client/jobs/JobInfo.kt diff --git a/src/main/java/com/nextcloud/client/jobs/JobsModule.kt b/app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/JobsModule.kt rename to app/src/main/java/com/nextcloud/client/jobs/JobsModule.kt diff --git a/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt b/app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt b/app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/NotificationWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt rename to app/src/main/java/com/nextcloud/client/jobs/OfflineSyncWork.kt diff --git a/src/main/java/com/nextcloud/client/jobs/TestJob.kt b/app/src/main/java/com/nextcloud/client/jobs/TestJob.kt similarity index 100% rename from src/main/java/com/nextcloud/client/jobs/TestJob.kt rename to app/src/main/java/com/nextcloud/client/jobs/TestJob.kt diff --git a/src/main/java/com/nextcloud/client/logger/FileLogHandler.kt b/app/src/main/java/com/nextcloud/client/logger/FileLogHandler.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/FileLogHandler.kt rename to app/src/main/java/com/nextcloud/client/logger/FileLogHandler.kt diff --git a/src/main/java/com/nextcloud/client/logger/LegacyLoggerAdapter.kt b/app/src/main/java/com/nextcloud/client/logger/LegacyLoggerAdapter.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/LegacyLoggerAdapter.kt rename to app/src/main/java/com/nextcloud/client/logger/LegacyLoggerAdapter.kt diff --git a/src/main/java/com/nextcloud/client/logger/Level.kt b/app/src/main/java/com/nextcloud/client/logger/Level.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/Level.kt rename to app/src/main/java/com/nextcloud/client/logger/Level.kt diff --git a/src/main/java/com/nextcloud/client/logger/LogEntry.kt b/app/src/main/java/com/nextcloud/client/logger/LogEntry.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/LogEntry.kt rename to app/src/main/java/com/nextcloud/client/logger/LogEntry.kt diff --git a/src/main/java/com/nextcloud/client/logger/Logger.kt b/app/src/main/java/com/nextcloud/client/logger/Logger.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/Logger.kt rename to app/src/main/java/com/nextcloud/client/logger/Logger.kt diff --git a/src/main/java/com/nextcloud/client/logger/LoggerImpl.kt b/app/src/main/java/com/nextcloud/client/logger/LoggerImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/LoggerImpl.kt rename to app/src/main/java/com/nextcloud/client/logger/LoggerImpl.kt diff --git a/src/main/java/com/nextcloud/client/logger/LogsRepository.kt b/app/src/main/java/com/nextcloud/client/logger/LogsRepository.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/LogsRepository.kt rename to app/src/main/java/com/nextcloud/client/logger/LogsRepository.kt diff --git a/src/main/java/com/nextcloud/client/logger/ThreadLoop.kt b/app/src/main/java/com/nextcloud/client/logger/ThreadLoop.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ThreadLoop.kt rename to app/src/main/java/com/nextcloud/client/logger/ThreadLoop.kt diff --git a/src/main/java/com/nextcloud/client/logger/ui/AsyncFilter.kt b/app/src/main/java/com/nextcloud/client/logger/ui/AsyncFilter.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ui/AsyncFilter.kt rename to app/src/main/java/com/nextcloud/client/logger/ui/AsyncFilter.kt diff --git a/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt rename to app/src/main/java/com/nextcloud/client/logger/ui/LogsActivity.kt diff --git a/src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt rename to app/src/main/java/com/nextcloud/client/logger/ui/LogsAdapter.kt diff --git a/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt rename to app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt diff --git a/src/main/java/com/nextcloud/client/logger/ui/LogsViewModel.kt b/app/src/main/java/com/nextcloud/client/logger/ui/LogsViewModel.kt similarity index 100% rename from src/main/java/com/nextcloud/client/logger/ui/LogsViewModel.kt rename to app/src/main/java/com/nextcloud/client/logger/ui/LogsViewModel.kt diff --git a/src/main/java/com/nextcloud/client/media/AudioFocus.kt b/app/src/main/java/com/nextcloud/client/media/AudioFocus.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/AudioFocus.kt rename to app/src/main/java/com/nextcloud/client/media/AudioFocus.kt diff --git a/src/main/java/com/nextcloud/client/media/AudioFocusManager.kt b/app/src/main/java/com/nextcloud/client/media/AudioFocusManager.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/AudioFocusManager.kt rename to app/src/main/java/com/nextcloud/client/media/AudioFocusManager.kt diff --git a/src/main/java/com/nextcloud/client/media/ErrorFormat.kt b/app/src/main/java/com/nextcloud/client/media/ErrorFormat.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/ErrorFormat.kt rename to app/src/main/java/com/nextcloud/client/media/ErrorFormat.kt diff --git a/src/main/java/com/nextcloud/client/media/LoadUrlTask.kt b/app/src/main/java/com/nextcloud/client/media/LoadUrlTask.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/LoadUrlTask.kt rename to app/src/main/java/com/nextcloud/client/media/LoadUrlTask.kt diff --git a/src/main/java/com/nextcloud/client/media/Player.kt b/app/src/main/java/com/nextcloud/client/media/Player.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/Player.kt rename to app/src/main/java/com/nextcloud/client/media/Player.kt diff --git a/src/main/java/com/nextcloud/client/media/PlayerError.kt b/app/src/main/java/com/nextcloud/client/media/PlayerError.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/PlayerError.kt rename to app/src/main/java/com/nextcloud/client/media/PlayerError.kt diff --git a/src/main/java/com/nextcloud/client/media/PlayerService.kt b/app/src/main/java/com/nextcloud/client/media/PlayerService.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/PlayerService.kt rename to app/src/main/java/com/nextcloud/client/media/PlayerService.kt diff --git a/src/main/java/com/nextcloud/client/media/PlayerServiceConnection.kt b/app/src/main/java/com/nextcloud/client/media/PlayerServiceConnection.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/PlayerServiceConnection.kt rename to app/src/main/java/com/nextcloud/client/media/PlayerServiceConnection.kt diff --git a/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt b/app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt rename to app/src/main/java/com/nextcloud/client/media/PlayerStateMachine.kt diff --git a/src/main/java/com/nextcloud/client/media/PlaylistItem.kt b/app/src/main/java/com/nextcloud/client/media/PlaylistItem.kt similarity index 100% rename from src/main/java/com/nextcloud/client/media/PlaylistItem.kt rename to app/src/main/java/com/nextcloud/client/media/PlaylistItem.kt diff --git a/src/main/java/com/nextcloud/client/migrations/MigrationError.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/MigrationError.kt rename to app/src/main/java/com/nextcloud/client/migrations/MigrationError.kt diff --git a/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt rename to app/src/main/java/com/nextcloud/client/migrations/MigrationInfo.kt diff --git a/src/main/java/com/nextcloud/client/migrations/Migrations.kt b/app/src/main/java/com/nextcloud/client/migrations/Migrations.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/Migrations.kt rename to app/src/main/java/com/nextcloud/client/migrations/Migrations.kt diff --git a/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt rename to app/src/main/java/com/nextcloud/client/migrations/MigrationsDb.kt diff --git a/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt rename to app/src/main/java/com/nextcloud/client/migrations/MigrationsManager.kt diff --git a/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt b/app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt rename to app/src/main/java/com/nextcloud/client/migrations/MigrationsManagerImpl.kt diff --git a/src/main/java/com/nextcloud/client/migrations/Package.md b/app/src/main/java/com/nextcloud/client/migrations/Package.md similarity index 100% rename from src/main/java/com/nextcloud/client/migrations/Package.md rename to app/src/main/java/com/nextcloud/client/migrations/Package.md diff --git a/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt b/app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt similarity index 100% rename from src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt rename to app/src/main/java/com/nextcloud/client/mixins/ActivityMixin.kt diff --git a/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt b/app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt similarity index 100% rename from src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt rename to app/src/main/java/com/nextcloud/client/mixins/MixinRegistry.kt diff --git a/src/main/java/com/nextcloud/client/mixins/Package.md b/app/src/main/java/com/nextcloud/client/mixins/Package.md similarity index 100% rename from src/main/java/com/nextcloud/client/mixins/Package.md rename to app/src/main/java/com/nextcloud/client/mixins/Package.md diff --git a/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt b/app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt similarity index 100% rename from src/main/java/com/nextcloud/client/mixins/SessionMixin.kt rename to app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt diff --git a/src/main/java/com/nextcloud/client/network/ClientFactory.java b/app/src/main/java/com/nextcloud/client/network/ClientFactory.java similarity index 100% rename from src/main/java/com/nextcloud/client/network/ClientFactory.java rename to app/src/main/java/com/nextcloud/client/network/ClientFactory.java diff --git a/src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java b/app/src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java rename to app/src/main/java/com/nextcloud/client/network/ClientFactoryImpl.java diff --git a/src/main/java/com/nextcloud/client/network/Connectivity.kt b/app/src/main/java/com/nextcloud/client/network/Connectivity.kt similarity index 100% rename from src/main/java/com/nextcloud/client/network/Connectivity.kt rename to app/src/main/java/com/nextcloud/client/network/Connectivity.kt diff --git a/src/main/java/com/nextcloud/client/network/ConnectivityService.java b/app/src/main/java/com/nextcloud/client/network/ConnectivityService.java similarity index 100% rename from src/main/java/com/nextcloud/client/network/ConnectivityService.java rename to app/src/main/java/com/nextcloud/client/network/ConnectivityService.java diff --git a/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java b/app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java rename to app/src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java diff --git a/src/main/java/com/nextcloud/client/network/NetworkModule.java b/app/src/main/java/com/nextcloud/client/network/NetworkModule.java similarity index 100% rename from src/main/java/com/nextcloud/client/network/NetworkModule.java rename to app/src/main/java/com/nextcloud/client/network/NetworkModule.java diff --git a/src/main/java/com/nextcloud/client/notifications/AppNotificationManager.kt b/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManager.kt similarity index 100% rename from src/main/java/com/nextcloud/client/notifications/AppNotificationManager.kt rename to app/src/main/java/com/nextcloud/client/notifications/AppNotificationManager.kt diff --git a/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt b/app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt rename to app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt diff --git a/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java b/app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java similarity index 100% rename from src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java rename to app/src/main/java/com/nextcloud/client/onboarding/FirstRunActivity.java diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingModule.kt b/app/src/main/java/com/nextcloud/client/onboarding/OnboardingModule.kt similarity index 100% rename from src/main/java/com/nextcloud/client/onboarding/OnboardingModule.kt rename to app/src/main/java/com/nextcloud/client/onboarding/OnboardingModule.kt diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingService.kt b/app/src/main/java/com/nextcloud/client/onboarding/OnboardingService.kt similarity index 100% rename from src/main/java/com/nextcloud/client/onboarding/OnboardingService.kt rename to app/src/main/java/com/nextcloud/client/onboarding/OnboardingService.kt diff --git a/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt b/app/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt similarity index 100% rename from src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt rename to app/src/main/java/com/nextcloud/client/onboarding/OnboardingServiceImpl.kt diff --git a/src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java b/app/src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java similarity index 100% rename from src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java rename to app/src/main/java/com/nextcloud/client/onboarding/WhatsNewActivity.java diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java similarity index 100% rename from src/main/java/com/nextcloud/client/preferences/AppPreferences.java rename to app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java similarity index 100% rename from src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java rename to app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java diff --git a/src/main/java/com/nextcloud/client/preferences/DarkMode.java b/app/src/main/java/com/nextcloud/client/preferences/DarkMode.java similarity index 100% rename from src/main/java/com/nextcloud/client/preferences/DarkMode.java rename to app/src/main/java/com/nextcloud/client/preferences/DarkMode.java diff --git a/src/main/java/com/nextcloud/client/preferences/PreferencesModule.java b/app/src/main/java/com/nextcloud/client/preferences/PreferencesModule.java similarity index 100% rename from src/main/java/com/nextcloud/client/preferences/PreferencesModule.java rename to app/src/main/java/com/nextcloud/client/preferences/PreferencesModule.java diff --git a/src/main/java/com/nextcloud/java/util/Optional.java b/app/src/main/java/com/nextcloud/java/util/Optional.java similarity index 100% rename from src/main/java/com/nextcloud/java/util/Optional.java rename to app/src/main/java/com/nextcloud/java/util/Optional.java diff --git a/src/main/java/com/nextcloud/java/util/function/Predicate.java b/app/src/main/java/com/nextcloud/java/util/function/Predicate.java similarity index 100% rename from src/main/java/com/nextcloud/java/util/function/Predicate.java rename to app/src/main/java/com/nextcloud/java/util/function/Predicate.java diff --git a/src/main/java/com/nextcloud/java/util/package-info.java b/app/src/main/java/com/nextcloud/java/util/package-info.java similarity index 100% rename from src/main/java/com/nextcloud/java/util/package-info.java rename to app/src/main/java/com/nextcloud/java/util/package-info.java diff --git a/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt b/app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt rename to app/src/main/java/com/nextcloud/ui/ChooseAccountDialogFragment.kt diff --git a/src/main/java/com/nextcloud/ui/ClearStatusTask.kt b/app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/ClearStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/ClearStatusTask.kt diff --git a/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt b/app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/SetPredefinedCustomStatusTask.kt diff --git a/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt rename to app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt diff --git a/src/main/java/com/nextcloud/ui/SetStatusTask.kt b/app/src/main/java/com/nextcloud/ui/SetStatusTask.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/SetStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/SetStatusTask.kt diff --git a/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt b/app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt similarity index 100% rename from src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt rename to app/src/main/java/com/nextcloud/ui/SetUserDefinedCustomStatusTask.kt diff --git a/src/main/java/com/nextcloud/ui/SquareLoaderImageView.java b/app/src/main/java/com/nextcloud/ui/SquareLoaderImageView.java similarity index 100% rename from src/main/java/com/nextcloud/ui/SquareLoaderImageView.java rename to app/src/main/java/com/nextcloud/ui/SquareLoaderImageView.java diff --git a/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java similarity index 100% rename from src/main/java/com/owncloud/android/MainApp.java rename to app/src/main/java/com/owncloud/android/MainApp.java diff --git a/src/main/java/com/owncloud/android/authentication/AccountAuthenticator.java b/app/src/main/java/com/owncloud/android/authentication/AccountAuthenticator.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AccountAuthenticator.java rename to app/src/main/java/com/owncloud/android/authentication/AccountAuthenticator.java diff --git a/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java rename to app/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorActivity.java diff --git a/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorService.java b/app/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorService.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AccountAuthenticatorService.java rename to app/src/main/java/com/owncloud/android/authentication/AccountAuthenticatorService.java diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java rename to app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.java rename to app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.java diff --git a/src/main/java/com/owncloud/android/authentication/AuthenticatorUrlUtils.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorUrlUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/AuthenticatorUrlUtils.java rename to app/src/main/java/com/owncloud/android/authentication/AuthenticatorUrlUtils.java diff --git a/src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.java b/app/src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.java rename to app/src/main/java/com/owncloud/android/authentication/DeepLinkLoginActivity.java diff --git a/src/main/java/com/owncloud/android/authentication/LoginUrlInfo.java b/app/src/main/java/com/owncloud/android/authentication/LoginUrlInfo.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/LoginUrlInfo.java rename to app/src/main/java/com/owncloud/android/authentication/LoginUrlInfo.java diff --git a/src/main/java/com/owncloud/android/authentication/PassCodeManager.java b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.java similarity index 100% rename from src/main/java/com/owncloud/android/authentication/PassCodeManager.java rename to app/src/main/java/com/owncloud/android/authentication/PassCodeManager.java diff --git a/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java b/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java rename to app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataProvider.java diff --git a/src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt b/app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt rename to app/src/main/java/com/owncloud/android/datamodel/ArbitraryDataSet.kt diff --git a/src/main/java/com/owncloud/android/datamodel/DecryptedFolderMetadata.java b/app/src/main/java/com/owncloud/android/datamodel/DecryptedFolderMetadata.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/DecryptedFolderMetadata.java rename to app/src/main/java/com/owncloud/android/datamodel/DecryptedFolderMetadata.java diff --git a/src/main/java/com/owncloud/android/datamodel/DecryptedPushMessage.java b/app/src/main/java/com/owncloud/android/datamodel/DecryptedPushMessage.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/DecryptedPushMessage.java rename to app/src/main/java/com/owncloud/android/datamodel/DecryptedPushMessage.java diff --git a/src/main/java/com/owncloud/android/datamodel/EncryptedFolderMetadata.java b/app/src/main/java/com/owncloud/android/datamodel/EncryptedFolderMetadata.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/EncryptedFolderMetadata.java rename to app/src/main/java/com/owncloud/android/datamodel/EncryptedFolderMetadata.java diff --git a/src/main/java/com/owncloud/android/datamodel/ExternalLinksProvider.java b/app/src/main/java/com/owncloud/android/datamodel/ExternalLinksProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/ExternalLinksProvider.java rename to app/src/main/java/com/owncloud/android/datamodel/ExternalLinksProvider.java diff --git a/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java rename to app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java diff --git a/src/main/java/com/owncloud/android/datamodel/FileSystemDataSet.java b/app/src/main/java/com/owncloud/android/datamodel/FileSystemDataSet.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/FileSystemDataSet.java rename to app/src/main/java/com/owncloud/android/datamodel/FileSystemDataSet.java diff --git a/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java b/app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java rename to app/src/main/java/com/owncloud/android/datamodel/FilesystemDataProvider.java diff --git a/src/main/java/com/owncloud/android/datamodel/MediaFolder.java b/app/src/main/java/com/owncloud/android/datamodel/MediaFolder.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/MediaFolder.java rename to app/src/main/java/com/owncloud/android/datamodel/MediaFolder.java diff --git a/src/main/java/com/owncloud/android/datamodel/MediaFolderType.java b/app/src/main/java/com/owncloud/android/datamodel/MediaFolderType.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/MediaFolderType.java rename to app/src/main/java/com/owncloud/android/datamodel/MediaFolderType.java diff --git a/src/main/java/com/owncloud/android/datamodel/MediaFoldersModel.java b/app/src/main/java/com/owncloud/android/datamodel/MediaFoldersModel.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/MediaFoldersModel.java rename to app/src/main/java/com/owncloud/android/datamodel/MediaFoldersModel.java diff --git a/src/main/java/com/owncloud/android/datamodel/MediaProvider.java b/app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/MediaProvider.java rename to app/src/main/java/com/owncloud/android/datamodel/MediaProvider.java diff --git a/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/OCFile.java rename to app/src/main/java/com/owncloud/android/datamodel/OCFile.java diff --git a/src/main/java/com/owncloud/android/datamodel/PushConfigurationState.java b/app/src/main/java/com/owncloud/android/datamodel/PushConfigurationState.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/PushConfigurationState.java rename to app/src/main/java/com/owncloud/android/datamodel/PushConfigurationState.java diff --git a/src/main/java/com/owncloud/android/datamodel/SignatureVerification.java b/app/src/main/java/com/owncloud/android/datamodel/SignatureVerification.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/SignatureVerification.java rename to app/src/main/java/com/owncloud/android/datamodel/SignatureVerification.java diff --git a/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/SyncedFolder.java rename to app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java diff --git a/src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java rename to app/src/main/java/com/owncloud/android/datamodel/SyncedFolderDisplayItem.java diff --git a/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java b/app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java rename to app/src/main/java/com/owncloud/android/datamodel/SyncedFolderProvider.java diff --git a/src/main/java/com/owncloud/android/datamodel/Template.java b/app/src/main/java/com/owncloud/android/datamodel/Template.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/Template.java rename to app/src/main/java/com/owncloud/android/datamodel/Template.java diff --git a/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java b/app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java rename to app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java diff --git a/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java rename to app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java diff --git a/src/main/java/com/owncloud/android/datamodel/VirtualFolderType.java b/app/src/main/java/com/owncloud/android/datamodel/VirtualFolderType.java similarity index 100% rename from src/main/java/com/owncloud/android/datamodel/VirtualFolderType.java rename to app/src/main/java/com/owncloud/android/datamodel/VirtualFolderType.java diff --git a/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java b/app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/DataStorageProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/StoragePoint.java b/app/src/main/java/com/owncloud/android/datastorage/StoragePoint.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/StoragePoint.java rename to app/src/main/java/com/owncloud/android/datastorage/StoragePoint.java diff --git a/src/main/java/com/owncloud/android/datastorage/UniqueStorageList.java b/app/src/main/java/com/owncloud/android/datastorage/UniqueStorageList.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/UniqueStorageList.java rename to app/src/main/java/com/owncloud/android/datastorage/UniqueStorageList.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java b/app/src/main/java/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/IStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/IStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/IStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/IStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java b/app/src/main/java/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java rename to app/src/main/java/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java diff --git a/src/main/java/com/owncloud/android/db/OCUpload.java b/app/src/main/java/com/owncloud/android/db/OCUpload.java similarity index 100% rename from src/main/java/com/owncloud/android/db/OCUpload.java rename to app/src/main/java/com/owncloud/android/db/OCUpload.java diff --git a/src/main/java/com/owncloud/android/db/OCUploadComparator.kt b/app/src/main/java/com/owncloud/android/db/OCUploadComparator.kt similarity index 100% rename from src/main/java/com/owncloud/android/db/OCUploadComparator.kt rename to app/src/main/java/com/owncloud/android/db/OCUploadComparator.kt diff --git a/src/main/java/com/owncloud/android/db/ProviderMeta.java b/app/src/main/java/com/owncloud/android/db/ProviderMeta.java similarity index 100% rename from src/main/java/com/owncloud/android/db/ProviderMeta.java rename to app/src/main/java/com/owncloud/android/db/ProviderMeta.java diff --git a/src/main/java/com/owncloud/android/db/UploadResult.java b/app/src/main/java/com/owncloud/android/db/UploadResult.java similarity index 100% rename from src/main/java/com/owncloud/android/db/UploadResult.java rename to app/src/main/java/com/owncloud/android/db/UploadResult.java diff --git a/src/main/java/com/owncloud/android/features/FeatureItem.java b/app/src/main/java/com/owncloud/android/features/FeatureItem.java similarity index 100% rename from src/main/java/com/owncloud/android/features/FeatureItem.java rename to app/src/main/java/com/owncloud/android/features/FeatureItem.java diff --git a/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java b/app/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java similarity index 100% rename from src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java rename to app/src/main/java/com/owncloud/android/files/BootupBroadcastReceiver.java diff --git a/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java b/app/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java rename to app/src/main/java/com/owncloud/android/files/CreateFileFromTemplateOperation.java diff --git a/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java b/app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/files/FetchTemplateOperation.java rename to app/src/main/java/com/owncloud/android/files/FetchTemplateOperation.java diff --git a/src/main/java/com/owncloud/android/files/FileMenuFilter.java b/app/src/main/java/com/owncloud/android/files/FileMenuFilter.java similarity index 100% rename from src/main/java/com/owncloud/android/files/FileMenuFilter.java rename to app/src/main/java/com/owncloud/android/files/FileMenuFilter.java diff --git a/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java b/app/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java rename to app/src/main/java/com/owncloud/android/files/StreamMediaFileOperation.java diff --git a/src/main/java/com/owncloud/android/files/services/FileDownloader.java b/app/src/main/java/com/owncloud/android/files/services/FileDownloader.java similarity index 100% rename from src/main/java/com/owncloud/android/files/services/FileDownloader.java rename to app/src/main/java/com/owncloud/android/files/services/FileDownloader.java diff --git a/src/main/java/com/owncloud/android/files/services/FileUploader.java b/app/src/main/java/com/owncloud/android/files/services/FileUploader.java similarity index 100% rename from src/main/java/com/owncloud/android/files/services/FileUploader.java rename to app/src/main/java/com/owncloud/android/files/services/FileUploader.java diff --git a/src/main/java/com/owncloud/android/files/services/IndexedForest.java b/app/src/main/java/com/owncloud/android/files/services/IndexedForest.java similarity index 100% rename from src/main/java/com/owncloud/android/files/services/IndexedForest.java rename to app/src/main/java/com/owncloud/android/files/services/IndexedForest.java diff --git a/src/main/java/com/owncloud/android/jobs/OfflineSyncJob.java b/app/src/main/java/com/owncloud/android/jobs/OfflineSyncJob.java similarity index 100% rename from src/main/java/com/owncloud/android/jobs/OfflineSyncJob.java rename to app/src/main/java/com/owncloud/android/jobs/OfflineSyncJob.java diff --git a/src/main/java/com/owncloud/android/media/MediaControlView.java b/app/src/main/java/com/owncloud/android/media/MediaControlView.java similarity index 100% rename from src/main/java/com/owncloud/android/media/MediaControlView.java rename to app/src/main/java/com/owncloud/android/media/MediaControlView.java diff --git a/src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java b/app/src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java rename to app/src/main/java/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java diff --git a/src/main/java/com/owncloud/android/operations/CommentFileOperation.java b/app/src/main/java/com/owncloud/android/operations/CommentFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CommentFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/CommentFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/CopyFileOperation.java b/app/src/main/java/com/owncloud/android/operations/CopyFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CopyFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/CopyFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CreateFolderOperation.java rename to app/src/main/java/com/owncloud/android/operations/CreateFolderOperation.java diff --git a/src/main/java/com/owncloud/android/operations/CreateShareViaLinkOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateShareViaLinkOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CreateShareViaLinkOperation.java rename to app/src/main/java/com/owncloud/android/operations/CreateShareViaLinkOperation.java diff --git a/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java b/app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java rename to app/src/main/java/com/owncloud/android/operations/CreateShareWithShareeOperation.java diff --git a/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java rename to app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java diff --git a/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/DownloadFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java b/app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java rename to app/src/main/java/com/owncloud/android/operations/GetCapabilitiesOperation.java diff --git a/src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java b/app/src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java rename to app/src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java diff --git a/src/main/java/com/owncloud/android/operations/GetSharesForFileOperation.java b/app/src/main/java/com/owncloud/android/operations/GetSharesForFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/GetSharesForFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/GetSharesForFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/GetUserProfileOperation.java b/app/src/main/java/com/owncloud/android/operations/GetUserProfileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/GetUserProfileOperation.java rename to app/src/main/java/com/owncloud/android/operations/GetUserProfileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/MoveFileOperation.java b/app/src/main/java/com/owncloud/android/operations/MoveFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/MoveFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/MoveFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java rename to app/src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RemoteOperationFailedException.java b/app/src/main/java/com/owncloud/android/operations/RemoteOperationFailedException.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RemoteOperationFailedException.java rename to app/src/main/java/com/owncloud/android/operations/RemoteOperationFailedException.java diff --git a/src/main/java/com/owncloud/android/operations/RemoveFileOperation.java b/app/src/main/java/com/owncloud/android/operations/RemoveFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RemoveFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/RemoveFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.java b/app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RenameFileOperation.java b/app/src/main/java/com/owncloud/android/operations/RenameFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RenameFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/RenameFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java b/app/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java rename to app/src/main/java/com/owncloud/android/operations/RichDocumentsCreateAssetOperation.java diff --git a/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java b/app/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java rename to app/src/main/java/com/owncloud/android/operations/RichDocumentsUrlOperation.java diff --git a/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java b/app/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java rename to app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UnshareOperation.java b/app/src/main/java/com/owncloud/android/operations/UnshareOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UnshareOperation.java rename to app/src/main/java/com/owncloud/android/operations/UnshareOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UpdateNoteForShareOperation.java b/app/src/main/java/com/owncloud/android/operations/UpdateNoteForShareOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UpdateNoteForShareOperation.java rename to app/src/main/java/com/owncloud/android/operations/UpdateNoteForShareOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UpdateOCVersionOperation.java b/app/src/main/java/com/owncloud/android/operations/UpdateOCVersionOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UpdateOCVersionOperation.java rename to app/src/main/java/com/owncloud/android/operations/UpdateOCVersionOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UpdateSharePermissionsOperation.java b/app/src/main/java/com/owncloud/android/operations/UpdateSharePermissionsOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UpdateSharePermissionsOperation.java rename to app/src/main/java/com/owncloud/android/operations/UpdateSharePermissionsOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java b/app/src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java rename to app/src/main/java/com/owncloud/android/operations/UpdateShareViaLinkOperation.java diff --git a/src/main/java/com/owncloud/android/operations/UploadException.java b/app/src/main/java/com/owncloud/android/operations/UploadException.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UploadException.java rename to app/src/main/java/com/owncloud/android/operations/UploadException.java diff --git a/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/UploadFileOperation.java rename to app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java diff --git a/src/main/java/com/owncloud/android/operations/common/SyncOperation.java b/app/src/main/java/com/owncloud/android/operations/common/SyncOperation.java similarity index 100% rename from src/main/java/com/owncloud/android/operations/common/SyncOperation.java rename to app/src/main/java/com/owncloud/android/operations/common/SyncOperation.java diff --git a/src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java b/app/src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java rename to app/src/main/java/com/owncloud/android/providers/DiskLruImageCacheFileProvider.java diff --git a/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java b/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java rename to app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java diff --git a/src/main/java/com/owncloud/android/providers/FileContentProvider.java b/app/src/main/java/com/owncloud/android/providers/FileContentProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/providers/FileContentProvider.java rename to app/src/main/java/com/owncloud/android/providers/FileContentProvider.java diff --git a/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java b/app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java similarity index 100% rename from src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java rename to app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java diff --git a/src/main/java/com/owncloud/android/services/AccountManagerService.java b/app/src/main/java/com/owncloud/android/services/AccountManagerService.java similarity index 100% rename from src/main/java/com/owncloud/android/services/AccountManagerService.java rename to app/src/main/java/com/owncloud/android/services/AccountManagerService.java diff --git a/src/main/java/com/owncloud/android/services/OperationsService.java b/app/src/main/java/com/owncloud/android/services/OperationsService.java similarity index 100% rename from src/main/java/com/owncloud/android/services/OperationsService.java rename to app/src/main/java/com/owncloud/android/services/OperationsService.java diff --git a/src/main/java/com/owncloud/android/services/SyncFolderHandler.java b/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java similarity index 100% rename from src/main/java/com/owncloud/android/services/SyncFolderHandler.java rename to app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java diff --git a/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java similarity index 97% rename from src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java rename to app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java index f1fe97818ad6..6186a2434e92 100644 --- a/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -1,111 +1,111 @@ -/* - * ownCloud Android client application - * - * @author sassman - * @author David A. Velasco - * @author Andy Scherzinger - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2015 ownCloud Inc. - * Copyright (C) 2019 Andy Scherzinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.owncloud.android.syncadapter; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.accounts.AuthenticatorException; -import android.accounts.OperationCanceledException; -import android.content.AbstractThreadedSyncAdapter; -import android.content.ContentProviderClient; -import android.content.Context; - -import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.lib.common.OwnCloudAccount; -import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; -import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; - -import java.io.IOException; - -/** - * Base synchronization adapter for ownCloud designed to be subclassed for different - * resource types, like FileSync, ConcatsSync, CalendarSync, etc.. - * - * Implements the standard {@link AbstractThreadedSyncAdapter}. - */ -abstract class AbstractOwnCloudSyncAdapter extends - AbstractThreadedSyncAdapter { - - private AccountManager accountManager; - private Account account; - private ContentProviderClient contentProviderClient; - private FileDataStorageManager storageManager; - - private OwnCloudClient client; - - AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) { - super(context, autoInitialize); - this.setAccountManager(AccountManager.get(context)); - } - - AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, - boolean allowParallelSyncs) { - super(context, autoInitialize, allowParallelSyncs); - this.setAccountManager(AccountManager.get(context)); - } - - void initClientForCurrentAccount() throws OperationCanceledException, - AuthenticatorException, IOException, AccountNotFoundException { - OwnCloudAccount ocAccount = new OwnCloudAccount(account, getContext()); - client = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, getContext()); - } - - public AccountManager getAccountManager() { - return this.accountManager; - } - - public Account getAccount() { - return this.account; - } - - public ContentProviderClient getContentProviderClient() { - return this.contentProviderClient; - } - - public FileDataStorageManager getStorageManager() { - return this.storageManager; - } - - protected OwnCloudClient getClient() { - return this.client; - } - - public void setAccountManager(AccountManager accountManager) { - this.accountManager = accountManager; - } - - public void setAccount(Account account) { - this.account = account; - } - - public void setContentProviderClient(ContentProviderClient contentProviderClient) { - this.contentProviderClient = contentProviderClient; - } - - public void setStorageManager(FileDataStorageManager storageManager) { - this.storageManager = storageManager; - } -} +/* + * ownCloud Android client application + * + * @author sassman + * @author David A. Velasco + * @author Andy Scherzinger + * Copyright (C) 2011 Bartek Przybylski + * Copyright (C) 2015 ownCloud Inc. + * Copyright (C) 2019 Andy Scherzinger + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.owncloud.android.syncadapter; + +import android.accounts.Account; +import android.accounts.AccountManager; +import android.accounts.AuthenticatorException; +import android.accounts.OperationCanceledException; +import android.content.AbstractThreadedSyncAdapter; +import android.content.ContentProviderClient; +import android.content.Context; + +import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.lib.common.OwnCloudAccount; +import com.owncloud.android.lib.common.OwnCloudClient; +import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; +import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException; + +import java.io.IOException; + +/** + * Base synchronization adapter for ownCloud designed to be subclassed for different + * resource types, like FileSync, ConcatsSync, CalendarSync, etc.. + * + * Implements the standard {@link AbstractThreadedSyncAdapter}. + */ +abstract class AbstractOwnCloudSyncAdapter extends + AbstractThreadedSyncAdapter { + + private AccountManager accountManager; + private Account account; + private ContentProviderClient contentProviderClient; + private FileDataStorageManager storageManager; + + private OwnCloudClient client; + + AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize) { + super(context, autoInitialize); + this.setAccountManager(AccountManager.get(context)); + } + + AbstractOwnCloudSyncAdapter(Context context, boolean autoInitialize, + boolean allowParallelSyncs) { + super(context, autoInitialize, allowParallelSyncs); + this.setAccountManager(AccountManager.get(context)); + } + + void initClientForCurrentAccount() throws OperationCanceledException, + AuthenticatorException, IOException, AccountNotFoundException { + OwnCloudAccount ocAccount = new OwnCloudAccount(account, getContext()); + client = OwnCloudClientManagerFactory.getDefaultSingleton(). + getClientFor(ocAccount, getContext()); + } + + public AccountManager getAccountManager() { + return this.accountManager; + } + + public Account getAccount() { + return this.account; + } + + public ContentProviderClient getContentProviderClient() { + return this.contentProviderClient; + } + + public FileDataStorageManager getStorageManager() { + return this.storageManager; + } + + protected OwnCloudClient getClient() { + return this.client; + } + + public void setAccountManager(AccountManager accountManager) { + this.accountManager = accountManager; + } + + public void setAccount(Account account) { + this.account = account; + } + + public void setContentProviderClient(ContentProviderClient contentProviderClient) { + this.contentProviderClient = contentProviderClient; + } + + public void setStorageManager(FileDataStorageManager storageManager) { + this.storageManager = storageManager; + } +} diff --git a/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java rename to app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java diff --git a/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java similarity index 96% rename from src/main/java/com/owncloud/android/syncadapter/FileSyncService.java rename to app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java index d565796c6019..fd9b44b54c32 100644 --- a/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java +++ b/app/src/main/java/com/owncloud/android/syncadapter/FileSyncService.java @@ -1,59 +1,59 @@ -/* - * ownCloud Android client application - * - * @author Bartek Przybylski - * @author David A. Velasco - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2015 ownCloud Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.owncloud.android.syncadapter; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; - -/** - * Background service for synchronizing remote files with their local state. - * - * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. - */ -public class FileSyncService extends Service { - - // Storage for an instance of the sync adapter - private static FileSyncAdapter syncAdapter; - // Object to use as a thread-safe lock - private static final Object syncAdapterLock = new Object(); - - /* - * {@inheritDoc} - */ - @Override - public void onCreate() { - synchronized (syncAdapterLock) { - if (syncAdapter == null) { - syncAdapter = new FileSyncAdapter(getApplicationContext(), true); - } - } - } - - /* - * {@inheritDoc} - */ - @Override - public IBinder onBind(Intent intent) { - return syncAdapter.getSyncAdapterBinder(); - } - -} +/* + * ownCloud Android client application + * + * @author Bartek Przybylski + * @author David A. Velasco + * Copyright (C) 2011 Bartek Przybylski + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.owncloud.android.syncadapter; + +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; + +/** + * Background service for synchronizing remote files with their local state. + * + * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. + */ +public class FileSyncService extends Service { + + // Storage for an instance of the sync adapter + private static FileSyncAdapter syncAdapter; + // Object to use as a thread-safe lock + private static final Object syncAdapterLock = new Object(); + + /* + * {@inheritDoc} + */ + @Override + public void onCreate() { + synchronized (syncAdapterLock) { + if (syncAdapter == null) { + syncAdapter = new FileSyncAdapter(getApplicationContext(), true); + } + } + } + + /* + * {@inheritDoc} + */ + @Override + public IBinder onBind(Intent intent) { + return syncAdapter.getSyncAdapterBinder(); + } + +} diff --git a/src/main/java/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java b/app/src/main/java/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java rename to app/src/main/java/com/owncloud/android/ui/CheckBoxPreferenceWithLongTitle.java diff --git a/src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java b/app/src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java rename to app/src/main/java/com/owncloud/android/ui/EmptyRecyclerView.java diff --git a/src/main/java/com/owncloud/android/ui/ExtendedListView.java b/app/src/main/java/com/owncloud/android/ui/ExtendedListView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/ExtendedListView.java rename to app/src/main/java/com/owncloud/android/ui/ExtendedListView.java diff --git a/src/main/java/com/owncloud/android/ui/PreferenceWithLongSummary.java b/app/src/main/java/com/owncloud/android/ui/PreferenceWithLongSummary.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/PreferenceWithLongSummary.java rename to app/src/main/java/com/owncloud/android/ui/PreferenceWithLongSummary.java diff --git a/src/main/java/com/owncloud/android/ui/SquareImageView.java b/app/src/main/java/com/owncloud/android/ui/SquareImageView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/SquareImageView.java rename to app/src/main/java/com/owncloud/android/ui/SquareImageView.java diff --git a/src/main/java/com/owncloud/android/ui/SquareLinearLayout.java b/app/src/main/java/com/owncloud/android/ui/SquareLinearLayout.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/SquareLinearLayout.java rename to app/src/main/java/com/owncloud/android/ui/SquareLinearLayout.java diff --git a/src/main/java/com/owncloud/android/ui/StatusDrawable.java b/app/src/main/java/com/owncloud/android/ui/StatusDrawable.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/StatusDrawable.java rename to app/src/main/java/com/owncloud/android/ui/StatusDrawable.java diff --git a/src/main/java/com/owncloud/android/ui/TextDrawable.java b/app/src/main/java/com/owncloud/android/ui/TextDrawable.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/TextDrawable.java rename to app/src/main/java/com/owncloud/android/ui/TextDrawable.java diff --git a/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java b/app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java rename to app/src/main/java/com/owncloud/android/ui/ThemeableSwitchPreference.java diff --git a/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java rename to app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java rename to app/src/main/java/com/owncloud/android/ui/activities/ActivitiesContract.java diff --git a/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java b/app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java rename to app/src/main/java/com/owncloud/android/ui/activities/ActivitiesPresenter.java diff --git a/src/main/java/com/owncloud/android/ui/activities/StickyHeaderItemDecoration.java b/app/src/main/java/com/owncloud/android/ui/activities/StickyHeaderItemDecoration.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/StickyHeaderItemDecoration.java rename to app/src/main/java/com/owncloud/android/ui/activities/StickyHeaderItemDecoration.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesRepository.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApi.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivitiesServiceApiImpl.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/activities/ActivityRepositories.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepository.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/files/FileRepositories.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesRepository.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApi.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/files/FilesServiceApiImpl.java diff --git a/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java b/app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java rename to app/src/main/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepository.java diff --git a/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/BaseActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java b/app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java rename to app/src/main/java/com/owncloud/android/ui/activity/ComponentsGetter.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/CopyToClipboardActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/EditorWebView.java rename to app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java rename to app/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java diff --git a/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/FileActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/FilePickerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FilePickerActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/FilePickerActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/FilePickerActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/HookActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/HookActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/HookActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/HookActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ManageSpaceActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java b/app/src/main/java/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java rename to app/src/main/java/com/owncloud/android/ui/activity/OnEnforceableRefreshListener.java diff --git a/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/PassCodeActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/RequestCredentialsActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.java rename to app/src/main/java/com/owncloud/android/ui/activity/RichDocumentsEditorWebView.java diff --git a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ShareActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java b/app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/StorageMigration.java rename to app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java diff --git a/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt b/app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt rename to app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt diff --git a/src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ThemedPreferenceActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java diff --git a/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java rename to app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ActivityAndVersionListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/CertificateCombinedExceptionViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java b/app/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java rename to app/src/main/java/com/owncloud/android/ui/adapter/DiskLruImageCache.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/FeaturesViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/FeaturesViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/FeaturesViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/FeaturesViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/FeaturesWebViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/FeaturesWebViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/FeaturesWebViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/FeaturesWebViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/FileDetailTabAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/FilterableListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/FilterableListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/FilterableListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/FilterableListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/InternalShareViewHolder.java b/app/src/main/java/com/owncloud/android/ui/adapter/InternalShareViewHolder.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/InternalShareViewHolder.java rename to app/src/main/java/com/owncloud/android/ui/adapter/InternalShareViewHolder.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java b/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java rename to app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/NewLinkShareViewHolder.java b/app/src/main/java/com/owncloud/android/ui/adapter/NewLinkShareViewHolder.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/NewLinkShareViewHolder.java rename to app/src/main/java/com/owncloud/android/ui/adapter/NewLinkShareViewHolder.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusClickListener.kt b/app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusClickListener.kt similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusClickListener.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusClickListener.kt diff --git a/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusListAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusListAdapter.kt similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusListAdapter.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusListAdapter.kt diff --git a/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt rename to app/src/main/java/com/owncloud/android/ui/adapter/PredefinedStatusViewHolder.kt diff --git a/src/main/java/com/owncloud/android/ui/adapter/PrintAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/PrintAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/PrintAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/PrintAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java b/app/src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ProgressListener.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/RichDocumentsTemplateAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/RichDocumentsTemplateAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/RichDocumentsTemplateAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/RichDocumentsTemplateAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/SendButtonAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/SendButtonAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/SendButtonAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/SendButtonAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java b/app/src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapterListener.java b/app/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapterListener.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapterListener.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ShareeListAdapterListener.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/SslCertificateViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/SslErrorViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/StickyHeaderAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/StickyHeaderAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/StickyHeaderAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/StickyHeaderAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/StoragePathAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/StoragePathAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/StoragePathAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/StoragePathAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/StoragePathItem.java b/app/src/main/java/com/owncloud/android/ui/adapter/StoragePathItem.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/StoragePathItem.java rename to app/src/main/java/com/owncloud/android/ui/adapter/StoragePathItem.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/SyncedFolderAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/TemplateAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/TrashbinListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/UploaderAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/UserListItem.java b/app/src/main/java/com/owncloud/android/ui/adapter/UserListItem.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/UserListItem.java rename to app/src/main/java/com/owncloud/android/ui/adapter/UserListItem.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/ViewType.java b/app/src/main/java/com/owncloud/android/ui/adapter/ViewType.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/ViewType.java rename to app/src/main/java/com/owncloud/android/ui/adapter/ViewType.java diff --git a/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java rename to app/src/main/java/com/owncloud/android/ui/adapter/X509CertificateViewAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/CheckAvailableSpaceTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckAvailableSpaceTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/CheckAvailableSpaceTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/CheckAvailableSpaceTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/CheckRemoteWipeTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/DeleteAllNotificationsTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/DeleteAllNotificationsTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/DeleteAllNotificationsTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/DeleteAllNotificationsTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/DeleteNotificationTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/DeleteNotificationTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/DeleteNotificationTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/DeleteNotificationTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/FetchRemoteFileTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/GallerySearchTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/LoadingVersionNumberTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/LoadingVersionNumberTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/LoadingVersionNumberTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/LoadingVersionNumberTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/NotificationExecuteActionTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/PrintAsyncTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/PrintAsyncTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/PrintAsyncTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/PrintAsyncTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/RetrieveStatusAsyncTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/RetrieveStatusAsyncTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/RetrieveStatusAsyncTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/RetrieveStatusAsyncTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/RichDocumentsLoadUrlTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/RichDocumentsLoadUrlTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/RichDocumentsLoadUrlTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/RichDocumentsLoadUrlTask.java diff --git a/src/main/java/com/owncloud/android/ui/asynctasks/TextEditorLoadUrlTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/TextEditorLoadUrlTask.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/asynctasks/TextEditorLoadUrlTask.java rename to app/src/main/java/com/owncloud/android/ui/asynctasks/TextEditorLoadUrlTask.java diff --git a/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java b/app/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/components/CustomViewPager.java rename to app/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java diff --git a/src/main/java/com/owncloud/android/ui/components/SendButtonData.java b/app/src/main/java/com/owncloud/android/ui/components/SendButtonData.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/components/SendButtonData.java rename to app/src/main/java/com/owncloud/android/ui/components/SendButtonData.java diff --git a/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java b/app/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java rename to app/src/main/java/com/owncloud/android/ui/decoration/MediaGridItemDecoration.java diff --git a/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java b/app/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java rename to app/src/main/java/com/owncloud/android/ui/decoration/SimpleListItemDividerDecoration.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalConfirmationDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalConfirmationDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/AccountRemovalConfirmationDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/AccountRemovalConfirmationDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ChooseTemplateDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ConfirmationDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ExpirationDatePickerDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/LoadingDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/LocalStoragePathPickerDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/MultipleAccountsDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/NoteDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/RenamePublicShareDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SendFilesDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SharePasswordDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SslValidatorDialog.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java b/app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SsoWebView.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SyncFileNotEnoughSpaceDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java b/app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java rename to app/src/main/java/com/owncloud/android/ui/dialog/SyncedFolderPreferencesDialogFragment.java diff --git a/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java rename to app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java diff --git a/src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.java b/app/src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/AccountRemovedEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.java b/app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/ChangeMenuEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/CommentsEvent.java b/app/src/main/java/com/owncloud/android/ui/events/CommentsEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/CommentsEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/CommentsEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.java b/app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/DummyDrawerEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.java b/app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/EncryptionEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/EncryptionEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.java b/app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/FavoriteEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/FavoriteEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/InitiateSyncedFolder.java b/app/src/main/java/com/owncloud/android/ui/events/InitiateSyncedFolder.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/InitiateSyncedFolder.java rename to app/src/main/java/com/owncloud/android/ui/events/InitiateSyncedFolder.java diff --git a/src/main/java/com/owncloud/android/ui/events/MenuItemClickEvent.java b/app/src/main/java/com/owncloud/android/ui/events/MenuItemClickEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/MenuItemClickEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/MenuItemClickEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/SearchEvent.java b/app/src/main/java/com/owncloud/android/ui/events/SearchEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/SearchEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/SearchEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.java b/app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/SyncEventFinished.java rename to app/src/main/java/com/owncloud/android/ui/events/SyncEventFinished.java diff --git a/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.java b/app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/TokenPushEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/TokenPushEvent.java diff --git a/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java b/app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java rename to app/src/main/java/com/owncloud/android/ui/events/VCardToggleEvent.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/FileFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/FileFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/LocalFileListFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java rename to app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetActions.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java rename to app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/TaskRetainerFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactListFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java rename to app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java b/app/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java rename to app/src/main/java/com/owncloud/android/ui/fragment/util/FileDetailSharingFragmentHelper.java diff --git a/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java b/app/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java rename to app/src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java diff --git a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java rename to app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java diff --git a/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java b/app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java rename to app/src/main/java/com/owncloud/android/ui/helpers/SparseBooleanArrayParcelable.java diff --git a/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/helpers/UriUploader.java rename to app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.java diff --git a/src/main/java/com/owncloud/android/ui/interfaces/ActivityListInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/ActivityListInterface.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/interfaces/ActivityListInterface.java rename to app/src/main/java/com/owncloud/android/ui/interfaces/ActivityListInterface.java diff --git a/src/main/java/com/owncloud/android/ui/interfaces/LocalFileListFragmentInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/LocalFileListFragmentInterface.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/interfaces/LocalFileListFragmentInterface.java rename to app/src/main/java/com/owncloud/android/ui/interfaces/LocalFileListFragmentInterface.java diff --git a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java rename to app/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java diff --git a/src/main/java/com/owncloud/android/ui/interfaces/TrashbinActivityInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/TrashbinActivityInterface.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/interfaces/TrashbinActivityInterface.java rename to app/src/main/java/com/owncloud/android/ui/interfaces/TrashbinActivityInterface.java diff --git a/src/main/java/com/owncloud/android/ui/interfaces/VersionListInterface.java b/app/src/main/java/com/owncloud/android/ui/interfaces/VersionListInterface.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/interfaces/VersionListInterface.java rename to app/src/main/java/com/owncloud/android/ui/interfaces/VersionListInterface.java diff --git a/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java b/app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java rename to app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java diff --git a/src/main/java/com/owncloud/android/ui/notifications/NotificationsContract.java b/app/src/main/java/com/owncloud/android/ui/notifications/NotificationsContract.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/notifications/NotificationsContract.java rename to app/src/main/java/com/owncloud/android/ui/notifications/NotificationsContract.java diff --git a/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/FileDownloadFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewImageErrorFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java rename to app/src/main/java/com/owncloud/android/ui/preview/PreviewVideoActivity.java diff --git a/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java b/app/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java rename to app/src/main/java/com/owncloud/android/ui/trashbin/RemoteTrashbinRepository.java diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java rename to app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.java diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java rename to app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinContract.java diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java rename to app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinPresenter.java diff --git a/src/main/java/com/owncloud/android/ui/trashbin/TrashbinRepository.java b/app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinRepository.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/trashbin/TrashbinRepository.java rename to app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinRepository.java diff --git a/src/main/java/com/owncloud/android/ui/whatsnew/ProgressIndicator.java b/app/src/main/java/com/owncloud/android/ui/whatsnew/ProgressIndicator.java similarity index 100% rename from src/main/java/com/owncloud/android/ui/whatsnew/ProgressIndicator.java rename to app/src/main/java/com/owncloud/android/ui/whatsnew/ProgressIndicator.java diff --git a/src/main/java/com/owncloud/android/utils/BitmapUtils.java b/app/src/main/java/com/owncloud/android/utils/BitmapUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/BitmapUtils.java rename to app/src/main/java/com/owncloud/android/utils/BitmapUtils.java diff --git a/src/main/java/com/owncloud/android/utils/ClipboardUtil.java b/app/src/main/java/com/owncloud/android/utils/ClipboardUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/ClipboardUtil.java rename to app/src/main/java/com/owncloud/android/utils/ClipboardUtil.java diff --git a/src/main/java/com/owncloud/android/utils/CsrHelper.java b/app/src/main/java/com/owncloud/android/utils/CsrHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/CsrHelper.java rename to app/src/main/java/com/owncloud/android/utils/CsrHelper.java diff --git a/src/main/java/com/owncloud/android/utils/DataHolderUtil.java b/app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/DataHolderUtil.java rename to app/src/main/java/com/owncloud/android/utils/DataHolderUtil.java diff --git a/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java b/app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java rename to app/src/main/java/com/owncloud/android/utils/DeviceCredentialUtils.java diff --git a/src/main/java/com/owncloud/android/utils/DialogMenuItem.java b/app/src/main/java/com/owncloud/android/utils/DialogMenuItem.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/DialogMenuItem.java rename to app/src/main/java/com/owncloud/android/utils/DialogMenuItem.java diff --git a/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/DisplayUtils.java rename to app/src/main/java/com/owncloud/android/utils/DisplayUtils.java diff --git a/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java b/app/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java rename to app/src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java diff --git a/src/main/java/com/owncloud/android/utils/EncryptionUtils.java b/app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/EncryptionUtils.java rename to app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java diff --git a/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java b/app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java rename to app/src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java diff --git a/src/main/java/com/owncloud/android/utils/FileSortOrder.java b/app/src/main/java/com/owncloud/android/utils/FileSortOrder.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileSortOrder.java rename to app/src/main/java/com/owncloud/android/utils/FileSortOrder.java diff --git a/src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java b/app/src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java rename to app/src/main/java/com/owncloud/android/utils/FileSortOrderByDate.java diff --git a/src/main/java/com/owncloud/android/utils/FileSortOrderByName.java b/app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileSortOrderByName.java rename to app/src/main/java/com/owncloud/android/utils/FileSortOrderByName.java diff --git a/src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java b/app/src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java rename to app/src/main/java/com/owncloud/android/utils/FileSortOrderBySize.java diff --git a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileStorageUtils.java rename to app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java diff --git a/src/main/java/com/owncloud/android/utils/FileUtil.java b/app/src/main/java/com/owncloud/android/utils/FileUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FileUtil.java rename to app/src/main/java/com/owncloud/android/utils/FileUtil.java diff --git a/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java b/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/FilesSyncHelper.java rename to app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java diff --git a/src/main/java/com/owncloud/android/utils/MimeType.java b/app/src/main/java/com/owncloud/android/utils/MimeType.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/MimeType.java rename to app/src/main/java/com/owncloud/android/utils/MimeType.java diff --git a/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java b/app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/MimeTypeUtil.java rename to app/src/main/java/com/owncloud/android/utils/MimeTypeUtil.java diff --git a/src/main/java/com/owncloud/android/utils/NextcloudServer.java b/app/src/main/java/com/owncloud/android/utils/NextcloudServer.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/NextcloudServer.java rename to app/src/main/java/com/owncloud/android/utils/NextcloudServer.java diff --git a/src/main/java/com/owncloud/android/utils/OwnCloudSession.java b/app/src/main/java/com/owncloud/android/utils/OwnCloudSession.java similarity index 96% rename from src/main/java/com/owncloud/android/utils/OwnCloudSession.java rename to app/src/main/java/com/owncloud/android/utils/OwnCloudSession.java index 400a0ba17fb3..e69b574f0216 100644 --- a/src/main/java/com/owncloud/android/utils/OwnCloudSession.java +++ b/app/src/main/java/com/owncloud/android/utils/OwnCloudSession.java @@ -1,55 +1,55 @@ -/* - * ownCloud Android client application - * - * @author Bartek Przybylski - * Copyright (C) 2011 Bartek Przybylski - * Copyright (C) 2015 ownCloud Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package com.owncloud.android.utils; - -/** - * Represents a session to an ownCloud instance - */ -class OwnCloudSession { - private String sessionName; - private String sessionUrl; - private int entryId; - - public OwnCloudSession(String sessionName, String sessionUrl, int entryId) { - this.sessionName = sessionName; - this.sessionUrl = sessionUrl; - this.entryId = entryId; - } - - public String getSessionName() { - return this.sessionName; - } - - public String getSessionUrl() { - return this.sessionUrl; - } - - public int getEntryId() { - return this.entryId; - } - - public void setSessionName(String sessionName) { - this.sessionName = sessionName; - } - - public void setSessionUrl(String sessionUrl) { - this.sessionUrl = sessionUrl; - } -} +/* + * ownCloud Android client application + * + * @author Bartek Przybylski + * Copyright (C) 2011 Bartek Przybylski + * Copyright (C) 2015 ownCloud Inc. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.owncloud.android.utils; + +/** + * Represents a session to an ownCloud instance + */ +class OwnCloudSession { + private String sessionName; + private String sessionUrl; + private int entryId; + + public OwnCloudSession(String sessionName, String sessionUrl, int entryId) { + this.sessionName = sessionName; + this.sessionUrl = sessionUrl; + this.entryId = entryId; + } + + public String getSessionName() { + return this.sessionName; + } + + public String getSessionUrl() { + return this.sessionUrl; + } + + public int getEntryId() { + return this.entryId; + } + + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } + + public void setSessionUrl(String sessionUrl) { + this.sessionUrl = sessionUrl; + } +} diff --git a/src/main/java/com/owncloud/android/utils/PermissionUtil.java b/app/src/main/java/com/owncloud/android/utils/PermissionUtil.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/PermissionUtil.java rename to app/src/main/java/com/owncloud/android/utils/PermissionUtil.java diff --git a/src/main/java/com/owncloud/android/utils/ReceiversHelper.java b/app/src/main/java/com/owncloud/android/utils/ReceiversHelper.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/ReceiversHelper.java rename to app/src/main/java/com/owncloud/android/utils/ReceiversHelper.java diff --git a/src/main/java/com/owncloud/android/utils/ScreenshotTest.java b/app/src/main/java/com/owncloud/android/utils/ScreenshotTest.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/ScreenshotTest.java rename to app/src/main/java/com/owncloud/android/utils/ScreenshotTest.java diff --git a/src/main/java/com/owncloud/android/utils/StringUtils.java b/app/src/main/java/com/owncloud/android/utils/StringUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/StringUtils.java rename to app/src/main/java/com/owncloud/android/utils/StringUtils.java diff --git a/src/main/java/com/owncloud/android/utils/SyncedFolderUtils.java b/app/src/main/java/com/owncloud/android/utils/SyncedFolderUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/SyncedFolderUtils.java rename to app/src/main/java/com/owncloud/android/utils/SyncedFolderUtils.java diff --git a/src/main/java/com/owncloud/android/utils/ThemeUtils.java b/app/src/main/java/com/owncloud/android/utils/ThemeUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/ThemeUtils.java rename to app/src/main/java/com/owncloud/android/utils/ThemeUtils.java diff --git a/src/main/java/com/owncloud/android/utils/UriUtils.java b/app/src/main/java/com/owncloud/android/utils/UriUtils.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/UriUtils.java rename to app/src/main/java/com/owncloud/android/utils/UriUtils.java diff --git a/src/main/java/com/owncloud/android/utils/glide/CustomGlideStreamLoader.java b/app/src/main/java/com/owncloud/android/utils/glide/CustomGlideStreamLoader.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/glide/CustomGlideStreamLoader.java rename to app/src/main/java/com/owncloud/android/utils/glide/CustomGlideStreamLoader.java diff --git a/src/main/java/com/owncloud/android/utils/glide/CustomGlideUriLoader.java b/app/src/main/java/com/owncloud/android/utils/glide/CustomGlideUriLoader.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/glide/CustomGlideUriLoader.java rename to app/src/main/java/com/owncloud/android/utils/glide/CustomGlideUriLoader.java diff --git a/src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.kt b/app/src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.kt similarity index 100% rename from src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.kt rename to app/src/main/java/com/owncloud/android/utils/glide/HttpStreamFetcher.kt diff --git a/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java b/app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java rename to app/src/main/java/com/owncloud/android/utils/svg/MenuSimpleTarget.java diff --git a/src/main/java/com/owncloud/android/utils/svg/SvgBitmapTranscoder.java b/app/src/main/java/com/owncloud/android/utils/svg/SvgBitmapTranscoder.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/svg/SvgBitmapTranscoder.java rename to app/src/main/java/com/owncloud/android/utils/svg/SvgBitmapTranscoder.java diff --git a/src/main/java/com/owncloud/android/utils/svg/SvgDecoder.java b/app/src/main/java/com/owncloud/android/utils/svg/SvgDecoder.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/svg/SvgDecoder.java rename to app/src/main/java/com/owncloud/android/utils/svg/SvgDecoder.java diff --git a/src/main/java/com/owncloud/android/utils/svg/SvgDrawableTranscoder.java b/app/src/main/java/com/owncloud/android/utils/svg/SvgDrawableTranscoder.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/svg/SvgDrawableTranscoder.java rename to app/src/main/java/com/owncloud/android/utils/svg/SvgDrawableTranscoder.java diff --git a/src/main/java/com/owncloud/android/utils/svg/SvgSoftwareLayerSetter.java b/app/src/main/java/com/owncloud/android/utils/svg/SvgSoftwareLayerSetter.java similarity index 100% rename from src/main/java/com/owncloud/android/utils/svg/SvgSoftwareLayerSetter.java rename to app/src/main/java/com/owncloud/android/utils/svg/SvgSoftwareLayerSetter.java diff --git a/src/main/java/org/nextcloud/providers/cursors/FileCursor.java b/app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java similarity index 100% rename from src/main/java/org/nextcloud/providers/cursors/FileCursor.java rename to app/src/main/java/org/nextcloud/providers/cursors/FileCursor.java diff --git a/src/main/java/org/nextcloud/providers/cursors/RootCursor.java b/app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java similarity index 100% rename from src/main/java/org/nextcloud/providers/cursors/RootCursor.java rename to app/src/main/java/org/nextcloud/providers/cursors/RootCursor.java diff --git a/src/main/java/third_parties/daveKoeller/AlphanumComparator.java b/app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java similarity index 97% rename from src/main/java/third_parties/daveKoeller/AlphanumComparator.java rename to app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java index 7dcf55a3aed7..857d39041bf5 100644 --- a/src/main/java/third_parties/daveKoeller/AlphanumComparator.java +++ b/app/src/main/java/third_parties/daveKoeller/AlphanumComparator.java @@ -1,197 +1,197 @@ -/* - * The Alphanum Algorithm is an improved sorting algorithm for strings - * containing numbers. Instead of sorting numbers in ASCII order like - * a standard sort, this algorithm sorts numbers in numeric order. - * - * The Alphanum Algorithm is discussed at http://www.DaveKoelle.com - * - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package third_parties.daveKoeller; - -import com.owncloud.android.lib.resources.files.model.ServerFileInterface; - -import java.io.File; -import java.io.Serializable; -import java.math.BigInteger; -import java.text.Collator; -import java.util.Comparator; - -/* - * This is an updated version with enhancements made by Daniel Migowski, Andre Bogus, and David Koelle - * * - * To convert to use Templates (Java 1.5+): - * - Change "implements Comparator" to "implements Comparator" - * - Change "compare(Object o1, Object o2)" to "compare(String s1, String s2)" - * - Remove the type checking and casting in compare(). - * - * To use this class: - * Use the static "sort" method from the java.util.Collections class: - * Collections.sort(your list, new AlphanumComparator()); - * - * Adapted to fit - * https://github.com/nextcloud/server/blob/9a4253ef7c34f9dc71a6a9f7828a10df769f0c32/tests/lib/NaturalSortTest.php - * by Tobias Kaminsky - */ -public class AlphanumComparator implements Comparator, Serializable { - private boolean isDigit(char ch) { - return ch >= 48 && ch <= 57; - } - - private boolean isSpecialChar(char ch) { - return ch <= 47 || ch >= 58 && ch <= 64 || ch >= 91 && ch <= 96 || ch >= 123 && ch <= 126; - } - - /** - * Length of string is passed in for improved efficiency (only need to calculate it once) - **/ - private String getChunk(String string, int stringLength, int marker) { - StringBuilder chunk = new StringBuilder(); - char c = string.charAt(marker); - chunk.append(c); - marker++; - if (isDigit(c)) { - while (marker < stringLength) { - c = string.charAt(marker); - if (!isDigit(c)) { - break; - } - chunk.append(c); - marker++; - } - } else if (!isSpecialChar(c)) { - while (marker < stringLength) { - c = string.charAt(marker); - if (isDigit(c) || isSpecialChar(c)) { - break; - } - chunk.append(c); - marker++; - } - } - return chunk.toString(); - } - - public int compare(ServerFileInterface o1, ServerFileInterface o2) { - String s1 = o1.getFileName(); - String s2 = o2.getFileName(); - - return compare(s1, s2); - } - - public int compare(File f1, File f2) { - String s1 = f1.getPath(); - String s2 = f2.getPath(); - - return compare(s1, s2); - } - - public int compare(T t1, T t2) { - return compare(t1.toString(), t2.toString()); - } - - public int compare(String s1, String s2) { - int thisMarker = 0; - int thatMarker = 0; - int s1Length = s1.length(); - int s2Length = s2.length(); - - while (thisMarker < s1Length && thatMarker < s2Length) { - String thisChunk = getChunk(s1, s1Length, thisMarker); - thisMarker += thisChunk.length(); - - String thatChunk = getChunk(s2, s2Length, thatMarker); - thatMarker += thatChunk.length(); - - // If both chunks contain numeric characters, sort them numerically - int result = 0; - if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0))) { - // extract digits - int thisChunkZeroCount = 0; - boolean zero = true; - int countThis = 0; - while (countThis < (thisChunk.length()) && isDigit(thisChunk.charAt(countThis))) { - if (zero) { - if (Character.getNumericValue(thisChunk.charAt(countThis)) == 0) { - thisChunkZeroCount++; - } else { - zero = false; - } - } - countThis++; - } - - - int thatChunkZeroCount = 0; - int countThat = 0; - zero = true; - while (countThat < (thatChunk.length()) && isDigit(thatChunk.charAt(countThat))) { - if (zero) { - if (Character.getNumericValue(thatChunk.charAt(countThat)) == 0) { - thatChunkZeroCount++; - } else { - zero = false; - } - } - countThat++; - } - - BigInteger thisChunkValue = new BigInteger(thisChunk.substring(0, countThis)); - BigInteger thatChunkValue = new BigInteger(thatChunk.substring(0, countThat)); - - result = thisChunkValue.compareTo(thatChunkValue); - - if (result == 0) { - // value is equal, compare leading zeros - result = Integer.compare(thisChunkZeroCount, thatChunkZeroCount); - - if (result != 0) { - return result; - } - } else { - return result; - } - } else if (isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) { - for (int i = 0; i < thisChunk.length(); i++) { - if (thisChunk.charAt(i) == '.' && thatChunk.charAt(i) != '.') { - return -1; - } else if (thatChunk.charAt(i) == '.' && thisChunk.charAt(i) != '.') { - return 1; - } else { - result = thisChunk.charAt(i) - thatChunk.charAt(i); - if (result != 0) { - return result; - } - } - } - } else if (isSpecialChar(thisChunk.charAt(0)) && !isSpecialChar(thatChunk.charAt(0))) { - return -1; - } else if (!isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) { - return 1; - } else { - result = Collator.getInstance().compare(thisChunk, thatChunk); - } - - if (result != 0) { - return result; - } - } - - return s1Length - s2Length; - } -} +/* + * The Alphanum Algorithm is an improved sorting algorithm for strings + * containing numbers. Instead of sorting numbers in ASCII order like + * a standard sort, this algorithm sorts numbers in numeric order. + * + * The Alphanum Algorithm is discussed at http://www.DaveKoelle.com + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +package third_parties.daveKoeller; + +import com.owncloud.android.lib.resources.files.model.ServerFileInterface; + +import java.io.File; +import java.io.Serializable; +import java.math.BigInteger; +import java.text.Collator; +import java.util.Comparator; + +/* + * This is an updated version with enhancements made by Daniel Migowski, Andre Bogus, and David Koelle + * * + * To convert to use Templates (Java 1.5+): + * - Change "implements Comparator" to "implements Comparator" + * - Change "compare(Object o1, Object o2)" to "compare(String s1, String s2)" + * - Remove the type checking and casting in compare(). + * + * To use this class: + * Use the static "sort" method from the java.util.Collections class: + * Collections.sort(your list, new AlphanumComparator()); + * + * Adapted to fit + * https://github.com/nextcloud/server/blob/9a4253ef7c34f9dc71a6a9f7828a10df769f0c32/tests/lib/NaturalSortTest.php + * by Tobias Kaminsky + */ +public class AlphanumComparator implements Comparator, Serializable { + private boolean isDigit(char ch) { + return ch >= 48 && ch <= 57; + } + + private boolean isSpecialChar(char ch) { + return ch <= 47 || ch >= 58 && ch <= 64 || ch >= 91 && ch <= 96 || ch >= 123 && ch <= 126; + } + + /** + * Length of string is passed in for improved efficiency (only need to calculate it once) + **/ + private String getChunk(String string, int stringLength, int marker) { + StringBuilder chunk = new StringBuilder(); + char c = string.charAt(marker); + chunk.append(c); + marker++; + if (isDigit(c)) { + while (marker < stringLength) { + c = string.charAt(marker); + if (!isDigit(c)) { + break; + } + chunk.append(c); + marker++; + } + } else if (!isSpecialChar(c)) { + while (marker < stringLength) { + c = string.charAt(marker); + if (isDigit(c) || isSpecialChar(c)) { + break; + } + chunk.append(c); + marker++; + } + } + return chunk.toString(); + } + + public int compare(ServerFileInterface o1, ServerFileInterface o2) { + String s1 = o1.getFileName(); + String s2 = o2.getFileName(); + + return compare(s1, s2); + } + + public int compare(File f1, File f2) { + String s1 = f1.getPath(); + String s2 = f2.getPath(); + + return compare(s1, s2); + } + + public int compare(T t1, T t2) { + return compare(t1.toString(), t2.toString()); + } + + public int compare(String s1, String s2) { + int thisMarker = 0; + int thatMarker = 0; + int s1Length = s1.length(); + int s2Length = s2.length(); + + while (thisMarker < s1Length && thatMarker < s2Length) { + String thisChunk = getChunk(s1, s1Length, thisMarker); + thisMarker += thisChunk.length(); + + String thatChunk = getChunk(s2, s2Length, thatMarker); + thatMarker += thatChunk.length(); + + // If both chunks contain numeric characters, sort them numerically + int result = 0; + if (isDigit(thisChunk.charAt(0)) && isDigit(thatChunk.charAt(0))) { + // extract digits + int thisChunkZeroCount = 0; + boolean zero = true; + int countThis = 0; + while (countThis < (thisChunk.length()) && isDigit(thisChunk.charAt(countThis))) { + if (zero) { + if (Character.getNumericValue(thisChunk.charAt(countThis)) == 0) { + thisChunkZeroCount++; + } else { + zero = false; + } + } + countThis++; + } + + + int thatChunkZeroCount = 0; + int countThat = 0; + zero = true; + while (countThat < (thatChunk.length()) && isDigit(thatChunk.charAt(countThat))) { + if (zero) { + if (Character.getNumericValue(thatChunk.charAt(countThat)) == 0) { + thatChunkZeroCount++; + } else { + zero = false; + } + } + countThat++; + } + + BigInteger thisChunkValue = new BigInteger(thisChunk.substring(0, countThis)); + BigInteger thatChunkValue = new BigInteger(thatChunk.substring(0, countThat)); + + result = thisChunkValue.compareTo(thatChunkValue); + + if (result == 0) { + // value is equal, compare leading zeros + result = Integer.compare(thisChunkZeroCount, thatChunkZeroCount); + + if (result != 0) { + return result; + } + } else { + return result; + } + } else if (isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) { + for (int i = 0; i < thisChunk.length(); i++) { + if (thisChunk.charAt(i) == '.' && thatChunk.charAt(i) != '.') { + return -1; + } else if (thatChunk.charAt(i) == '.' && thisChunk.charAt(i) != '.') { + return 1; + } else { + result = thisChunk.charAt(i) - thatChunk.charAt(i); + if (result != 0) { + return result; + } + } + } + } else if (isSpecialChar(thisChunk.charAt(0)) && !isSpecialChar(thatChunk.charAt(0))) { + return -1; + } else if (!isSpecialChar(thisChunk.charAt(0)) && isSpecialChar(thatChunk.charAt(0))) { + return 1; + } else { + result = Collator.getInstance().compare(thisChunk, thatChunk); + } + + if (result != 0) { + return result; + } + } + + return s1Length - s2Length; + } +} diff --git a/src/main/java/third_parties/daveKoeller/lgpl-2.1.txt b/app/src/main/java/third_parties/daveKoeller/lgpl-2.1.txt similarity index 100% rename from src/main/java/third_parties/daveKoeller/lgpl-2.1.txt rename to app/src/main/java/third_parties/daveKoeller/lgpl-2.1.txt diff --git a/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java b/app/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java similarity index 100% rename from src/main/java/third_parties/ezvcard_android/AndroidCustomField.java rename to app/src/main/java/third_parties/ezvcard_android/AndroidCustomField.java diff --git a/src/main/java/third_parties/ezvcard_android/ContactOperations.java b/app/src/main/java/third_parties/ezvcard_android/ContactOperations.java similarity index 100% rename from src/main/java/third_parties/ezvcard_android/ContactOperations.java rename to app/src/main/java/third_parties/ezvcard_android/ContactOperations.java diff --git a/src/main/java/third_parties/ezvcard_android/DataMappings.java b/app/src/main/java/third_parties/ezvcard_android/DataMappings.java similarity index 100% rename from src/main/java/third_parties/ezvcard_android/DataMappings.java rename to app/src/main/java/third_parties/ezvcard_android/DataMappings.java diff --git a/src/main/res/animator/appbar_elevation_off.xml b/app/src/main/res/animator/appbar_elevation_off.xml similarity index 100% rename from src/main/res/animator/appbar_elevation_off.xml rename to app/src/main/res/animator/appbar_elevation_off.xml diff --git a/src/main/res/animator/appbar_elevation_on.xml b/app/src/main/res/animator/appbar_elevation_on.xml similarity index 100% rename from src/main/res/animator/appbar_elevation_on.xml rename to app/src/main/res/animator/appbar_elevation_on.xml diff --git a/src/main/res/drawable-hdpi/checker_16_16.png b/app/src/main/res/drawable-hdpi/checker_16_16.png similarity index 100% rename from src/main/res/drawable-hdpi/checker_16_16.png rename to app/src/main/res/drawable-hdpi/checker_16_16.png diff --git a/src/main/res/drawable-hdpi/logo.png b/app/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from src/main/res/drawable-hdpi/logo.png rename to app/src/main/res/drawable-hdpi/logo.png diff --git a/src/main/res/drawable-mdpi/checker_16_16.png b/app/src/main/res/drawable-mdpi/checker_16_16.png similarity index 100% rename from src/main/res/drawable-mdpi/checker_16_16.png rename to app/src/main/res/drawable-mdpi/checker_16_16.png diff --git a/src/main/res/drawable-night/favorite.xml b/app/src/main/res/drawable-night/favorite.xml similarity index 100% rename from src/main/res/drawable-night/favorite.xml rename to app/src/main/res/drawable-night/favorite.xml diff --git a/src/main/res/drawable-night/ic_battery_alert.xml b/app/src/main/res/drawable-night/ic_battery_alert.xml similarity index 100% rename from src/main/res/drawable-night/ic_battery_alert.xml rename to app/src/main/res/drawable-night/ic_battery_alert.xml diff --git a/src/main/res/drawable-night/preview_markdown_gradient_shape.xml b/app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml similarity index 100% rename from src/main/res/drawable-night/preview_markdown_gradient_shape.xml rename to app/src/main/res/drawable-night/preview_markdown_gradient_shape.xml diff --git a/src/main/res/drawable-night/round_bgnd.xml b/app/src/main/res/drawable-night/round_bgnd.xml similarity index 100% rename from src/main/res/drawable-night/round_bgnd.xml rename to app/src/main/res/drawable-night/round_bgnd.xml diff --git a/src/main/res/drawable-night/shared_via_link.xml b/app/src/main/res/drawable-night/shared_via_link.xml similarity index 100% rename from src/main/res/drawable-night/shared_via_link.xml rename to app/src/main/res/drawable-night/shared_via_link.xml diff --git a/src/main/res/drawable-night/shared_via_users.xml b/app/src/main/res/drawable-night/shared_via_users.xml similarity index 100% rename from src/main/res/drawable-night/shared_via_users.xml rename to app/src/main/res/drawable-night/shared_via_users.xml diff --git a/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml similarity index 100% rename from src/main/res/drawable-v24/ic_launcher_background.xml rename to app/src/main/res/drawable-v24/ic_launcher_background.xml diff --git a/src/main/res/drawable-xhdpi/checker_16_16.png b/app/src/main/res/drawable-xhdpi/checker_16_16.png similarity index 100% rename from src/main/res/drawable-xhdpi/checker_16_16.png rename to app/src/main/res/drawable-xhdpi/checker_16_16.png diff --git a/src/main/res/drawable-xxhdpi/checker_16_16.png b/app/src/main/res/drawable-xxhdpi/checker_16_16.png similarity index 100% rename from src/main/res/drawable-xxhdpi/checker_16_16.png rename to app/src/main/res/drawable-xxhdpi/checker_16_16.png diff --git a/src/main/res/drawable-xxxhdpi/apk.png b/app/src/main/res/drawable-xxxhdpi/apk.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/apk.png rename to app/src/main/res/drawable-xxxhdpi/apk.png diff --git a/src/main/res/drawable-xxxhdpi/background.png b/app/src/main/res/drawable-xxxhdpi/background.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/background.png rename to app/src/main/res/drawable-xxxhdpi/background.png diff --git a/src/main/res/drawable-xxxhdpi/background_nc18.png b/app/src/main/res/drawable-xxxhdpi/background_nc18.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/background_nc18.png rename to app/src/main/res/drawable-xxxhdpi/background_nc18.png diff --git a/src/main/res/drawable-xxxhdpi/checker_16_16.png b/app/src/main/res/drawable-xxxhdpi/checker_16_16.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/checker_16_16.png rename to app/src/main/res/drawable-xxxhdpi/checker_16_16.png diff --git a/src/main/res/drawable-xxxhdpi/fdroid.png b/app/src/main/res/drawable-xxxhdpi/fdroid.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/fdroid.png rename to app/src/main/res/drawable-xxxhdpi/fdroid.png diff --git a/src/main/res/drawable-xxxhdpi/playstore.png b/app/src/main/res/drawable-xxxhdpi/playstore.png similarity index 100% rename from src/main/res/drawable-xxxhdpi/playstore.png rename to app/src/main/res/drawable-xxxhdpi/playstore.png diff --git a/src/main/res/drawable/account_circle_white.xml b/app/src/main/res/drawable/account_circle_white.xml similarity index 100% rename from src/main/res/drawable/account_circle_white.xml rename to app/src/main/res/drawable/account_circle_white.xml diff --git a/src/main/res/drawable/all_files.xml b/app/src/main/res/drawable/all_files.xml similarity index 100% rename from src/main/res/drawable/all_files.xml rename to app/src/main/res/drawable/all_files.xml diff --git a/src/main/res/drawable/arrow_right.xml b/app/src/main/res/drawable/arrow_right.xml similarity index 100% rename from src/main/res/drawable/arrow_right.xml rename to app/src/main/res/drawable/arrow_right.xml diff --git a/src/main/res/drawable/backrepeat.xml b/app/src/main/res/drawable/backrepeat.xml similarity index 100% rename from src/main/res/drawable/backrepeat.xml rename to app/src/main/res/drawable/backrepeat.xml diff --git a/src/main/res/drawable/borderless_btn.xml b/app/src/main/res/drawable/borderless_btn.xml similarity index 100% rename from src/main/res/drawable/borderless_btn.xml rename to app/src/main/res/drawable/borderless_btn.xml diff --git a/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml similarity index 100% rename from src/main/res/drawable/divider.xml rename to app/src/main/res/drawable/divider.xml diff --git a/src/main/res/drawable/e2e_border.xml b/app/src/main/res/drawable/e2e_border.xml similarity index 100% rename from src/main/res/drawable/e2e_border.xml rename to app/src/main/res/drawable/e2e_border.xml diff --git a/src/main/res/drawable/favorite.xml b/app/src/main/res/drawable/favorite.xml similarity index 100% rename from src/main/res/drawable/favorite.xml rename to app/src/main/res/drawable/favorite.xml diff --git a/src/main/res/drawable/file.xml b/app/src/main/res/drawable/file.xml similarity index 100% rename from src/main/res/drawable/file.xml rename to app/src/main/res/drawable/file.xml diff --git a/src/main/res/drawable/file_application.xml b/app/src/main/res/drawable/file_application.xml similarity index 100% rename from src/main/res/drawable/file_application.xml rename to app/src/main/res/drawable/file_application.xml diff --git a/src/main/res/drawable/file_calendar.xml b/app/src/main/res/drawable/file_calendar.xml similarity index 100% rename from src/main/res/drawable/file_calendar.xml rename to app/src/main/res/drawable/file_calendar.xml diff --git a/src/main/res/drawable/file_code.xml b/app/src/main/res/drawable/file_code.xml similarity index 100% rename from src/main/res/drawable/file_code.xml rename to app/src/main/res/drawable/file_code.xml diff --git a/src/main/res/drawable/file_doc.xml b/app/src/main/res/drawable/file_doc.xml similarity index 100% rename from src/main/res/drawable/file_doc.xml rename to app/src/main/res/drawable/file_doc.xml diff --git a/src/main/res/drawable/file_image.xml b/app/src/main/res/drawable/file_image.xml similarity index 100% rename from src/main/res/drawable/file_image.xml rename to app/src/main/res/drawable/file_image.xml diff --git a/src/main/res/drawable/file_link.xml b/app/src/main/res/drawable/file_link.xml similarity index 100% rename from src/main/res/drawable/file_link.xml rename to app/src/main/res/drawable/file_link.xml diff --git a/src/main/res/drawable/file_location.xml b/app/src/main/res/drawable/file_location.xml similarity index 100% rename from src/main/res/drawable/file_location.xml rename to app/src/main/res/drawable/file_location.xml diff --git a/src/main/res/drawable/file_movie.xml b/app/src/main/res/drawable/file_movie.xml similarity index 100% rename from src/main/res/drawable/file_movie.xml rename to app/src/main/res/drawable/file_movie.xml diff --git a/src/main/res/drawable/file_pdf.xml b/app/src/main/res/drawable/file_pdf.xml similarity index 100% rename from src/main/res/drawable/file_pdf.xml rename to app/src/main/res/drawable/file_pdf.xml diff --git a/src/main/res/drawable/file_ppt.xml b/app/src/main/res/drawable/file_ppt.xml similarity index 100% rename from src/main/res/drawable/file_ppt.xml rename to app/src/main/res/drawable/file_ppt.xml diff --git a/src/main/res/drawable/file_sound.xml b/app/src/main/res/drawable/file_sound.xml similarity index 100% rename from src/main/res/drawable/file_sound.xml rename to app/src/main/res/drawable/file_sound.xml diff --git a/src/main/res/drawable/file_text.xml b/app/src/main/res/drawable/file_text.xml similarity index 100% rename from src/main/res/drawable/file_text.xml rename to app/src/main/res/drawable/file_text.xml diff --git a/src/main/res/drawable/file_vcard.xml b/app/src/main/res/drawable/file_vcard.xml similarity index 100% rename from src/main/res/drawable/file_vcard.xml rename to app/src/main/res/drawable/file_vcard.xml diff --git a/src/main/res/drawable/file_xls.xml b/app/src/main/res/drawable/file_xls.xml similarity index 100% rename from src/main/res/drawable/file_xls.xml rename to app/src/main/res/drawable/file_xls.xml diff --git a/src/main/res/drawable/file_zip.xml b/app/src/main/res/drawable/file_zip.xml similarity index 100% rename from src/main/res/drawable/file_zip.xml rename to app/src/main/res/drawable/file_zip.xml diff --git a/src/main/res/drawable/first_run_files.xml b/app/src/main/res/drawable/first_run_files.xml similarity index 100% rename from src/main/res/drawable/first_run_files.xml rename to app/src/main/res/drawable/first_run_files.xml diff --git a/src/main/res/drawable/first_run_groupware.xml b/app/src/main/res/drawable/first_run_groupware.xml similarity index 100% rename from src/main/res/drawable/first_run_groupware.xml rename to app/src/main/res/drawable/first_run_groupware.xml diff --git a/src/main/res/drawable/first_run_talk.xml b/app/src/main/res/drawable/first_run_talk.xml similarity index 100% rename from src/main/res/drawable/first_run_talk.xml rename to app/src/main/res/drawable/first_run_talk.xml diff --git a/src/main/res/drawable/folder.xml b/app/src/main/res/drawable/folder.xml similarity index 100% rename from src/main/res/drawable/folder.xml rename to app/src/main/res/drawable/folder.xml diff --git a/src/main/res/drawable/folder_encrypted.xml b/app/src/main/res/drawable/folder_encrypted.xml similarity index 100% rename from src/main/res/drawable/folder_encrypted.xml rename to app/src/main/res/drawable/folder_encrypted.xml diff --git a/src/main/res/drawable/folder_external.xml b/app/src/main/res/drawable/folder_external.xml similarity index 100% rename from src/main/res/drawable/folder_external.xml rename to app/src/main/res/drawable/folder_external.xml diff --git a/src/main/res/drawable/folder_group.xml b/app/src/main/res/drawable/folder_group.xml similarity index 100% rename from src/main/res/drawable/folder_group.xml rename to app/src/main/res/drawable/folder_group.xml diff --git a/src/main/res/drawable/folder_shared_link.xml b/app/src/main/res/drawable/folder_shared_link.xml similarity index 100% rename from src/main/res/drawable/folder_shared_link.xml rename to app/src/main/res/drawable/folder_shared_link.xml diff --git a/src/main/res/drawable/folder_shared_users.xml b/app/src/main/res/drawable/folder_shared_users.xml similarity index 100% rename from src/main/res/drawable/folder_shared_users.xml rename to app/src/main/res/drawable/folder_shared_users.xml diff --git a/src/main/res/drawable/folder_star_32dp.xml b/app/src/main/res/drawable/folder_star_32dp.xml similarity index 100% rename from src/main/res/drawable/folder_star_32dp.xml rename to app/src/main/res/drawable/folder_star_32dp.xml diff --git a/src/main/res/drawable/ic_account_plus.xml b/app/src/main/res/drawable/ic_account_plus.xml similarity index 100% rename from src/main/res/drawable/ic_account_plus.xml rename to app/src/main/res/drawable/ic_account_plus.xml diff --git a/src/main/res/drawable/ic_action_cancel_grey.xml b/app/src/main/res/drawable/ic_action_cancel_grey.xml similarity index 100% rename from src/main/res/drawable/ic_action_cancel_grey.xml rename to app/src/main/res/drawable/ic_action_cancel_grey.xml diff --git a/src/main/res/drawable/ic_action_create_dir.xml b/app/src/main/res/drawable/ic_action_create_dir.xml similarity index 100% rename from src/main/res/drawable/ic_action_create_dir.xml rename to app/src/main/res/drawable/ic_action_create_dir.xml diff --git a/src/main/res/drawable/ic_action_delete_grey.xml b/app/src/main/res/drawable/ic_action_delete_grey.xml similarity index 100% rename from src/main/res/drawable/ic_action_delete_grey.xml rename to app/src/main/res/drawable/ic_action_delete_grey.xml diff --git a/src/main/res/drawable/ic_action_refresh.xml b/app/src/main/res/drawable/ic_action_refresh.xml similarity index 100% rename from src/main/res/drawable/ic_action_refresh.xml rename to app/src/main/res/drawable/ic_action_refresh.xml diff --git a/src/main/res/drawable/ic_action_upload.xml b/app/src/main/res/drawable/ic_action_upload.xml similarity index 100% rename from src/main/res/drawable/ic_action_upload.xml rename to app/src/main/res/drawable/ic_action_upload.xml diff --git a/src/main/res/drawable/ic_activity.xml b/app/src/main/res/drawable/ic_activity.xml similarity index 100% rename from src/main/res/drawable/ic_activity.xml rename to app/src/main/res/drawable/ic_activity.xml diff --git a/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml similarity index 100% rename from src/main/res/drawable/ic_alert.xml rename to app/src/main/res/drawable/ic_alert.xml diff --git a/src/main/res/drawable/ic_alphabetical_asc.xml b/app/src/main/res/drawable/ic_alphabetical_asc.xml similarity index 100% rename from src/main/res/drawable/ic_alphabetical_asc.xml rename to app/src/main/res/drawable/ic_alphabetical_asc.xml diff --git a/src/main/res/drawable/ic_alphabetical_desc.xml b/app/src/main/res/drawable/ic_alphabetical_desc.xml similarity index 100% rename from src/main/res/drawable/ic_alphabetical_desc.xml rename to app/src/main/res/drawable/ic_alphabetical_desc.xml diff --git a/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml similarity index 100% rename from src/main/res/drawable/ic_arrow_back.xml rename to app/src/main/res/drawable/ic_arrow_back.xml diff --git a/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml similarity index 100% rename from src/main/res/drawable/ic_arrow_up.xml rename to app/src/main/res/drawable/ic_arrow_up.xml diff --git a/src/main/res/drawable/ic_battery_alert.xml b/app/src/main/res/drawable/ic_battery_alert.xml similarity index 100% rename from src/main/res/drawable/ic_battery_alert.xml rename to app/src/main/res/drawable/ic_battery_alert.xml diff --git a/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml similarity index 100% rename from src/main/res/drawable/ic_camera.xml rename to app/src/main/res/drawable/ic_camera.xml diff --git a/src/main/res/drawable/ic_cancel.xml b/app/src/main/res/drawable/ic_cancel.xml similarity index 100% rename from src/main/res/drawable/ic_cancel.xml rename to app/src/main/res/drawable/ic_cancel.xml diff --git a/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml similarity index 100% rename from src/main/res/drawable/ic_check_circle.xml rename to app/src/main/res/drawable/ic_check_circle.xml diff --git a/src/main/res/drawable/ic_check_circle_outline.xml b/app/src/main/res/drawable/ic_check_circle_outline.xml similarity index 100% rename from src/main/res/drawable/ic_check_circle_outline.xml rename to app/src/main/res/drawable/ic_check_circle_outline.xml diff --git a/src/main/res/drawable/ic_checkbox_blank_outline.xml b/app/src/main/res/drawable/ic_checkbox_blank_outline.xml similarity index 100% rename from src/main/res/drawable/ic_checkbox_blank_outline.xml rename to app/src/main/res/drawable/ic_checkbox_blank_outline.xml diff --git a/src/main/res/drawable/ic_checkbox_marked.xml b/app/src/main/res/drawable/ic_checkbox_marked.xml similarity index 100% rename from src/main/res/drawable/ic_checkbox_marked.xml rename to app/src/main/res/drawable/ic_checkbox_marked.xml diff --git a/src/main/res/drawable/ic_circles.xml b/app/src/main/res/drawable/ic_circles.xml similarity index 100% rename from src/main/res/drawable/ic_circles.xml rename to app/src/main/res/drawable/ic_circles.xml diff --git a/src/main/res/drawable/ic_clock.xml b/app/src/main/res/drawable/ic_clock.xml similarity index 100% rename from src/main/res/drawable/ic_clock.xml rename to app/src/main/res/drawable/ic_clock.xml diff --git a/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml similarity index 100% rename from src/main/res/drawable/ic_close.xml rename to app/src/main/res/drawable/ic_close.xml diff --git a/src/main/res/drawable/ic_cloud_sync_off.xml b/app/src/main/res/drawable/ic_cloud_sync_off.xml similarity index 100% rename from src/main/res/drawable/ic_cloud_sync_off.xml rename to app/src/main/res/drawable/ic_cloud_sync_off.xml diff --git a/src/main/res/drawable/ic_cloud_sync_on.xml b/app/src/main/res/drawable/ic_cloud_sync_on.xml similarity index 100% rename from src/main/res/drawable/ic_cloud_sync_on.xml rename to app/src/main/res/drawable/ic_cloud_sync_on.xml diff --git a/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml similarity index 100% rename from src/main/res/drawable/ic_comment.xml rename to app/src/main/res/drawable/ic_comment.xml diff --git a/src/main/res/drawable/ic_comment_grid.xml b/app/src/main/res/drawable/ic_comment_grid.xml similarity index 100% rename from src/main/res/drawable/ic_comment_grid.xml rename to app/src/main/res/drawable/ic_comment_grid.xml diff --git a/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml similarity index 100% rename from src/main/res/drawable/ic_content_copy.xml rename to app/src/main/res/drawable/ic_content_copy.xml diff --git a/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml similarity index 100% rename from src/main/res/drawable/ic_delete.xml rename to app/src/main/res/drawable/ic_delete.xml diff --git a/src/main/res/drawable/ic_document_grey600.xml b/app/src/main/res/drawable/ic_document_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_document_grey600.xml rename to app/src/main/res/drawable/ic_document_grey600.xml diff --git a/src/main/res/drawable/ic_dots_vertical.xml b/app/src/main/res/drawable/ic_dots_vertical.xml similarity index 100% rename from src/main/res/drawable/ic_dots_vertical.xml rename to app/src/main/res/drawable/ic_dots_vertical.xml diff --git a/src/main/res/drawable/ic_download_grey600.xml b/app/src/main/res/drawable/ic_download_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_download_grey600.xml rename to app/src/main/res/drawable/ic_download_grey600.xml diff --git a/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml similarity index 100% rename from src/main/res/drawable/ic_edit.xml rename to app/src/main/res/drawable/ic_edit.xml diff --git a/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml similarity index 100% rename from src/main/res/drawable/ic_email.xml rename to app/src/main/res/drawable/ic_email.xml diff --git a/src/main/res/drawable/ic_external.xml b/app/src/main/res/drawable/ic_external.xml similarity index 100% rename from src/main/res/drawable/ic_external.xml rename to app/src/main/res/drawable/ic_external.xml diff --git a/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml similarity index 100% rename from src/main/res/drawable/ic_group.xml rename to app/src/main/res/drawable/ic_group.xml diff --git a/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml similarity index 100% rename from src/main/res/drawable/ic_history.xml rename to app/src/main/res/drawable/ic_history.xml diff --git a/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml similarity index 100% rename from src/main/res/drawable/ic_home.xml rename to app/src/main/res/drawable/ic_home.xml diff --git a/src/main/res/drawable/ic_image_grey600.xml b/app/src/main/res/drawable/ic_image_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_image_grey600.xml rename to app/src/main/res/drawable/ic_image_grey600.xml diff --git a/src/main/res/drawable/ic_image_outline.xml b/app/src/main/res/drawable/ic_image_outline.xml similarity index 100% rename from src/main/res/drawable/ic_image_outline.xml rename to app/src/main/res/drawable/ic_image_outline.xml diff --git a/src/main/res/drawable/ic_import.xml b/app/src/main/res/drawable/ic_import.xml similarity index 100% rename from src/main/res/drawable/ic_import.xml rename to app/src/main/res/drawable/ic_import.xml diff --git a/src/main/res/drawable/ic_information_outline.xml b/app/src/main/res/drawable/ic_information_outline.xml similarity index 100% rename from src/main/res/drawable/ic_information_outline.xml rename to app/src/main/res/drawable/ic_information_outline.xml diff --git a/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml similarity index 100% rename from src/main/res/drawable/ic_keyboard_arrow_down.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_down.xml diff --git a/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from src/main/res/drawable/ic_launcher_foreground.xml rename to app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml similarity index 100% rename from src/main/res/drawable/ic_link.xml rename to app/src/main/res/drawable/ic_link.xml diff --git a/src/main/res/drawable/ic_list_empty_create_folder.xml b/app/src/main/res/drawable/ic_list_empty_create_folder.xml similarity index 100% rename from src/main/res/drawable/ic_list_empty_create_folder.xml rename to app/src/main/res/drawable/ic_list_empty_create_folder.xml diff --git a/src/main/res/drawable/ic_list_empty_error.xml b/app/src/main/res/drawable/ic_list_empty_error.xml similarity index 100% rename from src/main/res/drawable/ic_list_empty_error.xml rename to app/src/main/res/drawable/ic_list_empty_error.xml diff --git a/src/main/res/drawable/ic_list_empty_folder.xml b/app/src/main/res/drawable/ic_list_empty_folder.xml similarity index 100% rename from src/main/res/drawable/ic_list_empty_folder.xml rename to app/src/main/res/drawable/ic_list_empty_folder.xml diff --git a/src/main/res/drawable/ic_list_empty_recent.xml b/app/src/main/res/drawable/ic_list_empty_recent.xml similarity index 100% rename from src/main/res/drawable/ic_list_empty_recent.xml rename to app/src/main/res/drawable/ic_list_empty_recent.xml diff --git a/src/main/res/drawable/ic_list_empty_shared.xml b/app/src/main/res/drawable/ic_list_empty_shared.xml similarity index 100% rename from src/main/res/drawable/ic_list_empty_shared.xml rename to app/src/main/res/drawable/ic_list_empty_shared.xml diff --git a/src/main/res/drawable/ic_lock_open_white.xml b/app/src/main/res/drawable/ic_lock_open_white.xml similarity index 100% rename from src/main/res/drawable/ic_lock_open_white.xml rename to app/src/main/res/drawable/ic_lock_open_white.xml diff --git a/src/main/res/drawable/ic_lock_white.xml b/app/src/main/res/drawable/ic_lock_white.xml similarity index 100% rename from src/main/res/drawable/ic_lock_white.xml rename to app/src/main/res/drawable/ic_lock_white.xml diff --git a/src/main/res/drawable/ic_map_marker.xml b/app/src/main/res/drawable/ic_map_marker.xml similarity index 100% rename from src/main/res/drawable/ic_map_marker.xml rename to app/src/main/res/drawable/ic_map_marker.xml diff --git a/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml similarity index 100% rename from src/main/res/drawable/ic_menu.xml rename to app/src/main/res/drawable/ic_menu.xml diff --git a/src/main/res/drawable/ic_modification_asc.xml b/app/src/main/res/drawable/ic_modification_asc.xml similarity index 100% rename from src/main/res/drawable/ic_modification_asc.xml rename to app/src/main/res/drawable/ic_modification_asc.xml diff --git a/src/main/res/drawable/ic_modification_desc.xml b/app/src/main/res/drawable/ic_modification_desc.xml similarity index 100% rename from src/main/res/drawable/ic_modification_desc.xml rename to app/src/main/res/drawable/ic_modification_desc.xml diff --git a/src/main/res/drawable/ic_movie_grey600.xml b/app/src/main/res/drawable/ic_movie_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_movie_grey600.xml rename to app/src/main/res/drawable/ic_movie_grey600.xml diff --git a/src/main/res/drawable/ic_music_grey600.xml b/app/src/main/res/drawable/ic_music_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_music_grey600.xml rename to app/src/main/res/drawable/ic_music_grey600.xml diff --git a/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml similarity index 100% rename from src/main/res/drawable/ic_notification.xml rename to app/src/main/res/drawable/ic_notification.xml diff --git a/src/main/res/drawable/ic_ok.xml b/app/src/main/res/drawable/ic_ok.xml similarity index 100% rename from src/main/res/drawable/ic_ok.xml rename to app/src/main/res/drawable/ic_ok.xml diff --git a/src/main/res/drawable/ic_people.xml b/app/src/main/res/drawable/ic_people.xml similarity index 100% rename from src/main/res/drawable/ic_people.xml rename to app/src/main/res/drawable/ic_people.xml diff --git a/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml similarity index 100% rename from src/main/res/drawable/ic_phone.xml rename to app/src/main/res/drawable/ic_phone.xml diff --git a/src/main/res/drawable/ic_play_arrow.xml b/app/src/main/res/drawable/ic_play_arrow.xml similarity index 100% rename from src/main/res/drawable/ic_play_arrow.xml rename to app/src/main/res/drawable/ic_play_arrow.xml diff --git a/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml similarity index 100% rename from src/main/res/drawable/ic_plus.xml rename to app/src/main/res/drawable/ic_plus.xml diff --git a/src/main/res/drawable/ic_post_add.xml b/app/src/main/res/drawable/ic_post_add.xml similarity index 100% rename from src/main/res/drawable/ic_post_add.xml rename to app/src/main/res/drawable/ic_post_add.xml diff --git a/src/main/res/drawable/ic_sd.xml b/app/src/main/res/drawable/ic_sd.xml similarity index 100% rename from src/main/res/drawable/ic_sd.xml rename to app/src/main/res/drawable/ic_sd.xml diff --git a/src/main/res/drawable/ic_sd_grey600.xml b/app/src/main/res/drawable/ic_sd_grey600.xml similarity index 100% rename from src/main/res/drawable/ic_sd_grey600.xml rename to app/src/main/res/drawable/ic_sd_grey600.xml diff --git a/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml similarity index 100% rename from src/main/res/drawable/ic_search.xml rename to app/src/main/res/drawable/ic_search.xml diff --git a/src/main/res/drawable/ic_search_grey.xml b/app/src/main/res/drawable/ic_search_grey.xml similarity index 100% rename from src/main/res/drawable/ic_search_grey.xml rename to app/src/main/res/drawable/ic_search_grey.xml diff --git a/src/main/res/drawable/ic_search_light_grey.xml b/app/src/main/res/drawable/ic_search_light_grey.xml similarity index 100% rename from src/main/res/drawable/ic_search_light_grey.xml rename to app/src/main/res/drawable/ic_search_light_grey.xml diff --git a/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml similarity index 100% rename from src/main/res/drawable/ic_select_all.xml rename to app/src/main/res/drawable/ic_select_all.xml diff --git a/src/main/res/drawable/ic_select_none.xml b/app/src/main/res/drawable/ic_select_none.xml similarity index 100% rename from src/main/res/drawable/ic_select_none.xml rename to app/src/main/res/drawable/ic_select_none.xml diff --git a/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml similarity index 100% rename from src/main/res/drawable/ic_send.xml rename to app/src/main/res/drawable/ic_send.xml diff --git a/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml similarity index 100% rename from src/main/res/drawable/ic_settings.xml rename to app/src/main/res/drawable/ic_settings.xml diff --git a/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml similarity index 100% rename from src/main/res/drawable/ic_share.xml rename to app/src/main/res/drawable/ic_share.xml diff --git a/src/main/res/drawable/ic_size_asc.xml b/app/src/main/res/drawable/ic_size_asc.xml similarity index 100% rename from src/main/res/drawable/ic_size_asc.xml rename to app/src/main/res/drawable/ic_size_asc.xml diff --git a/src/main/res/drawable/ic_size_desc.xml b/app/src/main/res/drawable/ic_size_desc.xml similarity index 100% rename from src/main/res/drawable/ic_size_desc.xml rename to app/src/main/res/drawable/ic_size_desc.xml diff --git a/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml similarity index 100% rename from src/main/res/drawable/ic_star.xml rename to app/src/main/res/drawable/ic_star.xml diff --git a/src/main/res/drawable/ic_star_light_yellow.xml b/app/src/main/res/drawable/ic_star_light_yellow.xml similarity index 100% rename from src/main/res/drawable/ic_star_light_yellow.xml rename to app/src/main/res/drawable/ic_star_light_yellow.xml diff --git a/src/main/res/drawable/ic_star_outline.xml b/app/src/main/res/drawable/ic_star_outline.xml similarity index 100% rename from src/main/res/drawable/ic_star_outline.xml rename to app/src/main/res/drawable/ic_star_outline.xml diff --git a/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml similarity index 100% rename from src/main/res/drawable/ic_sync.xml rename to app/src/main/res/drawable/ic_sync.xml diff --git a/src/main/res/drawable/ic_synced.xml b/app/src/main/res/drawable/ic_synced.xml similarity index 100% rename from src/main/res/drawable/ic_synced.xml rename to app/src/main/res/drawable/ic_synced.xml diff --git a/src/main/res/drawable/ic_synchronizing.xml b/app/src/main/res/drawable/ic_synchronizing.xml similarity index 100% rename from src/main/res/drawable/ic_synchronizing.xml rename to app/src/main/res/drawable/ic_synchronizing.xml diff --git a/src/main/res/drawable/ic_synchronizing_error.xml b/app/src/main/res/drawable/ic_synchronizing_error.xml similarity index 100% rename from src/main/res/drawable/ic_synchronizing_error.xml rename to app/src/main/res/drawable/ic_synchronizing_error.xml diff --git a/src/main/res/drawable/ic_tag.xml b/app/src/main/res/drawable/ic_tag.xml similarity index 100% rename from src/main/res/drawable/ic_tag.xml rename to app/src/main/res/drawable/ic_tag.xml diff --git a/src/main/res/drawable/ic_talk.xml b/app/src/main/res/drawable/ic_talk.xml similarity index 100% rename from src/main/res/drawable/ic_talk.xml rename to app/src/main/res/drawable/ic_talk.xml diff --git a/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml similarity index 100% rename from src/main/res/drawable/ic_twitter.xml rename to app/src/main/res/drawable/ic_twitter.xml diff --git a/src/main/res/drawable/ic_unshared.xml b/app/src/main/res/drawable/ic_unshared.xml similarity index 100% rename from src/main/res/drawable/ic_unshared.xml rename to app/src/main/res/drawable/ic_unshared.xml diff --git a/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml similarity index 100% rename from src/main/res/drawable/ic_user.xml rename to app/src/main/res/drawable/ic_user.xml diff --git a/src/main/res/drawable/ic_user_status_away.xml b/app/src/main/res/drawable/ic_user_status_away.xml similarity index 100% rename from src/main/res/drawable/ic_user_status_away.xml rename to app/src/main/res/drawable/ic_user_status_away.xml diff --git a/src/main/res/drawable/ic_user_status_dnd.xml b/app/src/main/res/drawable/ic_user_status_dnd.xml similarity index 100% rename from src/main/res/drawable/ic_user_status_dnd.xml rename to app/src/main/res/drawable/ic_user_status_dnd.xml diff --git a/src/main/res/drawable/ic_user_status_invisible.xml b/app/src/main/res/drawable/ic_user_status_invisible.xml similarity index 100% rename from src/main/res/drawable/ic_user_status_invisible.xml rename to app/src/main/res/drawable/ic_user_status_invisible.xml diff --git a/src/main/res/drawable/ic_view_list.xml b/app/src/main/res/drawable/ic_view_list.xml similarity index 100% rename from src/main/res/drawable/ic_view_list.xml rename to app/src/main/res/drawable/ic_view_list.xml diff --git a/src/main/res/drawable/ic_view_module.xml b/app/src/main/res/drawable/ic_view_module.xml similarity index 100% rename from src/main/res/drawable/ic_view_module.xml rename to app/src/main/res/drawable/ic_view_module.xml diff --git a/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml similarity index 100% rename from src/main/res/drawable/ic_warning.xml rename to app/src/main/res/drawable/ic_warning.xml diff --git a/src/main/res/drawable/ic_web.xml b/app/src/main/res/drawable/ic_web.xml similarity index 100% rename from src/main/res/drawable/ic_web.xml rename to app/src/main/res/drawable/ic_web.xml diff --git a/src/main/res/drawable/image_32dp.xml b/app/src/main/res/drawable/image_32dp.xml similarity index 100% rename from src/main/res/drawable/image_32dp.xml rename to app/src/main/res/drawable/image_32dp.xml diff --git a/src/main/res/drawable/image_fail.xml b/app/src/main/res/drawable/image_fail.xml similarity index 100% rename from src/main/res/drawable/image_fail.xml rename to app/src/main/res/drawable/image_fail.xml diff --git a/src/main/res/drawable/indicator_dot_not_selected.xml b/app/src/main/res/drawable/indicator_dot_not_selected.xml similarity index 100% rename from src/main/res/drawable/indicator_dot_not_selected.xml rename to app/src/main/res/drawable/indicator_dot_not_selected.xml diff --git a/src/main/res/drawable/indicator_dot_selected.xml b/app/src/main/res/drawable/indicator_dot_selected.xml similarity index 100% rename from src/main/res/drawable/indicator_dot_selected.xml rename to app/src/main/res/drawable/indicator_dot_selected.xml diff --git a/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml similarity index 100% rename from src/main/res/drawable/launch_screen.xml rename to app/src/main/res/drawable/launch_screen.xml diff --git a/src/main/res/drawable/nav_community.xml b/app/src/main/res/drawable/nav_community.xml similarity index 100% rename from src/main/res/drawable/nav_community.xml rename to app/src/main/res/drawable/nav_community.xml diff --git a/src/main/res/drawable/nav_contacts.xml b/app/src/main/res/drawable/nav_contacts.xml similarity index 100% rename from src/main/res/drawable/nav_contacts.xml rename to app/src/main/res/drawable/nav_contacts.xml diff --git a/src/main/res/drawable/nav_favorites.xml b/app/src/main/res/drawable/nav_favorites.xml similarity index 100% rename from src/main/res/drawable/nav_favorites.xml rename to app/src/main/res/drawable/nav_favorites.xml diff --git a/src/main/res/drawable/nav_logout.xml b/app/src/main/res/drawable/nav_logout.xml similarity index 100% rename from src/main/res/drawable/nav_logout.xml rename to app/src/main/res/drawable/nav_logout.xml diff --git a/src/main/res/drawable/nav_notifications.xml b/app/src/main/res/drawable/nav_notifications.xml similarity index 100% rename from src/main/res/drawable/nav_notifications.xml rename to app/src/main/res/drawable/nav_notifications.xml diff --git a/src/main/res/drawable/nav_on_device.xml b/app/src/main/res/drawable/nav_on_device.xml similarity index 100% rename from src/main/res/drawable/nav_on_device.xml rename to app/src/main/res/drawable/nav_on_device.xml diff --git a/src/main/res/drawable/nav_photos.xml b/app/src/main/res/drawable/nav_photos.xml similarity index 100% rename from src/main/res/drawable/nav_photos.xml rename to app/src/main/res/drawable/nav_photos.xml diff --git a/src/main/res/drawable/nav_recently.xml b/app/src/main/res/drawable/nav_recently.xml similarity index 100% rename from src/main/res/drawable/nav_recently.xml rename to app/src/main/res/drawable/nav_recently.xml diff --git a/src/main/res/drawable/nav_settings.xml b/app/src/main/res/drawable/nav_settings.xml similarity index 100% rename from src/main/res/drawable/nav_settings.xml rename to app/src/main/res/drawable/nav_settings.xml diff --git a/src/main/res/drawable/nav_shared.xml b/app/src/main/res/drawable/nav_shared.xml similarity index 100% rename from src/main/res/drawable/nav_shared.xml rename to app/src/main/res/drawable/nav_shared.xml diff --git a/src/main/res/drawable/nav_synced_folders.xml b/app/src/main/res/drawable/nav_synced_folders.xml similarity index 100% rename from src/main/res/drawable/nav_synced_folders.xml rename to app/src/main/res/drawable/nav_synced_folders.xml diff --git a/src/main/res/drawable/nav_trashbin.xml b/app/src/main/res/drawable/nav_trashbin.xml similarity index 100% rename from src/main/res/drawable/nav_trashbin.xml rename to app/src/main/res/drawable/nav_trashbin.xml diff --git a/src/main/res/drawable/nav_videos.xml b/app/src/main/res/drawable/nav_videos.xml similarity index 100% rename from src/main/res/drawable/nav_videos.xml rename to app/src/main/res/drawable/nav_videos.xml diff --git a/src/main/res/drawable/nextcloud_logo.xml b/app/src/main/res/drawable/nextcloud_logo.xml similarity index 100% rename from src/main/res/drawable/nextcloud_logo.xml rename to app/src/main/res/drawable/nextcloud_logo.xml diff --git a/src/main/res/drawable/no_network.xml b/app/src/main/res/drawable/no_network.xml similarity index 100% rename from src/main/res/drawable/no_network.xml rename to app/src/main/res/drawable/no_network.xml diff --git a/src/main/res/drawable/notification_icon.xml b/app/src/main/res/drawable/notification_icon.xml similarity index 100% rename from src/main/res/drawable/notification_icon.xml rename to app/src/main/res/drawable/notification_icon.xml diff --git a/src/main/res/drawable/online_status.xml b/app/src/main/res/drawable/online_status.xml similarity index 100% rename from src/main/res/drawable/online_status.xml rename to app/src/main/res/drawable/online_status.xml diff --git a/src/main/res/drawable/preview_image_gradient_shape.xml b/app/src/main/res/drawable/preview_image_gradient_shape.xml similarity index 100% rename from src/main/res/drawable/preview_image_gradient_shape.xml rename to app/src/main/res/drawable/preview_image_gradient_shape.xml diff --git a/src/main/res/drawable/preview_markdown_gradient_shape.xml b/app/src/main/res/drawable/preview_markdown_gradient_shape.xml similarity index 100% rename from src/main/res/drawable/preview_markdown_gradient_shape.xml rename to app/src/main/res/drawable/preview_markdown_gradient_shape.xml diff --git a/src/main/res/drawable/process_dialog_background.xml b/app/src/main/res/drawable/process_dialog_background.xml similarity index 100% rename from src/main/res/drawable/process_dialog_background.xml rename to app/src/main/res/drawable/process_dialog_background.xml diff --git a/src/main/res/drawable/progress_small.xml b/app/src/main/res/drawable/progress_small.xml similarity index 100% rename from src/main/res/drawable/progress_small.xml rename to app/src/main/res/drawable/progress_small.xml diff --git a/src/main/res/drawable/qrcode_scan.xml b/app/src/main/res/drawable/qrcode_scan.xml similarity index 100% rename from src/main/res/drawable/qrcode_scan.xml rename to app/src/main/res/drawable/qrcode_scan.xml diff --git a/src/main/res/drawable/round_bgnd.xml b/app/src/main/res/drawable/round_bgnd.xml similarity index 100% rename from src/main/res/drawable/round_bgnd.xml rename to app/src/main/res/drawable/round_bgnd.xml diff --git a/src/main/res/drawable/shared_via_link.xml b/app/src/main/res/drawable/shared_via_link.xml similarity index 100% rename from src/main/res/drawable/shared_via_link.xml rename to app/src/main/res/drawable/shared_via_link.xml diff --git a/src/main/res/drawable/shared_via_users.xml b/app/src/main/res/drawable/shared_via_users.xml similarity index 100% rename from src/main/res/drawable/shared_via_users.xml rename to app/src/main/res/drawable/shared_via_users.xml diff --git a/src/main/res/drawable/spinner_inner.xml b/app/src/main/res/drawable/spinner_inner.xml similarity index 100% rename from src/main/res/drawable/spinner_inner.xml rename to app/src/main/res/drawable/spinner_inner.xml diff --git a/src/main/res/drawable/split_action_bg.xml b/app/src/main/res/drawable/split_action_bg.xml similarity index 100% rename from src/main/res/drawable/split_action_bg.xml rename to app/src/main/res/drawable/split_action_bg.xml diff --git a/src/main/res/drawable/uploader_list_separator.xml b/app/src/main/res/drawable/uploader_list_separator.xml similarity index 100% rename from src/main/res/drawable/uploader_list_separator.xml rename to app/src/main/res/drawable/uploader_list_separator.xml diff --git a/src/main/res/drawable/uploads.xml b/app/src/main/res/drawable/uploads.xml similarity index 100% rename from src/main/res/drawable/uploads.xml rename to app/src/main/res/drawable/uploads.xml diff --git a/src/main/res/drawable/video_32dp.xml b/app/src/main/res/drawable/video_32dp.xml similarity index 100% rename from src/main/res/drawable/video_32dp.xml rename to app/src/main/res/drawable/video_32dp.xml diff --git a/src/main/res/drawable/view_play.xml b/app/src/main/res/drawable/view_play.xml similarity index 100% rename from src/main/res/drawable/view_play.xml rename to app/src/main/res/drawable/view_play.xml diff --git a/src/main/res/drawable/whats_new_progress_transition.xml b/app/src/main/res/drawable/whats_new_progress_transition.xml similarity index 100% rename from src/main/res/drawable/whats_new_progress_transition.xml rename to app/src/main/res/drawable/whats_new_progress_transition.xml diff --git a/src/main/res/layout-land/account_setup.xml b/app/src/main/res/layout-land/account_setup.xml similarity index 100% rename from src/main/res/layout-land/account_setup.xml rename to app/src/main/res/layout-land/account_setup.xml diff --git a/src/main/res/layout/account_action.xml b/app/src/main/res/layout/account_action.xml similarity index 100% rename from src/main/res/layout/account_action.xml rename to app/src/main/res/layout/account_action.xml diff --git a/src/main/res/layout/account_item.xml b/app/src/main/res/layout/account_item.xml similarity index 100% rename from src/main/res/layout/account_item.xml rename to app/src/main/res/layout/account_item.xml diff --git a/src/main/res/layout/account_setup.xml b/app/src/main/res/layout/account_setup.xml similarity index 100% rename from src/main/res/layout/account_setup.xml rename to app/src/main/res/layout/account_setup.xml diff --git a/src/main/res/layout/account_setup_webview.xml b/app/src/main/res/layout/account_setup_webview.xml similarity index 100% rename from src/main/res/layout/account_setup_webview.xml rename to app/src/main/res/layout/account_setup_webview.xml diff --git a/src/main/res/layout/accounts_layout.xml b/app/src/main/res/layout/accounts_layout.xml similarity index 100% rename from src/main/res/layout/accounts_layout.xml rename to app/src/main/res/layout/accounts_layout.xml diff --git a/src/main/res/layout/activity_etm.xml b/app/src/main/res/layout/activity_etm.xml similarity index 100% rename from src/main/res/layout/activity_etm.xml rename to app/src/main/res/layout/activity_etm.xml diff --git a/src/main/res/layout/activity_list_item.xml b/app/src/main/res/layout/activity_list_item.xml similarity index 100% rename from src/main/res/layout/activity_list_item.xml rename to app/src/main/res/layout/activity_list_item.xml diff --git a/src/main/res/layout/activity_list_item_header.xml b/app/src/main/res/layout/activity_list_item_header.xml similarity index 100% rename from src/main/res/layout/activity_list_item_header.xml rename to app/src/main/res/layout/activity_list_item_header.xml diff --git a/src/main/res/layout/activity_list_item_header_shimmer.xml b/app/src/main/res/layout/activity_list_item_header_shimmer.xml similarity index 100% rename from src/main/res/layout/activity_list_item_header_shimmer.xml rename to app/src/main/res/layout/activity_list_item_header_shimmer.xml diff --git a/src/main/res/layout/activity_list_item_shimmer.xml b/app/src/main/res/layout/activity_list_item_shimmer.xml similarity index 100% rename from src/main/res/layout/activity_list_item_shimmer.xml rename to app/src/main/res/layout/activity_list_item_shimmer.xml diff --git a/src/main/res/layout/activity_list_layout.xml b/app/src/main/res/layout/activity_list_layout.xml similarity index 100% rename from src/main/res/layout/activity_list_layout.xml rename to app/src/main/res/layout/activity_list_layout.xml diff --git a/src/main/res/layout/activity_manage_space.xml b/app/src/main/res/layout/activity_manage_space.xml similarity index 100% rename from src/main/res/layout/activity_manage_space.xml rename to app/src/main/res/layout/activity_manage_space.xml diff --git a/src/main/res/layout/activity_row.xml b/app/src/main/res/layout/activity_row.xml similarity index 100% rename from src/main/res/layout/activity_row.xml rename to app/src/main/res/layout/activity_row.xml diff --git a/src/main/res/layout/activity_show_error.xml b/app/src/main/res/layout/activity_show_error.xml similarity index 100% rename from src/main/res/layout/activity_show_error.xml rename to app/src/main/res/layout/activity_show_error.xml diff --git a/src/main/res/layout/activity_sso_grant_permission.xml b/app/src/main/res/layout/activity_sso_grant_permission.xml similarity index 100% rename from src/main/res/layout/activity_sso_grant_permission.xml rename to app/src/main/res/layout/activity_sso_grant_permission.xml diff --git a/src/main/res/layout/choose_template.xml b/app/src/main/res/layout/choose_template.xml similarity index 100% rename from src/main/res/layout/choose_template.xml rename to app/src/main/res/layout/choose_template.xml diff --git a/src/main/res/layout/community_layout.xml b/app/src/main/res/layout/community_layout.xml similarity index 100% rename from src/main/res/layout/community_layout.xml rename to app/src/main/res/layout/community_layout.xml diff --git a/src/main/res/layout/conflict_resolve_dialog.xml b/app/src/main/res/layout/conflict_resolve_dialog.xml similarity index 100% rename from src/main/res/layout/conflict_resolve_dialog.xml rename to app/src/main/res/layout/conflict_resolve_dialog.xml diff --git a/src/main/res/layout/contactlist_fragment.xml b/app/src/main/res/layout/contactlist_fragment.xml similarity index 100% rename from src/main/res/layout/contactlist_fragment.xml rename to app/src/main/res/layout/contactlist_fragment.xml diff --git a/src/main/res/layout/contactlist_list_item.xml b/app/src/main/res/layout/contactlist_list_item.xml similarity index 100% rename from src/main/res/layout/contactlist_list_item.xml rename to app/src/main/res/layout/contactlist_list_item.xml diff --git a/src/main/res/layout/contactlist_list_item_shimmer.xml b/app/src/main/res/layout/contactlist_list_item_shimmer.xml similarity index 100% rename from src/main/res/layout/contactlist_list_item_shimmer.xml rename to app/src/main/res/layout/contactlist_list_item_shimmer.xml diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/app/src/main/res/layout/contacts_backup_fragment.xml similarity index 100% rename from src/main/res/layout/contacts_backup_fragment.xml rename to app/src/main/res/layout/contacts_backup_fragment.xml diff --git a/src/main/res/layout/contacts_preference.xml b/app/src/main/res/layout/contacts_preference.xml similarity index 100% rename from src/main/res/layout/contacts_preference.xml rename to app/src/main/res/layout/contacts_preference.xml diff --git a/src/main/res/layout/deep_link_login.xml b/app/src/main/res/layout/deep_link_login.xml similarity index 100% rename from src/main/res/layout/deep_link_login.xml rename to app/src/main/res/layout/deep_link_login.xml diff --git a/src/main/res/layout/dialog_choose_account.xml b/app/src/main/res/layout/dialog_choose_account.xml similarity index 100% rename from src/main/res/layout/dialog_choose_account.xml rename to app/src/main/res/layout/dialog_choose_account.xml diff --git a/src/main/res/layout/dialog_set_status.xml b/app/src/main/res/layout/dialog_set_status.xml similarity index 100% rename from src/main/res/layout/dialog_set_status.xml rename to app/src/main/res/layout/dialog_set_status.xml diff --git a/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml similarity index 100% rename from src/main/res/layout/drawer.xml rename to app/src/main/res/layout/drawer.xml diff --git a/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml similarity index 100% rename from src/main/res/layout/drawer_header.xml rename to app/src/main/res/layout/drawer_header.xml diff --git a/src/main/res/layout/edit_box_dialog.xml b/app/src/main/res/layout/edit_box_dialog.xml similarity index 100% rename from src/main/res/layout/edit_box_dialog.xml rename to app/src/main/res/layout/edit_box_dialog.xml diff --git a/src/main/res/layout/empty_list.xml b/app/src/main/res/layout/empty_list.xml similarity index 100% rename from src/main/res/layout/empty_list.xml rename to app/src/main/res/layout/empty_list.xml diff --git a/src/main/res/layout/etm_background_job_list_item.xml b/app/src/main/res/layout/etm_background_job_list_item.xml similarity index 100% rename from src/main/res/layout/etm_background_job_list_item.xml rename to app/src/main/res/layout/etm_background_job_list_item.xml diff --git a/src/main/res/layout/etm_download_list_item.xml b/app/src/main/res/layout/etm_download_list_item.xml similarity index 100% rename from src/main/res/layout/etm_download_list_item.xml rename to app/src/main/res/layout/etm_download_list_item.xml diff --git a/src/main/res/layout/externalsite_webview.xml b/app/src/main/res/layout/externalsite_webview.xml similarity index 100% rename from src/main/res/layout/externalsite_webview.xml rename to app/src/main/res/layout/externalsite_webview.xml diff --git a/src/main/res/layout/file_details_activities_fragment.xml b/app/src/main/res/layout/file_details_activities_fragment.xml similarity index 100% rename from src/main/res/layout/file_details_activities_fragment.xml rename to app/src/main/res/layout/file_details_activities_fragment.xml diff --git a/src/main/res/layout/file_details_fragment.xml b/app/src/main/res/layout/file_details_fragment.xml similarity index 100% rename from src/main/res/layout/file_details_fragment.xml rename to app/src/main/res/layout/file_details_fragment.xml diff --git a/src/main/res/layout/file_details_share_group.xml b/app/src/main/res/layout/file_details_share_group.xml similarity index 100% rename from src/main/res/layout/file_details_share_group.xml rename to app/src/main/res/layout/file_details_share_group.xml diff --git a/src/main/res/layout/file_details_share_internal_share_link.xml b/app/src/main/res/layout/file_details_share_internal_share_link.xml similarity index 100% rename from src/main/res/layout/file_details_share_internal_share_link.xml rename to app/src/main/res/layout/file_details_share_internal_share_link.xml diff --git a/src/main/res/layout/file_details_share_link_share_item.xml b/app/src/main/res/layout/file_details_share_link_share_item.xml similarity index 100% rename from src/main/res/layout/file_details_share_link_share_item.xml rename to app/src/main/res/layout/file_details_share_link_share_item.xml diff --git a/src/main/res/layout/file_details_share_public_link_add_new_item.xml b/app/src/main/res/layout/file_details_share_public_link_add_new_item.xml similarity index 100% rename from src/main/res/layout/file_details_share_public_link_add_new_item.xml rename to app/src/main/res/layout/file_details_share_public_link_add_new_item.xml diff --git a/src/main/res/layout/file_details_share_share_item.xml b/app/src/main/res/layout/file_details_share_share_item.xml similarity index 100% rename from src/main/res/layout/file_details_share_share_item.xml rename to app/src/main/res/layout/file_details_share_share_item.xml diff --git a/src/main/res/layout/file_details_sharing_fragment.xml b/app/src/main/res/layout/file_details_sharing_fragment.xml similarity index 100% rename from src/main/res/layout/file_details_sharing_fragment.xml rename to app/src/main/res/layout/file_details_sharing_fragment.xml diff --git a/src/main/res/layout/file_download_fragment.xml b/app/src/main/res/layout/file_download_fragment.xml similarity index 100% rename from src/main/res/layout/file_download_fragment.xml rename to app/src/main/res/layout/file_download_fragment.xml diff --git a/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml similarity index 100% rename from src/main/res/layout/file_list_actions_bottom_sheet_creator.xml rename to app/src/main/res/layout/file_list_actions_bottom_sheet_creator.xml diff --git a/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml similarity index 100% rename from src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml rename to app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml diff --git a/src/main/res/layout/files.xml b/app/src/main/res/layout/files.xml similarity index 97% rename from src/main/res/layout/files.xml rename to app/src/main/res/layout/files.xml index e244b99a54cb..b37cdd833b27 100644 --- a/src/main/res/layout/files.xml +++ b/app/src/main/res/layout/files.xml @@ -1,79 +1,79 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/layout/files_folder_picker.xml b/app/src/main/res/layout/files_folder_picker.xml similarity index 100% rename from src/main/res/layout/files_folder_picker.xml rename to app/src/main/res/layout/files_folder_picker.xml diff --git a/src/main/res/layout/files_picker.xml b/app/src/main/res/layout/files_picker.xml similarity index 100% rename from src/main/res/layout/files_picker.xml rename to app/src/main/res/layout/files_picker.xml diff --git a/src/main/res/layout/first_run_activity.xml b/app/src/main/res/layout/first_run_activity.xml similarity index 100% rename from src/main/res/layout/first_run_activity.xml rename to app/src/main/res/layout/first_run_activity.xml diff --git a/src/main/res/layout/fragment_etm_accounts.xml b/app/src/main/res/layout/fragment_etm_accounts.xml similarity index 100% rename from src/main/res/layout/fragment_etm_accounts.xml rename to app/src/main/res/layout/fragment_etm_accounts.xml diff --git a/src/main/res/layout/fragment_etm_background_jobs.xml b/app/src/main/res/layout/fragment_etm_background_jobs.xml similarity index 100% rename from src/main/res/layout/fragment_etm_background_jobs.xml rename to app/src/main/res/layout/fragment_etm_background_jobs.xml diff --git a/src/main/res/layout/fragment_etm_downloader.xml b/app/src/main/res/layout/fragment_etm_downloader.xml similarity index 100% rename from src/main/res/layout/fragment_etm_downloader.xml rename to app/src/main/res/layout/fragment_etm_downloader.xml diff --git a/src/main/res/layout/fragment_etm_menu.xml b/app/src/main/res/layout/fragment_etm_menu.xml similarity index 100% rename from src/main/res/layout/fragment_etm_menu.xml rename to app/src/main/res/layout/fragment_etm_menu.xml diff --git a/src/main/res/layout/fragment_etm_migrations.xml b/app/src/main/res/layout/fragment_etm_migrations.xml similarity index 100% rename from src/main/res/layout/fragment_etm_migrations.xml rename to app/src/main/res/layout/fragment_etm_migrations.xml diff --git a/src/main/res/layout/fragment_etm_preferences.xml b/app/src/main/res/layout/fragment_etm_preferences.xml similarity index 100% rename from src/main/res/layout/fragment_etm_preferences.xml rename to app/src/main/res/layout/fragment_etm_preferences.xml diff --git a/src/main/res/layout/fragment_preview_media.xml b/app/src/main/res/layout/fragment_preview_media.xml similarity index 100% rename from src/main/res/layout/fragment_preview_media.xml rename to app/src/main/res/layout/fragment_preview_media.xml diff --git a/src/main/res/layout/generic_explanation.xml b/app/src/main/res/layout/generic_explanation.xml similarity index 100% rename from src/main/res/layout/generic_explanation.xml rename to app/src/main/res/layout/generic_explanation.xml diff --git a/src/main/res/layout/grid_image.xml b/app/src/main/res/layout/grid_image.xml similarity index 100% rename from src/main/res/layout/grid_image.xml rename to app/src/main/res/layout/grid_image.xml diff --git a/src/main/res/layout/grid_item.xml b/app/src/main/res/layout/grid_item.xml similarity index 97% rename from src/main/res/layout/grid_item.xml rename to app/src/main/res/layout/grid_item.xml index 5804bf30ee50..fbc58e418134 100644 --- a/src/main/res/layout/grid_item.xml +++ b/app/src/main/res/layout/grid_item.xml @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/layout/grid_sync_item.xml b/app/src/main/res/layout/grid_sync_item.xml similarity index 100% rename from src/main/res/layout/grid_sync_item.xml rename to app/src/main/res/layout/grid_sync_item.xml diff --git a/src/main/res/layout/info_box.xml b/app/src/main/res/layout/info_box.xml similarity index 100% rename from src/main/res/layout/info_box.xml rename to app/src/main/res/layout/info_box.xml diff --git a/src/main/res/layout/list_footer.xml b/app/src/main/res/layout/list_footer.xml similarity index 100% rename from src/main/res/layout/list_footer.xml rename to app/src/main/res/layout/list_footer.xml diff --git a/src/main/res/layout/list_fragment.xml b/app/src/main/res/layout/list_fragment.xml similarity index 100% rename from src/main/res/layout/list_fragment.xml rename to app/src/main/res/layout/list_fragment.xml diff --git a/src/main/res/layout/list_header.xml b/app/src/main/res/layout/list_header.xml similarity index 100% rename from src/main/res/layout/list_header.xml rename to app/src/main/res/layout/list_header.xml diff --git a/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml similarity index 100% rename from src/main/res/layout/list_item.xml rename to app/src/main/res/layout/list_item.xml diff --git a/src/main/res/layout/loading_dialog.xml b/app/src/main/res/layout/loading_dialog.xml similarity index 100% rename from src/main/res/layout/loading_dialog.xml rename to app/src/main/res/layout/loading_dialog.xml diff --git a/src/main/res/layout/log_entry_list_item.xml b/app/src/main/res/layout/log_entry_list_item.xml similarity index 100% rename from src/main/res/layout/log_entry_list_item.xml rename to app/src/main/res/layout/log_entry_list_item.xml diff --git a/src/main/res/layout/logs_activity.xml b/app/src/main/res/layout/logs_activity.xml similarity index 100% rename from src/main/res/layout/logs_activity.xml rename to app/src/main/res/layout/logs_activity.xml diff --git a/src/main/res/layout/material_list_item_single_line.xml b/app/src/main/res/layout/material_list_item_single_line.xml similarity index 100% rename from src/main/res/layout/material_list_item_single_line.xml rename to app/src/main/res/layout/material_list_item_single_line.xml diff --git a/src/main/res/layout/media_control.xml b/app/src/main/res/layout/media_control.xml similarity index 100% rename from src/main/res/layout/media_control.xml rename to app/src/main/res/layout/media_control.xml diff --git a/src/main/res/layout/multiple_accounts.xml b/app/src/main/res/layout/multiple_accounts.xml similarity index 100% rename from src/main/res/layout/multiple_accounts.xml rename to app/src/main/res/layout/multiple_accounts.xml diff --git a/src/main/res/layout/note_dialog.xml b/app/src/main/res/layout/note_dialog.xml similarity index 100% rename from src/main/res/layout/note_dialog.xml rename to app/src/main/res/layout/note_dialog.xml diff --git a/src/main/res/layout/notification_list_item.xml b/app/src/main/res/layout/notification_list_item.xml similarity index 100% rename from src/main/res/layout/notification_list_item.xml rename to app/src/main/res/layout/notification_list_item.xml diff --git a/src/main/res/layout/notifications_layout.xml b/app/src/main/res/layout/notifications_layout.xml similarity index 100% rename from src/main/res/layout/notifications_layout.xml rename to app/src/main/res/layout/notifications_layout.xml diff --git a/src/main/res/layout/passcodelock.xml b/app/src/main/res/layout/passcodelock.xml similarity index 100% rename from src/main/res/layout/passcodelock.xml rename to app/src/main/res/layout/passcodelock.xml diff --git a/src/main/res/layout/password_dialog.xml b/app/src/main/res/layout/password_dialog.xml similarity index 100% rename from src/main/res/layout/password_dialog.xml rename to app/src/main/res/layout/password_dialog.xml diff --git a/src/main/res/layout/predefined_status.xml b/app/src/main/res/layout/predefined_status.xml similarity index 100% rename from src/main/res/layout/predefined_status.xml rename to app/src/main/res/layout/predefined_status.xml diff --git a/src/main/res/layout/preview_image_activity.xml b/app/src/main/res/layout/preview_image_activity.xml similarity index 100% rename from src/main/res/layout/preview_image_activity.xml rename to app/src/main/res/layout/preview_image_activity.xml diff --git a/src/main/res/layout/preview_image_error_fragment.xml b/app/src/main/res/layout/preview_image_error_fragment.xml similarity index 100% rename from src/main/res/layout/preview_image_error_fragment.xml rename to app/src/main/res/layout/preview_image_error_fragment.xml diff --git a/src/main/res/layout/preview_image_fragment.xml b/app/src/main/res/layout/preview_image_fragment.xml similarity index 100% rename from src/main/res/layout/preview_image_fragment.xml rename to app/src/main/res/layout/preview_image_fragment.xml diff --git a/src/main/res/layout/receive_external_files.xml b/app/src/main/res/layout/receive_external_files.xml similarity index 100% rename from src/main/res/layout/receive_external_files.xml rename to app/src/main/res/layout/receive_external_files.xml diff --git a/src/main/res/layout/richdocuments_webview.xml b/app/src/main/res/layout/richdocuments_webview.xml similarity index 100% rename from src/main/res/layout/richdocuments_webview.xml rename to app/src/main/res/layout/richdocuments_webview.xml diff --git a/src/main/res/layout/search_users_groups_layout.xml b/app/src/main/res/layout/search_users_groups_layout.xml similarity index 100% rename from src/main/res/layout/search_users_groups_layout.xml rename to app/src/main/res/layout/search_users_groups_layout.xml diff --git a/src/main/res/layout/send_button.xml b/app/src/main/res/layout/send_button.xml similarity index 100% rename from src/main/res/layout/send_button.xml rename to app/src/main/res/layout/send_button.xml diff --git a/src/main/res/layout/send_files_fragment.xml b/app/src/main/res/layout/send_files_fragment.xml similarity index 100% rename from src/main/res/layout/send_files_fragment.xml rename to app/src/main/res/layout/send_files_fragment.xml diff --git a/src/main/res/layout/send_share_fragment.xml b/app/src/main/res/layout/send_share_fragment.xml similarity index 100% rename from src/main/res/layout/send_share_fragment.xml rename to app/src/main/res/layout/send_share_fragment.xml diff --git a/src/main/res/layout/setup_encryption_dialog.xml b/app/src/main/res/layout/setup_encryption_dialog.xml similarity index 100% rename from src/main/res/layout/setup_encryption_dialog.xml rename to app/src/main/res/layout/setup_encryption_dialog.xml diff --git a/src/main/res/layout/share_activity.xml b/app/src/main/res/layout/share_activity.xml similarity index 100% rename from src/main/res/layout/share_activity.xml rename to app/src/main/res/layout/share_activity.xml diff --git a/src/main/res/layout/sorting_order_fragment.xml b/app/src/main/res/layout/sorting_order_fragment.xml similarity index 100% rename from src/main/res/layout/sorting_order_fragment.xml rename to app/src/main/res/layout/sorting_order_fragment.xml diff --git a/src/main/res/layout/ssl_untrusted_cert_layout.xml b/app/src/main/res/layout/ssl_untrusted_cert_layout.xml similarity index 100% rename from src/main/res/layout/ssl_untrusted_cert_layout.xml rename to app/src/main/res/layout/ssl_untrusted_cert_layout.xml diff --git a/src/main/res/layout/ssl_validator_layout.xml b/app/src/main/res/layout/ssl_validator_layout.xml similarity index 100% rename from src/main/res/layout/ssl_validator_layout.xml rename to app/src/main/res/layout/ssl_validator_layout.xml diff --git a/src/main/res/layout/storage_path_dialog.xml b/app/src/main/res/layout/storage_path_dialog.xml similarity index 100% rename from src/main/res/layout/storage_path_dialog.xml rename to app/src/main/res/layout/storage_path_dialog.xml diff --git a/src/main/res/layout/storage_path_item.xml b/app/src/main/res/layout/storage_path_item.xml similarity index 100% rename from src/main/res/layout/storage_path_item.xml rename to app/src/main/res/layout/storage_path_item.xml diff --git a/src/main/res/layout/synced_folders_empty.xml b/app/src/main/res/layout/synced_folders_empty.xml similarity index 100% rename from src/main/res/layout/synced_folders_empty.xml rename to app/src/main/res/layout/synced_folders_empty.xml diff --git a/src/main/res/layout/synced_folders_footer.xml b/app/src/main/res/layout/synced_folders_footer.xml similarity index 100% rename from src/main/res/layout/synced_folders_footer.xml rename to app/src/main/res/layout/synced_folders_footer.xml diff --git a/src/main/res/layout/synced_folders_item_header.xml b/app/src/main/res/layout/synced_folders_item_header.xml similarity index 100% rename from src/main/res/layout/synced_folders_item_header.xml rename to app/src/main/res/layout/synced_folders_item_header.xml diff --git a/src/main/res/layout/synced_folders_layout.xml b/app/src/main/res/layout/synced_folders_layout.xml similarity index 100% rename from src/main/res/layout/synced_folders_layout.xml rename to app/src/main/res/layout/synced_folders_layout.xml diff --git a/src/main/res/layout/synced_folders_list_item_shimmer.xml b/app/src/main/res/layout/synced_folders_list_item_shimmer.xml similarity index 100% rename from src/main/res/layout/synced_folders_list_item_shimmer.xml rename to app/src/main/res/layout/synced_folders_list_item_shimmer.xml diff --git a/src/main/res/layout/synced_folders_settings_layout.xml b/app/src/main/res/layout/synced_folders_settings_layout.xml similarity index 100% rename from src/main/res/layout/synced_folders_settings_layout.xml rename to app/src/main/res/layout/synced_folders_settings_layout.xml diff --git a/src/main/res/layout/template_button.xml b/app/src/main/res/layout/template_button.xml similarity index 100% rename from src/main/res/layout/template_button.xml rename to app/src/main/res/layout/template_button.xml diff --git a/src/main/res/layout/test_layout.xml b/app/src/main/res/layout/test_layout.xml similarity index 100% rename from src/main/res/layout/test_layout.xml rename to app/src/main/res/layout/test_layout.xml diff --git a/src/main/res/layout/text_file_preview.xml b/app/src/main/res/layout/text_file_preview.xml similarity index 100% rename from src/main/res/layout/text_file_preview.xml rename to app/src/main/res/layout/text_file_preview.xml diff --git a/src/main/res/layout/toolbar_standard.xml b/app/src/main/res/layout/toolbar_standard.xml similarity index 100% rename from src/main/res/layout/toolbar_standard.xml rename to app/src/main/res/layout/toolbar_standard.xml diff --git a/src/main/res/layout/trashbin_activity.xml b/app/src/main/res/layout/trashbin_activity.xml similarity index 100% rename from src/main/res/layout/trashbin_activity.xml rename to app/src/main/res/layout/trashbin_activity.xml diff --git a/src/main/res/layout/trashbin_item.xml b/app/src/main/res/layout/trashbin_item.xml similarity index 100% rename from src/main/res/layout/trashbin_item.xml rename to app/src/main/res/layout/trashbin_item.xml diff --git a/src/main/res/layout/trashbin_item_shimmer.xml b/app/src/main/res/layout/trashbin_item_shimmer.xml similarity index 100% rename from src/main/res/layout/trashbin_item_shimmer.xml rename to app/src/main/res/layout/trashbin_item_shimmer.xml diff --git a/src/main/res/layout/upload_file_dialog.xml b/app/src/main/res/layout/upload_file_dialog.xml similarity index 100% rename from src/main/res/layout/upload_file_dialog.xml rename to app/src/main/res/layout/upload_file_dialog.xml diff --git a/src/main/res/layout/upload_files_layout.xml b/app/src/main/res/layout/upload_files_layout.xml similarity index 97% rename from src/main/res/layout/upload_files_layout.xml rename to app/src/main/res/layout/upload_files_layout.xml index 03c214e5045e..7be3552dc05c 100644 --- a/src/main/res/layout/upload_files_layout.xml +++ b/app/src/main/res/layout/upload_files_layout.xml @@ -1,103 +1,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/layout/upload_list_header.xml b/app/src/main/res/layout/upload_list_header.xml similarity index 100% rename from src/main/res/layout/upload_list_header.xml rename to app/src/main/res/layout/upload_list_header.xml diff --git a/src/main/res/layout/upload_list_item.xml b/app/src/main/res/layout/upload_list_item.xml similarity index 100% rename from src/main/res/layout/upload_list_item.xml rename to app/src/main/res/layout/upload_list_item.xml diff --git a/src/main/res/layout/upload_list_layout.xml b/app/src/main/res/layout/upload_list_layout.xml similarity index 100% rename from src/main/res/layout/upload_list_layout.xml rename to app/src/main/res/layout/upload_list_layout.xml diff --git a/src/main/res/layout/uploader_list_item_layout.xml b/app/src/main/res/layout/uploader_list_item_layout.xml similarity index 100% rename from src/main/res/layout/uploader_list_item_layout.xml rename to app/src/main/res/layout/uploader_list_item_layout.xml diff --git a/src/main/res/layout/user_info_details_table_item.xml b/app/src/main/res/layout/user_info_details_table_item.xml similarity index 100% rename from src/main/res/layout/user_info_details_table_item.xml rename to app/src/main/res/layout/user_info_details_table_item.xml diff --git a/src/main/res/layout/user_info_layout.xml b/app/src/main/res/layout/user_info_layout.xml similarity index 100% rename from src/main/res/layout/user_info_layout.xml rename to app/src/main/res/layout/user_info_layout.xml diff --git a/src/main/res/layout/version_list_item.xml b/app/src/main/res/layout/version_list_item.xml similarity index 100% rename from src/main/res/layout/version_list_item.xml rename to app/src/main/res/layout/version_list_item.xml diff --git a/src/main/res/layout/video_layout.xml b/app/src/main/res/layout/video_layout.xml similarity index 100% rename from src/main/res/layout/video_layout.xml rename to app/src/main/res/layout/video_layout.xml diff --git a/src/main/res/layout/whats_new_activity.xml b/app/src/main/res/layout/whats_new_activity.xml similarity index 100% rename from src/main/res/layout/whats_new_activity.xml rename to app/src/main/res/layout/whats_new_activity.xml diff --git a/src/main/res/layout/whats_new_element.xml b/app/src/main/res/layout/whats_new_element.xml similarity index 100% rename from src/main/res/layout/whats_new_element.xml rename to app/src/main/res/layout/whats_new_element.xml diff --git a/src/main/res/layout/whats_new_webview_element.xml b/app/src/main/res/layout/whats_new_webview_element.xml similarity index 100% rename from src/main/res/layout/whats_new_webview_element.xml rename to app/src/main/res/layout/whats_new_webview_element.xml diff --git a/src/main/res/menu/activity_file_display.xml b/app/src/main/res/menu/activity_file_display.xml similarity index 100% rename from src/main/res/menu/activity_file_display.xml rename to app/src/main/res/menu/activity_file_display.xml diff --git a/src/main/res/menu/activity_folder_picker.xml b/app/src/main/res/menu/activity_folder_picker.xml similarity index 100% rename from src/main/res/menu/activity_folder_picker.xml rename to app/src/main/res/menu/activity_folder_picker.xml diff --git a/src/main/res/menu/activity_logs.xml b/app/src/main/res/menu/activity_logs.xml similarity index 100% rename from src/main/res/menu/activity_logs.xml rename to app/src/main/res/menu/activity_logs.xml diff --git a/src/main/res/menu/activity_notifications.xml b/app/src/main/res/menu/activity_notifications.xml similarity index 100% rename from src/main/res/menu/activity_notifications.xml rename to app/src/main/res/menu/activity_notifications.xml diff --git a/src/main/res/menu/activity_receive_external_files.xml b/app/src/main/res/menu/activity_receive_external_files.xml similarity index 100% rename from src/main/res/menu/activity_receive_external_files.xml rename to app/src/main/res/menu/activity_receive_external_files.xml diff --git a/src/main/res/menu/activity_show_error.xml b/app/src/main/res/menu/activity_show_error.xml similarity index 100% rename from src/main/res/menu/activity_show_error.xml rename to app/src/main/res/menu/activity_show_error.xml diff --git a/src/main/res/menu/activity_synced_folders.xml b/app/src/main/res/menu/activity_synced_folders.xml similarity index 100% rename from src/main/res/menu/activity_synced_folders.xml rename to app/src/main/res/menu/activity_synced_folders.xml diff --git a/src/main/res/menu/activity_trashbin.xml b/app/src/main/res/menu/activity_trashbin.xml similarity index 100% rename from src/main/res/menu/activity_trashbin.xml rename to app/src/main/res/menu/activity_trashbin.xml diff --git a/src/main/res/menu/activity_upload_files.xml b/app/src/main/res/menu/activity_upload_files.xml similarity index 100% rename from src/main/res/menu/activity_upload_files.xml rename to app/src/main/res/menu/activity_upload_files.xml diff --git a/src/main/res/menu/activity_upload_list.xml b/app/src/main/res/menu/activity_upload_list.xml similarity index 100% rename from src/main/res/menu/activity_upload_list.xml rename to app/src/main/res/menu/activity_upload_list.xml diff --git a/src/main/res/menu/fragment_contact_list.xml b/app/src/main/res/menu/fragment_contact_list.xml similarity index 100% rename from src/main/res/menu/fragment_contact_list.xml rename to app/src/main/res/menu/fragment_contact_list.xml diff --git a/src/main/res/menu/fragment_etm_accounts.xml b/app/src/main/res/menu/fragment_etm_accounts.xml similarity index 100% rename from src/main/res/menu/fragment_etm_accounts.xml rename to app/src/main/res/menu/fragment_etm_accounts.xml diff --git a/src/main/res/menu/fragment_etm_background_jobs.xml b/app/src/main/res/menu/fragment_etm_background_jobs.xml similarity index 100% rename from src/main/res/menu/fragment_etm_background_jobs.xml rename to app/src/main/res/menu/fragment_etm_background_jobs.xml diff --git a/src/main/res/menu/fragment_etm_downloader.xml b/app/src/main/res/menu/fragment_etm_downloader.xml similarity index 100% rename from src/main/res/menu/fragment_etm_downloader.xml rename to app/src/main/res/menu/fragment_etm_downloader.xml diff --git a/src/main/res/menu/fragment_etm_migrations.xml b/app/src/main/res/menu/fragment_etm_migrations.xml similarity index 100% rename from src/main/res/menu/fragment_etm_migrations.xml rename to app/src/main/res/menu/fragment_etm_migrations.xml diff --git a/src/main/res/menu/fragment_etm_preferences.xml b/app/src/main/res/menu/fragment_etm_preferences.xml similarity index 100% rename from src/main/res/menu/fragment_etm_preferences.xml rename to app/src/main/res/menu/fragment_etm_preferences.xml diff --git a/src/main/res/menu/fragment_file_detail.xml b/app/src/main/res/menu/fragment_file_detail.xml similarity index 100% rename from src/main/res/menu/fragment_file_detail.xml rename to app/src/main/res/menu/fragment_file_detail.xml diff --git a/src/main/res/menu/fragment_file_detail_sharing_email_link.xml b/app/src/main/res/menu/fragment_file_detail_sharing_email_link.xml similarity index 100% rename from src/main/res/menu/fragment_file_detail_sharing_email_link.xml rename to app/src/main/res/menu/fragment_file_detail_sharing_email_link.xml diff --git a/src/main/res/menu/fragment_file_detail_sharing_public_link.xml b/app/src/main/res/menu/fragment_file_detail_sharing_public_link.xml similarity index 100% rename from src/main/res/menu/fragment_file_detail_sharing_public_link.xml rename to app/src/main/res/menu/fragment_file_detail_sharing_public_link.xml diff --git a/src/main/res/menu/item_account.xml b/app/src/main/res/menu/item_account.xml similarity index 100% rename from src/main/res/menu/item_account.xml rename to app/src/main/res/menu/item_account.xml diff --git a/src/main/res/menu/item_file.xml b/app/src/main/res/menu/item_file.xml similarity index 100% rename from src/main/res/menu/item_file.xml rename to app/src/main/res/menu/item_file.xml diff --git a/src/main/res/menu/item_trashbin.xml b/app/src/main/res/menu/item_trashbin.xml similarity index 100% rename from src/main/res/menu/item_trashbin.xml rename to app/src/main/res/menu/item_trashbin.xml diff --git a/src/main/res/menu/item_user_sharing_settings.xml b/app/src/main/res/menu/item_user_sharing_settings.xml similarity index 100% rename from src/main/res/menu/item_user_sharing_settings.xml rename to app/src/main/res/menu/item_user_sharing_settings.xml diff --git a/src/main/res/menu/partial_drawer_entries.xml b/app/src/main/res/menu/partial_drawer_entries.xml similarity index 100% rename from src/main/res/menu/partial_drawer_entries.xml rename to app/src/main/res/menu/partial_drawer_entries.xml diff --git a/src/main/res/menu/synced_folders_adapter.xml b/app/src/main/res/menu/synced_folders_adapter.xml similarity index 100% rename from src/main/res/menu/synced_folders_adapter.xml rename to app/src/main/res/menu/synced_folders_adapter.xml diff --git a/src/main/res/menu/upload_list_item_file_conflict.xml b/app/src/main/res/menu/upload_list_item_file_conflict.xml similarity index 100% rename from src/main/res/menu/upload_list_item_file_conflict.xml rename to app/src/main/res/menu/upload_list_item_file_conflict.xml diff --git a/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/main/res/raw/custom_error.html b/app/src/main/res/raw/custom_error.html similarity index 100% rename from src/main/res/raw/custom_error.html rename to app/src/main/res/raw/custom_error.html diff --git a/src/main/res/raw/encryption_key_words.txt b/app/src/main/res/raw/encryption_key_words.txt similarity index 100% rename from src/main/res/raw/encryption_key_words.txt rename to app/src/main/res/raw/encryption_key_words.txt diff --git a/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml similarity index 100% rename from src/main/res/values-ar/strings.xml rename to app/src/main/res/values-ar/strings.xml diff --git a/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml similarity index 100% rename from src/main/res/values-b+en+001/strings.xml rename to app/src/main/res/values-b+en+001/strings.xml diff --git a/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml similarity index 100% rename from src/main/res/values-b+es+419/strings.xml rename to app/src/main/res/values-b+es+419/strings.xml diff --git a/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml similarity index 100% rename from src/main/res/values-bg-rBG/strings.xml rename to app/src/main/res/values-bg-rBG/strings.xml diff --git a/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml similarity index 100% rename from src/main/res/values-br/strings.xml rename to app/src/main/res/values-br/strings.xml diff --git a/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml similarity index 100% rename from src/main/res/values-ca/strings.xml rename to app/src/main/res/values-ca/strings.xml diff --git a/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from src/main/res/values-cs-rCZ/strings.xml rename to app/src/main/res/values-cs-rCZ/strings.xml diff --git a/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml similarity index 100% rename from src/main/res/values-da/strings.xml rename to app/src/main/res/values-da/strings.xml diff --git a/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml similarity index 100% rename from src/main/res/values-de/strings.xml rename to app/src/main/res/values-de/strings.xml diff --git a/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml similarity index 100% rename from src/main/res/values-el/strings.xml rename to app/src/main/res/values-el/strings.xml diff --git a/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml similarity index 100% rename from src/main/res/values-eo/strings.xml rename to app/src/main/res/values-eo/strings.xml diff --git a/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml similarity index 100% rename from src/main/res/values-es-rAR/strings.xml rename to app/src/main/res/values-es-rAR/strings.xml diff --git a/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml similarity index 100% rename from src/main/res/values-es-rCL/strings.xml rename to app/src/main/res/values-es-rCL/strings.xml diff --git a/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml similarity index 100% rename from src/main/res/values-es-rCO/strings.xml rename to app/src/main/res/values-es-rCO/strings.xml diff --git a/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml similarity index 100% rename from src/main/res/values-es-rCR/strings.xml rename to app/src/main/res/values-es-rCR/strings.xml diff --git a/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml similarity index 100% rename from src/main/res/values-es-rDO/strings.xml rename to app/src/main/res/values-es-rDO/strings.xml diff --git a/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml similarity index 100% rename from src/main/res/values-es-rEC/strings.xml rename to app/src/main/res/values-es-rEC/strings.xml diff --git a/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml similarity index 100% rename from src/main/res/values-es-rGT/strings.xml rename to app/src/main/res/values-es-rGT/strings.xml diff --git a/src/main/res/values-es-rHN/strings.xml b/app/src/main/res/values-es-rHN/strings.xml similarity index 100% rename from src/main/res/values-es-rHN/strings.xml rename to app/src/main/res/values-es-rHN/strings.xml diff --git a/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from src/main/res/values-es-rMX/strings.xml rename to app/src/main/res/values-es-rMX/strings.xml diff --git a/src/main/res/values-es-rNI/strings.xml b/app/src/main/res/values-es-rNI/strings.xml similarity index 100% rename from src/main/res/values-es-rNI/strings.xml rename to app/src/main/res/values-es-rNI/strings.xml diff --git a/src/main/res/values-es-rPA/strings.xml b/app/src/main/res/values-es-rPA/strings.xml similarity index 100% rename from src/main/res/values-es-rPA/strings.xml rename to app/src/main/res/values-es-rPA/strings.xml diff --git a/src/main/res/values-es-rPE/strings.xml b/app/src/main/res/values-es-rPE/strings.xml similarity index 100% rename from src/main/res/values-es-rPE/strings.xml rename to app/src/main/res/values-es-rPE/strings.xml diff --git a/src/main/res/values-es-rPR/strings.xml b/app/src/main/res/values-es-rPR/strings.xml similarity index 100% rename from src/main/res/values-es-rPR/strings.xml rename to app/src/main/res/values-es-rPR/strings.xml diff --git a/src/main/res/values-es-rPY/strings.xml b/app/src/main/res/values-es-rPY/strings.xml similarity index 100% rename from src/main/res/values-es-rPY/strings.xml rename to app/src/main/res/values-es-rPY/strings.xml diff --git a/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml similarity index 100% rename from src/main/res/values-es-rSV/strings.xml rename to app/src/main/res/values-es-rSV/strings.xml diff --git a/src/main/res/values-es-rUY/strings.xml b/app/src/main/res/values-es-rUY/strings.xml similarity index 100% rename from src/main/res/values-es-rUY/strings.xml rename to app/src/main/res/values-es-rUY/strings.xml diff --git a/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml similarity index 100% rename from src/main/res/values-es/strings.xml rename to app/src/main/res/values-es/strings.xml diff --git a/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from src/main/res/values-et-rEE/strings.xml rename to app/src/main/res/values-et-rEE/strings.xml diff --git a/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml similarity index 100% rename from src/main/res/values-eu/strings.xml rename to app/src/main/res/values-eu/strings.xml diff --git a/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml similarity index 100% rename from src/main/res/values-fa/strings.xml rename to app/src/main/res/values-fa/strings.xml diff --git a/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml similarity index 100% rename from src/main/res/values-fi-rFI/strings.xml rename to app/src/main/res/values-fi-rFI/strings.xml diff --git a/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml similarity index 100% rename from src/main/res/values-fr/strings.xml rename to app/src/main/res/values-fr/strings.xml diff --git a/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml similarity index 100% rename from src/main/res/values-gl/strings.xml rename to app/src/main/res/values-gl/strings.xml diff --git a/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml similarity index 100% rename from src/main/res/values-hr/strings.xml rename to app/src/main/res/values-hr/strings.xml diff --git a/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml similarity index 100% rename from src/main/res/values-hu-rHU/strings.xml rename to app/src/main/res/values-hu-rHU/strings.xml diff --git a/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml similarity index 100% rename from src/main/res/values-in/strings.xml rename to app/src/main/res/values-in/strings.xml diff --git a/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml similarity index 100% rename from src/main/res/values-is/strings.xml rename to app/src/main/res/values-is/strings.xml diff --git a/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml similarity index 100% rename from src/main/res/values-it/strings.xml rename to app/src/main/res/values-it/strings.xml diff --git a/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml similarity index 100% rename from src/main/res/values-iw/strings.xml rename to app/src/main/res/values-iw/strings.xml diff --git a/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml similarity index 100% rename from src/main/res/values-ja-rJP/strings.xml rename to app/src/main/res/values-ja-rJP/strings.xml diff --git a/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml similarity index 100% rename from src/main/res/values-ka-rGE/strings.xml rename to app/src/main/res/values-ka-rGE/strings.xml diff --git a/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml similarity index 100% rename from src/main/res/values-ko/strings.xml rename to app/src/main/res/values-ko/strings.xml diff --git a/src/main/res/values-land/bools.xml b/app/src/main/res/values-land/bools.xml similarity index 100% rename from src/main/res/values-land/bools.xml rename to app/src/main/res/values-land/bools.xml diff --git a/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml similarity index 100% rename from src/main/res/values-lt-rLT/strings.xml rename to app/src/main/res/values-lt-rLT/strings.xml diff --git a/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml similarity index 100% rename from src/main/res/values-lv/strings.xml rename to app/src/main/res/values-lv/strings.xml diff --git a/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml similarity index 100% rename from src/main/res/values-mk/strings.xml rename to app/src/main/res/values-mk/strings.xml diff --git a/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml similarity index 100% rename from src/main/res/values-nb-rNO/strings.xml rename to app/src/main/res/values-nb-rNO/strings.xml diff --git a/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml similarity index 100% rename from src/main/res/values-night/colors.xml rename to app/src/main/res/values-night/colors.xml diff --git a/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml similarity index 100% rename from src/main/res/values-nl/strings.xml rename to app/src/main/res/values-nl/strings.xml diff --git a/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml similarity index 100% rename from src/main/res/values-pl/strings.xml rename to app/src/main/res/values-pl/strings.xml diff --git a/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from src/main/res/values-pt-rBR/strings.xml rename to app/src/main/res/values-pt-rBR/strings.xml diff --git a/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from src/main/res/values-pt-rPT/strings.xml rename to app/src/main/res/values-pt-rPT/strings.xml diff --git a/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml similarity index 100% rename from src/main/res/values-ro/strings.xml rename to app/src/main/res/values-ro/strings.xml diff --git a/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml similarity index 100% rename from src/main/res/values-ru/strings.xml rename to app/src/main/res/values-ru/strings.xml diff --git a/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml similarity index 100% rename from src/main/res/values-sc/strings.xml rename to app/src/main/res/values-sc/strings.xml diff --git a/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml similarity index 100% rename from src/main/res/values-sk-rSK/strings.xml rename to app/src/main/res/values-sk-rSK/strings.xml diff --git a/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml similarity index 100% rename from src/main/res/values-sl/strings.xml rename to app/src/main/res/values-sl/strings.xml diff --git a/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml similarity index 100% rename from src/main/res/values-sq/strings.xml rename to app/src/main/res/values-sq/strings.xml diff --git a/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml similarity index 100% rename from src/main/res/values-sr-rSP/strings.xml rename to app/src/main/res/values-sr-rSP/strings.xml diff --git a/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml similarity index 100% rename from src/main/res/values-sr/strings.xml rename to app/src/main/res/values-sr/strings.xml diff --git a/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml similarity index 100% rename from src/main/res/values-sv/strings.xml rename to app/src/main/res/values-sv/strings.xml diff --git a/src/main/res/values-sw360dp/dims.xml b/app/src/main/res/values-sw360dp/dims.xml similarity index 100% rename from src/main/res/values-sw360dp/dims.xml rename to app/src/main/res/values-sw360dp/dims.xml diff --git a/src/main/res/values-sw600dp/dims.xml b/app/src/main/res/values-sw600dp/dims.xml similarity index 100% rename from src/main/res/values-sw600dp/dims.xml rename to app/src/main/res/values-sw600dp/dims.xml diff --git a/src/main/res/values-tk/strings.xml b/app/src/main/res/values-tk/strings.xml similarity index 100% rename from src/main/res/values-tk/strings.xml rename to app/src/main/res/values-tk/strings.xml diff --git a/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml similarity index 100% rename from src/main/res/values-tr/strings.xml rename to app/src/main/res/values-tr/strings.xml diff --git a/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml similarity index 100% rename from src/main/res/values-uk/strings.xml rename to app/src/main/res/values-uk/strings.xml diff --git a/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml similarity index 100% rename from src/main/res/values-v27/styles.xml rename to app/src/main/res/values-v27/styles.xml diff --git a/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml similarity index 100% rename from src/main/res/values-vi/strings.xml rename to app/src/main/res/values-vi/strings.xml diff --git a/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from src/main/res/values-zh-rCN/strings.xml rename to app/src/main/res/values-zh-rCN/strings.xml diff --git a/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from src/main/res/values-zh-rHK/strings.xml rename to app/src/main/res/values-zh-rHK/strings.xml diff --git a/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/main/res/values-zh-rTW/strings.xml rename to app/src/main/res/values-zh-rTW/strings.xml diff --git a/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml similarity index 100% rename from src/main/res/values/arrays.xml rename to app/src/main/res/values/arrays.xml diff --git a/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from src/main/res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml similarity index 100% rename from src/main/res/values/bools.xml rename to app/src/main/res/values/bools.xml diff --git a/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml similarity index 100% rename from src/main/res/values/dims.xml rename to app/src/main/res/values/dims.xml diff --git a/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml similarity index 100% rename from src/main/res/values/setup.xml rename to app/src/main/res/values/setup.xml diff --git a/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/src/main/res/xml/authenticator.xml b/app/src/main/res/xml/authenticator.xml similarity index 100% rename from src/main/res/xml/authenticator.xml rename to app/src/main/res/xml/authenticator.xml diff --git a/src/main/res/xml/backup_config.xml b/app/src/main/res/xml/backup_config.xml similarity index 100% rename from src/main/res/xml/backup_config.xml rename to app/src/main/res/xml/backup_config.xml diff --git a/src/main/res/xml/exposed_filepaths.xml b/app/src/main/res/xml/exposed_filepaths.xml similarity index 100% rename from src/main/res/xml/exposed_filepaths.xml rename to app/src/main/res/xml/exposed_filepaths.xml diff --git a/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml similarity index 100% rename from src/main/res/xml/network_security_config.xml rename to app/src/main/res/xml/network_security_config.xml diff --git a/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml similarity index 100% rename from src/main/res/xml/preferences.xml rename to app/src/main/res/xml/preferences.xml diff --git a/src/main/res/xml/syncadapter_files.xml b/app/src/main/res/xml/syncadapter_files.xml similarity index 100% rename from src/main/res/xml/syncadapter_files.xml rename to app/src/main/res/xml/syncadapter_files.xml diff --git a/src/main/res/xml/users_and_groups_searchable.xml b/app/src/main/res/xml/users_and_groups_searchable.xml similarity index 100% rename from src/main/res/xml/users_and_groups_searchable.xml rename to app/src/main/res/xml/users_and_groups_searchable.xml diff --git a/src/qa/AndroidManifest.xml b/app/src/qa/AndroidManifest.xml similarity index 100% rename from src/qa/AndroidManifest.xml rename to app/src/qa/AndroidManifest.xml diff --git a/src/qa/google-services.json b/app/src/qa/google-services.json similarity index 100% rename from src/qa/google-services.json rename to app/src/qa/google-services.json diff --git a/src/qa/ic_launcher-web.png b/app/src/qa/ic_launcher-web.png similarity index 100% rename from src/qa/ic_launcher-web.png rename to app/src/qa/ic_launcher-web.png diff --git a/src/qa/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/qa/java/com/nextcloud/client/di/VariantComponentsModule.java similarity index 100% rename from src/qa/java/com/nextcloud/client/di/VariantComponentsModule.java rename to app/src/qa/java/com/nextcloud/client/di/VariantComponentsModule.java diff --git a/src/qa/java/com/owncloud/android/utils/PushUtils.java b/app/src/qa/java/com/owncloud/android/utils/PushUtils.java similarity index 100% rename from src/qa/java/com/owncloud/android/utils/PushUtils.java rename to app/src/qa/java/com/owncloud/android/utils/PushUtils.java diff --git a/src/qa/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java similarity index 100% rename from src/qa/java/com/owncloud/android/utils/SecurityUtils.java rename to app/src/qa/java/com/owncloud/android/utils/SecurityUtils.java diff --git a/src/qa/res/drawable-v24/ic_launcher_background.xml b/app/src/qa/res/drawable-v24/ic_launcher_background.xml similarity index 100% rename from src/qa/res/drawable-v24/ic_launcher_background.xml rename to app/src/qa/res/drawable-v24/ic_launcher_background.xml diff --git a/src/qa/res/drawable-v24/ic_launcher_foreground.xml b/app/src/qa/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from src/qa/res/drawable-v24/ic_launcher_foreground.xml rename to app/src/qa/res/drawable-v24/ic_launcher_foreground.xml diff --git a/src/qa/res/drawable/ic_launcher_background.xml b/app/src/qa/res/drawable/ic_launcher_background.xml similarity index 100% rename from src/qa/res/drawable/ic_launcher_background.xml rename to app/src/qa/res/drawable/ic_launcher_background.xml diff --git a/src/qa/res/drawable/ic_launcher_foreground.xml b/app/src/qa/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from src/qa/res/drawable/ic_launcher_foreground.xml rename to app/src/qa/res/drawable/ic_launcher_foreground.xml diff --git a/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src/qa/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/qa/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src/qa/res/mipmap-hdpi/ic_launcher.png b/app/src/qa/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/qa/res/mipmap-hdpi/ic_launcher.png rename to app/src/qa/res/mipmap-hdpi/ic_launcher.png diff --git a/src/qa/res/mipmap-mdpi/ic_launcher.png b/app/src/qa/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/qa/res/mipmap-mdpi/ic_launcher.png rename to app/src/qa/res/mipmap-mdpi/ic_launcher.png diff --git a/src/qa/res/mipmap-xhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/qa/res/mipmap-xhdpi/ic_launcher.png rename to app/src/qa/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/qa/res/mipmap-xxhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/qa/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/qa/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/qa/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/qa/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/qa/res/values/setup.xml b/app/src/qa/res/values/setup.xml similarity index 100% rename from src/qa/res/values/setup.xml rename to app/src/qa/res/values/setup.xml diff --git a/src/release/java/com/nextcloud/client/di/BuildTypeComponentsModule.java b/app/src/release/java/com/nextcloud/client/di/BuildTypeComponentsModule.java similarity index 100% rename from src/release/java/com/nextcloud/client/di/BuildTypeComponentsModule.java rename to app/src/release/java/com/nextcloud/client/di/BuildTypeComponentsModule.java diff --git a/src/test/java/com/nextcloud/client/core/LocalConnectionTest.kt b/app/src/test/java/com/nextcloud/client/core/LocalConnectionTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/core/LocalConnectionTest.kt rename to app/src/test/java/com/nextcloud/client/core/LocalConnectionTest.kt diff --git a/src/test/java/com/nextcloud/client/core/ManualAsyncRunnerTest.kt b/app/src/test/java/com/nextcloud/client/core/ManualAsyncRunnerTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/core/ManualAsyncRunnerTest.kt rename to app/src/test/java/com/nextcloud/client/core/ManualAsyncRunnerTest.kt diff --git a/src/test/java/com/nextcloud/client/core/TaskTest.kt b/app/src/test/java/com/nextcloud/client/core/TaskTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/core/TaskTest.kt rename to app/src/test/java/com/nextcloud/client/core/TaskTest.kt diff --git a/src/test/java/com/nextcloud/client/core/ThreadPoolAsyncRunnerTest.kt b/app/src/test/java/com/nextcloud/client/core/ThreadPoolAsyncRunnerTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/core/ThreadPoolAsyncRunnerTest.kt rename to app/src/test/java/com/nextcloud/client/core/ThreadPoolAsyncRunnerTest.kt diff --git a/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt b/app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt similarity index 100% rename from src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt rename to app/src/test/java/com/nextcloud/client/device/TestPowerManagementService.kt diff --git a/src/test/java/com/nextcloud/client/etm/TestEtmViewModel.kt b/app/src/test/java/com/nextcloud/client/etm/TestEtmViewModel.kt similarity index 100% rename from src/test/java/com/nextcloud/client/etm/TestEtmViewModel.kt rename to app/src/test/java/com/nextcloud/client/etm/TestEtmViewModel.kt diff --git a/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt rename to app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt diff --git a/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt b/app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt rename to app/src/test/java/com/nextcloud/client/jobs/ContentObserverWorkTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/FileLogHandlerTest.kt b/app/src/test/java/com/nextcloud/client/logger/FileLogHandlerTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/FileLogHandlerTest.kt rename to app/src/test/java/com/nextcloud/client/logger/FileLogHandlerTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/LevelTest.kt b/app/src/test/java/com/nextcloud/client/logger/LevelTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/LevelTest.kt rename to app/src/test/java/com/nextcloud/client/logger/LevelTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/LogEntryTest.kt b/app/src/test/java/com/nextcloud/client/logger/LogEntryTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/LogEntryTest.kt rename to app/src/test/java/com/nextcloud/client/logger/LogEntryTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/LoggerTest.kt b/app/src/test/java/com/nextcloud/client/logger/LoggerTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/LoggerTest.kt rename to app/src/test/java/com/nextcloud/client/logger/LoggerTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/ui/AsyncFilterTest.kt b/app/src/test/java/com/nextcloud/client/logger/ui/AsyncFilterTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/ui/AsyncFilterTest.kt rename to app/src/test/java/com/nextcloud/client/logger/ui/AsyncFilterTest.kt diff --git a/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt b/app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt rename to app/src/test/java/com/nextcloud/client/logger/ui/LogsViewModelTest.kt diff --git a/src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt b/app/src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt rename to app/src/test/java/com/nextcloud/client/media/AudioFocusManagerTest.kt diff --git a/src/test/java/com/nextcloud/client/media/AudioFocusTest.kt b/app/src/test/java/com/nextcloud/client/media/AudioFocusTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/media/AudioFocusTest.kt rename to app/src/test/java/com/nextcloud/client/media/AudioFocusTest.kt diff --git a/src/test/java/com/nextcloud/client/media/PlayerStateMachineTest.kt b/app/src/test/java/com/nextcloud/client/media/PlayerStateMachineTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/media/PlayerStateMachineTest.kt rename to app/src/test/java/com/nextcloud/client/media/PlayerStateMachineTest.kt diff --git a/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt b/app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt rename to app/src/test/java/com/nextcloud/client/mixins/MixinRegistryTest.kt diff --git a/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt b/app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt rename to app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt diff --git a/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt b/app/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt rename to app/src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt diff --git a/src/test/java/com/nextcloud/client/onboarding/OnboardingServiceTest.kt b/app/src/test/java/com/nextcloud/client/onboarding/OnboardingServiceTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/onboarding/OnboardingServiceTest.kt rename to app/src/test/java/com/nextcloud/client/onboarding/OnboardingServiceTest.kt diff --git a/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java b/app/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java similarity index 100% rename from src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java rename to app/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java diff --git a/src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt b/app/src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt similarity index 100% rename from src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt rename to app/src/test/java/com/nextcloud/client/utils/FileStorageUtilsTest.kt diff --git a/src/test/java/com/owncloud/android/authentication/AuthenticatorDataUrlTest.java b/app/src/test/java/com/owncloud/android/authentication/AuthenticatorDataUrlTest.java similarity index 100% rename from src/test/java/com/owncloud/android/authentication/AuthenticatorDataUrlTest.java rename to app/src/test/java/com/owncloud/android/authentication/AuthenticatorDataUrlTest.java diff --git a/src/test/java/com/owncloud/android/ui/TextDrawableTest.kt b/app/src/test/java/com/owncloud/android/ui/TextDrawableTest.kt similarity index 100% rename from src/test/java/com/owncloud/android/ui/TextDrawableTest.kt rename to app/src/test/java/com/owncloud/android/ui/TextDrawableTest.kt diff --git a/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java b/app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java rename to app/src/test/java/com/owncloud/android/ui/activities/ActivitiesPresenterTest.java diff --git a/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java b/app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java rename to app/src/test/java/com/owncloud/android/ui/activities/data/activities/RemoteActivitiesRepositoryTest.java diff --git a/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java b/app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java rename to app/src/test/java/com/owncloud/android/ui/activities/data/files/RemoteFilesRepositoryTest.java diff --git a/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java b/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java rename to app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java diff --git a/src/test/java/com/owncloud/android/ui/adapter/ActivityListAdapterTest.java b/app/src/test/java/com/owncloud/android/ui/adapter/ActivityListAdapterTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/adapter/ActivityListAdapterTest.java rename to app/src/test/java/com/owncloud/android/ui/adapter/ActivityListAdapterTest.java diff --git a/src/test/java/com/owncloud/android/ui/adapter/ShareeListAdapterTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/ShareeListAdapterTest.kt similarity index 100% rename from src/test/java/com/owncloud/android/ui/adapter/ShareeListAdapterTest.kt rename to app/src/test/java/com/owncloud/android/ui/adapter/ShareeListAdapterTest.kt diff --git a/src/test/java/com/owncloud/android/ui/adapter/UserListAdapterTest.java b/app/src/test/java/com/owncloud/android/ui/adapter/UserListAdapterTest.java similarity index 100% rename from src/test/java/com/owncloud/android/ui/adapter/UserListAdapterTest.java rename to app/src/test/java/com/owncloud/android/ui/adapter/UserListAdapterTest.java diff --git a/src/test/java/com/owncloud/android/ui/db/OCUploadComparatorTest.kt b/app/src/test/java/com/owncloud/android/ui/db/OCUploadComparatorTest.kt similarity index 100% rename from src/test/java/com/owncloud/android/ui/db/OCUploadComparatorTest.kt rename to app/src/test/java/com/owncloud/android/ui/db/OCUploadComparatorTest.kt diff --git a/src/test/java/com/owncloud/android/utils/DisplayUtilsTest.java b/app/src/test/java/com/owncloud/android/utils/DisplayUtilsTest.java similarity index 100% rename from src/test/java/com/owncloud/android/utils/DisplayUtilsTest.java rename to app/src/test/java/com/owncloud/android/utils/DisplayUtilsTest.java diff --git a/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java b/app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java similarity index 100% rename from src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java rename to app/src/test/java/com/owncloud/android/utils/OwnCloudSessionTest.java diff --git a/src/test/java/com/owncloud/android/utils/StringUtilsTest.java b/app/src/test/java/com/owncloud/android/utils/StringUtilsTest.java similarity index 100% rename from src/test/java/com/owncloud/android/utils/StringUtilsTest.java rename to app/src/test/java/com/owncloud/android/utils/StringUtilsTest.java diff --git a/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/src/versionDev/fastlane/metadata/android/ar-AR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/ar-AR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ar-AR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/ar-AR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ar-AR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/ar-AR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ar-AR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/ar-AR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ar-AR/title.txt b/app/src/versionDev/fastlane/metadata/android/ar-AR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ar-AR/title.txt rename to app/src/versionDev/fastlane/metadata/android/ar-AR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/ca/full_description.txt b/app/src/versionDev/fastlane/metadata/android/ca/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ca/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/ca/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ca/short_description.txt b/app/src/versionDev/fastlane/metadata/android/ca/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ca/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/ca/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ca/title.txt b/app/src/versionDev/fastlane/metadata/android/ca/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ca/title.txt rename to app/src/versionDev/fastlane/metadata/android/ca/title.txt diff --git a/src/versionDev/fastlane/metadata/android/cs-CZ/full_description.txt b/app/src/versionDev/fastlane/metadata/android/cs-CZ/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/cs-CZ/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/cs-CZ/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/cs-CZ/short_description.txt b/app/src/versionDev/fastlane/metadata/android/cs-CZ/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/cs-CZ/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/cs-CZ/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/cs-CZ/title.txt b/app/src/versionDev/fastlane/metadata/android/cs-CZ/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/cs-CZ/title.txt rename to app/src/versionDev/fastlane/metadata/android/cs-CZ/title.txt diff --git a/src/versionDev/fastlane/metadata/android/da-DK/full_description.txt b/app/src/versionDev/fastlane/metadata/android/da-DK/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/da-DK/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/da-DK/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/da-DK/short_description.txt b/app/src/versionDev/fastlane/metadata/android/da-DK/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/da-DK/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/da-DK/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/da-DK/title.txt b/app/src/versionDev/fastlane/metadata/android/da-DK/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/da-DK/title.txt rename to app/src/versionDev/fastlane/metadata/android/da-DK/title.txt diff --git a/src/versionDev/fastlane/metadata/android/de-DE/full_description.txt b/app/src/versionDev/fastlane/metadata/android/de-DE/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/de-DE/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/de-DE/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/de-DE/short_description.txt b/app/src/versionDev/fastlane/metadata/android/de-DE/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/de-DE/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/de-DE/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/de-DE/title.txt b/app/src/versionDev/fastlane/metadata/android/de-DE/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/de-DE/title.txt rename to app/src/versionDev/fastlane/metadata/android/de-DE/title.txt diff --git a/src/versionDev/fastlane/metadata/android/el-GR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/el-GR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/el-GR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/el-GR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/el-GR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/el-GR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/el-GR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/el-GR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/el-GR/title.txt b/app/src/versionDev/fastlane/metadata/android/el-GR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/el-GR/title.txt rename to app/src/versionDev/fastlane/metadata/android/el-GR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190517.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190517.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190517.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190517.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190518.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190518.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190518.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190518.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190520.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190520.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190520.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190520.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190521.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190521.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190521.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190521.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190522.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190522.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190522.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190522.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190523.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190523.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190523.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190523.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190524.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190524.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190524.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190524.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190528.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190528.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190528.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190528.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190529.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190529.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190529.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190529.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190530.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190530.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190530.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190530.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190531.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190531.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190531.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190531.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190601.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190601.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190601.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190601.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190604.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190604.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190604.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190604.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190605.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190605.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190605.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190605.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190612.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190612.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190612.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190612.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190613.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190613.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190613.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190613.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190615.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190615.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190615.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190615.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190619.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190619.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190619.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190619.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190621.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190621.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190621.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190621.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190622.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190622.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190622.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190622.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190625.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190625.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190625.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190625.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190627.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190627.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190627.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190627.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190629.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190629.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190629.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190629.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190701.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190701.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190701.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190701.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190702.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190702.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190702.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190702.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190703.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190703.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190703.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190703.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190704.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190704.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190704.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190704.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190705.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190705.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190705.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190705.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190710.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190710.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190710.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190710.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190711.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190711.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190711.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190711.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190713.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190713.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190713.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190713.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190716.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190716.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190716.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190716.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190717.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190717.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190717.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190717.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190720.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190720.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190720.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190720.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190723.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190723.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190723.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190723.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190724.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190724.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190724.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190724.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190726.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190726.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190726.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190726.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190727.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190727.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190727.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190727.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190730.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190730.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190730.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190730.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190731.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190731.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190731.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190731.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190802.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190802.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190802.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190802.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190803.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190803.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190803.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190803.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190806.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190806.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190806.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190806.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190808.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190808.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190808.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190808.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190809.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190809.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190809.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190809.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190810.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190810.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190810.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190810.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190813.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190813.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190813.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190813.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190815.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190815.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190815.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190815.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190816.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190816.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190816.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190816.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190817.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190817.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190817.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190817.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190820.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190820.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190820.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190820.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190821.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190821.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190821.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190821.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190822.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190822.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190822.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190822.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190823.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190823.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190823.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190823.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190824.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190824.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190824.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190824.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190827.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190827.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190827.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190827.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190828.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190828.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190828.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190828.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190829.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190829.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190829.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190829.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190903.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190903.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190903.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190903.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190904.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190904.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190904.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190904.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190905.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190905.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190905.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190905.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190906.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190906.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190906.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190906.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190910.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190910.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190910.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190910.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190911.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190911.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190911.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190911.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190913.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190913.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190913.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190913.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190914.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190914.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190914.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190914.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190921.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190921.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190921.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190921.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190924.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190924.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190924.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190924.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190926.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190926.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190926.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190926.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190928.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190928.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20190928.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20190928.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191002.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191002.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191002.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191002.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191003.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191003.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191003.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191003.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191005.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191005.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191005.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191005.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191008.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191008.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191008.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191008.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191009.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191009.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191009.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191009.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191010.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191010.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191010.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191010.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191011.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191011.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191011.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191011.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191012.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191012.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191012.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191012.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191016.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191016.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191016.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191016.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191017.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191017.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191017.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191017.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191018.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191018.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191018.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191018.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191019.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191019.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191019.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191019.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191022.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191022.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191022.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191022.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191024.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191024.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191024.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191024.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191025.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191025.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191025.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191025.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191026.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191026.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191026.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191026.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191029.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191029.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191029.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191029.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191030.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191030.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191030.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191030.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191031.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191031.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191031.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191031.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191101.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191101.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191101.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191101.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191102.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191102.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191102.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191102.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191106.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191106.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191106.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191106.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191107.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191107.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191107.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191107.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191108.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191108.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191108.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191108.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191113.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191113.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191113.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191113.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191114.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191114.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191114.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191114.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191116.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191116.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191116.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191116.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191119.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191119.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191119.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191119.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191120.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191120.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191120.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191120.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191121.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191121.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191121.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191121.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191123.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191123.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191123.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191123.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191127.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191127.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191127.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191127.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191129.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191203.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191204.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191205.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191206.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191206.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191206.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191206.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191207.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191207.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191207.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191207.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191211.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191211.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191211.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191211.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191213.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191213.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191213.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191213.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191214.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191214.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191214.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191214.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191217.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191217.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191217.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191217.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191218.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191218.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191218.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191218.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191219.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191219.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191219.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191219.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191220.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191220.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191220.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191220.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191221.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191221.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20191221.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20191221.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200107.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200107.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200107.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200107.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200108.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200108.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200108.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200108.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200109.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200109.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200109.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200109.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200110.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200110.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200110.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200110.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200112.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200112.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200112.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200112.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200115.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200115.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200115.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200115.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200117.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200117.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200117.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200117.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200118.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200118.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200118.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200118.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200121.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200121.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200121.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200121.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200122.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200122.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200122.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200122.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200125.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200125.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200125.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200125.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200128.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200128.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200128.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200128.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200129.txt b/app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200129.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/changelogs/20200129.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/changelogs/20200129.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/full_description.txt b/app/src/versionDev/fastlane/metadata/android/en-US/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/short_description.txt b/app/src/versionDev/fastlane/metadata/android/en-US/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/en-US/title.txt b/app/src/versionDev/fastlane/metadata/android/en-US/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/en-US/title.txt rename to app/src/versionDev/fastlane/metadata/android/en-US/title.txt diff --git a/src/versionDev/fastlane/metadata/android/es-ES/full_description.txt b/app/src/versionDev/fastlane/metadata/android/es-ES/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/es-ES/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/es-ES/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/es-ES/short_description.txt b/app/src/versionDev/fastlane/metadata/android/es-ES/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/es-ES/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/es-ES/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/es-ES/title.txt b/app/src/versionDev/fastlane/metadata/android/es-ES/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/es-ES/title.txt rename to app/src/versionDev/fastlane/metadata/android/es-ES/title.txt diff --git a/src/versionDev/fastlane/metadata/android/eu-ES/full_description.txt b/app/src/versionDev/fastlane/metadata/android/eu-ES/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/eu-ES/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/eu-ES/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/eu-ES/short_description.txt b/app/src/versionDev/fastlane/metadata/android/eu-ES/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/eu-ES/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/eu-ES/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/eu-ES/title.txt b/app/src/versionDev/fastlane/metadata/android/eu-ES/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/eu-ES/title.txt rename to app/src/versionDev/fastlane/metadata/android/eu-ES/title.txt diff --git a/src/versionDev/fastlane/metadata/android/fa-FA/full_description.txt b/app/src/versionDev/fastlane/metadata/android/fa-FA/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fa-FA/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/fa-FA/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fa-FA/short_description.txt b/app/src/versionDev/fastlane/metadata/android/fa-FA/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fa-FA/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/fa-FA/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fa-FA/title.txt b/app/src/versionDev/fastlane/metadata/android/fa-FA/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fa-FA/title.txt rename to app/src/versionDev/fastlane/metadata/android/fa-FA/title.txt diff --git a/src/versionDev/fastlane/metadata/android/fi-FI/full_description.txt b/app/src/versionDev/fastlane/metadata/android/fi-FI/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fi-FI/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/fi-FI/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fi-FI/short_description.txt b/app/src/versionDev/fastlane/metadata/android/fi-FI/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fi-FI/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/fi-FI/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fi-FI/title.txt b/app/src/versionDev/fastlane/metadata/android/fi-FI/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fi-FI/title.txt rename to app/src/versionDev/fastlane/metadata/android/fi-FI/title.txt diff --git a/src/versionDev/fastlane/metadata/android/fr-FR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/fr-FR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fr-FR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/fr-FR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fr-FR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/fr-FR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fr-FR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/fr-FR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/fr-FR/title.txt b/app/src/versionDev/fastlane/metadata/android/fr-FR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/fr-FR/title.txt rename to app/src/versionDev/fastlane/metadata/android/fr-FR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/is-IS/full_description.txt b/app/src/versionDev/fastlane/metadata/android/is-IS/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/is-IS/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/is-IS/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/is-IS/short_description.txt b/app/src/versionDev/fastlane/metadata/android/is-IS/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/is-IS/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/is-IS/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/is-IS/title.txt b/app/src/versionDev/fastlane/metadata/android/is-IS/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/is-IS/title.txt rename to app/src/versionDev/fastlane/metadata/android/is-IS/title.txt diff --git a/src/versionDev/fastlane/metadata/android/it-IT/full_description.txt b/app/src/versionDev/fastlane/metadata/android/it-IT/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/it-IT/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/it-IT/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/it-IT/short_description.txt b/app/src/versionDev/fastlane/metadata/android/it-IT/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/it-IT/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/it-IT/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/it-IT/title.txt b/app/src/versionDev/fastlane/metadata/android/it-IT/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/it-IT/title.txt rename to app/src/versionDev/fastlane/metadata/android/it-IT/title.txt diff --git a/src/versionDev/fastlane/metadata/android/ko-KR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/ko-KR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ko-KR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/ko-KR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ko-KR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/ko-KR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ko-KR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/ko-KR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/ko-KR/title.txt b/app/src/versionDev/fastlane/metadata/android/ko-KR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/ko-KR/title.txt rename to app/src/versionDev/fastlane/metadata/android/ko-KR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/lt-LT/full_description.txt b/app/src/versionDev/fastlane/metadata/android/lt-LT/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/lt-LT/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/lt-LT/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/lt-LT/short_description.txt b/app/src/versionDev/fastlane/metadata/android/lt-LT/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/lt-LT/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/lt-LT/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/lt-LT/title.txt b/app/src/versionDev/fastlane/metadata/android/lt-LT/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/lt-LT/title.txt rename to app/src/versionDev/fastlane/metadata/android/lt-LT/title.txt diff --git a/src/versionDev/fastlane/metadata/android/nl-NL/full_description.txt b/app/src/versionDev/fastlane/metadata/android/nl-NL/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/nl-NL/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/nl-NL/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/nl-NL/short_description.txt b/app/src/versionDev/fastlane/metadata/android/nl-NL/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/nl-NL/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/nl-NL/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/nl-NL/title.txt b/app/src/versionDev/fastlane/metadata/android/nl-NL/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/nl-NL/title.txt rename to app/src/versionDev/fastlane/metadata/android/nl-NL/title.txt diff --git a/src/versionDev/fastlane/metadata/android/pl-PL/full_description.txt b/app/src/versionDev/fastlane/metadata/android/pl-PL/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pl-PL/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/pl-PL/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pl-PL/short_description.txt b/app/src/versionDev/fastlane/metadata/android/pl-PL/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pl-PL/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/pl-PL/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pl-PL/title.txt b/app/src/versionDev/fastlane/metadata/android/pl-PL/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pl-PL/title.txt rename to app/src/versionDev/fastlane/metadata/android/pl-PL/title.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-BR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/pt-BR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-BR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/pt-BR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-BR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/pt-BR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-BR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/pt-BR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-BR/title.txt b/app/src/versionDev/fastlane/metadata/android/pt-BR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-BR/title.txt rename to app/src/versionDev/fastlane/metadata/android/pt-BR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-PT/full_description.txt b/app/src/versionDev/fastlane/metadata/android/pt-PT/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-PT/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/pt-PT/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-PT/short_description.txt b/app/src/versionDev/fastlane/metadata/android/pt-PT/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-PT/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/pt-PT/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/pt-PT/title.txt b/app/src/versionDev/fastlane/metadata/android/pt-PT/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/pt-PT/title.txt rename to app/src/versionDev/fastlane/metadata/android/pt-PT/title.txt diff --git a/src/versionDev/fastlane/metadata/android/sl-SL/full_description.txt b/app/src/versionDev/fastlane/metadata/android/sl-SL/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sl-SL/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/sl-SL/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sl-SL/short_description.txt b/app/src/versionDev/fastlane/metadata/android/sl-SL/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sl-SL/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/sl-SL/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sl-SL/title.txt b/app/src/versionDev/fastlane/metadata/android/sl-SL/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sl-SL/title.txt rename to app/src/versionDev/fastlane/metadata/android/sl-SL/title.txt diff --git a/src/versionDev/fastlane/metadata/android/sr-SR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/sr-SR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sr-SR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/sr-SR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sr-SR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/sr-SR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sr-SR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/sr-SR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sr-SR/title.txt b/app/src/versionDev/fastlane/metadata/android/sr-SR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sr-SR/title.txt rename to app/src/versionDev/fastlane/metadata/android/sr-SR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/sv-SE/full_description.txt b/app/src/versionDev/fastlane/metadata/android/sv-SE/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sv-SE/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/sv-SE/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sv-SE/short_description.txt b/app/src/versionDev/fastlane/metadata/android/sv-SE/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sv-SE/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/sv-SE/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/sv-SE/title.txt b/app/src/versionDev/fastlane/metadata/android/sv-SE/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/sv-SE/title.txt rename to app/src/versionDev/fastlane/metadata/android/sv-SE/title.txt diff --git a/src/versionDev/fastlane/metadata/android/tr-TR/full_description.txt b/app/src/versionDev/fastlane/metadata/android/tr-TR/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/tr-TR/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/tr-TR/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/tr-TR/short_description.txt b/app/src/versionDev/fastlane/metadata/android/tr-TR/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/tr-TR/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/tr-TR/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/tr-TR/title.txt b/app/src/versionDev/fastlane/metadata/android/tr-TR/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/tr-TR/title.txt rename to app/src/versionDev/fastlane/metadata/android/tr-TR/title.txt diff --git a/src/versionDev/fastlane/metadata/android/uk-UK/full_description.txt b/app/src/versionDev/fastlane/metadata/android/uk-UK/full_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/uk-UK/full_description.txt rename to app/src/versionDev/fastlane/metadata/android/uk-UK/full_description.txt diff --git a/src/versionDev/fastlane/metadata/android/uk-UK/short_description.txt b/app/src/versionDev/fastlane/metadata/android/uk-UK/short_description.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/uk-UK/short_description.txt rename to app/src/versionDev/fastlane/metadata/android/uk-UK/short_description.txt diff --git a/src/versionDev/fastlane/metadata/android/uk-UK/title.txt b/app/src/versionDev/fastlane/metadata/android/uk-UK/title.txt similarity index 100% rename from src/versionDev/fastlane/metadata/android/uk-UK/title.txt rename to app/src/versionDev/fastlane/metadata/android/uk-UK/title.txt diff --git a/src/versionDev/google-services.json b/app/src/versionDev/google-services.json similarity index 100% rename from src/versionDev/google-services.json rename to app/src/versionDev/google-services.json diff --git a/src/versionDev/ic_launcher-web.png b/app/src/versionDev/ic_launcher-web.png similarity index 100% rename from src/versionDev/ic_launcher-web.png rename to app/src/versionDev/ic_launcher-web.png diff --git a/src/versionDev/java/com/nextcloud/client/di/VariantComponentsModule.java b/app/src/versionDev/java/com/nextcloud/client/di/VariantComponentsModule.java similarity index 100% rename from src/versionDev/java/com/nextcloud/client/di/VariantComponentsModule.java rename to app/src/versionDev/java/com/nextcloud/client/di/VariantComponentsModule.java diff --git a/src/versionDev/java/com/owncloud/android/utils/PushUtils.java b/app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java similarity index 100% rename from src/versionDev/java/com/owncloud/android/utils/PushUtils.java rename to app/src/versionDev/java/com/owncloud/android/utils/PushUtils.java diff --git a/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java b/app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java similarity index 100% rename from src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java rename to app/src/versionDev/java/com/owncloud/android/utils/SecurityUtils.java diff --git a/src/versionDev/res/drawable-v26/ic_launcher_background.xml b/app/src/versionDev/res/drawable-v26/ic_launcher_background.xml similarity index 100% rename from src/versionDev/res/drawable-v26/ic_launcher_background.xml rename to app/src/versionDev/res/drawable-v26/ic_launcher_background.xml diff --git a/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml b/app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml similarity index 100% rename from src/versionDev/res/drawable-v26/ic_launcher_foreground.xml rename to app/src/versionDev/res/drawable-v26/ic_launcher_foreground.xml diff --git a/src/versionDev/res/drawable/ic_launcher_foreground.xml b/app/src/versionDev/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from src/versionDev/res/drawable/ic_launcher_foreground.xml rename to app/src/versionDev/res/drawable/ic_launcher_foreground.xml diff --git a/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/versionDev/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/src/versionDev/res/mipmap-hdpi/ic_launcher.png b/app/src/versionDev/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/versionDev/res/mipmap-hdpi/ic_launcher.png rename to app/src/versionDev/res/mipmap-hdpi/ic_launcher.png diff --git a/src/versionDev/res/mipmap-mdpi/ic_launcher.png b/app/src/versionDev/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/versionDev/res/mipmap-mdpi/ic_launcher.png rename to app/src/versionDev/res/mipmap-mdpi/ic_launcher.png diff --git a/src/versionDev/res/mipmap-xhdpi/ic_launcher.png b/app/src/versionDev/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/versionDev/res/mipmap-xhdpi/ic_launcher.png rename to app/src/versionDev/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/versionDev/res/mipmap-xxhdpi/ic_launcher.png b/app/src/versionDev/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/versionDev/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/versionDev/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/versionDev/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/src/versionDev/res/values/setup.xml b/app/src/versionDev/res/values/setup.xml similarity index 100% rename from src/versionDev/res/values/setup.xml rename to app/src/versionDev/res/values/setup.xml diff --git a/build.gradle b/build.gradle index 08bf0fd16d89..5e3e1869c77e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import com.github.spotbugs.snom.SpotBugsTask - // Gradle build file // // This project was started in Eclipse and later moved to Android Studio. In the transition, both IDEs were supported. @@ -12,9 +10,7 @@ buildscript { repositories { google() jcenter() - maven { - url 'https://plugins.gradle.org/m2/' - } + maven { url 'https://plugins.gradle.org/m2/' } mavenCentral() } dependencies { @@ -25,39 +21,33 @@ buildscript { classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0" classpath "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 classpath 'com.karumi:shot:5.5.1' + classpath "org.jlleitschuh.gradle:ktlint-gradle:10.0.0" } } -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' apply plugin: 'checkstyle' apply plugin: 'pmd' -apply plugin: 'com.hiya.jacoco-android' apply plugin: 'com.github.spotbugs' apply plugin: 'io.gitlab.arturbosch.detekt' -apply plugin: 'shot' - -configurations { - ktlint +apply plugin: 'com.github.spotbugs' - all { - exclude group: 'org.jetbrains', module: 'annotations-java5' // via prism4j, already using annotations explicitly +subprojects { + apply plugin: "org.jlleitschuh.gradle.ktlint" // Version should be inherited from parent - // check for updates every build - resolutionStrategy { - cacheChangingModulesFor 0, 'seconds' - exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" - } + // Optionally configure plugin + ktlint { + debug = true } } +configurations { + ktlint +} + ext { jacocoVersion = "0.8.2" daggerVersion = "2.32" - markwonVersion = "4.6.2" + markwonVersion = "4.6.2" prismVersion = "2.0.0" butterknifeVersion = "10.2.3" androidLibraryVersion = "master-SNAPSHOT" @@ -74,13 +64,15 @@ ext { preDexEnabled = "true" == System.getProperty("pre-dex", "true") } -repositories { - google() - jcenter() - maven { url "https://jitpack.io" } +allprojects { + repositories { + google() + jcenter() + maven { url "https://jitpack.io" } - flatDir { - dirs 'libs' + flatDir { + dirs 'libs' + } } } @@ -90,338 +82,10 @@ def versionMinor = 16 def versionPatch = 0 def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable -for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()) { - for (String arg : tr.args) { - // any gplay, but only exact "build", as e.g. buildGeneric shall not apply gplay.grade - if (arg.contains("Gplay") || arg.contains("lint") || arg.contains("ExecuteScreenshot") || arg == "build") { - apply from: 'gplay.gradle' - System.console().println("Applying gplay.gradle") - } - } -} - - - -android { - lintOptions { - checkGeneratedSources = true - abortOnError false - htmlReport true - htmlOutput file("$project.buildDir/reports/lint/lint.html") - disable 'MissingTranslation', - 'GradleDependency', - 'VectorPath', - 'IconMissingDensityFolder', - 'IconDensities', - 'GoogleAppIndexingWarning', - 'MissingDefaultResource', - 'InvalidPeriodicWorkRequestInterval' // crashes due to a bug in lint itself - } - - dexOptions { - javaMaxHeapSize "4g" - } - - compileSdkVersion 29 - - defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 - - // arguments to be passed to functional tests - testInstrumentationRunner "com.nextcloud.client.ScreenshotTestRunner" - testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}" - testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}" - testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}" - testInstrumentationRunnerArguments disableAnalytics: 'true' - - multiDexEnabled true - - versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild - - if (versionBuild > 89) { - versionName "${versionMajor}.${versionMinor}.${versionPatch}" - } else if (versionBuild > 50) { - versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50) - } else { - versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1) - } - - // adapt structure from Eclipse to Gradle/Android Studio expectations; - // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure - - flavorDimensions "default" - - buildTypes { - debug { - testCoverageEnabled (project.hasProperty('coverage')) - } - } - - productFlavors { - // used for f-droid - generic { - applicationId 'com.nextcloud.client' - dimension "default" - } - - gplay { - applicationId 'com.nextcloud.client' - dimension "default" - } - - versionDev { - applicationId "com.nextcloud.android.beta" - dimension "default" - versionCode 20200129 - versionName "20200129" - } - - qa { - applicationId "com.nextcloud.android.qa" - dimension "default" - versionCode 1 - versionName "1" - } - } - - testOptions { - unitTests.returnDefaultValues = true - animationsDisabled true - } - } - - // adapt structure from Eclipse to Gradle/Android Studio expectations; - // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure - - dexOptions { - // Skip pre-dexing when running on CI or when disabled via -D pre-dex=false. - preDexLibraries = preDexEnabled && !ciBuild - } - - packagingOptions { - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/LICENSE' - } - - tasks.register("checkstyle", Checkstyle) { - configFile = file("${rootProject.projectDir}/checkstyle.xml") - configProperties.checkstyleSuppressionsPath = file("${project.rootDir}/config/quality/checkstyle/suppressions.xml").absolutePath - source 'src' - include '**/*.java' - exclude '**/gen/**' - classpath = files() - } - - tasks.register("pmd", Pmd) { - ruleSetFiles = files("${project.rootDir}/ruleset.xml") - ignoreFailures = true // should continue checking - ruleSets = [] - - source 'src' - include '**/*.java' - exclude '**/gen/**' - - reports { - xml.enabled = false - html.enabled = true - xml { - destination = file("$project.buildDir/reports/pmd/pmd.xml") - } - html { - destination = file("$project.buildDir/reports/pmd/pmd.html") - } - } - } - - android.applicationVariants.all { variant -> - String variantName = variant.name - String capVariantName = variantName.substring(0, 1).toUpperCase() + variantName.substring(1) - tasks.register("spotbugs${capVariantName}Report", SpotBugsTask) { - ignoreFailures = true // should continue checking - effort = "max" - reportLevel = "medium" - classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/classes/") - excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") - - reports { - xml.enabled = false - html { - enabled = true - destination = file("$project.buildDir/reports/spotbugs/spotbugs.html") - } - } - } - } - - check.dependsOn 'checkstyle', 'spotbugsGplayDebugReport', 'pmd', 'lint', 'ktlint', 'detekt' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - buildFeatures { - dataBinding true - viewBinding true - } -} - -dependencies { - // dependencies for app building - implementation 'androidx.multidex:multidex:2.0.1' -// implementation project('nextcloud-android-library') - genericImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" - gplayImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" - versionDevImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" - qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" - - kapt 'javax.xml.bind:jaxb-api:2.3.1' - kapt 'org.glassfish.jaxb:jaxb-core:2.3.0.1' - kapt 'org.glassfish.jaxb:jaxb-runtime:2.3.3' - - annotationProcessor 'javax.xml.bind:jaxb-api:2.3.1' - annotationProcessor 'org.glassfish.jaxb:jaxb-core:2.3.0.1' - annotationProcessor 'org.glassfish.jaxb:jaxb-runtime:2.3.3' - - compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' // remove after entire switch to lib v2 - implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2 - implementation 'org.apache.jackrabbit:jackrabbit-webdav:2.13.1' // remove after entire switch to lib v2 - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'com.jakewharton:disklrucache:2.0.2' - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.3.2' - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0" - implementation "androidx.work:work-runtime:$workRuntime" - implementation "androidx.work:work-runtime-ktx:$workRuntime" - implementation "androidx.fragment:fragment:1.2.5" - implementation 'com.github.albfernandez:juniversalchardet:2.0.3' // need this version for Android <7 - compileOnly 'com.google.code.findbugs:annotations:3.0.1u2' - implementation 'commons-io:commons-io:2.8.0' - implementation "com.jakewharton:butterknife:$butterknifeVersion" - kapt "com.jakewharton:butterknife-compiler:$butterknifeVersion" - implementation 'org.greenrobot:eventbus:3.2.0' - implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.2' - implementation 'org.lukhnos:nnio:0.2' - implementation 'org.bouncycastle:bcpkix-jdk15to18:1.68' - implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.afollestad:sectioned-recyclerview:0.5.0' - implementation 'com.github.chrisbanes:PhotoView:2.3.0' - implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.21' - implementation 'com.github.tobiaskaminsky:qrcodescanner:0.1.2.2' // 'com.github.blikoon:QRCodeScanner:0.1.2' - implementation 'com.google.android:flexbox:2.0.1' - implementation 'org.parceler:parceler-api:1.1.13' - kapt 'org.parceler:parceler:1.1.13' - implementation('com.github.bumptech.glide:glide:3.8.0') { - exclude group: "com.android.support" - } - implementation 'com.caverock:androidsvg:1.4' - implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.vanniktech:emoji-google:0.7.0' - - implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido:4.1.0' - implementation 'com.github.cotechde.hwsecurity:hwsecurity-fido2:4.1.0' - - spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0' - spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7' - - implementation "com.google.dagger:dagger:$daggerVersion" - implementation "com.google.dagger:dagger-android:$daggerVersion" - implementation "com.google.dagger:dagger-android-support:$daggerVersion" - kapt "com.google.dagger:dagger-compiler:$daggerVersion" - kapt "com.google.dagger:dagger-android-processor:$daggerVersion" - - ktlint "com.pinterest:ktlint:0.40.0" - implementation 'org.conscrypt:conscrypt-android:2.5.1' - - // Shimmer animation - implementation 'com.elyeproj.libraries:loaderviewlibrary:2.0.0' - - // dependencies for markdown rendering - implementation "io.noties.markwon:core:$markwonVersion" - implementation "io.noties.markwon:ext-strikethrough:$markwonVersion" - implementation "io.noties.markwon:ext-tables:$markwonVersion" - implementation "io.noties.markwon:ext-tasklist:$markwonVersion" - implementation "io.noties.markwon:html:$markwonVersion" - - implementation "io.noties.markwon:syntax-highlight:$markwonVersion" - implementation "io.noties:prism4j:$prismVersion" - kapt "io.noties:prism4j-bundler:$prismVersion" - - // dependencies for local unit tests - testImplementation 'junit:junit:4.13.2' - testImplementation "org.mockito:mockito-core:$mockitoVersion" - testImplementation 'androidx.test:core:1.3.0' - testImplementation "org.powermock:powermock-core:$powermockVersion" - testImplementation "org.powermock:powermock-module-junit4:$powermockVersion" - testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion" - testImplementation 'org.json:json:20201115' - testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - testImplementation 'androidx.arch.core:core-testing:2.1.0' - testImplementation "io.mockk:mockk:$mockkVersion" - testImplementation "io.mockk:mockk-android:$mockkVersion" - - // dependencies for instrumented tests - // JUnit4 Rules - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test:rules:1.3.0' - // Android JUnit Runner - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestUtil 'androidx.test:orchestrator:1.3.0' - - // Espresso core - androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion" - androidTestImplementation "androidx.test.espresso:espresso-contrib:$espressoVersion" - androidTestImplementation "androidx.test.espresso:espresso-web:$espressoVersion" - androidTestImplementation "androidx.test.espresso:espresso-accessibility:$espressoVersion" - - // Mocking support - androidTestImplementation 'com.github.tmurakami:dexopener:2.0.5' // required to allow mocking on API 27 and older - androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - androidTestImplementation "org.mockito:mockito-core:$mockitoVersion" - androidTestImplementation("org.mockito:mockito-android:$mockitoVersion") { - exclude group: "net.bytebuddy", module: "byte-buddy-android" - } - androidTestImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" - androidTestImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion" - androidTestImplementation "io.mockk:mockk-android:1.10.4" - androidTestImplementation 'androidx.arch.core:core-testing:2.0.1' - - // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests - // androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details - //androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}" - androidTestImplementation 'tools.fastlane:screengrab:2.0.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2') - -// jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}" -// jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}" -// androidJacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}" -// androidJacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}" -// androidJacocoAnt "org.jacoco:org.jacoco.core:${jacocoVersion}" -// androidJacocoAnt "org.jacoco:org.jacoco.report:${jacocoVersion}" -// androidJacocoAnt "org.jacoco:org.jacoco.agent:${jacocoVersion}" - - implementation "com.github.stateless4j:stateless4j:2.6.0" -} - spotbugs { toolVersion = '3.1.12' } -configurations.all { - resolutionStrategy{ - cacheChangingModulesFor 0, 'seconds' - force 'org.objenesis:objenesis:2.6' - } - -} - tasks.withType(Test) { // increased logging for tests testLogging { @@ -429,12 +93,6 @@ tasks.withType(Test) { } } -android.applicationVariants.all { variant -> - variant.outputs.all { output -> - outputFileName = "${output.baseName}-${variant.versionCode}.apk" - } -} - tasks.register("combinedTestReport", JacocoReport) { reports { @@ -474,7 +132,3 @@ detekt { config = files("detekt.yml") input = files("src/") } - -shot { - showOnlyFailingTestsInReports = ciBuild -} diff --git a/gplay.gradle b/gplay.gradle deleted file mode 100644 index 45e7f5989a4d..000000000000 --- a/gplay.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - // upon each update first test: new registration, receive push - implementation "com.google.firebase:firebase-messaging:20.1.3" -} diff --git a/settings.gradle b/settings.gradle index 7093b5e02430..40b70bd250d3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'Nextcloud' -include ':' +include ':app'