Fixed broken theme state.

wantedbear007 · Jun 8, 2022 · ba64d6a · ba64d6a
1 parent 6951498
commit ba64d6a
Show file tree

Hide file tree

Showing 25 changed files with 541 additions and 462 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -171,17 +171,6 @@ android {
             }
         }
     }
-    signingConfigs {
-        release {
-            if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
-                storeFile file(MYAPP_UPLOAD_STORE_FILE)
-                storePassword MYAPP_UPLOAD_STORE_PASSWORD
-                keyAlias MYAPP_UPLOAD_KEY_ALIAS
-                keyPassword MYAPP_UPLOAD_KEY_PASSWORD
-            }
-        }
-    }
-
 
     if (isNewArchitectureEnabled()) {
         // We configure the NDK build only if you decide to opt-in for the New Architecture.
@@ -250,7 +239,6 @@ android {
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig signingConfigs.release
         }
     }
 
@@ -329,3 +317,4 @@ def isNewArchitectureEnabled() {
     // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
+
diff --git a/android/app/src/main/assets/fonts/AntDesign.ttf b/android/app/src/main/assets/fonts/AntDesign.ttf
diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf
diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Feather.ttf b/android/app/src/main/assets/fonts/Feather.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
diff --git a/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
diff --git a/android/app/src/main/assets/fonts/Fontisto.ttf b/android/app/src/main/assets/fonts/Fontisto.ttf
diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf
diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf
diff --git a/android/build.gradle b/android/build.gradle
@@ -51,3 +51,7 @@ allprojects {
         maven { url 'https://www.jitpack.io' }
     }
 }
+  project.ext.react = [
+      entryFile: "index.js",
+      enableHermes: true
+  ]
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -38,8 +38,3 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
-
-MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore
-MYAPP_UPLOAD_KEY_ALIAS=my-key-alias
-MYAPP_UPLOAD_STORE_PASSWORD=9907224577
-MYAPP_UPLOAD_KEY_PASSWORD=9907224577
diff --git a/context/Context.js b/context/Context.js
@@ -1,22 +1,24 @@
 import React, {createContext, useEffect, useState} from 'react';
 import AsyncStorage from '@react-native-community/async-storage';
