diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b5d83a451fe03416d1a6e1fa58a10e06ff8ad0dd..6cd392f87db3f21a06ca95ff6b9fee2eda6d6854 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,9 +15,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/logo2" - android:label="@string/sell_rad" - android:roundIcon="@mipmap/logo2_round" + android:icon="@mipmap/plunv_logo" + android:label="Pluñv" + android:roundIcon="@mipmap/plunv_logo_round" android:supportsRtl="true" android:theme="@style/Theme.MyApplication" tools:targetApi="31"> diff --git a/app/src/main/plunv_logo-playstore.png b/app/src/main/plunv_logo-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..951f24dddfde53f12743c1d9ea8a64fe1f7426be Binary files /dev/null and b/app/src/main/plunv_logo-playstore.png differ diff --git a/app/src/main/res/drawable/avi_main_black.png b/app/src/main/res/drawable/avi_main_black.png new file mode 100644 index 0000000000000000000000000000000000000000..95e0a0482f4589557a04345bb797ce7968112e77 Binary files /dev/null and b/app/src/main/res/drawable/avi_main_black.png differ diff --git a/app/src/main/res/drawable/line_4.png b/app/src/main/res/drawable/line_4.png new file mode 100644 index 0000000000000000000000000000000000000000..6861591a717c1df0ba17991e2407c064c1223099 Binary files /dev/null and b/app/src/main/res/drawable/line_4.png differ diff --git a/app/src/main/res/drawable/line_5.png b/app/src/main/res/drawable/line_5.png new file mode 100644 index 0000000000000000000000000000000000000000..06cac791b7eeead352ea16ec479e626d3efa8e76 Binary files /dev/null and b/app/src/main/res/drawable/line_5.png differ diff --git a/app/src/main/res/drawable/line_6.png b/app/src/main/res/drawable/line_6.png new file mode 100644 index 0000000000000000000000000000000000000000..03473bb64723ce01f39d3339cf2be3b4d9d9953e Binary files /dev/null and b/app/src/main/res/drawable/line_6.png differ diff --git a/app/src/main/res/drawable/logo_main_black.png b/app/src/main/res/drawable/logo_main_black.png new file mode 100644 index 0000000000000000000000000000000000000000..b0ecc205545c40782691e4bc26f613e099acb408 Binary files /dev/null and b/app/src/main/res/drawable/logo_main_black.png differ diff --git a/app/src/main/res/drawable/plunv_black.png b/app/src/main/res/drawable/plunv_black.png new file mode 100644 index 0000000000000000000000000000000000000000..de25ae8254c2e4f963ed79b30a4f1bbb4189cda4 Binary files /dev/null and b/app/src/main/res/drawable/plunv_black.png differ diff --git a/app/src/main/res/drawable/plunv_logo.png b/app/src/main/res/drawable/plunv_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..154f25bb36d3362a8e2fe2541b8f70e855ddd2ee Binary files /dev/null and b/app/src/main/res/drawable/plunv_logo.png differ diff --git a/app/src/main/res/drawable/plunv_logo_foreground.xml b/app/src/main/res/drawable/plunv_logo_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..7ba4d7d01446287e92473c77259c9c0bcd39f4fd --- /dev/null +++ b/app/src/main/res/drawable/plunv_logo_foreground.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <group android:scaleX="0.46" + android:scaleY="0.46" + android:translateX="29.16" + android:translateY="29.16"> + <group android:translateY="132.82031"> + </group> + </group> +</vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/polygon_10.png b/app/src/main/res/drawable/polygon_10.png new file mode 100644 index 0000000000000000000000000000000000000000..da5e90ae98c572296982a30dcf680075b2d62cdc Binary files /dev/null and b/app/src/main/res/drawable/polygon_10.png differ diff --git a/app/src/main/res/drawable/polygon_11.png b/app/src/main/res/drawable/polygon_11.png new file mode 100644 index 0000000000000000000000000000000000000000..2f51179594555dd88bc7d2a834a9a8a51584d28a Binary files /dev/null and b/app/src/main/res/drawable/polygon_11.png differ diff --git a/app/src/main/res/drawable/polygon_12.png b/app/src/main/res/drawable/polygon_12.png new file mode 100644 index 0000000000000000000000000000000000000000..4d63a0cced8ae283030cea7a510c86bc93c8893c Binary files /dev/null and b/app/src/main/res/drawable/polygon_12.png differ diff --git a/app/src/main/res/drawable/polygon_13.png b/app/src/main/res/drawable/polygon_13.png new file mode 100644 index 0000000000000000000000000000000000000000..03b3529f522522127155df0b5c2065d4125f97af Binary files /dev/null and b/app/src/main/res/drawable/polygon_13.png differ diff --git a/app/src/main/res/drawable/polygon_14.png b/app/src/main/res/drawable/polygon_14.png new file mode 100644 index 0000000000000000000000000000000000000000..5196f858fac9a6ce8e5bad078e79b7433a57be1a Binary files /dev/null and b/app/src/main/res/drawable/polygon_14.png differ diff --git a/app/src/main/res/drawable/polygon_15.png b/app/src/main/res/drawable/polygon_15.png new file mode 100644 index 0000000000000000000000000000000000000000..637e9b7d47bb2444a43ae4fe9d562b2105513ea5 Binary files /dev/null and b/app/src/main/res/drawable/polygon_15.png differ diff --git a/app/src/main/res/drawable/rectangle_2.png b/app/src/main/res/drawable/rectangle_2.png new file mode 100644 index 0000000000000000000000000000000000000000..6b38713648851de242fbd0878bebe2a09fadea8a Binary files /dev/null and b/app/src/main/res/drawable/rectangle_2.png differ diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 37c63a1dc72a1b18c6583e00255a8d48e79cff80..ce1449d0a00570dd597447ff76ddce38179f42cd 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -9,35 +9,34 @@ tools:context=".PublicActivity"> <ImageView - android:alpha="0.4" android:id="@+id/image_1" android:layout_width="match_parent" android:layout_height="match_parent" + android:alpha="0.4" android:scaleType="centerCrop" android:src="@drawable/image_1" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/bottom_navigation" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> <ImageView + style="@style/BigPolygon" android:id="@+id/polygon_2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" android:layout_marginBottom="25dp" - android:alpha="0.75" - android:src="@drawable/polygon_2" /> + android:alpha="0.75" /> <ImageView + style="@style/BottomPolygon" android:id="@+id/polygon_4" android:layout_width="match_parent" android:layout_height="wrap_content" - android:scaleType="fitXY" - android:src="@drawable/polygon_4" - android:alpha="0.75" android:layout_gravity="center_horizontal|bottom" - /> + android:alpha="0.75" + android:scaleType="fitXY" /> <ImageView android:id="@+id/image_2" @@ -45,111 +44,102 @@ android:layout_height="48.6dp" android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="20dp" - android:src="@drawable/image_2" - /> + android:src="@drawable/image_2" /> <ImageView + style="@style/MiniRectangle" android:id="@+id/rectangle_5" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginBottom="266dp" - android:src="@drawable/rectangle_1" - /> + android:layout_marginBottom="266dp" /> <Button android:id="@+id/learning_button" + style="@style/ButtonAppearance" android:layout_width="168dp" android:layout_height="124dp" + android:layout_gravity="center_vertical" android:layout_marginStart="34dp" android:layout_marginBottom="266dp" - android:layout_gravity="center_vertical" - android:backgroundTint="#517293" android:drawableLeft="@drawable/book" android:fontFamily="@font/inter" - android:text="@string/learn" - android:textSize="20sp" - android:rotation="-5" - android:paddingRight="5dp" android:paddingLeft="5dp" - style="@style/ButtonAppearance"/> + android:paddingRight="5dp" + android:rotation="-5" + android:text="@string/learn" + android:textSize="20sp" /> <ImageView + style="@style/MiniRectangle" android:id="@+id/rectangle_6" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginBottom="97dp" - android:src="@drawable/rectangle_1" - /> + android:layout_marginBottom="97dp" /> + + <ImageView + style="@style/MiniRectangle" + android:id="@+id/rectangle_8" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginTop="241dp" /> <Button android:id="@+id/settings_button" + style="@style/ButtonAppearance" android:layout_width="168dp" android:layout_height="124dp" + android:layout_gravity="center_vertical" android:layout_marginStart="34dp" android:layout_marginTop="241dp" - android:layout_gravity="center_vertical" - android:backgroundTint="#517293" android:drawableLeft="@drawable/param" android:fontFamily="@font/inter" - android:text="@string/settings" - android:textSize="20sp" - android:rotation="-5" - android:paddingRight="5dp" android:paddingLeft="5dp" - style="@style/ButtonAppearance"/> + android:paddingRight="5dp" + android:rotation="-5" + android:text="@string/settings" + android:textSize="20sp" /> <ImageView + style="@style/MiniRectangle" android:id="@+id/rectangle_7" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginTop="72dp" - android:src="@drawable/rectangle_1" - /> + android:layout_marginTop="72dp" /> <Button android:id="@+id/photo_button" + style="@style/ButtonAppearance" android:layout_width="168dp" android:layout_height="124dp" + android:layout_gravity="center_vertical" android:layout_marginStart="34dp" android:layout_marginTop="72dp" - android:layout_gravity="center_vertical" - android:backgroundTint="#517293" android:drawableLeft="@drawable/camera" android:fontFamily="@font/inter" - android:text="@string/photo" - android:textSize="20sp" - android:rotation="-5" - android:paddingRight="3.75dp" android:paddingLeft="3.75dp" - style="@style/ButtonAppearance"/> - - <ImageView - android:id="@+id/rectangle_8" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginTop="241dp" - android:src="@drawable/rectangle_1" - /> + android:paddingRight="3.75dp" + android:rotation="-5" + android:text="@string/photo" + android:textSize="20sp" /> <Button android:id="@+id/stats_button" + style="@style/ButtonAppearance" android:layout_width="168dp" android:layout_height="124dp" + android:layout_gravity="center_vertical" android:layout_marginStart="34dp" android:layout_marginBottom="97dp" - android:layout_gravity="center_vertical" - android:backgroundTint="#517293" android:drawableLeft="@drawable/stats" android:fontFamily="@font/inter" - android:text="@string/stats" - android:textSize="20sp" - android:rotation="-5" - android:paddingRight="3.75dp" android:paddingLeft="3.75dp" - style="@style/ButtonAppearance"/> + android:paddingRight="3.75dp" + android:rotation="-5" + android:text="@string/stats" + android:textSize="20sp" /> </FrameLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3b13ac8495c35e1ea90e99801f36e277713a502f..1e9d1ced2b628ab531ed39ee1e59a0d1fe46badf 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,49 +1,49 @@ <!-- Auto layout, variables, and unit scale are not yet supported --> <FrameLayout + style="@style/MainBackground" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/welcomescre" android:layout_width="match_parent" android:layout_height="match_parent" - android:clipToOutline="true" - android:background="@color/white"> + android:clipToOutline="true" > <ImageView + style="@style/NameMain" android:id="@+id/imageView6" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:srcCompat="@drawable/plunv" android:paddingHorizontal="70dp" android:layout_gravity="bottom" android:layout_marginBottom="240dp"/> <ImageView + style="@style/LogoMain" android:id="@+id/imageView7" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:srcCompat="@drawable/logo_main" android:layout_gravity="center" android:paddingBottom="430dp" android:paddingTop="174dp" android:paddingHorizontal="37dp"/> <ImageView + style="@style/SubNameMain" android:id="@+id/imageView8" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:srcCompat="@drawable/avi_main" android:paddingHorizontal="60dp" android:layout_gravity="bottom" android:layout_marginBottom="220dp"/> <ImageView + style="@style/BottomPolygonMain" android:id="@+id/imageView9" android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitXY" - app:srcCompat="@drawable/polygon_9" android:layout_gravity="bottom"/> <ImageView diff --git a/app/src/main/res/layout/activity_public.xml b/app/src/main/res/layout/activity_public.xml index 9fc6399b1b6610186d595d062684714edbc1a3c9..76f19b61bb95cda0ea279413cdf465453430fe4c 100644 --- a/app/src/main/res/layout/activity_public.xml +++ b/app/src/main/res/layout/activity_public.xml @@ -29,12 +29,11 @@ android:layout_above="@id/bottom_navigation"/> <com.google.android.material.bottomnavigation.BottomNavigationView + style="@style/BottomNavTint" android:id="@+id/bottom_navigation" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="#517293" - app:itemIconTint="#D9D9D9" app:itemTextColor="#D9D9D9" app:itemRippleColor="#3D5062" app:menu="@menu/bottom_nav_menu" diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml index bbe02b662e8876260dfa5683405976e49476a8d9..4f6b328cb67b42118e3df396511285f24f9e1bea 100644 --- a/app/src/main/res/layout/activity_tutorial.xml +++ b/app/src/main/res/layout/activity_tutorial.xml @@ -9,43 +9,42 @@ tools:context=".TutorialActivity"> <ImageView - android:alpha="0.4" android:id="@+id/image_1" android:layout_width="match_parent" android:layout_height="match_parent" + android:alpha="0.4" android:scaleType="centerCrop" android:src="@drawable/image_1" - app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/bottom_navigation" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> <androidx.viewpager2.widget.ViewPager2 android:id="@+id/tutorial_viewpager" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="match_parent" /> <LinearLayout android:id="@+id/dots_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal" + android:layout_marginBottom="19dp" + android:gravity="center" android:orientation="horizontal" + android:padding="8dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:gravity="center" - android:padding="8dp" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="19dp"/> + app:layout_constraintStart_toStartOf="parent" /> <Button android:id="@+id/tuto_end_button" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - style="@style/ButtonAppearance" android:layout_gravity="center_horizontal|bottom" android:layout_marginBottom="60dp" - android:text="@string/tuto_end" - android:fontFamily="@font/inter"/> + android:fontFamily="@font/inter" + android:text="@string/tuto_end" /> </FrameLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_learning_page.xml b/app/src/main/res/layout/fragment_learning_page.xml index db72feb8a6703f39c1f8000e01c78b41a9aaf2a2..ef16fc6a33058e9d0be718a3fd4e846ef44d6320 100644 --- a/app/src/main/res/layout/fragment_learning_page.xml +++ b/app/src/main/res/layout/fragment_learning_page.xml @@ -7,16 +7,14 @@ <TextView + style="@style/PageTitleAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="50dp" android:layout_marginBottom="60dp" - android:background="@drawable/polygon_5" android:paddingTop="30dp" android:paddingEnd="50dp" android:text="@string/apprendre" - android:textAlignment="center" - android:textColor="#1E1E1E" android:textSize="38sp" /> <ScrollView @@ -32,17 +30,16 @@ <!-- Header Text --> <TextView android:id="@+id/header_text" + style="@style/TopTopAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_transparent" android:padding="10dp" android:text="@string/learning_page_header" android:textAlignment="center" - android:textColor="#000000" android:textSize="18sp" /> <TextView @@ -54,14 +51,15 @@ android:text="@string/becasseau" /> <LinearLayout + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingVertical="12dp"> <ImageView android:layout_width="wrap_content" @@ -77,7 +75,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -94,14 +91,15 @@ android:text="@string/bernache" /> <LinearLayout + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingVertical="12dp"> <com.google.android.material.imageview.ShapeableImageView android:layout_width="120dp" @@ -120,7 +118,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -137,14 +134,15 @@ android:text="@string/goeland" /> <LinearLayout + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingVertical="12dp"> <com.google.android.material.imageview.ShapeableImageView android:layout_width="120dp" @@ -163,7 +161,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -180,14 +177,15 @@ android:text="@string/mouette" /> <LinearLayout + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingVertical="12dp"> <com.google.android.material.imageview.ShapeableImageView android:layout_width="120dp" @@ -206,7 +204,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -216,30 +213,21 @@ <TextView android:id="@+id/pluvier" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" + style="@style/TopAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="10dp" - android:background="@drawable/shape_1" - android:gravity="center|start" - android:paddingStart="12dp" - android:paddingTop="10dp" - android:paddingEnd="10dp" - android:paddingBottom="10dp" - android:text="@string/pluvier_argente" - android:textColor="#000000" - android:textSize="18sp" /> + android:text="@string/pluvier_argente" /> <LinearLayout + style="@style/BottomAppearance" + android:paddingVertical="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" android:orientation="horizontal"> <com.google.android.material.imageview.ShapeableImageView @@ -259,7 +247,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -276,13 +263,14 @@ android:text="@string/grand_cormoran" /> <LinearLayout + style="@style/BottomAppearance" + android:paddingVertical="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" android:orientation="horizontal"> <com.google.android.material.imageview.ShapeableImageView @@ -302,7 +290,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -316,16 +303,17 @@ android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="10dp" - android:text="@string/foulque_macroule"/> + android:text="@string/foulque_macroule" /> <LinearLayout + style="@style/BottomAppearance" + android:paddingVertical="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" android:orientation="horizontal"> <com.google.android.material.imageview.ShapeableImageView @@ -345,7 +333,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -362,13 +349,14 @@ android:text="@string/tadorne_de_belon" /> <LinearLayout + style="@style/BottomAppearance" + android:paddingVertical="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" android:orientation="horizontal"> <com.google.android.material.imageview.ShapeableImageView @@ -388,7 +376,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -405,13 +392,14 @@ android:text="@string/chevalier_gambette" /> <LinearLayout + style="@style/BottomAppearance" + android:paddingVertical="12dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_2" android:orientation="horizontal"> <com.google.android.material.imageview.ShapeableImageView @@ -431,7 +419,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginStart="12dp" - android:backgroundTint="#517293" android:fontFamily="@font/inter" android:paddingLeft="12dp" android:paddingRight="12dp" diff --git a/app/src/main/res/layout/fragment_overlay_dialog_becasseau.xml b/app/src/main/res/layout/fragment_overlay_dialog_becasseau.xml index c94822dc02f8081a3a4bdb955a394339bde8dd16..0bd52657a313d245b1542b1989112de762c0a24b 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_becasseau.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_becasseau.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/becasseau_sanderling" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/becasseau_sanderling" + android:textSize="16sp" /> <Button android:id="@+id/return_becasseau" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_overlay_dialog_bernache.xml b/app/src/main/res/layout/fragment_overlay_dialog_bernache.xml index 2032479a65307298427e4bedea7631799e7542b5..5c34871f9b970cc1460f6f91bd2854421972e535 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_bernache.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_bernache.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/bernache_cravant" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/bernache_cravant" + android:textSize="16sp" /> <Button android:id="@+id/return_bernache" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_overlay_dialog_chevalier.xml b/app/src/main/res/layout/fragment_overlay_dialog_chevalier.xml index 873ec161fdf3cd161ab17d3146705f4099adf60f..1bcf4cfd73dcff3af9404402524d67b9fc1cfd25 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_chevalier.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_chevalier.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/chevalier" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/chevalier" + android:textSize="16sp" /> <Button android:id="@+id/return_chevalier" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overlay_dialog_cormoran.xml b/app/src/main/res/layout/fragment_overlay_dialog_cormoran.xml index ab1adc3e9f3478ef578a435c9ecda64a2c315df0..e1d2ed98f26d776ddae1883b86ee3bdd7bb6ea4f 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_cormoran.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_cormoran.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/cormoran" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/cormoran" + android:textSize="16sp" /> <Button android:id="@+id/return_cormoran" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overlay_dialog_foulque.xml b/app/src/main/res/layout/fragment_overlay_dialog_foulque.xml index c12262b61b7c4e1e7856cf0c0bcee8f9d4b37f8f..182a63b3b15a382357bac8c1e8058ce9be9dcbfc 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_foulque.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_foulque.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/foulque" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/foulque" + android:textSize="16sp" /> <Button android:id="@+id/return_foulque" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overlay_dialog_goeland.xml b/app/src/main/res/layout/fragment_overlay_dialog_goeland.xml index b8fdb8a592fc5657012c2bd787296aff5b5d1d67..c1e020da9e1c16b4627766fd1e82566e7f3610b0 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_goeland.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_goeland.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/goeland_argente" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/goeland_argente" + android:textSize="16sp" /> <Button android:id="@+id/return_goeland" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_overlay_dialog_mouette.xml b/app/src/main/res/layout/fragment_overlay_dialog_mouette.xml index 1312f2231738c79cb360d4222bbef1d809a21c2a..245f18dba7b934c6fb239820dd7af9015278caab 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_mouette.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_mouette.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/mouette_rieuse" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/mouette_rieuse" + android:textSize="16sp" /> <Button android:id="@+id/return_mouette" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_overlay_dialog_pluvier.xml b/app/src/main/res/layout/fragment_overlay_dialog_pluvier.xml index 0e9e727844a6193deb84e272512bed19dd3e7397..81db0d9e9615fad30af78228b0348ab7eb0f3cee 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_pluvier.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_pluvier.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/pluvier" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/pluvier" + android:textSize="16sp" /> <Button android:id="@+id/return_pluvier" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> diff --git a/app/src/main/res/layout/fragment_overlay_dialog_tadorne.xml b/app/src/main/res/layout/fragment_overlay_dialog_tadorne.xml index 02c6a34f50cdcdff367954676050e9425d2ba32a..442515ce9638c1db2d825882d998c47d3116d65e 100644 --- a/app/src/main/res/layout/fragment_overlay_dialog_tadorne.xml +++ b/app/src/main/res/layout/fragment_overlay_dialog_tadorne.xml @@ -9,27 +9,25 @@ <!-- Your custom overlay content here --> <TextView + style="@style/OverlayAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" - android:text="@string/tadorne" - android:textSize="16sp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="5dp" android:gravity="center_vertical" - android:background="@drawable/shape_3" android:padding="15dp" - android:layout_marginRight="20dp" - android:layout_marginLeft="20dp" - android:layout_marginBottom="5dp"/> + android:text="@string/tadorne" + android:textSize="16sp" /> <Button android:id="@+id/return_tadorne" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/retour" - android:paddingRight="50dp" - android:paddingLeft="50dp" - style="@style/ButtonAppearance" android:layout_gravity="right" - android:layout_marginRight="20dp"/> + android:layout_marginRight="20dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:text="@string/retour" /> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_photo_page.xml b/app/src/main/res/layout/fragment_photo_page.xml index 51807a87f6b22b61931f67cbb88b7ebac599d31a..bb93ae6309d8819514a5a435e2ea98efccc91685 100644 --- a/app/src/main/res/layout/fragment_photo_page.xml +++ b/app/src/main/res/layout/fragment_photo_page.xml @@ -9,36 +9,33 @@ <!-- To see the tutorial again --> <Button android:id="@+id/see_tuto" + style="@style/ButtonAppearance" android:layout_width="320dp" android:layout_height="wrap_content" - style="@style/ButtonAppearance" - android:backgroundTint="#99FFFFFF" android:layout_gravity="center_horizontal" android:layout_marginTop="180dp" - android:text="@string/see_tuto" - android:textColor="@color/black" android:fontFamily="@font/inter" - android:textSize="15sp"/> + android:text="@string/see_tuto" + android:textSize="15sp" /> <FrameLayout + style="@style/TopTopAppearance" android:layout_width="320dp" android:layout_height="386dp" - android:background="@drawable/shape_transparent" android:layout_gravity="center"> + <!-- Camera Button --> <Button android:id="@+id/camera_button" + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/camera" - android:textSize="20sp" - android:fontFamily="@font/inter" - android:textColor="#D9D9D9" - android:backgroundTint="#517293" - style="@style/ButtonAppearance" android:layout_gravity="bottom|start" android:layout_marginStart="6dp" - android:drawableLeft="@drawable/camera_tiny"/> + android:drawableLeft="@drawable/camera_tiny" + android:fontFamily="@font/inter" + android:text="@string/camera" + android:textSize="20sp" /> <!-- Folder Button --> <Button @@ -46,90 +43,81 @@ style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:backgroundTint="#517293" - android:text="@string/galerie" - android:textSize="20sp" - android:fontFamily="@font/inter" - android:textColor="#D9D9D9" android:layout_gravity="bottom|end" + android:layout_marginEnd="6dp" android:drawableLeft="@drawable/folder" - android:layout_marginEnd="6dp"/> + android:fontFamily="@font/inter" + android:text="@string/galerie" + android:textSize="20sp" /> <!-- Main Image Display --> <ImageView android:id="@+id/main_image_display" android:layout_width="209dp" android:layout_height="209dp" + android:layout_gravity="center" app:layout_constraintBottom_toTopOf="@+id/textPredictionOutput" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.507" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.101" - tools:srcCompat="@tools:sample/avatars" - android:layout_gravity="center"/> + tools:srcCompat="@tools:sample/avatars" /> - <TextView + <Button + style="@style/ButtonAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/especes" - android:textSize="15sp" - android:textColor="#D9D9D9" - android:paddingHorizontal="40dp" - android:fontFamily="@font/inter" android:layout_gravity="center_horizontal|top" android:layout_marginTop="20dp" - android:background="@drawable/shape" - android:backgroundTint="#517293"/> + android:fontFamily="@font/inter" + android:paddingHorizontal="40dp" + android:text="@string/especes" + android:textSize="15sp" /> </FrameLayout> - + <!-- Prediction Text --> <TextView android:id="@+id/textPredictionOutput" android:layout_width="351dp" android:layout_height="28dp" + android:layout_gravity="bottom|center_horizontal" android:layout_marginBottom="146dp" android:text="" android:textColor="#F12B2B" android:textSize="17sp" - android:textStyle="bold" - android:layout_gravity="bottom|center_horizontal"/> - + android:textStyle="bold" /> + <!-- Accuracy Text --> <TextView android:id="@+id/textProbabilityOutput" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" + android:layout_marginBottom="106dp" android:text="" android:textColor="#F12B2B" android:textSize="17sp" - android:textStyle="bold" - android:layout_gravity="center_horizontal|bottom" - android:layout_marginBottom="106dp"/> + android:textStyle="bold" /> <!-- Prediction Label --> <TextView android:id="@+id/prediction_label" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" android:layout_marginBottom="186dp" android:text="PREDICTION:" android:textColor="#D9D9D9" android:textSize="24sp" - android:textStyle="bold" - android:layout_gravity="center_horizontal|bottom"/> + android:textStyle="bold" /> <TextView + style="@style/PageTitleAppearance" android:id="@+id/learning_page_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_marginTop="50dp" android:layout_marginBottom="60dp" - android:background="@drawable/polygon_5" android:paddingTop="30dp" android:paddingEnd="50dp" - android:text="@string/photo" - android:textAlignment="center" - android:textColor="#1E1E1E" - android:textSize="38sp" /> + android:text="@string/photo" /> </FrameLayout> diff --git a/app/src/main/res/layout/fragment_settings_page.xml b/app/src/main/res/layout/fragment_settings_page.xml index a04a161be3687e757e138380f18bc95d56be9a06..23cb9916ae010094cd3e1db936ae809f5e8c0bdb 100644 --- a/app/src/main/res/layout/fragment_settings_page.xml +++ b/app/src/main/res/layout/fragment_settings_page.xml @@ -6,17 +6,12 @@ android:orientation="vertical"> <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/PageTitleAppearance" android:layout_marginTop="50dp" android:layout_marginBottom="60dp" - android:background="@drawable/polygon_5" android:paddingTop="30dp" android:paddingEnd="50dp" - android:text="@string/settings" - android:textAlignment="center" - android:textColor="#1E1E1E" - android:textSize="38sp" /> + android:text="@string/settings" /> <ScrollView android:layout_width="match_parent" @@ -30,21 +25,13 @@ android:orientation="vertical"> <TextView - android:paddingBottom="7dp" - android:paddingTop="7dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/TopTopAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape_transparent" - android:fontFamily="@font/inter" - android:text="@string/settings_gen" - android:textAlignment="center" - android:textColor="@color/black" - android:textSize="16sp" - app:icon="@drawable/folder" - app:iconGravity="textStart" /> + android:paddingTop="7dp" + android:paddingBottom="7dp" + android:text="@string/settings_gen" /> <TextView style="@style/TopAppearance" @@ -54,11 +41,9 @@ android:text="@string/mode" /> <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/BottomAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" - android:background="@drawable/shape_2" android:layout_marginBottom="23dp"> <Button @@ -66,16 +51,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginRight="15dp" android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" android:layout_marginBottom="15dp" android:text="@string/mode_sombre" + android:textSize="15sp" app:icon="@drawable/moon" - app:iconGravity="textStart"/> + app:iconGravity="textStart" /> <TextView android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> </FrameLayout> @@ -84,14 +70,13 @@ android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:text="@string/tutorial"/> + android:text="@string/tutorial" + android:textSize="15sp" /> <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/BottomAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" - android:background="@drawable/shape_2" android:layout_marginBottom="23dp"> <Button @@ -99,46 +84,38 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" - android:layout_marginRight="15dp" android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" android:layout_marginBottom="15dp" android:text="@string/download" + android:textSize="15sp" app:icon="@drawable/folder" - app:iconGravity="textStart"/> + app:iconGravity="textStart" /> <TextView android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> </FrameLayout> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/TopTopAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="33dp" - android:background="@drawable/shape" - android:fontFamily="@font/inter" - android:text="@string/settings_conf" - android:textAlignment="center" - android:textColor="@color/black" - android:textSize="16sp" - app:iconGravity="textStart" /> + android:text="@string/settings_conf" /> <TextView style="@style/TopAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:text="@string/personal_data"/> + android:text="@string/personal_data" /> <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/BottomAppearance" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" - android:layout_marginBottom="10dp" - android:background="@drawable/shape_2" /> + android:layout_marginBottom="10dp" /> </LinearLayout> </ScrollView> </LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_stats_page.xml b/app/src/main/res/layout/fragment_stats_page.xml index 00d17a79d6e7e23ebc8bec5dfdd31a39c8b03720..1d27aa9814570cb5692db26e01d36f5d4ed588c0 100644 --- a/app/src/main/res/layout/fragment_stats_page.xml +++ b/app/src/main/res/layout/fragment_stats_page.xml @@ -6,16 +6,15 @@ android:orientation="vertical"> <TextView + style="@style/PageTitleAppearance" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="50dp" android:layout_marginBottom="60dp" - android:background="@drawable/polygon_5" android:paddingTop="30dp" android:paddingEnd="50dp" android:text="@string/stats" android:textAlignment="center" - android:textColor="#1E1E1E" android:textSize="38sp" /> <ScrollView @@ -44,12 +43,12 @@ app:iconGravity="textStart" /> <TextView + style="@style/TopAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:background="@drawable/shape_1" android:fontFamily="@font/inter" android:gravity="center" android:text="@string/nombre_de_photos_prises" @@ -57,9 +56,9 @@ android:textSize="16sp" /> <TextView + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_2" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="10dp"/> @@ -75,12 +74,12 @@ android:textColor="@color/white"/> <TextView + style="@style/TopAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:background="@drawable/shape_1" android:fontFamily="@font/inter" android:gravity="center" android:text="@string/proportions" @@ -88,9 +87,9 @@ android:textSize="16sp" /> <TextView + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_2" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="10dp"/> @@ -106,12 +105,12 @@ android:textColor="@color/white"/> <TextView + style="@style/TopAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="8dp" - android:background="@drawable/shape_1" android:fontFamily="@font/inter" android:gravity="center" android:text="@string/nombre_ind" @@ -119,9 +118,9 @@ android:textSize="16sp" /> <TextView + style="@style/BottomAppearance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/shape_2" android:layout_marginLeft="40dp" android:layout_marginRight="40dp" android:layout_marginBottom="10dp"/> diff --git a/app/src/main/res/layout/fragment_tutorial_page1.xml b/app/src/main/res/layout/fragment_tutorial_page1.xml index 66e2cb69acdcafd8d306eaa8a6e4d3771a16b29c..afd4df3f14354c169837364bc24e0fb8bd65ee42 100644 --- a/app/src/main/res/layout/fragment_tutorial_page1.xml +++ b/app/src/main/res/layout/fragment_tutorial_page1.xml @@ -5,21 +5,22 @@ android:layout_height="match_parent"> <ImageView + style="@style/TutoPage1" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="5.7dp" - android:src="@drawable/polygon_6" /> + android:paddingTop="5.7dp" /> <ImageView + style="@style/TutoLine1" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:layout_marginTop="-131dp" - android:src="@drawable/line_1" /> + android:layout_marginTop="-131dp" /> + <TextView + style="@style/TutorialTitles" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/shape_transparent_blue" android:text="@string/tuto_id" android:textSize="29sp" android:fontFamily="@font/inter" @@ -33,6 +34,7 @@ android:layout_marginLeft="-15dp"/> <FrameLayout + style="@style/TopTopAppearance" android:layout_width="320dp" android:layout_height="296dp" android:layout_gravity="center" @@ -41,8 +43,7 @@ <ImageView android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center" - android:background="@drawable/shape_transparent"/> + android:layout_gravity="center"/> <TextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/fragment_tutorial_page2.xml b/app/src/main/res/layout/fragment_tutorial_page2.xml index fbb737f3a35dcdbe7c5f46d73d11809205915e12..12b032e9564d6ddc301847146822c5f4f4495f36 100644 --- a/app/src/main/res/layout/fragment_tutorial_page2.xml +++ b/app/src/main/res/layout/fragment_tutorial_page2.xml @@ -5,29 +5,29 @@ android:layout_height="match_parent"> <ImageView + style="@style/TutoPage2" android:id="@+id/imageView2" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="65dp" - app:srcCompat="@drawable/polygon_7" /> + android:paddingTop="65dp" /> <ImageView + style="@style/TutoLine2" android:id="@+id/imageView5" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:paddingTop="269dp" - app:srcCompat="@drawable/line_2" /> + android:paddingTop="269dp" /> <FrameLayout + style="@style/TopTopAppearance" android:layout_width="272dp" android:layout_height="520dp" android:layout_gravity="center" android:layout_marginTop="70dp"> <ImageView android:layout_width="match_parent" - android:layout_height="match_parent" - android:src="@drawable/shape_transparent"/> + android:layout_height="match_parent"/> <ImageView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/fragment_tutorial_page3.xml b/app/src/main/res/layout/fragment_tutorial_page3.xml index 709d0c044249c856f1a0814ffc1338e656fba8a5..76b95fb8f50da8832df2f4b8f5debaa844208210 100644 --- a/app/src/main/res/layout/fragment_tutorial_page3.xml +++ b/app/src/main/res/layout/fragment_tutorial_page3.xml @@ -5,23 +5,23 @@ android:layout_height="match_parent"> <ImageView + style="@style/TutoPage3" android:id="@+id/imageView3" android:layout_width="match_parent" android:layout_height="match_parent" - android:scaleType="fitCenter" - app:srcCompat="@drawable/polygon_8" /> + android:scaleType="fitCenter" /> <ImageView + style="@style/TutoLine3" android:id="@+id/imageView4" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingBottom="219.3dp" - app:srcCompat="@drawable/line_3" /> + android:paddingBottom="219.3dp" /> <TextView + style="@style/TutorialTitles" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/shape_transparent_blue" android:text="@string/tuto_app" android:textAlignment="center" android:textSize="26sp" @@ -37,14 +37,14 @@ android:layout_marginTop="160dp"/> <FrameLayout + style="@style/TopTopAppearance" android:layout_width="319dp" android:layout_height="440dp" android:layout_gravity="center" android:layout_marginTop="90dp"> <ImageView android:layout_width="match_parent" - android:layout_height="match_parent" - android:src="@drawable/shape_transparent"/> + android:layout_height="match_parent"/> <ImageView android:layout_width="wrap_content" diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 99c0786d42af28acc25446ce90bfebc94e4b4aa9..19dd5372e5973851b74e672e07429382db752871 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -1,21 +1,26 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:checkable="true" android:id="@+id/navigation_apprendre" android:icon="@drawable/book" android:title="Apprendre" /> <item + android:checkable="true" android:id="@+id/navigation_statistiques" android:icon="@drawable/stats" android:title="Stats" /> <item + android:checkable="true" android:id="@+id/navigation_accueil" android:icon="@drawable/home" android:title="Accueil"/> <item + android:checkable="true" android:id="@+id/navigation_identifier" android:icon="@drawable/camera" android:title="Documenter" /> <item + android:checkable="true" android:id="@+id/navigation_parametres" android:icon="@drawable/param" android:title="Paramètres" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755bf50c6b03d8714a9c6184705e6a08389f..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@drawable/ic_launcher_background" /> - <foreground android:drawable="@drawable/ic_launcher_foreground" /> - <monochrome android:drawable="@drawable/ic_launcher_foreground" /> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/logo.xml b/app/src/main/res/mipmap-anydpi-v26/logo.xml deleted file mode 100644 index 16a18b9616b4097b5bbcb2314f07319eeec9f5f4..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/logo.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/logo_background"/> - <foreground android:drawable="@mipmap/logo_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/logo2.xml b/app/src/main/res/mipmap-anydpi-v26/logo2.xml deleted file mode 100644 index 5299c833f4e1335e4213b064a504b2f82390e7f6..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/logo2.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/logo2_background"/> - <foreground android:drawable="@mipmap/logo2_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/logo2_round.xml b/app/src/main/res/mipmap-anydpi-v26/logo2_round.xml deleted file mode 100644 index 5299c833f4e1335e4213b064a504b2f82390e7f6..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/logo2_round.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/logo2_background"/> - <foreground android:drawable="@mipmap/logo2_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/logo_round.xml b/app/src/main/res/mipmap-anydpi-v26/logo_round.xml deleted file mode 100644 index 16a18b9616b4097b5bbcb2314f07319eeec9f5f4..0000000000000000000000000000000000000000 --- a/app/src/main/res/mipmap-anydpi-v26/logo_round.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> - <background android:drawable="@color/logo_background"/> - <foreground android:drawable="@mipmap/logo_foreground"/> -</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/plunv_logo.xml b/app/src/main/res/mipmap-anydpi-v26/plunv_logo.xml new file mode 100644 index 0000000000000000000000000000000000000000..cb41709424ce4044d6445172d0e12cee3069e1b6 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/plunv_logo.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="@mipmap/plunv_logo_background"/> + <foreground android:drawable="@mipmap/plunv_logo_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/plunv_logo_round.xml b/app/src/main/res/mipmap-anydpi-v26/plunv_logo_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..cb41709424ce4044d6445172d0e12cee3069e1b6 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/plunv_logo_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="@mipmap/plunv_logo_background"/> + <foreground android:drawable="@mipmap/plunv_logo_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo.webp b/app/src/main/res/mipmap-hdpi/logo.webp deleted file mode 100644 index af8c06b492b8f98f2e7e098adbcb01ad1d18b42e..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo2.webp b/app/src/main/res/mipmap-hdpi/logo2.webp deleted file mode 100644 index d4e11d18caf5b01083fc38c32be6b9d53a1b3d39..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo2_foreground.webp b/app/src/main/res/mipmap-hdpi/logo2_foreground.webp deleted file mode 100644 index 1883f7ad923cbb77bf37fc39f943bcdcd2816659..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo2_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo2_round.webp b/app/src/main/res/mipmap-hdpi/logo2_round.webp deleted file mode 100644 index 00b09ee356ff59a5456ac24a03e3a7329d4591ff..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo2_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo_foreground.webp b/app/src/main/res/mipmap-hdpi/logo_foreground.webp deleted file mode 100644 index 33d7e9a32aaa349d9b39923cc425c8ac6ef50f84..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/logo_round.webp b/app/src/main/res/mipmap-hdpi/logo_round.webp deleted file mode 100644 index a980382350534900c6514c55e9d3b86e2dd563bc..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-hdpi/logo_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/plunv_logo.webp b/app/src/main/res/mipmap-hdpi/plunv_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..dead6d8a61442029084095f131a44c6775c9711b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/plunv_logo.webp differ diff --git a/app/src/main/res/mipmap-hdpi/plunv_logo_background.webp b/app/src/main/res/mipmap-hdpi/plunv_logo_background.webp new file mode 100644 index 0000000000000000000000000000000000000000..9782699b34e7436548ed72487c449a5038af9faf Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/plunv_logo_background.webp differ diff --git a/app/src/main/res/mipmap-hdpi/plunv_logo_foreground.webp b/app/src/main/res/mipmap-hdpi/plunv_logo_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..9782699b34e7436548ed72487c449a5038af9faf Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/plunv_logo_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/plunv_logo_round.webp b/app/src/main/res/mipmap-hdpi/plunv_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1d2b27708689f204849e4a4f8eb39ed5f8716c4c Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/plunv_logo_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo.webp b/app/src/main/res/mipmap-mdpi/logo.webp deleted file mode 100644 index 95184aa269699e67193b6a8db8c3f5de474b6c87..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo2.webp b/app/src/main/res/mipmap-mdpi/logo2.webp deleted file mode 100644 index 04f624c7ab23e7f21477c5cc72ab70e9675ae2d8..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo2_foreground.webp b/app/src/main/res/mipmap-mdpi/logo2_foreground.webp deleted file mode 100644 index 52ebe52fa8e9a4ee708a214bc1068109c9af3a5a..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo2_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo2_round.webp b/app/src/main/res/mipmap-mdpi/logo2_round.webp deleted file mode 100644 index ae1416dccd691da60e6b498a798ed08396a17449..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo2_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo_foreground.webp b/app/src/main/res/mipmap-mdpi/logo_foreground.webp deleted file mode 100644 index 7012c9a5a6d7359f4ee87c43a9a233172a737c13..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/logo_round.webp b/app/src/main/res/mipmap-mdpi/logo_round.webp deleted file mode 100644 index 8481d586bc6e80423250b523334265cbcb456bd8..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-mdpi/logo_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/plunv_logo.webp b/app/src/main/res/mipmap-mdpi/plunv_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..16721515a38e8ca022018ea638c56c1cf1f99577 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/plunv_logo.webp differ diff --git a/app/src/main/res/mipmap-mdpi/plunv_logo_background.webp b/app/src/main/res/mipmap-mdpi/plunv_logo_background.webp new file mode 100644 index 0000000000000000000000000000000000000000..9eaa947372304518f7b18fab098e62ce39d8f066 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/plunv_logo_background.webp differ diff --git a/app/src/main/res/mipmap-mdpi/plunv_logo_foreground.webp b/app/src/main/res/mipmap-mdpi/plunv_logo_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..9eaa947372304518f7b18fab098e62ce39d8f066 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/plunv_logo_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/plunv_logo_round.webp b/app/src/main/res/mipmap-mdpi/plunv_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..caee6b9ac93fd6849a12eeaea3177d05bae50694 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/plunv_logo_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo.webp b/app/src/main/res/mipmap-xhdpi/logo.webp deleted file mode 100644 index e7731a9b8da9b57568ee8a97c4c8939d25b0aa46..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo2.webp b/app/src/main/res/mipmap-xhdpi/logo2.webp deleted file mode 100644 index 524c90fb149d9327a09d79285044d1514f29d123..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo2_foreground.webp b/app/src/main/res/mipmap-xhdpi/logo2_foreground.webp deleted file mode 100644 index 2eb96535898fe4101c7846f8cc80297c4d714b83..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo2_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo2_round.webp b/app/src/main/res/mipmap-xhdpi/logo2_round.webp deleted file mode 100644 index f2bb73f73106041c968bc045bc1be135488e08f8..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo2_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo_foreground.webp b/app/src/main/res/mipmap-xhdpi/logo_foreground.webp deleted file mode 100644 index 399ca83aca30819758566c89f124d2c52444ea59..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/logo_round.webp b/app/src/main/res/mipmap-xhdpi/logo_round.webp deleted file mode 100644 index 80c5a994f22dad8a6a35d6f1f020c50b20dea3ce..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xhdpi/logo_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/plunv_logo.webp b/app/src/main/res/mipmap-xhdpi/plunv_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..cd889d51361b8939c57be14b02e762ae3b91a746 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/plunv_logo.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/plunv_logo_background.webp b/app/src/main/res/mipmap-xhdpi/plunv_logo_background.webp new file mode 100644 index 0000000000000000000000000000000000000000..6f377f39f802d2e807bcb2628b4c7bc49a3159b2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/plunv_logo_background.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/plunv_logo_foreground.webp b/app/src/main/res/mipmap-xhdpi/plunv_logo_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..6f377f39f802d2e807bcb2628b4c7bc49a3159b2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/plunv_logo_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/plunv_logo_round.webp b/app/src/main/res/mipmap-xhdpi/plunv_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..518c549104f0d96a477f06cb42ba179d0ea75b5a Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/plunv_logo_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9f036a47549d47db79c16788749dca10..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083623b375139afb391af71cc533a7dd37..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo.webp b/app/src/main/res/mipmap-xxhdpi/logo.webp deleted file mode 100644 index cf14859c87d8c17691fbfa8cc4f93aaf18075339..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo2.webp b/app/src/main/res/mipmap-xxhdpi/logo2.webp deleted file mode 100644 index 51d3ee61e2daffe1fdf08b695840dc6b86638f91..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo2_foreground.webp b/app/src/main/res/mipmap-xxhdpi/logo2_foreground.webp deleted file mode 100644 index 2ca0bca2d326d48e8947e88cbd4a76242b6a13a4..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo2_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo2_round.webp b/app/src/main/res/mipmap-xxhdpi/logo2_round.webp deleted file mode 100644 index aced5915a93a82a46f0fdf80a1db05412814a93b..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo2_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo_foreground.webp b/app/src/main/res/mipmap-xxhdpi/logo_foreground.webp deleted file mode 100644 index 11710e964088fbe34fb93b3677e2ce371fa8b53c..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/logo_round.webp b/app/src/main/res/mipmap-xxhdpi/logo_round.webp deleted file mode 100644 index 803c2838ec6d546117c839d3f9a403811d462b15..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/logo_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/plunv_logo.webp b/app/src/main/res/mipmap-xxhdpi/plunv_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..21a87d4cb2ec30809ce24835e4cd7c6437fc1071 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/plunv_logo.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/plunv_logo_background.webp b/app/src/main/res/mipmap-xxhdpi/plunv_logo_background.webp new file mode 100644 index 0000000000000000000000000000000000000000..cacd5175d68e0f82f855180d00f43650bc495241 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/plunv_logo_background.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/plunv_logo_foreground.webp b/app/src/main/res/mipmap-xxhdpi/plunv_logo_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..cacd5175d68e0f82f855180d00f43650bc495241 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/plunv_logo_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/plunv_logo_round.webp b/app/src/main/res/mipmap-xxhdpi/plunv_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..f6b52c2391ca300792a4e5a8eafc84f714a58bfd Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/plunv_logo_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo.webp b/app/src/main/res/mipmap-xxxhdpi/logo.webp deleted file mode 100644 index f91fd8b04db68016a8d8202982196eea4cdd35d7..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo2.webp b/app/src/main/res/mipmap-xxxhdpi/logo2.webp deleted file mode 100644 index 4edb34a4c689661f9744537a0a6e192fddff08cd..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo2.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo2_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/logo2_foreground.webp deleted file mode 100644 index 331459cac01b573614bafcce0299cbf8e3d406fe..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo2_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo2_round.webp b/app/src/main/res/mipmap-xxxhdpi/logo2_round.webp deleted file mode 100644 index 6163c7b6e45fd977e48ababe0f03a457d056a5fb..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo2_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/logo_foreground.webp deleted file mode 100644 index 443f6cf8d0656fbe63774373db6088db8ac96c7c..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo_foreground.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/logo_round.webp b/app/src/main/res/mipmap-xxxhdpi/logo_round.webp deleted file mode 100644 index 63eb0d6c9ab01652f38b16b2ba4623d410bc34ff..0000000000000000000000000000000000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/logo_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/plunv_logo.webp b/app/src/main/res/mipmap-xxxhdpi/plunv_logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..97f1af8eb3b84578d50123c5b0e8b3e653d3eb4d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/plunv_logo.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/plunv_logo_background.webp b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_background.webp new file mode 100644 index 0000000000000000000000000000000000000000..25810f1b43a3041c34ed3581e2746035cf6beb8a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_background.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/plunv_logo_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_foreground.webp new file mode 100644 index 0000000000000000000000000000000000000000..25810f1b43a3041c34ed3581e2746035cf6beb8a Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/plunv_logo_round.webp b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..efe9115945960088e75bf84a2144ea37267d74fa Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/plunv_logo_round.webp differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index b997b48398ca36fa7d89ed26cab61e64e8ca9bf9..8ffded9c6e1fa0b30fe91d29c2ea5515f0977d53 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -9,7 +9,7 @@ <style name="ButtonAppearance" parent="ShapeAppearance.MaterialComponents.SmallComponent"> <item name="cornerFamily">rounded</item> <item name="cornerRadius">8dp</item> - <item name="backgroundTint">#1E1E1E</item> + <item name="backgroundTint">#565758</item> <item name="iconTint">#D9D9D9</item> <item name="android:textColor">#D9D9D9</item> </style> @@ -26,4 +26,100 @@ <item name="android:paddingTop">7dp</item> <item name="android:paddingBottom">7dp</item> </style> + + <style name="BottomAppearance" parent=""> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@drawable/shape_transparent_black_bottom_rounded</item> + <item name="android:textColor">#1E1E1E</item> + </style> + + <style name="TopTopAppearance" parent=""> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@drawable/shape_transparent_black</item> + <item name="android:fontFamily">@font/inter</item> + <item name="android:textAlignment">center</item> + <item name="android:textColor">#D9D9D9</item> + <item name="android:textSize">16sp</item> + </style> + + <style name="PageTitleAppearance" parent=""> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:background">@drawable/polygon_10</item> + <item name="android:textColor">#D9D9D9</item> + <item name="android:textAlignment">center</item> + <item name="android:textSize">38sp</item> + </style> + + <style name="MiniRectangle" parent=""> + <item name="android:src">@drawable/rectangle_2</item> + </style> + + <style name="BigPolygon" parent=""> + <item name="android:src">@drawable/polygon_11</item> + </style> + + <style name="BottomPolygon" parent=""> + <item name="android:src">@drawable/polygon_12</item> + </style> + + <style name="BottomPolygonMain" parent=""> + <item name="android:src">@drawable/polygon_12</item> + </style> + + <style name="LogoMain" parent=""> + <item name="android:src">@drawable/logo_main_black</item> + </style> + + <style name="MainBackground"> + <item name="android:background">#3f3f3f</item> + </style> + + <style name="NameMain" parent=""> + <item name="android:src">@drawable/plunv_black</item> + </style> + + <style name="SubNameMain"> + <item name="android:src">@drawable/avi_main_black</item> + </style> + + <style name="BottomNavTint"> + <item name="android:background">#E0121212</item> + <item name="itemIconTint">#D9D9D9</item> + </style> + + <style name="OverlayAppearance" parent=""> + <item name="android:background">@drawable/shape_transparent_black</item> + <item name="android:textColor">#D9D9D9</item> + </style> + + <style name="TutorialTitles" parent=""> + <item name="android:background">@drawable/shape_transparent_black</item> + </style> + + <style name="TutoPage1" parent=""> + <item name="android:src">@drawable/polygon_13</item> + </style> + + <style name="TutoLine1" parent=""> + <item name="android:src">@drawable/line_4</item> + </style> + + <style name="TutoPage2" parent=""> + <item name="android:src">@drawable/polygon_14</item> + </style> + + <style name="TutoLine2" parent=""> + <item name="android:src">@drawable/line_5</item> + </style> + + <style name="TutoPage3" parent=""> + <item name="android:src">@drawable/polygon_15</item> + </style> + + <style name="TutoLine3" parent=""> + <item name="android:src">@drawable/line_6</item> + </style> </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 208a7667772f1ba8af89878e66abf3d43b462472..a7abaf4179bf36631197adfa25bb923fa72804f8 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -24,7 +24,7 @@ <style name="TopAppearance" parent=""> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textColor">#000000</item> + <item name="android:textColor">#1E1E1E</item> <item name="android:background">@drawable/shape_transparent_top_rounded</item> <item name="fontFamily">@font/inter</item> <item name="android:gravity">center</item> @@ -34,4 +34,99 @@ <item name="android:paddingBottom">7dp</item> </style> + <style name="BottomAppearance" parent=""> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@drawable/shape_transparent_bottom_rounded</item> + <item name="android:textColor">#D9D9D9</item> + </style> + + <style name="TopTopAppearance" parent=""> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:background">@drawable/shape_transparent</item> + <item name="android:fontFamily">@font/inter</item> + <item name="android:textAlignment">center</item> + <item name="android:textColor">#1E1E1E</item> + <item name="android:textSize">16sp</item> + </style> + + <style name="PageTitleAppearance" parent=""> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:background">@drawable/polygon_5</item> + <item name="android:textColor">#1E1E1E</item> + <item name="android:textAlignment">center</item> + <item name="android:textSize">38sp</item> + </style> + + <style name="MiniRectangle" parent=""> + <item name="android:src">@drawable/rectangle_1</item> + </style> + + <style name="BigPolygon" parent=""> + <item name="android:src">@drawable/polygon_2</item> + </style> + + <style name="BottomPolygon" parent=""> + <item name="android:src">@drawable/polygon_4</item> + </style> + + <style name="BottomPolygonMain" parent=""> + <item name="android:src">@drawable/polygon_9</item> + </style> + + <style name="LogoMain" parent=""> + <item name="android:src">@drawable/logo_main</item> + </style> + + <style name="MainBackground" parent=""> + <item name="android:background">@color/white</item> + </style> + + <style name="NameMain" parent=""> + <item name="android:src">@drawable/plunv</item> + </style> + + <style name="SubNameMain" parent=""> + <item name="android:src">@drawable/avi_main</item> + </style> + + <style name="BottomNavTint" parent=""> + <item name="android:background">#E0517293</item> + <item name="itemIconTint">#ABABAB</item> + </style> + + <style name="OverlayAppearance" parent=""> + <item name="android:background">@drawable/shape_transparent</item> + <item name="android:textColor">#1E1E1E</item> + </style> + + <style name="TutorialTitles" parent=""> + <item name="android:background">@drawable/shape_transparent_blue</item> + </style> + + <style name="TutoPage1" parent=""> + <item name="android:src">@drawable/polygon_6</item> + </style> + + <style name="TutoLine1" parent=""> + <item name="android:src">@drawable/line_1</item> + </style> + + <style name="TutoPage2" parent=""> + <item name="android:src">@drawable/polygon_7</item> + </style> + + <style name="TutoLine2" parent=""> + <item name="android:src">@drawable/line_2</item> + </style> + + <style name="TutoPage3" parent=""> + <item name="android:src">@drawable/polygon_8</item> + </style> + + <style name="TutoLine3" parent=""> + <item name="android:src">@drawable/line_3</item> + </style> </resources> \ No newline at end of file