- // More info here:
- // https://github.com/gladed/gradle-android-git-version#3-use-a-git-tag-to-specify-your-version-number-see-semantic-versioning
versionName androidGitVersion.name()
- versionCode androidGitVersion.code()
-
- Properties properties = new Properties()
- properties.load(project.rootProject.file('local.properties').newDataInputStream())
+ versionCode 1
manifestPlaceholders = [
- APP_NAME: APP_NAME_RELEASE,
- GOOGLE_NEARBY_MESSAGES_API_KEY: "${properties.getProperty('GOOGLE_NEARBY_MESSAGES_API_KEY')}"
+ APP_NAME: APP_NAME,
+ appAuthRedirectScheme: 'io.mosip.residentapp.inji'
]
}
splits {
abi {
reset()
enable enableSeparateBuildPerCPUArchitecture
- universalApk false // If true, also generate a universal APK
+ universalApk true // If true, also generate a universal APK
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
}
}
+
signingConfigs {
release {
- def keystore = System.getenv("RELEASE_KEYSTORE") ?: "debug.keystore"
- def keystoreAlias = System.getenv("RELEASE_KEYSTORE_ALIAS") ?: "androiddebugkey"
- def keystorePass = System.getenv("RELEASE_KEYSTORE_PASSWORD") ?: "android"
+ def keystore = file('release.keystore')
+ def keystoreAlias = System.getenv("RELEASE_KEYSTORE_ALIAS")
+ def keystorePass = System.getenv("RELEASE_KEYSTORE_PASSWORD")
storeFile file("$keystore")
storePassword "$keystorePass"
keyAlias "$keystoreAlias"
@@ -189,9 +135,9 @@ android {
v1SigningEnabled false
}
debug {
- def keystore = System.getenv("DEBUG_KEYSTORE") ?: "debug.keystore"
- def keystoreAlias = System.getenv("DEBUG_KEYSTORE_ALIAS") ?: "androiddebugkey"
- def keystorePass = System.getenv("DEBUG_KEYSTORE_PASSWORD") ?: "android"
+ def keystore = file('debug.keystore')
+ def keystoreAlias = System.getenv("DEBUG_KEYSTORE_ALIAS")
+ def keystorePass = System.getenv("DEBUG_KEYSTORE_PASSWORD")
storeFile file("$keystore")
storePassword "$keystorePass"
keyAlias "$keystoreAlias"
@@ -205,6 +151,10 @@ android {
signingConfig signingConfigs.debug
}
release {
+ lintOptions {
+ checkReleaseBuilds false
+ abortOnError false
+ }
// Caution! In production, you need to generate your own keystore file.
// see https://reactnative.dev/docs/signed-apk-android.
signingConfig signingConfigs.release
@@ -216,41 +166,52 @@ android {
flavorDimensions "inji"
productFlavors {
- mosip {
- versionName defaultConfig.versionName + "-mosip"
- manifestPlaceholders = [
- APP_NAME: APP_NAME_MOSIP
- ]
+ residentapp {
+ versionName defaultConfig.versionName
+ dimension "inji"
+ resValue "string", "app_name", "Inji"
+ }
+ inji {
+ applicationId "io.mosip.inji.wallet"
+ versionName defaultConfig.versionName
+ dimension "inji"
+ resValue "string", "app_name", "Inji Wallet"
+ }
+ collab {
+ applicationId "io.mosip.inji.collab"
+ versionName defaultConfig.versionName
dimension "inji"
+ resValue "string", "app_name", "Inji Wallet Collab"
}
- newlogic {
- versionName defaultConfig.versionName + "-newlogic"
- manifestPlaceholders = [
- APP_NAME: APP_NAME_NEWLOGIC
- ]
+ synergy {
+ applicationId "io.mosip.inji.synergy"
+ versionName defaultConfig.versionName
dimension "inji"
+ resValue "string", "app_name", "Inji Wallet Synergy"
}
- ph {
- versionName defaultConfig.versionName + "-ph"
- manifestPlaceholders = [
- APP_NAME: APP_NAME_PH
- ]
+ mec {
+ applicationId "io.mosip.inji.mec"
+ versionName defaultConfig.versionName
dimension "inji"
+ resValue "string", "app_name", "Inji Wallet Mec"
}
}
android.applicationVariants.all { variant ->
- variant.outputs.all {
+ variant.outputs.all { output ->
def datetime = new Date().format('yyyyMMdd_HHmm')
- outputFileName = "${defaultConfig.applicationId}-${variant.versionName}_${datetime}.apk"
+ def architecture = output.getFilter(com.android.build.OutputFile.ABI) ?: "universal"
+ outputFileName = "Inji_${architecture}.apk"
}
}
}
dependencies {
- implementation fileTree(dir: "libs", include: ["*.jar"])
- //noinspection GradleDynamicVersion
- implementation "com.facebook.react:react-native:+"// From node_modules
+
+ // The version of react-native is set by the React Native Gradle Plugin
+ implementation("com.facebook.react:react-android")
+
+ implementation 'com.facebook.soloader:soloader:0.10.1+'
def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
@@ -261,6 +222,7 @@ dependencies {
if (isGifEnabled || isWebpEnabled) {
implementation 'com.facebook.fresco:fresco:2.0.0'
implementation 'com.facebook.fresco:imagepipeline-okhttp3:2.0.0'
+ implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.4.1'
}
if (isGifEnabled) {
@@ -278,9 +240,7 @@ dependencies {
}
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
- debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
- exclude group:'com.facebook.fbjni'
- }
+ debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
exclude group:'com.facebook.flipper'
exclude group:'com.squareup.okhttp3', module:'okhttp'
@@ -289,34 +249,13 @@ dependencies {
exclude group:'com.facebook.flipper'
}
- if (enableHermes) {
- debugImplementation files(new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute(null, rootDir).text.trim(), "../android/hermes-debug.aar"))
- releaseImplementation files(new File(["node", "--print", "require.resolve('hermes-engine/package.json')"].execute(null, rootDir).text.trim(), "../android/hermes-release.aar"))
+ if (hermesEnabled.toBoolean()) {
+ implementation("com.facebook.react:hermes-android")
} else {
implementation jscFlavor
}
- // Firebase
- implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
- implementation 'com.google.firebase:firebase-analytics:18.0.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
}
-// Run this once to be able to run the application with BUCK
-// puts all compile dependencies into folder libs for BUCK to use
-task copyDownloadableDepsToLibs(type: Copy) {
- from configurations.compile
- into 'libs'
-}
-
-apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json')"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
-applyNativeModulesAppBuildGradle(project)
-apply from: "./eas-build.gradle"
-
-try {
- def servicesJSON = file('google-services.json')
- if (servicesJSON.text) {
- apply plugin: 'com.google.gms.google-services'
- }
-} catch(Exception e) {
- logger.warn("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
-}
+apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: "./eas-build.gradle"
\ No newline at end of file
diff --git a/android/app/build_defs.bzl b/android/app/build_defs.bzl
deleted file mode 100644
index fff270f8d1..0000000000
--- a/android/app/build_defs.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Helper definitions to glob .aar and .jar targets"""
-
-def create_aar_targets(aarfiles):
- for aarfile in aarfiles:
- name = "aars__" + aarfile[aarfile.rindex("/") + 1:aarfile.rindex(".aar")]
- lib_deps.append(":" + name)
- android_prebuilt_aar(
- name = name,
- aar = aarfile,
- )
-
-def create_jar_targets(jarfiles):
- for jarfile in jarfiles:
- name = "jars__" + jarfile[jarfile.rindex("/") + 1:jarfile.rindex(".jar")]
- lib_deps.append(":" + name)
- prebuilt_jar(
- name = name,
- binary_jar = jarfile,
- )
diff --git a/android/app/debug.keystore b/android/app/debug.keystore
deleted file mode 100644
index 364e105ed3..0000000000
Binary files a/android/app/debug.keystore and /dev/null differ
diff --git a/android/app/google-services.json b/android/app/google-services.json
deleted file mode 100644
index 3d2bb016da..0000000000
--- a/android/app/google-services.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "project_info": {
- "project_number": "259470317171",
- "project_id": "mosip-resident-app",
- "storage_bucket": "mosip-resident-app.appspot.com"
- },
- "client": [
- {
- "client_info": {
- "mobilesdk_app_id": "",
- "android_client_info": {
- "package_name": "io.mosip.residentapp"
- }
- },
- "oauth_client": [
- {
- "client_id": "",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": ""
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "",
- "client_type": 3
- }
- ]
- }
- }
- }
- ],
- "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/android/app/google-services.json.gpg b/android/app/google-services.json.gpg
deleted file mode 100644
index 6303fa5765..0000000000
Binary files a/android/app/google-services.json.gpg and /dev/null differ
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 50a047e612..06b6486cc0 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -2,6 +2,18 @@
xmlns:tools="http://schemas.android.com/tools">
+
+
+
+
+
+
+
+
+
+ >
+
+
-
diff --git a/android/app/src/debug/java/io/mosip/residentapp/ReactNativeFlipper.java b/android/app/src/debug/java/io/mosip/residentapp/ReactNativeFlipper.java
index ef368bd9d2..f4263ee7e6 100644
--- a/android/app/src/debug/java/io/mosip/residentapp/ReactNativeFlipper.java
+++ b/android/app/src/debug/java/io/mosip/residentapp/ReactNativeFlipper.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the LICENSE file in the root
* directory of this source tree.
@@ -17,22 +17,27 @@
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceEventListener;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.modules.network.NetworkingModule;
import okhttp3.OkHttpClient;
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the debug
+ * flavor of it. Here you can add your own plugins and customize the Flipper setup.
+ */
public class ReactNativeFlipper {
public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
if (FlipperUtils.shouldEnableFlipper(context)) {
final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
- client.addPlugin(new ReactFlipperPlugin());
client.addPlugin(new DatabasesFlipperPlugin(context));
client.addPlugin(new SharedPreferencesFlipperPlugin(context));
client.addPlugin(CrashReporterPlugin.getInstance());
+
NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
NetworkingModule.setCustomClientBuilder(
new NetworkingModule.CustomClientBuilder() {
@@ -43,12 +48,13 @@ public void apply(OkHttpClient.Builder builder) {
});
client.addPlugin(networkFlipperPlugin);
client.start();
+
// Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
// Hence we run if after all native modules have been initialized
ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
if (reactContext == null) {
reactInstanceManager.addReactInstanceEventListener(
- new ReactInstanceManager.ReactInstanceEventListener() {
+ new ReactInstanceEventListener() {
@Override
public void onReactContextInitialized(ReactContext reactContext) {
reactInstanceManager.removeReactInstanceEventListener(this);
diff --git a/android/app/src/debug/res/xml/network_security_config.xml b/android/app/src/debug/res/xml/network_security_config.xml
new file mode 100644
index 0000000000..c1a02d62c0
--- /dev/null
+++ b/android/app/src/debug/res/xml/network_security_config.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ localhost
+ 10.0.2.2
+ 10.0.3.2
+
+
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 775353eac5..4e96975dca 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,48 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/android/app/src/main/java/io/mosip/residentapp/MainActivity.java b/android/app/src/main/java/io/mosip/residentapp/MainActivity.java
index ef1e17f8af..35b6474a2a 100644
--- a/android/app/src/main/java/io/mosip/residentapp/MainActivity.java
+++ b/android/app/src/main/java/io/mosip/residentapp/MainActivity.java
@@ -1,4 +1,5 @@
package io.mosip.residentapp;
+import expo.modules.ReactActivityDelegateWrapper;
import android.Manifest;
import android.content.Context;
@@ -9,11 +10,12 @@
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
-import androidx.core.content.ContextCompat;
import com.facebook.react.ReactActivity;
import com.facebook.react.ReactActivityDelegate;
import com.facebook.react.ReactRootView;
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactActivityDelegate;
import expo.modules.ReactActivityDelegateWrapper;
/**
@@ -29,9 +31,7 @@ public class MainActivity extends ReactActivity {
Manifest.permission.BLUETOOTH_ADMIN,
Manifest.permission.ACCESS_WIFI_STATE,
Manifest.permission.CHANGE_WIFI_STATE,
- Manifest.permission.CHANGE_WIFI_MULTICAST_STATE,
- Manifest.permission.ACCESS_COARSE_LOCATION,
- Manifest.permission.ACCESS_FINE_LOCATION,
+ Manifest.permission.CHANGE_WIFI_MULTICAST_STATE
};
private static final int REQUEST_CODE_REQUIRED_PERMISSIONS = 1;
@@ -82,7 +82,7 @@ protected void onStart() {
*/
private static boolean hasPermissions(Context context, String... permissions) {
for (String permission : permissions) {
- if (ContextCompat.checkSelfPermission(context, permission) != PackageManager.PERMISSION_GRANTED) {
+ if (context.checkCallingOrSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
return false;
}
}
@@ -112,16 +112,19 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
recreate();
}
+ /**
+ * Returns the instance of the {@link ReactActivityDelegate}. Here we use a util class {@link
+ * DefaultReactActivityDelegate} which allows you to easily enable Fabric and Concurrent React
+ * (aka React 18) with two boolean flags.
+ */
@Override
protected ReactActivityDelegate createReactActivityDelegate() {
- return new ReactActivityDelegateWrapper(
- this,
- new ReactActivityDelegate(this, getMainComponentName()) {
- @Override
- protected ReactRootView createRootView() {
- return new RNGestureHandlerEnabledRootView(MainActivity.this);
- }
- }
- );
+ return new ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, new DefaultReactActivityDelegate( this,
+ getMainComponentName(),
+ // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+ DefaultNewArchitectureEntryPoint.getFabricEnabled(), // fabricEnabled
+ // If you opted-in for the New Architecture, we enable Concurrent React (i.e. React 18).
+ DefaultNewArchitectureEntryPoint.getConcurrentReactEnabled() // concurrentRootEnabled
+ ));
}
}
diff --git a/android/app/src/main/java/io/mosip/residentapp/MainActivity.java.bak b/android/app/src/main/java/io/mosip/residentapp/MainActivity.java.bak
deleted file mode 100644
index 329fdf4c21..0000000000
--- a/android/app/src/main/java/io/mosip/residentapp/MainActivity.java.bak
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.mosip.residentapp;
-
-import android.os.Bundle;
-
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.ReactRootView;
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
-
-import expo.modules.ReactActivityDelegateWrapper;
-
-public class MainActivity extends ReactActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // Set the theme to AppTheme BEFORE onCreate to support
- // coloring the background, status bar, and navigation bar.
- // This is required for expo-splash-screen.
- setTheme(R.style.AppTheme);
- super.onCreate(null);
- }
-
- /**
- * Returns the name of the main component registered from JavaScript.
- * This is used to schedule rendering of the component.
- */
- @Override
- protected String getMainComponentName() {
- return "main";
- }
-
- @Override
- protected ReactActivityDelegate createReactActivityDelegate() {
- return new ReactActivityDelegateWrapper(
- this,
- new ReactActivityDelegate(this, getMainComponentName()) {
- @Override
- protected ReactRootView createRootView() {
- return new RNGestureHandlerEnabledRootView(MainActivity.this);
- }
- });
- }
-}
diff --git a/android/app/src/main/java/io/mosip/residentapp/MainApplication.java b/android/app/src/main/java/io/mosip/residentapp/MainApplication.java
index 80c0d4bf5c..0271f4666d 100644
--- a/android/app/src/main/java/io/mosip/residentapp/MainApplication.java
+++ b/android/app/src/main/java/io/mosip/residentapp/MainApplication.java
@@ -1,4 +1,6 @@
package io.mosip.residentapp;
+import expo.modules.ApplicationLifecycleDispatcher;
+import expo.modules.ReactNativeHostWrapper;
import android.app.Application;
import android.content.Context;
@@ -12,23 +14,20 @@
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+import com.facebook.react.defaults.DefaultReactNativeHost;
import com.facebook.soloader.SoLoader;
-import expo.modules.ApplicationLifecycleDispatcher;
-import expo.modules.ReactNativeHostWrapper;
import timber.log.Timber;
import com.facebook.react.bridge.JSIModulePackage;
-import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.firebase.crashlytics.FirebaseCrashlytics;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
public class MainApplication extends Application implements ReactApplication {
- private final ReactNativeHost mReactNativeHost = new ReactNativeHostWrapper(
- this,
- new ReactNativeHost(this) {
+ private final ReactNativeHost mReactNativeHost =
+ new ReactNativeHostWrapper(this, new DefaultReactNativeHost(this) {
@Override
public boolean getUseDeveloperSupport() {
return BuildConfig.DEBUG;
@@ -47,6 +46,14 @@ protected List getPackages() {
protected String getJSMainModuleName() {
return "index";
}
+ @Override
+ protected boolean isNewArchEnabled() {
+ return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+ }
+ @Override
+ protected Boolean isHermesEnabled() {
+ return BuildConfig.IS_HERMES_ENABLED;
+ }
});
@Override
@@ -59,73 +66,21 @@ public void onCreate() {
super.onCreate();
SoLoader.init(this, /* native exopackage */ false);
- initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
- ApplicationLifecycleDispatcher.onApplicationCreate(this);
+ if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+ // If you opted-in for the New Architecture, we load the native entry point for this app.
+ DefaultNewArchitectureEntryPoint.load();
+ }
+ ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
if (BuildConfig.DEBUG) {
Timber.plant(new Timber.DebugTree());
}
- // Setup Firebase
- FirebaseAnalytics.getInstance(this);
- Timber.plant(new CrashReportingTree());
+ ApplicationLifecycleDispatcher.onApplicationCreate(this);
}
@Override
- public void onConfigurationChanged(@NonNull Configuration newConfig) {
+ public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
}
-
- /**
- * Loads Flipper in React Native templates. Call this in the onCreate method with something like
- * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
- *
- * @param context
- * @param reactInstanceManager
- */
- private static void initializeFlipper(
- Context context, ReactInstanceManager reactInstanceManager) {
- if (BuildConfig.DEBUG) {
- try {
- /*
- We use reflection here to pick up the class that initializes Flipper,
- since Flipper library is not available in release mode
- */
- Class aClass = Class.forName("io.mosip.residentapp.ReactNativeFlipper");
- aClass
- .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
- .invoke(null, context, reactInstanceManager);
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
- }
- /**
- * A tree which logs important information for crash reporting.
- */
- private static class CrashReportingTree extends Timber.Tree {
- FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
- @Override
- protected void log(int priority, String tag, @NonNull String message, Throwable t) {
- if (priority == Log.VERBOSE || priority == Log.DEBUG) {
- return;
- }
-
- crashlytics.setCustomKey("priority", priority);
- crashlytics.setCustomKey("tag", tag);
- crashlytics.log(message);
-
- if (t != null) {
- if (priority == Log.ERROR) {
- crashlytics.recordException(t);
- }
- }
- }
- }
}
diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png
index 7855a1f24f..74f09d47a0 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png
index 7855a1f24f..b3c779cd8d 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png
index 7855a1f24f..f0bc985d4e 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png
index 7855a1f24f..8b9628b1e4 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png
index 7855a1f24f..11c2705725 100644
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png and b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png differ
diff --git a/android/app/src/main/res/drawable/mosip_logo.png b/android/app/src/main/res/drawable/mosip_logo.png
deleted file mode 100644
index c761d380dc..0000000000
Binary files a/android/app/src/main/res/drawable/mosip_logo.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable/splash_image.png b/android/app/src/main/res/drawable/splash_image.png
new file mode 100644
index 0000000000..ce339f7dab
Binary files /dev/null and b/android/app/src/main/res/drawable/splash_image.png differ
diff --git a/android/app/src/main/res/drawable/splashscreen.xml b/android/app/src/main/res/drawable/splashscreen.xml
index 70fc5faf47..341aa5379f 100644
--- a/android/app/src/main/res/drawable/splashscreen.xml
+++ b/android/app/src/main/res/drawable/splashscreen.xml
@@ -1,5 +1,11 @@
-
-
+
+
+
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 00b86e2f82..b833571586 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 00b86e2f82..b833571586 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index bdb1022a81..fe1b117497 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 0baedc4b34..d2f6a79734 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_mosip.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_mosip.png
index 8fcc1dfcd1..d2f6a79734 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_mosip.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_mosip.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index d699dce763..667f363148 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 20ab661b74..064fce091f 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 4ac95aa57d..a63d82ce88 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_mosip.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_mosip.png
index d6694772d1..a63d82ce88 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_mosip.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_mosip.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index f667950c57..a832cd3f9f 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 95cfd92ba3..3bf9087161 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 4932bbad77..e3d82442d9 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_mosip.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_mosip.png
index 763e641bbc..e3d82442d9 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_mosip.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_mosip.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index f17fb26b13..e0575f130f 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 2852d710f7..554bf6abce 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 5435db1342..0eeac74405 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosip.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosip.png
index b6d6d55ec3..0eeac74405 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosip.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_mosip.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index dd3eca94ea..dff3acfa6d 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 9f64b814bc..54c78b2fe2 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 8e2fea97b4..aaa5b2cf58 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosip.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosip.png
index b98b0328cb..aaa5b2cf58 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosip.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_mosip.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index c85fb66f0b..796f0d29d9 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 9dc2f904b3..3c05de5be8 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -1,2 +1 @@
-
\ No newline at end of file
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 85f04e2e5c..c9ee8c6308 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
-
- #ffffff
+ #FFFFFF
#FFFFFF
#023c69
#ffffff
+ #ffffff
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 4bf7115061..d961af5b44 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,9 +1,5 @@
-
- MOSIP Resident App
- MOSIP Resident App - Mosip/Inji
- MOSIP Resident App - Newlogic
- MOSIP Resident App - PH
- contain
+ cover
false
+ undefined
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index bef78ada36..b0cbdbeb18 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,4 +1,3 @@
-