diff --git a/.idea/misc.xml b/.idea/misc.xml index 2fbdf8cdcfb3e0f30b82e96aed1e015604084b9e..ced6401789bd5ac6fecd7b804e07cbc867049ea1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,15 +4,11 @@ <option name="filePathToZoomLevelMap"> <map> <entry key="..\:/Git/application-android-iut/app/src/main/res/layout-land/activity_main.xml" value="0.19635416666666666" /> + <entry key="..\:/Git/application-android-iut/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml" value="0.11197916666666667" /> <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_main.xml" value="0.176" /> - <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_num_table.xml" value="0.264" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout-land/activity_main.xml" value="0.21516754850088182" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml" value="0.1" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/activity_main.xml" value="0.11302083333333333" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/activity_num_table.xml" value="0.24547101449275363" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/fragment_frag_horizontal_layout.xml" value="0.1" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/fragment_frag_vertical_layout.xml" value="0.1" /> - <entry key="..\:/Users/sofia/Documents/GitHub/application-android-iut/app/src/main/res/layout/fragment_pizza_custom_vertical.xml" value="0.16822916666666668" /> + <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/activity_num_table.xml" value="0.17346014492753623" /> + <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/fragment_frag_vertical_layout.xml" value="0.1" /> + <entry key="..\:/Git/application-android-iut/app/src/main/res/layout/fragment_pizza_custom_vertical.xml" value="0.176" /> <entry key="..\:/Z IUT Orsay/AndroidStudioProjects/Pizzeria/app/src/main/res/layout-land/activity_main.xml" value="0.1" /> <entry key="..\:/Z IUT Orsay/AndroidStudioProjects/Pizzeria/app/src/main/res/layout/activity_main.xml" value="0.2" /> </map> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ac6e0164bfa3805e210b73d96406bfa08d524507..2078e4a5160b5c25b2a7cbee9e5ff1cc0c78a556 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ <application android:allowBackup="true" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/lasridelarte" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" diff --git a/app/src/main/res/drawable/lasridelarte.png b/app/src/main/res/drawable/lasridelarte.png new file mode 100644 index 0000000000000000000000000000000000000000..3287fb016960d504088b83e69e5f1a2719ea4f37 Binary files /dev/null and b/app/src/main/res/drawable/lasridelarte.png differ diff --git a/app/src/main/res/drawable/rosewood.jpg b/app/src/main/res/drawable/rosewood.jpg new file mode 100644 index 0000000000000000000000000000000000000000..46d4806b6086cb194f1ac824a4f68afdccffaf4c Binary files /dev/null and b/app/src/main/res/drawable/rosewood.jpg differ diff --git a/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml b/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml index 15abfc6c6d49e06479f564611772b0ebdf685fd7..3d4d643fc2c9854479f330a24621eafe08f084b4 100644 --- a/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml +++ b/app/src/main/res/layout-land/fragment_frag_horizontal_layout.xml @@ -14,7 +14,7 @@ android:id="@+id/napolitaine" android:layout_width="0dp" android:layout_height="0dp" - android:text="NAPOLITAINE" + android:text="@string/napolitaine"/> app:layout_constraintBottom_toTopOf="@+id/quatreFromages" app:layout_constraintEnd_toStartOf="@+id/royale" app:layout_constraintHorizontal_weight="1" @@ -25,7 +25,7 @@ android:id="@+id/royale" android:layout_width="0dp" android:layout_height="0dp" - android:text="ROYALE" + android:text="@string/royale"/> app:layout_constraintBottom_toTopOf="@+id/montagnarde" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="1" @@ -36,7 +36,7 @@ android:id="@+id/quatreFromages" android:layout_width="0dp" android:layout_height="0dp" - android:text="QUATRE FROMAGES" + android:text="@string/quatrefromages"/> app:layout_constraintBottom_toTopOf="@+id/raclette" app:layout_constraintEnd_toStartOf="@+id/montagnarde" app:layout_constraintHorizontal_weight="1" @@ -47,7 +47,7 @@ android:id="@+id/montagnarde" android:layout_width="0dp" android:layout_height="0dp" - android:text="MONTAGNARDE" + android:text="@string/montagnarde"/> app:layout_constraintStart_toEndOf="@+id/quatreFromages" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/royale" @@ -58,7 +58,7 @@ android:id="@+id/raclette" android:layout_width="0dp" android:layout_height="0dp" - android:text="RACLETTE" + android:text="@string/raclette"/> app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/hawaii" app:layout_constraintTop_toBottomOf="@+id/quatreFromages" @@ -69,7 +69,7 @@ android:id="@+id/hawaii" android:layout_width="0dp" android:layout_height="0dp" - android:text="HAWAII" + android:text="@string/hawaii"/> app:layout_constraintBottom_toTopOf="@+id/tiramisu" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/raclette" @@ -80,7 +80,7 @@ android:id="@+id/pannaCotta" android:layout_width="0dp" android:layout_height="0dp" - android:text="PANNA COTTA" + android:text="@string/pannacotta"/> app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/tiramisu" app:layout_constraintTop_toBottomOf="@+id/raclette" @@ -91,7 +91,7 @@ android:id="@+id/tiramisu" android:layout_width="0dp" android:layout_height="0dp" - android:text="TIRAMISU" + android:text="@string/tiramisu"/> app:layout_constraintStart_toEndOf="@+id/pannaCotta" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/hawaii" @@ -103,7 +103,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:backgroundTint="#F44336" - android:text="Pizza Personnalisé" + android:text="@string/pizzaperso"/> app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/activity_num_table.xml b/app/src/main/res/layout/activity_num_table.xml index cac596d169a428d6a477a4b56c016ca1d6137a42..c608c5d4ca397241788e5812274baa7347bc31f4 100644 --- a/app/src/main/res/layout/activity_num_table.xml +++ b/app/src/main/res/layout/activity_num_table.xml @@ -7,6 +7,17 @@ android:layout_height="match_parent" tools:context=".NumTable"> + <ImageView + android:id="@+id/imageView" + android:layout_width="0dp" + android:layout_height="232dp" + android:adjustViewBounds="true" + android:scaleType="centerInside" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/rosewood" /> + <TextView android:id="@+id/textNumTable" android:layout_width="0dp" @@ -17,7 +28,7 @@ app:layout_constraintBottom_toTopOf="@+id/btnValider" app:layout_constraintEnd_toStartOf="@+id/tableNumInput" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/imageView" /> <EditText android:id="@+id/tableNumInput" @@ -29,13 +40,13 @@ app:layout_constraintBottom_toTopOf="@+id/btnValider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/textNumTable" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/imageView" /> <Button android:id="@+id/btnValider" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Button" + android:text="@string/choose" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" diff --git a/app/src/main/res/layout/fragment_frag_vertical_layout.xml b/app/src/main/res/layout/fragment_frag_vertical_layout.xml index 1a5168a05aa4b3bbfa255cb61da8c8ae0288fbe6..018989437478f576d6473ab66fd61edde8a796ae 100644 --- a/app/src/main/res/layout/fragment_frag_vertical_layout.xml +++ b/app/src/main/res/layout/fragment_frag_vertical_layout.xml @@ -14,7 +14,7 @@ android:id="@+id/napolitaine" android:layout_width="0dp" android:layout_height="0dp" - android:text="NAPOLITAINE" + android:text="@string/napolitaine" app:layout_constraintBottom_toTopOf="@+id/royale" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -24,7 +24,7 @@ android:id="@+id/royale" android:layout_width="0dp" android:layout_height="0dp" - android:text="ROYALE" + android:text="@string/royale" app:layout_constraintBottom_toTopOf="@+id/quatreFromages" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -34,7 +34,7 @@ android:id="@+id/quatreFromages" android:layout_width="0dp" android:layout_height="0dp" - android:text="QUATRE FROMAGES" + android:text="@string/quatrefromages" app:layout_constraintBottom_toTopOf="@+id/montagnarde" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -44,7 +44,7 @@ android:id="@+id/montagnarde" android:layout_width="0dp" android:layout_height="0dp" - android:text="MONTAGNARDE" + android:text="@string/montagnarde" app:layout_constraintBottom_toTopOf="@+id/raclette" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -54,7 +54,7 @@ android:id="@+id/raclette" android:layout_width="0dp" android:layout_height="0dp" - android:text="RACLETTE" + android:text="@string/raclette" app:layout_constraintBottom_toTopOf="@+id/hawaii" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ android:id="@+id/hawaii" android:layout_width="0dp" android:layout_height="0dp" - android:text="HAWAII" + android:text="@string/hawaii" app:layout_constraintBottom_toTopOf="@+id/linearLayout2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -87,7 +87,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:layout_marginEnd="5dp" - android:text="PANNA COTTA" /> + android:text="@string/pannacotta" /> <Button android:id="@+id/tiramisu" @@ -95,7 +95,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:layout_marginEnd="5dp" - android:text="TIRAMISU" /> + android:text="@string/tiramisu" /> </LinearLayout> <Button @@ -103,7 +103,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:backgroundTint="#F44336" - android:text="Pizza Personnalisé" + android:text="@string/pizzaperso" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..a9352eeaddfea4ad21d86c3977884b6553578579 --- /dev/null +++ b/app/src/main/res/values-fr/strings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">Lasri Del Arte</string> + <string name="choose">Choisir</string> + <string name="napolitaine">Napolitaine</string> + <string name="royale">Royale</string> + <string name="quatrefromages">Quatre Fromages</string> + <string name="montagnarde">Montagnarde</string> + <string name="raclette">Raclette</string> + <string name="hawaii">Hawaii</string> + <string name="pannacotta">Panna Cotta</string> + <string name="tiramisu">Tiramisu</string> + <string name="pizzaperso">Pizza Personnalisé</string> +</resources> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127d327620c93d2b2d00342a68e97b98a48d..ebc6dc42f0c5331c2da931d40fdfb68dedec3748 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,8 @@ <color name="teal_700">#FF018786</color> <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> + <color name="DelArteGreen">#199d55</color> + <color name="DelArteDarkGreen">#16884a</color> + <color name="DelArteDarkRed">#d84038</color> + <color name="DelArteLightRed">#e2756f</color> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 64839a184f043981629c9cf1628f6dbbf42bca8e..c1722f23ad0c3d3a799dd97430ae98ecbee3a4ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,13 @@ <resources> - <string name="app_name">Pizzeria</string> - <!-- TODO: Remove or change this placeholder text --> - <string name="hello_blank_fragment">Hello blank fragment</string> + <string name="app_name">Lasri Del Arte</string> + <string name="choose">Choisir</string> + <string name="napolitaine">Napolitaine</string> + <string name="royale">Royale</string> + <string name="quatrefromages">Quatre Fromages</string> + <string name="montagnarde">Montagnarde</string> + <string name="raclette">Raclette</string> + <string name="hawaii">Hawaii</string> + <string name="pannacotta">Panna Cotta</string> + <string name="tiramisu">Tiramisu</string> + <string name="pizzaperso">Pizza Personnalisé</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index d40f124c749409c45945880dd11cf28ac582222a..881f705dd34d041cddb416f2f1b3c2df717a5ea4 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,12 +2,12 @@ <!-- Base application theme. --> <style name="Theme.Pizzeria" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> <!-- Primary brand color. --> - <item name="colorPrimary">@color/purple_500</item> - <item name="colorPrimaryVariant">@color/purple_700</item> + <item name="colorPrimary">@color/DelArteGreen</item> + <item name="colorPrimaryVariant">@color/DelArteDarkGreen</item> <item name="colorOnPrimary">@color/white</item> <!-- Secondary brand color. --> - <item name="colorSecondary">@color/teal_200</item> - <item name="colorSecondaryVariant">@color/teal_700</item> + <item name="colorSecondary">@color/DelArteLightRed</item> + <item name="colorSecondaryVariant">@color/DelArteDarkRed</item> <item name="colorOnSecondary">@color/black</item> <!-- Status bar color. --> <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>