diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2464155..186e757 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -44,7 +44,7 @@ plugins { setupKover() android { - namespace = "io.element.android.x" + namespace = "id.databisnis.android.bchot" defaultConfig { applicationId = BuildTimeConfig.APPLICATION_ID @@ -187,6 +187,8 @@ android { isDefault = true buildConfigFieldStr("SHORT_FLAVOR_DESCRIPTION", "G") buildConfigFieldStr("FLAVOR_DESCRIPTION", "GooglePlay") + targetSdk = 36 + minSdk = 29 } create("fdroid") { dimension = "store" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9610942..0701974 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -68,5 +68,5 @@ # Also needed after AGP 8.13.1 upgrade, it seems like proguard is now more aggressive on removing unused code -keep class org.matrix.rustcomponents.sdk.** { *;} -keep class uniffi.** { *;} --keep class io.element.android.x.di.** { *; } --keepnames class io.element.android.x.** +-keep class id.databisnis.android.bchot.di.** { *; } +-keepnames class id.databisnis.android.bchot.** diff --git a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt b/app/src/main/kotlin/id/databisnis/android/bchot/ElementXApplication.kt similarity index 78% rename from app/src/main/kotlin/io/element/android/x/ElementXApplication.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/ElementXApplication.kt index e29ff82..7674dcc 100644 --- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/ElementXApplication.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x +package id.databisnis.android.bchot import android.app.Application import androidx.startup.AppInitializer @@ -14,11 +14,11 @@ import androidx.work.Configuration import dev.zacsweers.metro.createGraphFactory import io.element.android.libraries.di.DependencyInjectionGraphOwner import io.element.android.libraries.workmanager.api.di.MetroWorkerFactory -import io.element.android.x.di.AppGraph -import io.element.android.x.info.logApplicationInfo -import io.element.android.x.initializer.CacheCleanerInitializer -import io.element.android.x.initializer.CrashInitializer -import io.element.android.x.initializer.PlatformInitializer +import id.databisnis.android.bchot.di.AppGraph +import id.databisnis.android.bchot.info.logApplicationInfo +import id.databisnis.android.bchot.initializer.CacheCleanerInitializer +import id.databisnis.android.bchot.initializer.CrashInitializer +import id.databisnis.android.bchot.initializer.PlatformInitializer class ElementXApplication : Application(), DependencyInjectionGraphOwner, Configuration.Provider { override val graph: AppGraph = createGraphFactory().create(this) diff --git a/app/src/main/kotlin/io/element/android/x/MainActivity.kt b/app/src/main/kotlin/id/databisnis/android/bchot/MainActivity.kt similarity index 97% rename from app/src/main/kotlin/io/element/android/x/MainActivity.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/MainActivity.kt index 162a55c..7d10d7e 100644 --- a/app/src/main/kotlin/io/element/android/x/MainActivity.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/MainActivity.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x +package id.databisnis.android.bchot import android.content.Intent import android.os.Bundle @@ -40,8 +40,8 @@ import io.element.android.libraries.core.log.logger.LoggerTag import io.element.android.libraries.designsystem.theme.ElementThemeApp import io.element.android.libraries.designsystem.utils.snackbar.LocalSnackbarDispatcher import io.element.android.services.analytics.compose.LocalAnalyticsService -import io.element.android.x.di.AppBindings -import io.element.android.x.intent.SafeUriHandler +import id.databisnis.android.bchot.di.AppBindings +import id.databisnis.android.bchot.intent.SafeUriHandler import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/MainNode.kt b/app/src/main/kotlin/id/databisnis/android/bchot/MainNode.kt similarity index 98% rename from app/src/main/kotlin/io/element/android/x/MainNode.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/MainNode.kt index 2004db8..1b84b24 100644 --- a/app/src/main/kotlin/io/element/android/x/MainNode.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/MainNode.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x +package id.databisnis.android.bchot import android.content.Context import android.content.Intent diff --git a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppBindings.kt similarity index 97% rename from app/src/main/kotlin/io/element/android/x/di/AppBindings.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/AppBindings.kt index 6e157f6..60d3367 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppBindings.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesTo diff --git a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppGraph.kt similarity index 96% rename from app/src/main/kotlin/io/element/android/x/di/AppGraph.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/AppGraph.kt index 7b5ba11..d38101a 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppGraph.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import android.content.Context import androidx.work.ListenableWorker diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppModule.kt similarity index 97% rename from app/src/main/kotlin/io/element/android/x/di/AppModule.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/AppModule.kt index 87d0ece..5f23aff 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/AppModule.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import android.content.Context import android.content.SharedPreferences @@ -30,8 +30,8 @@ import io.element.android.libraries.di.annotations.AppCoroutineScope import io.element.android.libraries.di.annotations.ApplicationContext import io.element.android.libraries.recentemojis.api.EmojibaseProvider import io.element.android.libraries.recentemojis.impl.DefaultEmojibaseProvider -import io.element.android.x.BuildConfig -import io.element.android.x.R +import id.databisnis.android.bchot.BuildConfig +import id.databisnis.android.bchot.R import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultRoomGraphFactory.kt similarity index 94% rename from app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultRoomGraphFactory.kt index bc5c853..b0c51f3 100644 --- a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomGraphFactory.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultRoomGraphFactory.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import dev.zacsweers.metro.ContributesBinding import io.element.android.appnav.di.RoomGraphFactory diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultSessionGraphFactory.kt similarity index 94% rename from app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultSessionGraphFactory.kt index 9631713..cbdd15a 100644 --- a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/DefaultSessionGraphFactory.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/RoomGraph.kt similarity index 95% rename from app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/RoomGraph.kt index 6588335..0c5ad4a 100644 --- a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/RoomGraph.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import dev.zacsweers.metro.GraphExtension import dev.zacsweers.metro.Provides diff --git a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt b/app/src/main/kotlin/id/databisnis/android/bchot/di/SessionGraph.kt similarity index 95% rename from app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/di/SessionGraph.kt index e53d0eb..a860e95 100644 --- a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/di/SessionGraph.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.di +package id.databisnis.android.bchot.di import dev.zacsweers.metro.GraphExtension import dev.zacsweers.metro.Provides diff --git a/app/src/main/kotlin/io/element/android/x/info/Logs.kt b/app/src/main/kotlin/id/databisnis/android/bchot/info/Logs.kt similarity index 94% rename from app/src/main/kotlin/io/element/android/x/info/Logs.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/info/Logs.kt index 2b66fef..6fcbc14 100644 --- a/app/src/main/kotlin/io/element/android/x/info/Logs.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/info/Logs.kt @@ -6,11 +6,11 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.info +package id.databisnis.android.bchot.info import android.content.Context import io.element.android.libraries.androidutils.system.getVersionCodeFromManifest -import io.element.android.x.BuildConfig +import id.databisnis.android.bchot.BuildConfig import timber.log.Timber import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/CacheCleanerInitializer.kt similarity index 93% rename from app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/initializer/CacheCleanerInitializer.kt index 3e187bc..0a1094a 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/CacheCleanerInitializer.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/CacheCleanerInitializer.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.initializer +package id.databisnis.android.bchot.initializer import android.content.Context import androidx.startup.Initializer diff --git a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/CrashInitializer.kt similarity index 94% rename from app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/initializer/CrashInitializer.kt index 3caff8a..ba3599f 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/CrashInitializer.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.initializer +package id.databisnis.android.bchot.initializer import android.content.Context import androidx.startup.Initializer diff --git a/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/PlatformInitializer.kt similarity index 95% rename from app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/initializer/PlatformInitializer.kt index 0eea512..3f715b0 100644 --- a/app/src/main/kotlin/io/element/android/x/initializer/PlatformInitializer.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/initializer/PlatformInitializer.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.initializer +package id.databisnis.android.bchot.initializer import android.content.Context import android.system.Os @@ -15,7 +15,7 @@ import io.element.android.features.rageshake.api.logs.createWriteToFilesConfigur import io.element.android.libraries.architecture.bindings import io.element.android.libraries.featureflag.api.FeatureFlags import io.element.android.libraries.matrix.api.tracing.TracingConfiguration -import io.element.android.x.di.AppBindings +import id.databisnis.android.bchot.di.AppBindings import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import timber.log.Timber diff --git a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt b/app/src/main/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProvider.kt similarity index 94% rename from app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProvider.kt index 0453fdf..5c28995 100644 --- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProvider.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.intent +package id.databisnis.android.bchot.intent import android.content.Context import android.content.Intent @@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.api.core.ThreadId import io.element.android.libraries.push.impl.intent.IntentProvider -import io.element.android.x.MainActivity +import id.databisnis.android.bchot.MainActivity @ContributesBinding(AppScope::class) class DefaultIntentProvider( diff --git a/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt b/app/src/main/kotlin/id/databisnis/android/bchot/intent/SafeUriHandler.kt similarity index 92% rename from app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/intent/SafeUriHandler.kt index 1e9af37..9299ce9 100644 --- a/app/src/main/kotlin/io/element/android/x/intent/SafeUriHandler.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/intent/SafeUriHandler.kt @@ -6,7 +6,7 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.intent +package id.databisnis.android.bchot.intent import android.app.Activity import androidx.compose.ui.platform.UriHandler diff --git a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt b/app/src/main/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProvider.kt similarity index 90% rename from app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt rename to app/src/main/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProvider.kt index ad4f9a4..695b013 100644 --- a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt +++ b/app/src/main/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProvider.kt @@ -6,13 +6,13 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.oidc +package id.databisnis.android.bchot.oidc import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider import io.element.android.services.toolbox.api.strings.StringProvider -import io.element.android.x.R +import id.databisnis.android.bchot.R @ContributesBinding(AppScope::class) class DefaultOidcRedirectUrlProvider( diff --git a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt b/app/src/test/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProviderTest.kt similarity index 96% rename from app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt rename to app/src/test/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProviderTest.kt index 4598a74..c36f40e 100644 --- a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt +++ b/app/src/test/kotlin/id/databisnis/android/bchot/intent/DefaultIntentProviderTest.kt @@ -8,7 +8,7 @@ @file:Suppress("SameParameterValue") -package io.element.android.x.intent +package id.databisnis.android.bchot.intent import android.content.Context import android.content.Intent @@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID import io.element.android.libraries.matrix.test.A_THREAD_ID import io.element.android.tests.testutils.lambda.lambdaRecorder import io.element.android.tests.testutils.lambda.value -import io.element.android.x.MainActivity +import id.databisnis.android.bchot.MainActivity import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt b/app/src/test/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProviderTest.kt similarity index 91% rename from app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt rename to app/src/test/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProviderTest.kt index 1856735..b853606 100644 --- a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt +++ b/app/src/test/kotlin/id/databisnis/android/bchot/oidc/DefaultOidcRedirectUrlProviderTest.kt @@ -6,11 +6,11 @@ * Please see LICENSE files in the repository root for full details. */ -package io.element.android.x.oidc +package id.databisnis.android.bchot.oidc import com.google.common.truth.Truth.assertThat import io.element.android.services.toolbox.test.strings.FakeStringProvider -import io.element.android.x.R +import id.databisnis.android.bchot.R import org.junit.Test class DefaultOidcRedirectUrlProviderTest { diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt index e1ae689..5602ada 100644 --- a/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt +++ b/appconfig/src/main/kotlin/io/element/android/appconfig/ApplicationConfig.kt @@ -17,19 +17,19 @@ object ApplicationConfig { * - "Element X dbg" for debug builds; * - "Element X nightly" for nightly builds. */ - const val APPLICATION_NAME: String = "" + const val APPLICATION_NAME: String = "bChot" /** * Used in the strings to reference the Element client. * Cannot be empty. * For Element, the value is "Element". */ - const val PRODUCTION_APPLICATION_NAME: String = "Element" + const val PRODUCTION_APPLICATION_NAME: String = "bChot" /** * Used in the strings to reference the Element Desktop client, for instance Element Web. * Cannot be empty. * For Element, the value is "Element". We use the same name for desktop and mobile for now. */ - const val DESKTOP_APPLICATION_NAME: String = "Element" + const val DESKTOP_APPLICATION_NAME: String = "bChot" } diff --git a/appicon/element/src/main/ic_launcher-playstore.png b/appicon/element/src/main/ic_launcher-playstore.png index 325bf57..181c8b5 100644 Binary files a/appicon/element/src/main/ic_launcher-playstore.png and b/appicon/element/src/main/ic_launcher-playstore.png differ diff --git a/appicon/element/src/main/ic_launcher_bchot.png b/appicon/element/src/main/ic_launcher_bchot.png new file mode 100644 index 0000000..9454581 Binary files /dev/null and b/appicon/element/src/main/ic_launcher_bchot.png differ diff --git a/appicon/element/src/main/res/drawable/ic_launcher_background.xml b/appicon/element/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/appicon/element/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 9de193b..c4a603d 100644 --- a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,12 +1,5 @@ - + - - + \ No newline at end of file diff --git a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 9de193b..c4a603d 100644 --- a/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/appicon/element/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,12 +1,5 @@ - + - - + \ No newline at end of file diff --git a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp index 2ae0da8..98b4ec5 100644 Binary files a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp and b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp index e40370b..04e75a3 100644 Binary files a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp index 8ad6b74..a43b391 100644 Binary files a/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/appicon/element/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp index d4e1b90..b4839a7 100644 Binary files a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp and b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp index ac2361f..717720b 100644 Binary files a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 3cd52b2..08de588 100644 Binary files a/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/appicon/element/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp index 527b238..9ecfa75 100644 Binary files a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp index f8c5c5f..1cdc627 100644 Binary files a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1c98f35..cf4af90 100644 Binary files a/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/appicon/element/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp index ed524b8..c87a7dd 100644 Binary files a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp index bb401bc..e94b461 100644 Binary files a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index a6b0547..e37024b 100644 Binary files a/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/appicon/element/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index 359e392..fb5975b 100644 Binary files a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp index f0f9a63..d7a288b 100644 Binary files a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 3612579..9a6c71d 100644 Binary files a/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/appicon/element/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/appicon/enterprise/src/main/bchot-medium.svg b/appicon/enterprise/src/main/bchot-medium.svg new file mode 100755 index 0000000..563d1ec --- /dev/null +++ b/appicon/enterprise/src/main/bchot-medium.svg @@ -0,0 +1,660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appicon/enterprise/src/main/bchot-transparan.svg b/appicon/enterprise/src/main/bchot-transparan.svg new file mode 100755 index 0000000..2e66971 --- /dev/null +++ b/appicon/enterprise/src/main/bchot-transparan.svg @@ -0,0 +1,52 @@ + + + + + diff --git a/appicon/enterprise/src/main/ic_launcher-playstore.png b/appicon/enterprise/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..d4c79c3 Binary files /dev/null and b/appicon/enterprise/src/main/ic_launcher-playstore.png differ diff --git a/appicon/enterprise/src/main/res/drawable/ic_launcher_background.xml b/appicon/enterprise/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/appicon/enterprise/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..c4a603d --- /dev/null +++ b/appicon/enterprise/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml deleted file mode 100644 index 38ef234..0000000 --- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index 0fd0f91..0000000 --- a/appicon/enterprise/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher.webp b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..98b4ec5 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..04e75a3 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..a43b391 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher.webp b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..b4839a7 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..717720b Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..08de588 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher.webp b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..9ecfa75 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..1cdc627 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..cf4af90 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..c87a7dd Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..e94b461 Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..e37024b Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..fb5975b Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp new file mode 100644 index 0000000..d7a288b Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ diff --git a/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9a6c71d Binary files /dev/null and b/appicon/enterprise/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt index 4af64cb..0eb8f3c 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.sync.withLock import timber.log.Timber import java.util.concurrent.ConcurrentHashMap -private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey" +private const val SAVE_INSTANCE_KEY = "id.databisnis.android.bchot.di.MatrixClientsHolder.SaveInstanceKey" /** * In-memory cache for logged in Matrix sessions. diff --git a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt index 9a91e97..b36de3c 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.onEach -private const val SAVE_INSTANCE_KEY = "io.element.android.x.RootNavStateFlowFactory.SAVE_INSTANCE_KEY" +private const val SAVE_INSTANCE_KEY = "id.databisnis.android.bchot.RootNavStateFlowFactory.SAVE_INSTANCE_KEY" /** * This class is responsible for creating a flow of [RootNavState]. diff --git a/gradle.properties b/gradle.properties index ce03899..51e9934 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 -XX:+UseG1GC +org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8 -XX:+UseG1GC # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app"s APK diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt index 1130702..c1135b5 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BuildMeta.kt @@ -13,8 +13,8 @@ import io.element.android.libraries.core.meta.BuildType fun BuildMeta.isElement(): Boolean { return when (buildType) { - BuildType.RELEASE -> applicationId == "io.element.android.x" - BuildType.NIGHTLY -> applicationId == "io.element.android.x.nightly" - BuildType.DEBUG -> applicationId == "io.element.android.x.debug" + BuildType.RELEASE -> applicationId == "id.databisnis.android.bchot" + BuildType.NIGHTLY -> applicationId == "id.databisnis.android.bchot.nightly" + BuildType.DEBUG -> applicationId == "id.databisnis.android.bchot.debug" } } diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt index 07f7f8b..15457f0 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableMessageEvent.kt @@ -52,7 +52,7 @@ data class NotifiableMessageEvent( override val description: String = body ?: "" // Example of value: - // content://io.element.android.x.debug.notifications.fileprovider/downloads/temp/notif/matrix.org/XGItzSDOnSyXjYtOPfiKexDJ + // content://id.databisnis.android.bchot.debug.notifications.fileprovider/downloads/temp/notif/matrix.org/XGItzSDOnSyXjYtOPfiKexDJ val imageUri: Uri? get() = imageUriString?.toUri() } diff --git a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt index 8ad2d62..7344260 100644 --- a/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt +++ b/libraries/pushstore/impl/src/main/kotlin/io/element/android/libraries/pushstore/impl/UserPushStoreDataStore.kt @@ -41,7 +41,7 @@ class UserPushStoreDataStore( init { // Migrate legacy data. Previous file can be too long if the userId is too long. The userId can be up to 255 chars. // Example of long file path, with `averylonguserid` replacing a very longer name - // /data/user/0/io.element.android.x.debug/files/datastore/push_store_@averylonguserid:example.org.preferences_pb + // /data/user/0/id.databisnis.android.bchot.debug/files/datastore/push_store_@averylonguserid:example.org.preferences_pb val legacyFile = context.preferencesDataStoreFile("push_store_$userId") if (legacyFile.exists()) { Timber.d("Migrating legacy push data store for $userId") diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt index f792e89..bb37ab4 100644 --- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt +++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt @@ -9,8 +9,8 @@ package config object BuildTimeConfig { - const val APPLICATION_ID = "io.element.android.x" - const val APPLICATION_NAME = "Element X" + const val APPLICATION_ID = "id.databisnis.android.bchot" + const val APPLICATION_NAME = "bChot" const val GOOGLE_APP_ID_RELEASE = "1:912726360885:android:d097de99a4c23d2700427c" const val GOOGLE_APP_ID_DEBUG = "1:912726360885:android:def0a4e454042e9b00427c" const val GOOGLE_APP_ID_NIGHTLY = "1:912726360885:android:e17435e0beb0303000427c" diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt index b7403f4..a71cf39 100644 --- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt +++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistContentTest.kt @@ -19,7 +19,7 @@ class KonsistContentTest { Konsist .scopeFromProduction() .files - .withImportNamed("io.element.android.x.BuildConfig") + .withImportNamed("id.databisnis.android.bchot.BuildConfig") .assertFalse(additionalMessage = "Please do not use BuildConfig.VERSION_CODE, but use the versionCode from BuildMeta") { it.text.contains("BuildConfig.VERSION_CODE") } diff --git a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt index 5ae7c75..86b7f09 100644 --- a/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt +++ b/tests/uitests/src/test/kotlin/base/ComposablePreviewProvider.kt @@ -22,7 +22,7 @@ private val PACKAGE_TREES = arrayOf( "io.element.android.services", "io.element.android.appicon", "io.element.android.appnav", - "io.element.android.x", + "id.databisnis.android.bchot", ) object ComposablePreviewProvider : TestParameterValuesProvider() { diff --git a/tools/adb/disable_app_standby.sh b/tools/adb/disable_app_standby.sh index b6e115e..a98c4bc 100755 --- a/tools/adb/disable_app_standby.sh +++ b/tools/adb/disable_app_standby.sh @@ -11,7 +11,7 @@ echo " => Standby OFF" set -x -package_name="io.element.android.x.debug" +package_name="id.databisnis.android.bchot.debug" adb shell dumpsys battery reset adb shell am set-inactive "${package_name}" false adb shell am get-inactive "${package_name}" diff --git a/tools/adb/enable_app_standby.sh b/tools/adb/enable_app_standby.sh index b6156e5..15501e4 100755 --- a/tools/adb/enable_app_standby.sh +++ b/tools/adb/enable_app_standby.sh @@ -11,7 +11,7 @@ echo " => Standby ON" set -x -package_name="io.element.android.x.debug" +package_name="id.databisnis.android.bchot.debug" adb shell dumpsys battery unplug adb shell am set-inactive "${package_name}" true adb shell am get-inactive "${package_name}"