-import { Appearance } from 'react-native';
+import {Appearance} from 'react-native';
 
 const Context = createContext();
 
 export function ContextContainer({children}) {
   const [darkTheme, setDarkTheme] = useState(true);
-  const systemTheme = Appearance.getColorScheme()
+  const systemTheme = Appearance.getColorScheme();
   useEffect(() => {
     const getData = async () => {
       try {
         const darkMode = await AsyncStorage.getItem('theme');
-        if (darkMode == 'true') {
-          setDarkTheme(true);
+        if (darkMode == 'false') {
+          setDarkTheme(false);
+        } else if (!darkMode) {
+          if (systemTheme == 'light') {
+            setDarkTheme(false);
+          }
         }
-      } catch (e) {
-
-      }
+      } catch (e) {}
     };
 
     getData();
@@ -27,9 +29,7 @@ export function ContextContainer({children}) {
       try {
         const jsonVal = JSON.stringify(darkTheme);
         await AsyncStorage.setItem('theme', jsonVal);
-      } catch (e) {
-
-      }
+      } catch (e) {}
     };
 
     storeData();

diff --git a/ios/eternityNews.xcodeproj/project.pbxproj b/ios/eternityNews.xcodeproj/project.pbxproj
@@ -14,6 +14,22 @@
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		7699B88040F8A987B510C191 /* libPods-eternityNews-eternityNewsTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-eternityNews-eternityNewsTests.a */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
+		D857826F13304BC1A5D18E7E /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BA87320A94C34AC4AB84E527 /* AntDesign.ttf */; };
+		25DB30411D104E2CAFC51B7F /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EFA77D59845B4836B32E1D33 /* Entypo.ttf */; };
+		AB482086B2CB449E937A5FA1 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8E1CEE90CCAD40E1BA81E4CC /* EvilIcons.ttf */; };
+		1279DF9C3F6A4EFE83E3710C /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6476AD248C694905BB9E5AE8 /* Feather.ttf */; };
+		51889792E8704958919BD55D /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 078DBAA2FC4C487F958600AC /* FontAwesome.ttf */; };
+		D24D92DAE6974E2D9A559CA9 /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 335A3C1DF68A4AA8A451A429 /* FontAwesome5_Brands.ttf */; };
+		AF4105959C9D49F6A84AE609 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ADA12BE8B7494601A18E38BC /* FontAwesome5_Regular.ttf */; };
+		45B85E455B154700B854F1A3 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 80B621A91CA84B129614D7A2 /* FontAwesome5_Solid.ttf */; };
+		1474B798574944E7B637EDF5 /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C173B2C872474EA3928D5E75 /* Fontisto.ttf */; };
+		574E2BBE88594E7CA86951DC /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 58284127C427433F96FEF41C /* Foundation.ttf */; };
+		B2423ACB0B2D48CEB7E8EF77 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1F1D7928D8A94EDE93C34EF8 /* Ionicons.ttf */; };
+		12A5C52603494EA882D8D587 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 56873BDD42C5401CBC6231A9 /* MaterialCommunityIcons.ttf */; };
+		67E4523DABE04F41B47A9CC1 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6C5916FE1D7B4743B075927D /* MaterialIcons.ttf */; };
+		774B673DFA564723A1222DE4 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6F137C4643F5422FA8346855 /* Octicons.ttf */; };
+		C4D1AFC001AA4C9285B36EF6 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C50C3C8F7E8A412DB2624D1F /* SimpleLineIcons.ttf */; };
+		24B03C7041CD4561B6D7AFFC /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F802EA1B0C994B67A1CF2E23 /* Zocial.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -44,6 +60,22 @@
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = eternityNews/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-eternityNews-eternityNewsTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-eternityNews-eternityNewsTests.release.xcconfig"; path = "Target Support Files/Pods-eternityNews-eternityNewsTests/Pods-eternityNews-eternityNewsTests.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		BA87320A94C34AC4AB84E527 /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		EFA77D59845B4836B32E1D33 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		8E1CEE90CCAD40E1BA81E4CC /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		6476AD248C694905BB9E5AE8 /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		078DBAA2FC4C487F958600AC /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		335A3C1DF68A4AA8A451A429 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		ADA12BE8B7494601A18E38BC /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		80B621A91CA84B129614D7A2 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		C173B2C872474EA3928D5E75 /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		58284127C427433F96FEF41C /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		1F1D7928D8A94EDE93C34EF8 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		56873BDD42C5401CBC6231A9 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		6C5916FE1D7B4743B075927D /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		6F137C4643F5422FA8346855 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		C50C3C8F7E8A412DB2624D1F /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
+		F802EA1B0C994B67A1CF2E23 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -122,6 +154,7 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				BBD78D7AC51CEA395F1C20DB /* Pods */,
+				D8D97AD5F8E8439BA900963E /* Resources */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -148,6 +181,30 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
+		D8D97AD5F8E8439BA900963E /* Resources */ = {
+			isa = "PBXGroup";
+			children = (
+				BA87320A94C34AC4AB84E527 /* AntDesign.ttf */,
+				EFA77D59845B4836B32E1D33 /* Entypo.ttf */,
+				8E1CEE90CCAD40E1BA81E4CC /* EvilIcons.ttf */,
+				6476AD248C694905BB9E5AE8 /* Feather.ttf */,
+				078DBAA2FC4C487F958600AC /* FontAwesome.ttf */,
+				335A3C1DF68A4AA8A451A429 /* FontAwesome5_Brands.ttf */,
+				ADA12BE8B7494601A18E38BC /* FontAwesome5_Regular.ttf */,
+				80B621A91CA84B129614D7A2 /* FontAwesome5_Solid.ttf */,
+				C173B2C872474EA3928D5E75 /* Fontisto.ttf */,
+				58284127C427433F96FEF41C /* Foundation.ttf */,
+				1F1D7928D8A94EDE93C34EF8 /* Ionicons.ttf */,
+				56873BDD42C5401CBC6231A9 /* MaterialCommunityIcons.ttf */,
+				6C5916FE1D7B4743B075927D /* MaterialIcons.ttf */,
+				6F137C4643F5422FA8346855 /* Octicons.ttf */,
+				C50C3C8F7E8A412DB2624D1F /* SimpleLineIcons.ttf */,
+				F802EA1B0C994B67A1CF2E23 /* Zocial.ttf */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+			path = "";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -244,6 +301,22 @@
 			files = (
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
+				D857826F13304BC1A5D18E7E /* AntDesign.ttf in Resources */,
+				25DB30411D104E2CAFC51B7F /* Entypo.ttf in Resources */,
+				AB482086B2CB449E937A5FA1 /* EvilIcons.ttf in Resources */,
+				1279DF9C3F6A4EFE83E3710C /* Feather.ttf in Resources */,
+				51889792E8704958919BD55D /* FontAwesome.ttf in Resources */,
+				D24D92DAE6974E2D9A559CA9 /* FontAwesome5_Brands.ttf in Resources */,
+				AF4105959C9D49F6A84AE609 /* FontAwesome5_Regular.ttf in Resources */,
+				45B85E455B154700B854F1A3 /* FontAwesome5_Solid.ttf in Resources */,
+				1474B798574944E7B637EDF5 /* Fontisto.ttf in Resources */,
+				574E2BBE88594E7CA86951DC /* Foundation.ttf in Resources */,
+				B2423ACB0B2D48CEB7E8EF77 /* Ionicons.ttf in Resources */,
+				12A5C52603494EA882D8D587 /* MaterialCommunityIcons.ttf in Resources */,
+				67E4523DABE04F41B47A9CC1 /* MaterialIcons.ttf in Resources */,
+				774B673DFA564723A1222DE4 /* Octicons.ttf in Resources */,
+				C4D1AFC001AA4C9285B36EF6 /* SimpleLineIcons.ttf in Resources */,
+				24B03C7041CD4561B6D7AFFC /* Zocial.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/ios/eternityNews/Info.plist b/ios/eternityNews/Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -51,5 +51,24 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>AntDesign.ttf</string>
+		<string>Entypo.ttf</string>
+		<string>EvilIcons.ttf</string>
+		<string>Feather.ttf</string>
+		<string>FontAwesome.ttf</string>
+		<string>FontAwesome5_Brands.ttf</string>
+		<string>FontAwesome5_Regular.ttf</string>
+		<string>FontAwesome5_Solid.ttf</string>
+		<string>Fontisto.ttf</string>
+		<string>Foundation.ttf</string>
+		<string>Ionicons.ttf</string>
+		<string>MaterialCommunityIcons.ttf</string>
+		<string>MaterialIcons.ttf</string>
+		<string>Octicons.ttf</string>
+		<string>SimpleLineIcons.ttf</string>
+		<string>Zocial.ttf</string>
+	</array>
 </dict>
 </plist>
diff --git a/package.json b/package.json
@@ -30,9 +30,9 @@
     "@babel/core": "^7.18.2",
     "@babel/runtime": "^7.18.3",
     "@react-native-community/eslint-config": "^3.0.2",
-    "babel-jest": "^28.1.1",
-    "eslint": "^8.17.0",
-    "jest": "^28.1.1",
+    "babel-jest": "^28.1.0",
+    "eslint": "^8.16.0",
+    "jest": "^28.1.0",
     "metro-react-native-babel-preset": "^0.71.0",
     "react-test-renderer": "17.0.2"
   },

diff --git a/screens/Home.js b/screens/Home.js
@@ -9,6 +9,7 @@ import InfoPage from './InfoPage';
 const Home = ({navigation}) => {
   const colors = Theme();
   const icons = Icons();
+
 
   return (
     <Card>