Merge pull request #15 from YunsGeek/dev

changes
YounesKHENIFER · Jun 27, 2022 · 8cf3faf · 8cf3faf
2 parents 4c9f774 + 40ca286
commit 8cf3faf
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 - there is more than 200 Reciter
 - you can listen to each Reciter
 - i hope you like it and give us a ⭐ :)
-- link for donwload (universal apk) : https://bit.ly/3DImJsL
+- link for donwload (universal apk) : https://bit.ly/quraan-1-0-4
 - link for donwload (x86 cpu apk) : https://bit.ly/38ve4yw
 - link for donwload (x86_64 cpu apk) : https://bit.ly/3Keb6MT
 - link for donwload (arm64-v8a cpu apk) : https://bit.ly/35FIqx4

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -153,7 +153,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.4"
     }
     splits {
         abi {

diff --git a/...res/drawable-hdpi/node_modules_reactnavigation_elements_src_assets_backicon.png b/...res/drawable-hdpi/node_modules_reactnavigation_elements_src_assets_backicon.png
diff --git a/...res/drawable-mdpi/node_modules_reactnavigation_elements_src_assets_backicon.png b/...res/drawable-mdpi/node_modules_reactnavigation_elements_src_assets_backicon.png
diff --git a/...drawable-mdpi/node_modules_reactnavigation_elements_src_assets_backiconmask.png b/...drawable-mdpi/node_modules_reactnavigation_elements_src_assets_backiconmask.png
diff --git a/...es/drawable-xhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png b/...es/drawable-xhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png
diff --git a/...s/drawable-xxhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png b/...s/drawable-xxhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png
diff --git a/.../drawable-xxxhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png b/.../drawable-xxxhdpi/node_modules_reactnavigation_elements_src_assets_backicon.png
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -27,10 +27,10 @@ android.enableJetifier=true
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.99.0
 
-MYAPP_UPLOAD_STORE_FILE=YOURKEY.keystore
-MYAPP_UPLOAD_KEY_ALIAS=YOURKEY
-MYAPP_UPLOAD_STORE_PASSWORD=YOURPASSWORD
-MYAPP_UPLOAD_KEY_PASSWORD=YOURPASSWORD
+MYAPP_UPLOAD_STORE_FILE=quraanplayer.keystore
+MYAPP_UPLOAD_KEY_ALIAS=quraanplayer
+MYAPP_UPLOAD_STORE_PASSWORD=yunsgeekquraanplayer
+MYAPP_UPLOAD_KEY_PASSWORD=yunsgeekquraanplayer
 
 
 

diff --git a/src/navigations/BottomNavigation.js b/src/navigations/BottomNavigation.js
@@ -22,7 +22,6 @@ import NetInfo from '@react-native-community/netinfo';
 import InfosScreen from '../screens/InfosScreen';
 import DownloadsScreen from '../screens/DownloadsScreen';
 import FavoritesScreen from '../screens/FavoritesScreen';
-import OfflineScreen from '../components/OfflineScreen';
 const Tab = createBottomTabNavigator();
 
 export default function BottomTabs({navigation, route}) {
@@ -147,11 +146,9 @@ export default function BottomTabs({navigation, route}) {
 
       <Tab.Screen
         name="Main"
-        component={
-          connected
-            ? StackNavigator
-            : () => <OfflineScreen setRefresh={setRefresh} />
-        }
+        component={() => (
+          <StackNavigator connected={connected} setRefresh={setRefresh} />
+        )}
         options={{
           tabBarLabel: 'الإستماع',
           tabBarIcon: ({focused, color, size}) => {

diff --git a/src/navigations/StackNavigator.js b/src/navigations/StackNavigator.js
@@ -8,10 +8,11 @@ import ReciterScreen from '../screens/ReciterScreen';
 import fonts from '../style/fonts';
 import {MyLightTheme, MyDarkTheme} from '../style/themes';
 import useToggleTheme from '../style/useToggleTheme';
+import OfflineScreen from '../components/OfflineScreen';
 
 const Stack = createStackNavigator();
 
-const StackNavigator = () => {
+const StackNavigator = ({connected, setRefresh}) => {
   const {isDark} = useToggleTheme();
   const colors = isDark ? MyDarkTheme.colors : MyLightTheme.colors;
 
@@ -38,14 +39,22 @@ const StackNavigator = () => {
           title: 'قارئ القرآن',
         }}
         name="Home"
-        component={HomeScreen}
+        component={
+          connected
+            ? HomeScreen
+            : () => <OfflineScreen setRefresh={setRefresh} />
+        }
       />
       <Stack.Screen
         options={{
           headerBackVisible: true,
         }}
         name="Reciter"
-        component={ReciterScreen}
+        component={
+          connected
+            ? ReciterScreen
+            : () => <OfflineScreen setRefresh={setRefresh} />
+        }
       />
       <Stack.Screen
         name="Player"