diff --git a/apps/android/.gitignore b/apps/android/.gitignore index 4d1f29a2d1..e4dd4a5169 100644 --- a/apps/android/.gitignore +++ b/apps/android/.gitignore @@ -9,6 +9,7 @@ /.idea/assetWizardSettings.xml /.idea/deploymentTargetDropDown.xml /.idea/misc.xml +/.idea/uiDesigner.xml .DS_Store /build /captures diff --git a/apps/android/app/build.gradle b/apps/android/app/build.gradle index 5fcf716d4a..45b0cd177c 100644 --- a/apps/android/app/build.gradle +++ b/apps/android/app/build.gradle @@ -26,9 +26,18 @@ android { cppFlags '' } } + manifestPlaceholders.app_name = "@string/app_name" + manifestPlaceholders.provider_authorities = "chat.simplex.app.provider" } buildTypes { + debug { + applicationIdSuffix "$application_id_suffix" + debuggable new Boolean("$enable_debuggable") + manifestPlaceholders.app_name = "$app_name" + // Provider can't be the same for different apps on the same device + manifestPlaceholders.provider_authorities = "chat.simplex.app${application_id_suffix}.provider" + } release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' diff --git a/apps/android/app/src/main/AndroidManifest.xml b/apps/android/app/src/main/AndroidManifest.xml index 5f2de04a24..127641dc54 100644 --- a/apps/android/app/src/main/AndroidManifest.xml +++ b/apps/android/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ android:name="SimplexApp" android:allowBackup="true" android:icon="@mipmap/icon" - android:label="@string/app_name" + android:label="${app_name}" android:supportsRtl="true" android:theme="@style/Theme.SimpleX"> @@ -34,7 +34,7 @@ android:name=".MainActivity" android:launchMode="singleTask" android:exported="true" - android:label="@string/app_name" + android:label="${app_name}" android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.SimpleX"> @@ -66,9 +66,7 @@ @@ -80,9 +78,7 @@ @@ -98,7 +94,7 @@