Merge pull request #15 from roni-castro/feat/change-icons-dev

feat: Update app config and libs

android/app/build.gradle

@@ -164,15 +164,21 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
+            applicationIdSuffix ".debug"
+            resValue "string", "app_name", "@string/app_name_debug"
             resValue "string", "CodePushDeploymentKey", '""'
         }
         release {
             // signingConfig signingConfigs.release // UNCOMMENT THIS LINE TO BUILD MANUALLY
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            resValue "string", "app_name", "@string/app_name_release"
             resValue "string", "CodePushDeploymentKey", '"qoJE0DadXLl_TZwrP0fh7OD14MbeWE2d58-9j"'
         }
         releaseStaging {
+            signingConfig signingConfigs.release // UNCOMMENT THIS LINE TO BUILD MANUALLY
+            applicationIdSuffix ".staging"
+            resValue "string", "app_name", "@string/app_name_staging"
             resValue "string", "CodePushDeploymentKey", '"IfvQj9X80UOBQ0EYqNSPQQbOYZdqjqB959MFU"'
             matchingFallbacks = ['release']
         }

android/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,31 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startY="49.59793"
+                android:startX="42.9492"
+                android:endY="92.4963"
+                android:endX="85.84757"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000"/>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/debug/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="splashscreen_bg">#312f39</color>
+</resources>

android/app/src/debug/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#312F39</color>
+</resources>

android/app/src/main/res/values/strings.xml

@@ -1,3 +1,5 @@
 <resources>
-    <string name="app_name">Go Barber</string>
+    <string name="app_name_debug">Go Barber Debug</string>
+    <string name="app_name_staging">Go Barber Staging</string>
+    <string name="app_name_release">Go Barber</string>
 </resources>

ios/Podfile.lock

@@ -3,10 +3,10 @@ PODS:
   - boost-for-react-native (1.63.0)
   - CocoaAsyncSocket (7.6.4)
   - CocoaLibEvent (1.0.0)
-  - CodePush (6.3.0):
+  - CodePush (7.0.1):
     - Base64 (~> 1.1)
     - JWT (~> 3.0.0-beta.12)
-    - React
+    - React-Core
     - SSZipArchive (~> 2.2.2)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.2)
@@ -507,7 +507,7 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
-  CodePush: 69186fd1143f7e5e5c6f65383cf14f4927e28213
+  CodePush: 9bb93f52a44ee80b72739d89dead9c7e86c3bd3a
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3ef4a7f62e7db01092f9d517d2ebc0d0677c4a37
   FBReactNativeSpec: dc7fa9088f0f2a998503a352b0554d69a4391c5a
@@ -561,4 +561,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 6dfd69bf86c307b92a1b4eb850da9fc49f1d1248
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.10.0

ios/gobarberapp.xcodeproj/project.pbxproj

@@ -43,7 +43,9 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = gobarberapp/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = gobarberapp/main.m; sourceTree = "<group>"; };
 		22AD1CEC8B2C4DF68C1802C8 /* RobotoSlab-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoSlab-Regular.ttf"; path = "../assets/fonts/RobotoSlab-Regular.ttf"; sourceTree = "<group>"; };
+		5317CA7C83C94F521B90F6B9 /* Pods-gobarberapp-gobarberappTests.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gobarberapp-gobarberappTests.staging.xcconfig"; path = "Target Support Files/Pods-gobarberapp-gobarberappTests/Pods-gobarberapp-gobarberappTests.staging.xcconfig"; sourceTree = "<group>"; };
 		628172132A207AE52F0C9F07 /* Pods-gobarberapp-gobarberappTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gobarberapp-gobarberappTests.release.xcconfig"; path = "Target Support Files/Pods-gobarberapp-gobarberappTests/Pods-gobarberapp-gobarberappTests.release.xcconfig"; sourceTree = "<group>"; };
+		62F2EA97D3D5B34D98C5D6DA /* Pods-gobarberapp.staging.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gobarberapp.staging.xcconfig"; path = "Target Support Files/Pods-gobarberapp/Pods-gobarberapp.staging.xcconfig"; sourceTree = "<group>"; };
 		743E8FFC843E4D99D6855B4B /* Pods-gobarberapp-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gobarberapp-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-gobarberapp-tvOSTests/Pods-gobarberapp-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
 		85726F52C454F52B053AA5F2 /* Pods-gobarberapp-gobarberappTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-gobarberapp-gobarberappTests.debug.xcconfig"; path = "Target Support Files/Pods-gobarberapp-gobarberappTests/Pods-gobarberapp-gobarberappTests.debug.xcconfig"; sourceTree = "<group>"; };
 		8CD8BB3C2505EFBD0079153A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -133,6 +135,8 @@
 				C995F313B25464D98040D6E7 /* Pods-gobarberapp-tvOS.release.xcconfig */,
 				C0A4CAF351319A5B5D9B26EB /* Pods-gobarberapp-tvOSTests.debug.xcconfig */,
 				743E8FFC843E4D99D6855B4B /* Pods-gobarberapp-tvOSTests.release.xcconfig */,
+				62F2EA97D3D5B34D98C5D6DA /* Pods-gobarberapp.staging.xcconfig */,
+				5317CA7C83C94F521B90F6B9 /* Pods-gobarberapp-gobarberappTests.staging.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -768,7 +772,7 @@
 		};
 		8C47CBF12517130400298FD7 /* Staging */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 030C981C9A2FF1E7A0FD78EF /* Pods-gobarberapp.release.xcconfig */;
+			baseConfigurationReference = 62F2EA97D3D5B34D98C5D6DA /* Pods-gobarberapp.staging.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -792,7 +796,7 @@
 		};
 		8C47CBF22517130400298FD7 /* Staging */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 628172132A207AE52F0C9F07 /* Pods-gobarberapp-gobarberappTests.release.xcconfig */;
+			baseConfigurationReference = 5317CA7C83C94F521B90F6B9 /* Pods-gobarberapp-gobarberappTests.staging.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;

ios/gobarberapp/Info.plist

@@ -22,6 +22,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>CodePushDeploymentKey</key>
+	<string>$(CODEPUSH_KEY)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -61,9 +65,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>CodePushDeploymentKey</key>
-	<string>$(CODEPUSH_KEY)</string>
 </dict>
 </plist>

package.json

@@ -3,7 +3,9 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "android": "react-native run-android",
+    "android": "react-native run-android --appIdSuffix debug",
+    "android:release": "react-native run-android --variant=release",
+    "android:releaseStaging": "react-native run-android --variant=releaseStaging --appIdSuffix staging",
     "ios": "react-native run-ios",
     "start": "react-native start",
     "test": "jest",
@@ -25,7 +27,7 @@
     "postinstall-postinstall": "^2.1.0",
     "react": "16.13.1",
     "react-native": "0.63.2",
-    "react-native-code-push": "^6.3.0",
+    "react-native-code-push": "^7.0.1",
     "react-native-gesture-handler": "^1.6.1",
     "react-native-image-crop-picker": "^0.34.1",
     "react-native-iphone-x-helper": "^1.2.1",