Merge branch 'master-holder'

Author: baky30

.eslintrc

@@ -1,5 +1,5 @@
 {
-  "extends": ["@react-native", "prettier"],
+  "extends": ["prettier"],
   "plugins": ["react", "jsx-a11y", "import"],
   "parser": "@babel/eslint-parser",
   "rules": {
@@ -11,6 +11,7 @@
     "global-require": "off",
     "no-underscore-dangle": "off",
     "react/jsx-one-expression-per-line": "off",
-    "react/require-default-props": "off"
+    "react/require-default-props": "off",
+    "react/no-unstable-nested-components": "off"
   }
 }

.gitignore

@@ -14,14 +14,14 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+ios/.xcode.env.local
 *.xccheckout
 *.moved-aside
 DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
 project.xcworkspace
-ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -34,13 +34,15 @@ local.properties
 .cxx/
 *.keystore
 !debug.keystore
+!/android/app/debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
+
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

.prettierrc

@@ -1,9 +1,8 @@
 {
   "trailingComma": "all",
   "semi": true,
-  "singleQuote": true,
+  "singleQuote": false,
   "bracketSpacing": true,
-  "arrowParens": "avoid",
   "bracketSameLine": false,
   "tabWidth": 2,
   "parser": "flow"

App.js

@@ -2,8 +2,8 @@ import { Provider } from 'react-redux';
 import React from 'react';
 import { View, ActivityIndicator, StyleSheet } from 'react-native';
 import { PersistGate } from 'redux-persist/integration/react';
-import { NavigationContainer } from '@react-navigation/native';
 import { colors } from './src/styles';
+import { NavigationContainer } from '@react-navigation/native';
 
 import { store, persistor } from './src/redux/store';
 
@@ -15,7 +15,6 @@ export default function App() {
       <NavigationContainer>
         <PersistGate
           loading={
-            // eslint-disable-next-line react/jsx-wrap-multilines
             <View style={styles.container}>
               <ActivityIndicator color={colors.red} />
             </View>

Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
-
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
-
 gem 'cocoapods', '~> 1.13'
 gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

README.md

@@ -47,13 +47,13 @@ react {
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
 }
+
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
 def enableProguardInReleaseBuilds = false
-
 /**
- * The preferred build flavor of JavaScriptCore  (JSC)
+ * The preferred build flavor of JavaScriptCore (JSC)
  *
  * For example, to use the international variant, you can use:
  * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
@@ -69,45 +69,47 @@ android {
     ndkVersion rootProject.ext.ndkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdk rootProject.ext.compileSdkVersion
-    namespace "com.reactnativestarter"
+    namespace "com.reactnativestarter.upd"
+
 //     compileOptions {
 //         sourceCompatibility JavaVersion.VERSION_1_8
 //         targetCompatibility JavaVersion.VERSION_1_8
 //     }
-
-    defaultConfig {
-        applicationId "com.reactnativestarter"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
-        multiDexEnabled true
-    }
-//   dexOptions {
-//       javaMaxHeapSize "4g"
-//   }
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
             storePassword 'android'
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
+        release {
+            storeFile file('my-upload-key.keystore')
+            storePassword 'vlad_keystore321'
+            keyAlias 'my-key-alias'
+            keyPassword 'vlad_keystore321'
+        }
+    }
+    defaultConfig {
+        applicationId "com.reactnativestarter.upd"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 6
+        versionName "4.0.1"
     }
+
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
             // see https://facebook.github.io/react-native/docs/signed-apk-android.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
 }
-
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
@@ -121,3 +123,4 @@ dependencies {
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

android/app/build.gradle

@@ -8,3 +8,4 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
+

android/app/proguard-rules.pro

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+          xmlns:tools="http://schemas.android.com/tools">
 
-    <application
-        android:usesCleartextTraffic="true"
-        tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning"/>
+     <application
+             android:usesCleartextTraffic="true"
+             tools:targetApi="28"
+             tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>

android/app/src/debug/AndroidManifest.xml

@@ -3,22 +3,22 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-      android:name=".MainApplication"
-      android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:roundIcon="@mipmap/ic_launcher_round"
-      android:allowBackup="false"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
-        android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-        android:windowSoftInputMode="adjustResize"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
+            android:name=".MainApplication"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:allowBackup="false"
+            android:theme="@style/AppTheme">
+        <activity
+                android:name=".MainActivity"
+                android:label="@string/app_name"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+                android:windowSoftInputMode="adjustResize"
+                android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>