diff --git a/changelog.d/6779.misc b/changelog.d/6779.misc new file mode 100644 index 00000000000..70eda0eb2fc --- /dev/null +++ b/changelog.d/6779.misc @@ -0,0 +1 @@ +[Modules] Lifts the application variants to the app module diff --git a/coverage.gradle b/coverage.gradle index 716f9b7cc71..2c0af25368e 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -81,11 +81,11 @@ task generateCoverageReport(type: JacocoReport) { task unitTestsWithCoverage(type: GradleBuild) { // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage startParameter.projectProperties.coverage = [enableTestCoverage: false] - tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest'] + tasks = ['testDebugUnitTest'] } task instrumentationTestsWithCoverage(type: GradleBuild) { startParameter.projectProperties.coverage = [enableTestCoverage: true] startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui' - tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] + tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] } diff --git a/gradle.properties b/gradle.properties index 2af9214ed55..0e561faa8d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g org.gradle.configureondemand=true org.gradle.parallel=true org.gradle.vfs.watch=true +org.gradle.caching=true # Android Settings android.enableJetifier=true diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 235c92cfc57..82c433d2df9 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -291,6 +291,12 @@ android { } } + sourceSets { + nightly { + java.srcDirs += "src/release/java" + } + } + flavorDimensions "store" productFlavors { @@ -340,16 +346,48 @@ android { "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ] } + + buildFeatures { + viewBinding true + } } dependencies { implementation project(':vector') implementation project(':vector-config') + debugImplementation project(':library:ui-styles') implementation libs.dagger.hilt implementation 'androidx.multidex:multidex:2.0.1' implementation "androidx.sharetarget:sharetarget:1.1.0" + // Flipper, debug builds only + debugImplementation(libs.flipper.flipper) { + exclude group: 'com.facebook.fbjni', module: 'fbjni' + } + debugImplementation(libs.flipper.flipperNetworkPlugin) { + exclude group: 'com.facebook.fbjni', module: 'fbjni' + } + debugImplementation 'com.facebook.soloader:soloader:0.10.4' + debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" + + gplayImplementation "com.google.android.gms:play-services-location:16.0.0" + // UnifiedPush gplay flavor only + gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.2') { + exclude group: 'com.google.firebase', module: 'firebase-core' + exclude group: 'com.google.firebase', module: 'firebase-analytics' + exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' + } + + // Nightly + // API-only library + gplayImplementation libs.google.appdistributionApi + // Full SDK implementation + gplayImplementation libs.google.appdistribution + + // OSS License, gplay flavor only + gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' kapt libs.dagger.hiltCompiler + kapt libs.airbnb.epoxyProcessor androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner @@ -374,5 +412,6 @@ dependencies { androidTestImplementation libs.androidx.fragmentTesting androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10" debugImplementation libs.androidx.fragmentTesting + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' } diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml new file mode 100644 index 00000000000..a7867f40819 --- /dev/null +++ b/vector-app/src/debug/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt similarity index 99% rename from vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt index eaaf0219898..005e9c499b7 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt @@ -34,13 +34,13 @@ import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO import im.vector.app.core.utils.checkPermissions import im.vector.app.core.utils.registerForPermissionsResult import im.vector.app.core.utils.toast -import im.vector.app.databinding.ActivityDebugMenuBinding import im.vector.app.features.debug.analytics.DebugAnalyticsActivity import im.vector.app.features.debug.features.DebugFeaturesSettingsActivity import im.vector.app.features.debug.leak.DebugMemoryLeaksActivity import im.vector.app.features.debug.sas.DebugSasEmojiActivity import im.vector.app.features.debug.settings.DebugPrivateSettingsActivity import im.vector.app.features.qrcode.QrCodeScannerActivity +import im.vector.application.databinding.ActivityDebugMenuBinding import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkDefaultActivity import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkTestActivity import im.vector.lib.ui.styles.debug.DebugMaterialThemeDarkVectorActivity diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt similarity index 97% rename from vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt index 0f00f2daa5a..a9be5512e43 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt @@ -23,13 +23,13 @@ import android.widget.Toast import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import dagger.hilt.android.AndroidEntryPoint -import im.vector.app.R import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.utils.checkPermissions import im.vector.app.core.utils.onPermissionDeniedDialog import im.vector.app.core.utils.onPermissionDeniedSnackbar import im.vector.app.core.utils.registerForPermissionsResult -import im.vector.app.databinding.ActivityDebugPermissionBinding +import im.vector.application.R +import im.vector.application.databinding.ActivityDebugPermissionBinding import timber.log.Timber @AndroidEntryPoint diff --git a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt similarity index 97% rename from vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt index 59c60e0e15a..6e94bce00a6 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt @@ -20,9 +20,9 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity -import im.vector.app.R -import im.vector.app.databinding.ActivityTestLinkifyBinding -import im.vector.app.databinding.ItemTestLinkifyBinding +import im.vector.application.R +import im.vector.application.databinding.ActivityTestLinkifyBinding +import im.vector.application.databinding.ItemTestLinkifyBinding class TestLinkifyActivity : AppCompatActivity() { diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt similarity index 97% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt index eb23fe63830..0fa11d72204 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt @@ -25,7 +25,7 @@ import com.airbnb.mvrx.withState import im.vector.app.core.epoxy.onClick import im.vector.app.core.extensions.toOnOff import im.vector.app.core.platform.VectorBaseFragment -import im.vector.app.databinding.FragmentDebugAnalyticsBinding +import im.vector.application.databinding.FragmentDebugAnalyticsBinding import me.gujun.android.span.span class DebugAnalyticsFragment : VectorBaseFragment() { diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt similarity index 94% rename from vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt index 1e9b88c0484..38765bfa9ba 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt @@ -23,9 +23,9 @@ import android.widget.Spinner import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R @EpoxyModelClass abstract class BooleanFeatureItem : VectorEpoxyModel(R.layout.item_feature) { @@ -70,8 +70,8 @@ abstract class BooleanFeatureItem : VectorEpoxyModel( } class Holder : VectorEpoxyHolder() { - val label by bind(im.vector.app.R.id.feature_label) - val optionsSpinner by bind(im.vector.app.R.id.feature_options) + val label by bind(R.id.feature_label) + val optionsSpinner by bind(R.id.feature_options) } interface Listener { diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt similarity index 92% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt index 5e16182f3cd..57138b9a476 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt @@ -66,13 +66,13 @@ class DebugVectorOverrides(private val context: Context) : VectorOverrides { suspend fun setHomeserverCapabilities(block: HomeserverCapabilitiesOverride.() -> HomeserverCapabilitiesOverride) { val capabilitiesOverride = block(forceHomeserverCapabilities.firstOrNull() ?: HomeserverCapabilitiesOverride(null, null)) context.dataStore.edit { settings -> - when (capabilitiesOverride.canChangeDisplayName) { + when (val canChangeDisplayName = capabilitiesOverride.canChangeDisplayName) { null -> settings.remove(forceCanChangeDisplayName) - else -> settings[forceCanChangeDisplayName] = capabilitiesOverride.canChangeDisplayName + else -> settings[forceCanChangeDisplayName] = canChangeDisplayName } - when (capabilitiesOverride.canChangeAvatar) { + when (val canChangeAvatar = capabilitiesOverride.canChangeAvatar) { null -> settings.remove(forceCanChangeAvatar) - else -> settings[forceCanChangeAvatar] = capabilitiesOverride.canChangeAvatar + else -> settings[forceCanChangeAvatar] = canChangeAvatar } } } diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt similarity index 94% rename from vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt index 5231e591dac..00f74515cc1 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt @@ -23,9 +23,9 @@ import android.widget.Spinner import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R @EpoxyModelClass abstract class EnumFeatureItem : VectorEpoxyModel(R.layout.item_feature) { @@ -70,8 +70,8 @@ abstract class EnumFeatureItem : VectorEpoxyModel(R.layo } class Holder : VectorEpoxyHolder() { - val label by bind(im.vector.app.R.id.feature_label) - val optionsSpinner by bind(im.vector.app.R.id.feature_options) + val label by bind(R.id.feature_label) + val optionsSpinner by bind(R.id.feature_options) } interface Listener { diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt similarity index 96% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt index 2abf6487e2f..e9afa9aea93 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt @@ -25,7 +25,7 @@ import com.airbnb.mvrx.withState import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.epoxy.onClick import im.vector.app.core.platform.VectorBaseFragment -import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding +import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding @AndroidEntryPoint class DebugMemoryLeaksFragment : diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt similarity index 98% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt index 5432cb08888..26eb1c1025d 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt similarity index 98% rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt index 179ee356939..bbc438e4b22 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt @@ -21,9 +21,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R import me.gujun.android.span.image import me.gujun.android.span.span import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt similarity index 97% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt index be3d41e0e1a..020c2285214 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt @@ -25,8 +25,8 @@ import android.view.ViewGroup import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.app.core.platform.VectorBaseFragment -import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity +import im.vector.application.databinding.FragmentDebugPrivateSettingsBinding class DebugPrivateSettingsFragment : VectorBaseFragment() { diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt similarity index 97% rename from vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt index 7f510ee5e98..2800b7bd8d8 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt @@ -24,7 +24,7 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.LinearLayout -import im.vector.app.databinding.ViewBooleanDropdownBinding +import im.vector.application.databinding.ViewBooleanDropdownBinding class OverrideDropdownView @JvmOverloads constructor( context: Context, diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt diff --git a/vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt rename to vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt diff --git a/vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt b/vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt rename to vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt diff --git a/vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt b/vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt rename to vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector-app/src/debug/res/layout/activity_debug_menu.xml similarity index 100% rename from vector/src/debug/res/layout/activity_debug_menu.xml rename to vector-app/src/debug/res/layout/activity_debug_menu.xml diff --git a/vector/src/debug/res/layout/activity_debug_permission.xml b/vector-app/src/debug/res/layout/activity_debug_permission.xml similarity index 100% rename from vector/src/debug/res/layout/activity_debug_permission.xml rename to vector-app/src/debug/res/layout/activity_debug_permission.xml diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector-app/src/debug/res/layout/activity_test_linkify.xml similarity index 100% rename from vector/src/debug/res/layout/activity_test_linkify.xml rename to vector-app/src/debug/res/layout/activity_test_linkify.xml diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector-app/src/debug/res/layout/demo_theme_sample.xml similarity index 100% rename from vector/src/debug/res/layout/demo_theme_sample.xml rename to vector-app/src/debug/res/layout/demo_theme_sample.xml diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector-app/src/debug/res/layout/demo_themes.xml similarity index 100% rename from vector/src/debug/res/layout/demo_themes.xml rename to vector-app/src/debug/res/layout/demo_themes.xml diff --git a/vector/src/debug/res/layout/fragment_debug_analytics.xml b/vector-app/src/debug/res/layout/fragment_debug_analytics.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_analytics.xml rename to vector-app/src/debug/res/layout/fragment_debug_analytics.xml diff --git a/vector/src/debug/res/layout/fragment_debug_memory_leaks.xml b/vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_memory_leaks.xml rename to vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml diff --git a/vector/src/debug/res/layout/fragment_debug_private_settings.xml b/vector-app/src/debug/res/layout/fragment_debug_private_settings.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_private_settings.xml rename to vector-app/src/debug/res/layout/fragment_debug_private_settings.xml diff --git a/vector/src/debug/res/layout/item_feature.xml b/vector-app/src/debug/res/layout/item_feature.xml similarity index 100% rename from vector/src/debug/res/layout/item_feature.xml rename to vector-app/src/debug/res/layout/item_feature.xml diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector-app/src/debug/res/layout/item_sas_emoji.xml similarity index 100% rename from vector/src/debug/res/layout/item_sas_emoji.xml rename to vector-app/src/debug/res/layout/item_sas_emoji.xml diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector-app/src/debug/res/layout/item_test_linkify.xml similarity index 100% rename from vector/src/debug/res/layout/item_test_linkify.xml rename to vector-app/src/debug/res/layout/item_test_linkify.xml diff --git a/vector/src/debug/res/layout/view_boolean_dropdown.xml b/vector-app/src/debug/res/layout/view_boolean_dropdown.xml similarity index 100% rename from vector/src/debug/res/layout/view_boolean_dropdown.xml rename to vector-app/src/debug/res/layout/view_boolean_dropdown.xml diff --git a/vector/src/debug/res/values/strings.xml b/vector-app/src/debug/res/values/strings.xml similarity index 100% rename from vector/src/debug/res/values/strings.xml rename to vector-app/src/debug/res/values/strings.xml diff --git a/vector/src/debug/res/xml/shortcuts.xml b/vector-app/src/debug/res/xml/shortcuts.xml similarity index 100% rename from vector/src/debug/res/xml/shortcuts.xml rename to vector-app/src/debug/res/xml/shortcuts.xml diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml similarity index 78% rename from vector/src/fdroid/AndroidManifest.xml rename to vector-app/src/fdroid/AndroidManifest.xml index 15db89ca13b..354d4509587 100644 --- a/vector/src/fdroid/AndroidManifest.xml +++ b/vector-app/src/fdroid/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -15,7 +14,7 @@ @@ -24,12 +23,12 @@ diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt similarity index 95% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt index bd1e0eb0eed..bccbf42e92d 100644 --- a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt +++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt @@ -16,6 +16,7 @@ package im.vector.app.fdroid.receiver +import android.annotation.SuppressLint import android.app.AlarmManager import android.app.PendingIntent import android.content.BroadcastReceiver @@ -65,6 +66,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() { companion object { private const val REQUEST_CODE = 0 + @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive fun scheduleAlarm(context: Context, sessionId: String, delayInSeconds: Int, clock: Clock) { // Reschedule Timber.v("## Sync: Scheduling alarm for background sync in $delayInSeconds seconds") @@ -87,6 +89,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() { } } + @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive fun cancelAlarm(context: Context) { Timber.v("## Sync: Cancel alarm for background sync") val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java) diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt b/vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt rename to vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/package-info.kt b/vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/package-info.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt diff --git a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt b/vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt rename to vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml index 84607cf3d7f..bff594c0def 100644 --- a/vector-app/src/main/AndroidManifest.xml +++ b/vector-app/src/main/AndroidManifest.xml @@ -18,6 +18,24 @@ tools:ignore="UnusedAttribute" tools:replace="android:allowBackup"> + + + + + + + + + + + + + diff --git a/vector/src/nightly/res/xml/shortcuts.xml b/vector-app/src/nightly/res/xml/shortcuts.xml similarity index 100% rename from vector/src/nightly/res/xml/shortcuts.xml rename to vector-app/src/nightly/res/xml/shortcuts.xml diff --git a/vector/src/release/java/im/vector/app/core/di/DebugModule.kt b/vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt similarity index 100% rename from vector/src/release/java/im/vector/app/core/di/DebugModule.kt rename to vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt diff --git a/vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt b/vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt similarity index 100% rename from vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt rename to vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt diff --git a/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt b/vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt similarity index 100% rename from vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt rename to vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt diff --git a/vector/src/release/res/xml/shortcuts.xml b/vector-app/src/release/res/xml/shortcuts.xml similarity index 100% rename from vector/src/release/res/xml/shortcuts.xml rename to vector-app/src/release/res/xml/shortcuts.xml diff --git a/vector/build.gradle b/vector/build.gradle index a5538053fc1..f6db2a61df8 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -66,23 +66,6 @@ android { testCoverageEnabled = coverage.enableTestCoverage } } - nightly { - initWith release - matchingFallbacks = ['release'] - } - release - } - - flavorDimensions "store" - - productFlavors { - gplay { - dimension "store" - } - - fdroid { - dimension "store" - } } compileOptions { @@ -111,10 +94,6 @@ android { test { java.srcDirs += "src/sharedTest/java" } - // Add sourceSets for `release` version when building `nightly` - nightly { - java.srcDirs += "src/release/java" - } } buildFeatures { @@ -183,12 +162,6 @@ dependencies { // Snap Helper https://github.com/rubensousa/GravitySnapHelper api 'com.github.rubensousa:gravitysnaphelper:2.2.2' - // Nightly - // API-only library - gplayImplementation libs.google.appdistributionApi - // Full SDK implementation - gplayImplementation libs.google.appdistribution - // Work api libs.androidx.work @@ -204,7 +177,7 @@ dependencies { // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation libs.google.material - implementation 'me.gujun.android:span:1.7' + api 'me.gujun.android:span:1.7' implementation libs.markwon.core implementation libs.markwon.extLatex implementation libs.markwon.inlineParser @@ -256,15 +229,6 @@ dependencies { // UnifiedPush implementation 'com.github.UnifiedPush:android-connector:2.0.1' - // UnifiedPush gplay flavor only - gplayImplementation('com.google.firebase:firebase-messaging:23.0.8') { - exclude group: 'com.google.firebase', module: 'firebase-core' - exclude group: 'com.google.firebase', module: 'firebase-analytics' - exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' - } - - // OSS License, gplay flavor only - gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' implementation "androidx.emoji2:emoji2:1.1.0" @@ -300,14 +264,12 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' // MapTiler - fdroidApi(libs.maplibre.androidSdk) { + api(libs.maplibre.androidSdk) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - fdroidApi(libs.maplibre.pluginAnnotation) { + api(libs.maplibre.pluginAnnotation) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - gplayApi libs.maplibre.androidSdk - gplayApi libs.maplibre.pluginAnnotation // TESTS testImplementation libs.tests.junit @@ -320,19 +282,6 @@ dependencies { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" } - // Flipper, debug builds only - debugImplementation(libs.flipper.flipper) { - exclude group: 'com.facebook.fbjni', module: 'fbjni' - } - debugImplementation(libs.flipper.flipperNetworkPlugin) { - exclude group: 'com.facebook.fbjni', module: 'fbjni' - } - debugImplementation 'com.facebook.soloader:soloader:0.10.4' - debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" - - // Activate when you want to check for leaks, from time to time. - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' - androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner androidTestImplementation libs.androidx.testRules diff --git a/vector/src/androidTest/AndroidManifest.xml b/vector/src/androidTest/AndroidManifest.xml new file mode 100644 index 00000000000..5c3b99d4d13 --- /dev/null +++ b/vector/src/androidTest/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/vector/src/debug/AndroidManifest.xml b/vector/src/debug/AndroidManifest.xml deleted file mode 100644 index 94fdb1b3894..00000000000 --- a/vector/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 94f2abe78b6..d60620dddf2 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -90,23 +90,6 @@ android:name=".features.MainActivity" android:theme="@style/Theme.Vector.Launcher" /> - - - - - - - - - - - -