Updating layout and adding bottom tab bar menu

pull/4/head
Arthur VALIN 2 years ago
parent e730228b3c
commit 984c6c31b7

@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#FFFFFF" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
</vector>

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
</vector>

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

@ -1,66 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<!-- Trouver un moyen de virer le menu par défaut ou le garder et virer le frameLayout en dessous-->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="55dp"
android:background="@color/green">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/app_name"
android:textColor="@color/white"
android:layout_marginStart="25dp"
android:gravity="center"
android:textSize="20sp"
android:layout_marginLeft="25dp" />
</FrameLayout>
<!-- Ici map, j'ai essayé de télécharger la map de google dans "Design" mais ca a cassé le projet donc à éviter pour l'instant je pense-->
<!-- Trouver un moyen de virer le menu par défaut ou le garder et virer le frameLayout en dessous-->
<!-- Arriver à mettre le menu en bas + Ajouter des icones-->
<!-- Faire un composant pour éviter la répétition ?-->
<LinearLayout
<TextView
android:layout_width="match_parent"
android:layout_height="55dp"
android:gravity="center"
>
<Button
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/profil"
android:textSize="11sp"
android:layout_marginRight="20dp"
style="?android:attr/buttonBarButtonStyle"/>
<Button
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/carte"
android:textSize="11sp"
android:layout_marginRight="20dp"
android:layout_marginLeft="20dp"
style="?android:attr/buttonBarButtonStyle" />
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/main_turquoise_700"
android:gravity="center_vertical"
android:padding="20dp"
android:text="@string/app_name"
android:textColor="@color/main_turquoise_50"
android:textSize="20sp"
android:textStyle="bold" />
<!-- Ici map, j'ai essayé de télécharger la map de google dans "Design" mais ca a cassé le projet donc à éviter pour l'instant je pense-->
<View
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="8"></View>
<Button
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="@string/liste"
android:textSize="11sp"
android:layout_marginLeft="20dp"
style="?android:attr/buttonBarButtonStyle"/>
<!-- Faire un composant pour éviter la répétition ?-->
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/main_turquoise_700"
app:menu="@menu/bottom_tabs" />
</LinearLayout>
</LinearLayout>

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/profile"
android:enabled="true"
android:title="@string/profil"
android:icon="@drawable/profile"/>
<item
android:id="@+id/map"
android:enabled="true"
android:title="@string/carte"
android:icon="@drawable/map"/>
<item
android:id="@+id/list"
android:enabled="true"
android:title="@string/liste"
android:icon="@drawable/list" />
</menu>

@ -1,9 +1,9 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorPrimary">@color/purple_700</item>
<item name="colorPrimaryVariant">@color/purple_200</item>
<item name="colorOnPrimary">@color/black</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>

@ -9,4 +9,9 @@
<color name="white">#FFFFFFFF</color>
<color name="green">#FF3D7D3C</color>
<color name="green_variant">#FF659964</color>
<color name="main_turquoise_700">#2f3e46</color>
<color name="main_turquoise_500">#354f52</color>
<color name="main_turquoise_200">#52796f</color>
<color name="main_turquoise_50">#cad2c5</color>
</resources>

@ -1,9 +1,9 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.Geocaching" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/green</item>
<item name="colorPrimaryVariant">@color/green_variant</item>
<item name="colorPrimary">@color/main_turquoise_50</item>
<item name="colorPrimaryVariant">@color/main_turquoise_500</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>

Loading…
Cancel
Save