Merge pull request #7 from rafi-zimraan/main

Finishing fitur DrawerLayoutAndroid

Author: muhammadhafifalbusyro

Diff for: android/app/build.gradle

@@ -229,6 +229,14 @@ android {
             keyAlias 'androiddebugkey'
             keyPassword 'android'
         }
+         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
+            }
+         }
     }
     buildTypes {
         debug {
@@ -240,6 +248,7 @@ android {
             signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+             signingConfig signingConfigs.release
         }
     }
 

Diff for: android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +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"/>
+</adaptive-icon>

Diff for: android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +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"/>
+</adaptive-icon>

Diff for: android/app/src/main/res/mipmap-hdpi/ic_launcher.png

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

Diff for: android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png

@@ -38,3 +38,7 @@ 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=12345678
+MYAPP_UPLOAD_KEY_PASSWORD=12345678

Diff for: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

@@ -17,6 +17,8 @@ const images = {
   mapsMuslimIndonesia: require('../assets/images/mapsMuslimIndonesia.png'),
   food: require('../assets/images/food.jpg'),
   posterkajian: require('../assets/images/posterKajian.png'),
+  logoMuslimIndo: require('../assets/images/logoMuslimIndo.jpg'),
+  BgLogo: require('../assets/images/BgLogo.png'),
 };
 
 // ! Icons
@@ -33,6 +35,13 @@ const icons = {
   location: require('../assets/icons/Location.png'),
   vectorSave: require('../assets/icons/VectorSave.png'),
   clock: require('../assets/icons/clock.png'),
+  setting: require('../assets/icons/setting.png'),
+  IconUser: require('../assets/icons/IconUser.png'),
+  VectorTambah: require('../assets/icons/VectorTambah.png'),
+  gmail: require('../assets/icons/gmail.png'),
+  right: require('../assets/icons/right.png'),
+  logOut: require('../assets/icons/logOut.png'),
+  goggleMap: require('../assets/icons/goggleMap.png'),
 };
 
 // !  Export all assets files

Diff for: android/app/src/main/res/mipmap-ldpi/ic_launcher.png

@@ -1,37 +1,41 @@
 import React from 'react';
-import { TouchableOpacity, Text, StyleSheet, Dimensions } from 'react-native';
-import { fonts } from '../assets';
-import { colors } from '../utils';
+import {TouchableOpacity, Text, StyleSheet, Dimensions} from 'react-native';
+import {fonts} from '../assets';
+import {colors} from '../utils';
+import {
+  widthPercentageToDP as wp,
+  heightPercentageToDP as hp,
+} from 'react-native-responsive-screen';
 
 const width = Dimensions.get('window').width;
 
 const ButtonCustom = ({
-	title = 'Button',
-  	onPress,
-  	color = colors.primary,
-  	buttonStyle
+  title = 'Button',
+  onPress,
+  color = colors.primary,
+  buttonStyle,
 }) => {
-	return (
-		<TouchableOpacity
-		style = {[ buttonStyle, styles.button, { backgroundColor : color } ]}
-		onPress = { onPress }>
-			<Text style = { styles.text }>{title}</Text>
-		</TouchableOpacity>
-	);
+  return (
+    <TouchableOpacity
+      style={[buttonStyle, styles.button, {backgroundColor: color}]}
+      onPress={onPress}>
+      <Text style={styles.text}>{title}</Text>
+    </TouchableOpacity>
+  );
 };
 
 const styles = StyleSheet.create({
-	button : {
-		paddingVertical : 10,
-		paddingHorizontal : width * 0.2,
-		justifyContent : 'center',
-		alignItems : 'center',
-		borderRadius : 5,
-		elevation : 5,
-	},
-	text : {
-		fontFamily : fonts.PoppinsRegular,
-		color : colors.white,
-	},
+  button: {
+    marginLeft: '80%',
+    marginRight: 25,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+    borderRadius: 5,
+    elevation: 5,
+  },
+  text: {
+    fontFamily: fonts.PoppinsRegular,
+    color: colors.white,
+  },
 });
 export default ButtonCustom;

Diff for: android/app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -60,7 +60,6 @@ const MainNavigator = () => {
       <Tab.Screen
         name="Profile"
         component={Setting}
-        barStyle={styles.setting}
         options={{
           tabBarLabel: 'Profile',
           tabBarIcon: ({color}) => (
@@ -74,7 +73,6 @@ const MainNavigator = () => {
 
 const styles = StyleSheet.create({
   barStyle: {
-    backgroundColor: colors.white,
     borderTopRightRadius: 30,
     borderTopLeftRadius: 30,
     paddingHorizontal: 8,
@@ -84,9 +82,5 @@ const styles = StyleSheet.create({
     width: wp('100%'),
     // position: 'absolute', //use if you want to absolute navbar
   },
-  setting: {
-    boderTopRightRadius: 30,
-    borderTopLeftRadius: 30,
-  },
 });
 export default MainNavigator;

Diff for: android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png

@@ -1,7 +1,14 @@
 import * as React from 'react';
 import {NavigationContainer} from '@react-navigation/native';
 import {createNativeStackNavigator} from '@react-navigation/native-stack';
-import {ForgotPassword, Login, NewPassword, Register, Splash} from '../screens';
+import {
+  EditProfile,
+  ForgotPassword,
+  Login,
+  NewPassword,
+  Register,
+  Splash,
+} from '../screens';
 import MainNavigator from './MainNavigator';
 
 const Stack = createNativeStackNavigator();
@@ -19,6 +26,7 @@ const AppNavigator = () => {
         <Stack.Screen name="ForgotPassword" component={ForgotPassword} />
         <Stack.Screen name="MainNavigator" component={MainNavigator} />
         <Stack.Screen name="NewPassword" component={NewPassword} />
+        <Stack.Screen name="EditProfile" component={EditProfile} />
       </Stack.Navigator>
     </NavigationContainer>
   );

Diff for: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png

@@ -0,0 +1,88 @@
+import React from 'react';
+import {
+  SafeAreaView,
+  StatusBar,
+  StyleSheet,
+  Text,
+  View,
+  TouchableOpacity,
+  Image,
+} from 'react-native';
+import {colors, dimens} from '../../utils';
+import {
+  widthPercentageToDP as wp,
+  heightPercentageToDP as hp,
+} from 'react-native-responsive-screen';
+import {useContext} from 'react';
+import {GlobalContext} from '../../Store/globalContext';
+import {fonts, icons, images} from '../../assets';
+
+const EditProfile = () => {
+  const globaleContext = useContext(GlobalContext);
+  const dark = globaleContext.state.isDark;
+
+  return (
+    <SafeAreaView style={styles.container}>
+      <StatusBar barStyle={'light-content'} backgroundColor={colors.green} />
+      <View style={styles.body}>
+        <View
+          style={{
+            marginTop: '10%',
+            height: '10%',
+            justifyContent: 'center',
+            alignItems: 'center',
+          }}>
+          <TouchableOpacity>
+            <Image
+              source={images.user}
+              style={{height: hp('11%'), width: wp('23%')}}
+            />
+          </TouchableOpacity>
+          <Text style={styles.TxtTitle}>Edit Profile</Text>
+        </View>
+
+        {/* CONTENT PROFILE */}
+        <View
+          style={[
+            styles.ContentProfile,
+            {
+              backgroundColor: dark ? colors.black : colors.white,
+            },
+          ]}></View>
+      </View>
+    </SafeAreaView>
+  );
+};
+
+export default EditProfile;
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: colors.green,
+  },
+  body: {
+    height: '100%',
+    width: '100%',
+    backgroundColor: colors.green,
+  },
+  TxtTitle: {
+    fontFamily: fonts.PoppinsMedium,
+    paddingTop: 10,
+  },
+  ContentProfile: {
+    backgroundColor: colors.white,
+    height: hp('100%'),
+    borderTopLeftRadius: 50,
+    borderTopRightRadius: 50,
+    marginTop: '80%',
+  },
+
+  line: {
+    borderWidth: 0.4,
+    borderRadius: 10,
+    width: wp('75%'),
+    top: '13%',
+    marginLeft: 10,
+  },
+});

Diff for: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

@@ -0,0 +1,3 @@
+import EditProfile from './EditProfile';
+
+export {EditProfile};

Diff for: android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png

@@ -147,10 +147,10 @@ const styles = StyleSheet.create({
   },
   line: {
     width: wp('40%'),
-    borderWidth: 3,
+    borderWidth: 1.8,
     color: colors.black,
     marginTop: '27%',
     marginLeft: 128,
-    borderRadius: 20,
+    borderRadius: 10,
   },
 });

Diff for: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

@@ -184,7 +184,7 @@ const styles = StyleSheet.create({
   },
   headerTxtWelcome: {
     marginTop: '5%',
-    marginLeft: 20,
+    marginLeft: 10,
   },
   viewMuslimIndonesia: {
     flexDirection: 'row',
@@ -206,7 +206,6 @@ const styles = StyleSheet.create({
     paddingLeft: 5,
   },
   bodyTxtUser: {
-    marginTop: '3%',
     flexDirection: 'row',
     justifyContent: 'space-between',
   },
@@ -219,14 +218,14 @@ const styles = StyleSheet.create({
     justifyContent: 'flex-end',
     flexDirection: 'row',
     bottom: '65%',
-    marginRight: '5%',
+    marginRight: '2%',
   },
   imgNotif: {
     height: hp('4%'),
     width: wp('8%'),
   },
   imgUser: {
-    height: hp('7%'),
+    height: hp('7.3%'),
     width: wp('15%'),
   },
   textInput: {
@@ -248,6 +247,8 @@ const styles = StyleSheet.create({
   ViewTextInput: {
     height: hp('7%'),
     width: wp('80%'),
+    textShadowColor: '#688F16',
+    color: colors.black,
   },
   contentCarosel: {
     marginHorizontal: 20,
@@ -275,11 +276,11 @@ const styles = StyleSheet.create({
   bottomDate: {
     justifyContent: 'center',
     alignItems: 'center',
-    bottom: 45,
+    bottom: 37,
     backgroundColor: colors.white,
-    marginLeft: '61%',
+    marginLeft: '59%',
     height: hp('4%'),
-    width: wp('33%'),
+    width: wp('35%'),
     borderRadius: 10,
   },
   viewBottom: {
@@ -306,7 +307,7 @@ const styles = StyleSheet.create({
   bodyTopTab: {
     backgroundColor: colors.white,
     height: hp('100%'),
-    marginTop: '12%',
+    marginTop: '20%',
     borderTopRightRadius: 40,
     borderTopLeftRadius: 40,
   },