@fadyshawky/react-native-magic 2.1.0 → 2.1.2

package/.vscode/settings.json

@@ -3,5 +3,6 @@
         "activityBar.background": "#342D0C",
         "titleBar.activeBackground": "#493F10",
         "titleBar.activeForeground": "#FCFAF0"
-    }
+    },
+    "java.configuration.updateBuildConfiguration": "automatic"
 }

package/README.md

@@ -34,7 +34,7 @@ Then run:
 
 ```bash
 npm start
-npm run ios    # or: npm run android
+npm run ios    # or an Android variant below
 ```
 
 ## First steps after creating your app
@@ -69,7 +69,12 @@ src/
 |---------|-------------|
 | `npm start` | Start Metro bundler |
 | `npm run ios` | Run on iOS |
-| `npm run android` | Run on Android |
+| `npm run android:prod:debug` | Run Android (production, debug) |
+| `npm run android:prod:release` | Run Android (production, release) |
+| `npm run android:staging:debug` | Run Android (staging, debug) |
+| `npm run android:staging:release` | Run Android (staging, release) |
+| `npm run android:development:debug` | Run Android (development, debug) |
+| `npm run android:development:release` | Run Android (development, release) |
 | `npm test` | Run tests |
 | `npm run lint` | Lint code |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fadyshawky/react-native-magic",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Plug-and-play React Native template: TypeScript, Redux, React Navigation, scalable architecture. Init and start developing without hassle.",
   "keywords": [
     "react-native-magic",
@@ -19,94 +19,6 @@
   "author": "Fady Shawky",
   "type": "commonjs",
   "main": "index.js",
-  "dependencies": {
-    "@fontsource/poppins": "^5.1.0",
-    "@react-native-async-storage/async-storage": "^2.1.0",
-    "@react-native-camera-roll/camera-roll": "^7.9.0",
-    "@react-native-community/datetimepicker": "^8.2.0",
-    "@react-native-community/image-editor": "^4.2.1",
-    "@react-native-community/netinfo": "^11.4.1",
-    "@react-native-community/slider": "^4.5.5",
-    "@react-navigation/bottom-tabs": "^7.2.0",
-    "@react-navigation/drawer": "^7.1.1",
-    "@react-navigation/material-top-tabs": "^7.1.0",
-    "@react-navigation/native": "^7.0.14",
-    "@react-navigation/native-stack": "^7.2.0",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@shopify/flash-list": "^1.7.2",
-    "@types/intl": "^1.2.2",
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.13",
-    "@types/react-native-vector-icons": "^6.4.18",
-    "@types/react-redux": "^7.1.34",
-    "axios": "^1.7.9",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "dayjs": "^1.11.13",
-    "detox": "^20.28.0",
-    "intl": "^1.2.5",
-    "lodash": "^4.17.21",
-    "mime": "^4.0.6",
-    "patch-package": "^8.0.0",
-    "react": "^18.3.1",
-    "react-native": "^0.76.5",
-    "react-native-actions-sheet": "^0.9.7",
-    "react-native-animated-pagination-dots": "^0.1.73",
-    "react-native-calendars": "^1.1307.0",
-    "react-native-config": "^1.5.3",
-    "react-native-device-info": "^14.0.2",
-    "react-native-dropdown-select-list": "^2.0.5",
-    "react-native-gesture-handler": "^2.21.2",
-    "react-native-image-crop-picker": "^0.41.6",
-    "react-native-image-resource-generator": "^1.0.2",
-    "react-native-in-app-review": "^4.3.3",
-    "react-native-keyboard-aware-scroll-view": "^0.9.5",
-    "react-native-localization": "^2.3.2",
-    "react-native-mask-input": "^1.2.3",
-    "react-native-orientation-locker": "^1.7.0",
-    "react-native-pager-view": "^6.6.1",
-    "react-native-permissions": "^5.2.1",
-    "react-native-safe-area-context": "^5.0.0",
-    "react-native-screens": "^4.4.0",
-    "react-native-sfsymbols": "^1.2.2",
-    "react-native-share": "^12.0.3",
-    "react-native-snackbar": "^2.8.0",
-    "react-native-svg": "^15.10.1",
-    "react-native-tab-view": "^4.0.5",
-    "react-native-vector-icons": "^10.2.0",
-    "react-native-vision-camera": "^4.6.3",
-    "react-native-webview": "^13.12.5",
-    "react-redux": "^9.2.0",
-    "redux": "^5.0.1",
-    "redux-persist": "^6.0.0",
-    "redux-persist-transform-filter": "^0.0.22"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/runtime": "^7.26.0",
-    "@jest/globals": "^29.7.0",
-    "@react-native-community/cli": "15.0.1",
-    "@react-native-community/cli-platform-android": "15.0.1",
-    "@react-native-community/cli-platform-ios": "15.0.1",
-    "@react-native/babel-preset": "^0.76.5",
-    "@react-native/eslint-config": "^0.76.5",
-    "@react-native/metro-config": "^0.76.5",
-    "@react-native/typescript-config": "^0.76.5",
-    "@types/react": "^18.3.18",
-    "@types/react-test-renderer": "^18.3.1",
-    "babel-jest": "^29.7.0",
-    "eslint": "^8.57.1",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^28.10.0",
-    "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
-    "eslint-plugin-react-native": "^4.1.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
-    "jest": "^29.7.0",
-    "prettier": "^2.8.8",
-    "react-test-renderer": "^18.3.1",
-    "typescript": "^5.0.4"
-  },
   "scripts": {
     "test": "exit 0"
   },

package/template/.env.example

@@ -7,3 +7,6 @@ API_BASE_URL=https://api.example.com
 # Bundle ID (Android applicationId / iOS). Set at init with --package-name or when prompted.
 APP_ID=com.yourcompany.yourapp
 ANDROID_APP_ID=com.yourcompany.yourapp
+
+ANDROID_VERSION_CODE=1
+ANDROID_VERSION_NAME=1.0.0

package/template/android/app/build.gradle

@@ -123,8 +123,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         multiDexEnabled true
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode  project.env.get("ANDROID_VERSION_CODE").toInteger()
-        versionName  project.env.get("ANDROID_VERSION_NAME")
+        versionCode  project.env.get("ANDROID_VERSION_CODE")?.toInteger() ?: 1
+        versionName  project.env.get("ANDROID_VERSION_NAME") ?: "1.0.0"
         resValue "string", "build_config_package", project.env.get("ANDROID_APP_ID")
 
         ndk {
@@ -169,7 +169,7 @@ android {
                 def projectName = project.env.get("PROJECT_NAME")
                 def SEP = "_"
                 
-                def newApkName = projectName + SEP + project.env.get("ENV") + SEP + project.env.get("ANDROID_VERSION_NAME") + SEP + project.env.get("ANDROID_VERSION_CODE") + ".apk"
+                def newApkName = projectName + SEP + project.env.get("ENV") + SEP + (project.env.get("ANDROID_VERSION_NAME") ?: "1.0.0") + SEP + (project.env.get("ANDROID_VERSION_CODE")?.toInteger() ?: 1) + ".apk"
                 
 
                 println "Naming File ... " + newApkName                        

package/template/android/app/src/main/java/com/reactnativemagic/MainActivity.kt

@@ -5,11 +5,17 @@ import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
 import com.facebook.react.defaults.DefaultReactActivityDelegate
+import com.swmansion.rnscreens.fragment.restoration.RNScreensFragmentFactory
 
 class MainActivity : ReactActivity() {
 
+  /**
+   * Prevents crash on activity recreation: "Screen fragments should never be restored".
+   * See https://github.com/software-mansion/react-native-screens/issues/17
+   */
   override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(null)
+    supportFragmentManager.fragmentFactory = RNScreensFragmentFactory()
+    super.onCreate(savedInstanceState)
   }
 
   /**
@@ -24,4 +30,4 @@ class MainActivity : ReactActivity() {
    */
   override fun createReactActivityDelegate(): ReactActivityDelegate =
       DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
-}
+}

package/template/android/app/src/main/java/com/reactnativemagic/MainApplication.kt

@@ -4,41 +4,24 @@ import android.app.Application
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
-import com.facebook.react.defaults.DefaultReactNativeHost
-import com.facebook.react.soloader.OpenSourceMergedSoMapping
-import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 
-  override val reactNativeHost: ReactNativeHost =
-      object : DefaultReactNativeHost(this) {
-        override fun getPackages(): List<ReactPackage> =
-            PackageList(this).packages.apply {
-              // Packages that cannot be autolinked yet can be added manually here, for example:
-              // add(MyReactNativePackage())
-            }
-
-        override fun getJSMainModuleName(): String = "index"
-
-        override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
-
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-      }
-
-  override val reactHost: ReactHost
-    get() = getDefaultReactHost(applicationContext, reactNativeHost)
+  override val reactHost: ReactHost by lazy {
+    getDefaultReactHost(
+      context = applicationContext,
+      packageList =
+        PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here, for example:
+          // add(MyReactNativePackage())
+        },
+    )
+  }
 
   override fun onCreate() {
     super.onCreate()
-    SoLoader.init(this, OpenSourceMergedSoMapping)
-    if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-      // If you opted-in for the New Architecture, we load the native entry point for this app.
-      load()
-    }
+    loadReactNative(this)
   }
 }

