Dev

.gitignore

@@ -283,3 +283,9 @@ buck-out/
 web-build/
 android/java_pid13560.hprof
 android/java_pid22412.hprof
+.idea/smtp-pi.iml
+
+# environment variable
+.env.dev
+.env.local
+.env.prod

App.js

@@ -8,7 +8,6 @@ import { createStackNavigator } from '@react-navigation/stack';
 import Login from './components/Login';
 import Chart from "./components/Chart";
 import MapAdmin from './components/Map/MapAdmin';
-import SetGPSLocation from "./components/Place/SetGPSLocation";
 import MapTruck from './components/Map/MapTruck';
 import BottomTabNavigator from './navigation/BottomTabNavigator';
 import useLinking from './navigation/useLinking';
@@ -17,6 +16,7 @@ import TruckScreen from "./screens/Truck/TruckScreen";
 import CraneScreen from "./screens/Crane/CraneScreen";
 import { navigationRef } from './navigation/RootNavigation';
 import LogoutButton from "./components/LogoutButton";
+import BottomTabTruckNavigator from "./navigation/BottomTabTruckNavigator";
 
 const Stack = createStackNavigator();
 
@@ -64,7 +64,7 @@ export default function App(props) {
           <Stack.Navigator>
             <Stack.Screen name="Login" component={Login} options={{headerShown:false}}/>
             <Stack.Screen name="Chart" component={Chart} options={{headerShown:false}}/>
-            <Stack.Screen name="Truck" component={TruckScreen} options={{headerShown:false}}/>
+            <Stack.Screen name="Truck" component={BottomTabTruckNavigator} options={{headerShown:false}}/>
             <Stack.Screen name="Crane" component={CraneScreen} options={{headerShown:false}}/>
             <Stack.Screen name="Admin" component={BottomTabNavigator} options={{headerShown:false}}/>
           </Stack.Navigator>

Style.js

@@ -1,3 +1,8 @@
+import { Dimensions} from "react-native";
+
+const { width, height } = Dimensions.get("window");
+const CARD_HEIGHT = 220;
+const CARD_WIDTH = width * 0.8;
 
 export default {
     container:{
@@ -8,10 +13,11 @@ export default {
     containerForm:{
         alignItems: 'center',
     },
-
+    progressBar:{
+      alignItems: 'center',
+      justifyContent: 'center',
+    },
     input : {
-        height : 40 ,
-        padding : 10,
         borderColor: 'gray',
         borderWidth:1 ,
         marginHorizontal : 5
@@ -48,18 +54,17 @@ export default {
     },
 
     previewPlace : {
+        borderWidth:1,
         backgroundColor : '#FFFFFF',
-        borderBottomColor : '#202340',
-        marginTop : 30,
-        height : 37,
-        flex : 1,
+        borderColor : '#aaa5a5',
+        height : 50,
+        marginHorizontal : 15,
         flexDirection : 'row',
-        justifyContent : 'space-between',
         alignItems: 'center',
     },
     rightWorksite : {
         color : '#FFF',
-        fontweight : 'bold',
+        fontWeight : 'bold',
         fontSize : 22
     },
     button : {
@@ -101,6 +106,17 @@ export default {
         color: 'rgba(96,100,109, 1)',
         lineHeight: 24,
         textAlign: 'center',
+        justifyContent : 'center'
+    },
+
+    previewText: {
+        flex : 2,
+        paddingVertical : 50,
+        fontSize: 17,
+        color: 'rgba(96,100,109, 1)',
+        lineHeight: 24,
+        textAlign: 'center',
+        justifyContent : 'center'
     },
     textinput : {
         alignSelf: 'stretch',
@@ -113,4 +129,87 @@ export default {
         marginBottom: 15,
     },
 
+    cardFuel: {
+        flexDirection : "row",
+        position : "absolute",
+        backgroundColor: "#FFF",
+        borderRadius : 5,
+        marginHorizontal: 10,
+        shadowColor: "#000",
+        shadowRadius: 5,
+        shadowOpacity: 0.3,
+        bottom: 200,
+        left: width*0.14,
+        right: 0,
+        height: CARD_HEIGHT*1.9,
+        width: CARD_WIDTH*0.85,
+        overflow: "hidden",
+    },
+
+    // Marker Custom
+    bubble : {
+        flexDirection : 'column',
+        alignSelf: "flex-start",
+        backgroundColor : '#fff',
+        borderColor: "#cccccc",
+        width: 150,
+    },
+
+    arrow: {
+        backgroundColor: "transparent",
+        borderColor : "transparent",
+        borderTopColor : "#fff",
+        borderWidth: 16,
+        alignSelf: 'center',
+        marginTop : -32,
+    },
+
+    arrowBorder: {
+        backgroundColor: "transparent",
+        borderColor : "transparent",
+        borderTopColor : "#007a87",
+        borderWidth: 16,
+        alignSelf: 'center',
+        marginTop : -0.5,
+    },
+
+    name : {
+        fontSize: 16,
+        marginBottom: 5,
+    },
+
+    card: {
+        flexDirection : "row",
+        position : "absolute",
+        backgroundColor: "#FFF",
+        borderRadius : 5,
+        marginHorizontal: 10,
+        shadowColor: "#000",
+        shadowRadius: 5,
+        shadowOpacity: 0.3,
+        bottom: 5,
+        left: width*0.07,
+        right: 0,
+        height: CARD_HEIGHT,
+        width: CARD_WIDTH,
+        overflow: "hidden",
+    },
+    timePicker : {
+        flexDirection : "column",
+        width: CARD_WIDTH*0.66,
+
+    },
+    textContent: {
+        flex: 2,
+        padding: 10,
+    },
+    cardTitle: {
+        fontSize: 12,
+        fontWeight: "bold",
+    },
+    cardDescription: {
+        fontSize: 12,
+        paddingVertical:5,
+        color: "#444",
+    },
 }

android/app/build.gradle

@@ -142,8 +142,8 @@ android {
         applicationId 'com.smtp.smtp'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 13
-        versionName "1.0.13"
+        versionCode 17
+        versionName "1.0.17"
         resValue "string", "build_config_package", "com.smtp.smtp"
     }
     splits {
@@ -201,7 +201,8 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"
-    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'// From node_modules
+    implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
+    implementation 'junit:junit:4.12'// From node_modules
     addUnimodulesDependencies()
 
     implementation 'com.google.android.material:material:1.0.0'

android/app/src/main/AndroidManifest.xml

@@ -40,12 +40,8 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         android:largeHeap="true">
-        <service
-            android:name=".PauseService"
-            android:enabled="true"
-            android:exported="true"></service>
 
-        <receiver android:name="com.smtp.smtp.NetworkStateReceiver">
+        <receiver android:name="com.smtp.smtp.navigation.NetworkStateReceiver">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
             </intent-filter>
@@ -85,9 +81,9 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".Navigation"
+            android:name=".navigation.Navigation"
             android:screenOrientation="portrait" />
-        <activity android:name=".NavigationLauncherActivity" />
+        <activity android:name=".road.RouteEditor" />
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
 
         <uses-library

android/app/src/main/java/com/smtp/smtp/ActivityStarterModule.java

@@ -6,6 +6,8 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
+import com.smtp.smtp.navigation.Navigation;
+import com.smtp.smtp.road.RouteEditor;
 
 class ActivityStarterModule extends ReactContextBaseJavaModule {
     private static ReactApplicationContext reactContext;
@@ -52,7 +54,7 @@ void editRoad(String chantierId, String typeRoute,  String nameChantier, String
         destinationLnglat[0] = destination.getDouble(0);
         destinationLnglat[1] = destination.getDouble(1);
 
-        Intent intent = new Intent(reactContext, NavigationLauncherActivity.class);
+        Intent intent = new Intent(reactContext, RouteEditor.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.putExtra("chantierId", chantierId);
         intent.putExtra("typeRoute", typeRoute);