package/template/android/build.gradle

@@ -1,11 +1,11 @@
 buildscript {
     ext {
-        buildToolsVersion = "35.0.0"
+        buildToolsVersion = "36.0.0"
         minSdkVersion = 24
-        compileSdkVersion = 35
-        targetSdkVersion = 34
-        ndkVersion = "26.1.10909125"
-        kotlinVersion = "1.9.24"
+        compileSdkVersion = 36
+        targetSdkVersion = 36
+        ndkVersion = "27.1.12297006"
+        kotlinVersion = "2.1.20"
     }
     repositories {
         google()
@@ -15,6 +15,8 @@ buildscript {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
+        classpath 'com.google.gms:google-services:4.4.4'
+
     }
 }
 

package/template/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/template/package.json

@@ -3,58 +3,72 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "android": "react-native run-android",
+    "android:prod:debug": "react-native run-android --mode=productionDebug",
+    "android:prod:release": "react-native run-android --mode=productionRelease",
+    "android:staging:debug": "react-native run-android --mode=stagingDebug",
+    "android:staging:release": "react-native run-android --mode=stagingRelease",
+    "android:development:debug": "react-native run-android --mode=developmentDebug",
+    "android:development:release": "react-native run-android --mode=developmentRelease",
     "ios": "react-native run-ios",
     "lint": "eslint .",
     "start": "react-native start",
     "test": "jest"
   },
   "dependencies": {
-    "@react-native-async-storage/async-storage": "^2.2.0",
-    "@react-navigation/bottom-tabs": "^7.14.0",
-    "@react-navigation/native": "^7.1.28",
-    "@react-navigation/native-stack": "^7.13.0",
-    "@reduxjs/toolkit": "^2.11.0",
-    "axios": "^1.13.0",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "dayjs": "^1.11.19",
-    "intl": "^1.2.5",
-    "lodash": "^4.17.23",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
-    "react-native": "^0.84.0",
-    "react-native-actions-sheet": "^10.1.0",
-    "react-native-config": "^1.6.0",
-    "react-native-device-info": "^14.0.0",
-    "react-native-gesture-handler": "^2.30.0",
-    "react-native-localization": "^2.3.2",
-    "react-native-safe-area-context": "^5.6.0",
-    "react-native-screens": "^4.24.0",
-    "react-native-snackbar": "^2.8.0",
-    "react-redux": "^9.2.0",
-    "redux": "^5.0.1",
-    "redux-persist": "^6.0.0",
-    "redux-persist-transform-filter": "^0.0.22"
+    "@good-react-native/gradient-border": "1.0.2",
+    "@react-native-async-storage/async-storage": "2.2.0",
+    "@react-native-masked-view/masked-view": "0.3.2",
+    "@react-navigation/bottom-tabs": "7.15.5",
+    "@react-navigation/native": "7.1.33",
+    "@react-navigation/native-stack": "7.14.4",
+    "@reduxjs/toolkit": "2.11.2",
+    "axios": "1.13.6",
+    "babel-plugin-transform-remove-console": "6.9.4",
+    "dayjs": "1.11.19",
+    "intl": "1.2.5",
+    "lodash": "4.17.23",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
+    "react-native": "0.84.1",
+    "react-native-actions-sheet": "10.1.2",
+    "react-native-config": "1.6.1",
+    "react-native-device-info": "15.0.2",
+    "react-native-gesture-handler": "2.30.0",
+    "react-native-keyboard-aware-scroll-view": "0.9.5",
+    "react-native-linear-gradient": "2.8.3",
+    "react-native-localization": "2.3.2",
+    "react-native-reanimated": "4.2.2",
+    "react-native-restart": "0.0.27",
+    "react-native-safe-area-context": "5.7.0",
+    "react-native-screens": "4.24.0",
+    "react-native-sfsymbols": "1.2.2",
+    "react-native-snackbar": "3.0.1",
+    "react-native-vector-icons": "10.3.0",
+    "react-native-worklets": "0.7.4",
+    "react-redux": "9.2.0",
+    "redux": "5.0.1",
+    "redux-persist": "6.0.0",
+    "redux-persist-transform-filter": "0.0.22"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.0",
-    "@babel/preset-env": "^7.26.0",
-    "@babel/runtime": "^7.28.0",
-    "@react-native-community/cli": "^20.1.0",
-    "@react-native-community/cli-platform-android": "^20.1.0",
-    "@react-native-community/cli-platform-ios": "^20.1.0",
-    "@react-native/babel-preset": "^0.84.0",
-    "@react-native/eslint-config": "^0.84.0",
-    "@react-native/metro-config": "^0.84.0",
-    "@react-native/typescript-config": "^0.84.0",
-    "@types/jest": "^30.0.0",
-    "@types/react": "^19.2.0",
-    "@types/react-test-renderer": "^19.1.0",
-    "eslint": "^10.0.0",
-    "jest": "^30.0.0",
-    "prettier": "^3.8.0",
-    "react-test-renderer": "^19.2.0",
-    "typescript": "^5.9.0"
+    "@babel/core": "7.29.0",
+    "@babel/preset-env": "7.29.0",
+    "@babel/runtime": "7.28.6",
+    "@react-native-community/cli": "20.1.2",
+    "@react-native-community/cli-platform-android": "20.1.2",
+    "@react-native-community/cli-platform-ios": "20.1.2",
+    "@react-native/babel-preset": "0.84.1",
+    "@react-native/eslint-config": "0.84.1",
+    "@react-native/metro-config": "0.84.1",
+    "@react-native/typescript-config": "0.84.1",
+    "@types/jest": "30.0.0",
+    "@types/react": "19.2.14",
+    "@types/react-test-renderer": "19.1.0",
+    "eslint": "10.0.2",
+    "jest": "30.2.0",
+    "prettier": "3.8.1",
+    "react-test-renderer": "19.2.3",
+    "typescript": "5.9.3"
   },
   "engines": {
     "node": ">=20"

package/template/src/common/components/Cards.tsx

@@ -80,7 +80,7 @@ const styles = StyleSheet.create({
     height: scaleHeight(100),
   },
   title: {
-    fontSize: CommonSizes.fontSize.body2,
+    fontSize: CommonSizes.font.bodyMedium,
     textAlign: 'center',
     marginBottom: CommonSizes.spacing.small,
   },

package/template/src/common/components/EmptyView.tsx

@@ -22,7 +22,7 @@ const styles = StyleSheet.create({
     ...CommonStyles.normalText,
     fontWeight: '600',
     textAlign: 'center',
-    marginBottom: CommonSizes.spacing.extraSmall,
+    marginBottom: CommonSizes.spacing.xSmall,
   } as TextStyle,
   description: {
     ...CommonStyles.normalText,

package/template/src/common/components/OTPInput.tsx

@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
   },
   input: {
     flex: 1,
-    height: CommonSizes.spacing.xxl,
+    height: CommonSizes.spacing.xxxLarge,
     borderWidth: 1,
     borderRadius: CommonSizes.borderRadius.medium,
     textAlign: 'center',

package/template/src/common/components/PrimaryButton.tsx

@@ -17,7 +17,7 @@ import {
   TouchablePlatformProps,
 } from '../../../types';
 import {useTheme} from '../../core/theme/ThemeProvider';
-import {BorderRadius, Spacing} from '../../core/theme/commonSizes';
+import {CommonSizes} from '../../core/theme/commonSizes';
 import {createThemedStyles} from '../../core/theme/commonStyles';
 import {Theme} from '../../core/theme/types';
 import {IconPlatform} from './IconPlatform';
@@ -271,10 +271,10 @@ function createSmallSolidStyles(theme: Theme): IStyles {
   const commonStyles = createThemedStyles(theme);
   return StyleSheet.create({
     button: {
-      padding: Spacing.medium,
+      padding: CommonSizes.spacing.medium,
       alignItems: 'center',
       justifyContent: 'center',
-      borderRadius: BorderRadius.extraLarge,
+      borderRadius: CommonSizes.borderRadius.xLarge,
       flexDirection: 'row',
       backgroundColor: theme.colors.indigoBlue,
       // width: 175,
@@ -295,10 +295,10 @@ function createSmallOutlineStyles(theme: Theme): IStyles {
   const commonStyles = createThemedStyles(theme);
   return StyleSheet.create({
     button: {
-      padding: Spacing.medium,
+      padding: CommonSizes.spacing.medium,
       alignItems: 'center',
       justifyContent: 'center',
-      borderRadius: BorderRadius.extraLarge,
+      borderRadius: CommonSizes.borderRadius.xLarge,
       flexDirection: 'row',
       backgroundColor: 'transparent',
       width: 175,

package/template/src/common/components/PrimaryTextInput.tsx

@@ -22,7 +22,7 @@ import {
   ViewStyle,
 } from 'react-native';
 import {useTheme} from '../../core/theme/ThemeProvider';
-import {NewColors} from '../../core/theme/colors';
+import {PrimaryColors, AlertColors} from '../../core/theme/colors';
 import {isIos} from '../../core/theme/commonConsts';
 import {CommonSizes} from '../../core/theme/commonSizes';
 import {CommonStyles} from '../../core/theme/commonStyles';
@@ -268,13 +268,13 @@ function getInputContainerStyle(
   }
 }
 
-const selectionColor = NewColors.blueNormalActive;
+const selectionColor = PrimaryColors.PlatinateBlue_400;
 
 const commonInputContainer: TextStyle = {
   flexDirection: 'row',
   alignItems: 'center',
   justifyContent: 'center',
-  minHeight: CommonSizes.spacing.extraLarge,
+  minHeight: CommonSizes.spacing.xxxLarge,
   textAlignVertical: 'center',
   textAlign: 'center',
   width: '100%',
@@ -307,7 +307,7 @@ const styles = StyleSheet.create({
     ...commonInputContainer,
     ...Platform.select({
       android: {
-        borderColor: NewColors.red,
+        borderColor: AlertColors.error_400,
       },
     }),
   } as TextStyle,

package/template/src/common/components/RadioButton.tsx

@@ -46,7 +46,7 @@ export const RadioButton: FC<IProps> = memo(
 const commonLabel: TextStyle = {
   ...CommonStyles.normalText,
   flex: 1,
-  paddingStart: CommonSizes.spacing.extraSmall,
+  paddingStart: CommonSizes.spacing.xSmall,
 };
 
 const styles = StyleSheet.create({

package/template/src/common/components/RadioIcon.tsx

@@ -1,6 +1,6 @@
 import React, {FC, memo, useMemo} from 'react';
 import {StyleSheet, View, ViewStyle} from 'react-native';
-import {NewColors} from '../../core/theme/colors';
+import {PrimaryColors} from '../../core/theme/colors';
 
 interface IProps {
   isSelected: boolean;
@@ -41,14 +41,14 @@ const commonInnerCircle: ViewStyle = {
 const styles = StyleSheet.create({
   outerCircle: {
     ...commonOuterCircle,
-    borderColor: NewColors.blueNormalActive,
+    borderColor: PrimaryColors.PlatinateBlue_400,
   } as ViewStyle,
   outerCircleSelected: {
     ...commonOuterCircle,
-    borderColor: NewColors.blueNormalActive,
+    borderColor: PrimaryColors.PlatinateBlue_400,
   } as ViewStyle,
   innerCircle: {
     ...commonInnerCircle,
-    backgroundColor: NewColors.blueNormalActive,
+    backgroundColor: PrimaryColors.PlatinateBlue_400,
   } as ViewStyle,
 });

package/template/src/common/components/TryAgain.tsx

@@ -6,7 +6,7 @@ import {
   TouchableOpacity,
   View,
 } from 'react-native';
-import {Colors, NewColors} from '../../core/theme/colors';
+import {PrimaryColors} from '../../core/theme/colors';
 import {CommonSizes} from '../../core/theme/commonSizes';
 import {CommonStyles} from '../../core/theme/commonStyles';
 import {localization} from '../localization/localization';
@@ -38,11 +38,11 @@ const styles = StyleSheet.create({
   title: {
     ...CommonStyles.normalText,
     textAlign: 'center',
-    marginBottom: CommonSizes.spacing.extraSmall,
+    marginBottom: CommonSizes.spacing.xSmall,
   } as TextStyle,
   description: {
     ...CommonStyles.normalText,
-    color: NewColors.blueNormalActive,
+    color: PrimaryColors.PlatinateBlue_400,
     textAlign: 'center',
     textDecorationLine: 'underline',
   } as TextStyle,

package/template/src/common/validations/errorValidations.ts

@@ -3,7 +3,7 @@ import {unwrapResult} from '@reduxjs/toolkit';
 import {Alert} from 'react-native';
 import {IErrorResult, ErrorRepresentationType} from '../../../types';
 import Snackbar from 'react-native-snackbar';
-import {NewColors} from '../../core/theme/colors';
+
 export function handlePromiseResult(
   promiseAction: Promise<any>,
   successMessage?: string,

package/template/src/navigation/TabBar.tsx

@@ -16,7 +16,7 @@ import {
   useRTL,
   useTranslation,
 } from '../common/localization/LocalizationProvider';
-import {BlackColors, NewColors} from '../core/theme/colors';
+import {PrimaryColors} from '../core/theme/colors';
 import {CommonSizes} from '../core/theme/commonSizes';
 import {CommonStyles} from '../core/theme/commonStyles';
 import {scaleHeight, scaleWidth} from '../core/theme/scaling';
@@ -125,11 +125,11 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
     height: scaleHeight(130),
-    borderTopLeftRadius: CommonSizes.borderRadius.huge,
-    borderTopRightRadius: CommonSizes.borderRadius.huge,
+    borderTopLeftRadius: CommonSizes.borderRadius.xxLarge,
+    borderTopRightRadius: CommonSizes.borderRadius.xxLarge,
     justifyContent: 'space-evenly',
     ...CommonStyles.dropShadow,
-    backgroundColor: BlackColors.indigoBlue,
+    backgroundColor: PrimaryColors.PlatinateBlue_600,
     position: 'absolute',
     bottom: 0,
     left: 0,
@@ -141,6 +141,6 @@ const styles = StyleSheet.create({
   },
   label: {},
   labelFocused: {
-    color: NewColors.blueNormalActive,
+    color: PrimaryColors.PlatinateBlue_400,
   },
 });

package/template/src/screens/index.tsx

@@ -1,24 +1,9 @@
 // Authentication Screens
 export {Login} from './Login/Login';
 export {OTPScreen as OTP} from './OTP/OTPScreen';
-export {ForceChangePasswordScreen as ForceChangePassword} from './ForceChangePassword/ForceChangePasswordScreen';
 
 // Main Navigation Screens
 export {HomeScreen as Home} from './home/HomeScreen';
 export {Profile} from './profile/Profile';
 export {Splash} from './splash/Splash';
 
-// Service Related Screens
-export {Categories} from './Categories/Categories';
-export {Services} from './Services/Services';
-export {SingleService} from './SingleService/SingleService';
-export {Providers} from './Providers/Providers';
-export {InquiredBill} from './InquiredBill/InquiredBill';
-export {PaymentConfirmation} from './PaymentConfirmation/PaymentConfirmation';
-
-// History and Receipt Screens
-export {History} from './History/History';
-export {Favorites} from './Favorites/Favorites';
-
-// Device and Card Related Screens
-export {ReceiptScreen} from './ReceiptScreen/ReceiptScreen';

package/template/tsconfig.json

@@ -1,7 +1,8 @@
 {
-  "extends": "@react-native/typescript-config/tsconfig.json",
+  "extends": "@react-native/typescript-config",
   "compilerOptions": {
-    "jsx": "react-native",
-    "lib": ["ES2015", "ES2017", "ES2020", "ESNext", "DOM"]
-  }
+    "types": ["jest"]
+  },
+  "include": ["**/*.ts", "**/*.tsx"],
+  "exclude": ["**/node_modules", "**/Pods"]
 }