diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..d711db5 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Geocaching \ No newline at end of file diff --git a/Documentation/banner.png b/Documentation/banner.png new file mode 100644 index 0000000..706d9ce Binary files /dev/null and b/Documentation/banner.png differ diff --git a/README.md b/README.md index 852be62..557d45e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,61 @@ -J'ai pas fait grand chose car j'ai eu masse problème avec le projet, il a fallut modifier plein de choses dans les settings graddle. +

+ +

+ +![Kotlin](https://img.shields.io/badge/Kotlin-7F52FF.svg?style=for-the-badge&logo=Kotlin&logoColor=white) +![Android Studio](https://img.shields.io/badge/Android%20Studio-3DDC84.svg?style=for-the-badge&logo=Android-Studio&logoColor=white) +![Android](https://img.shields.io/badge/Android-3DDC84.svg?style=for-the-badge&logo=Android&logoColor=white)
+ + +**RoadTrip** est une application mobile Android qui permet aux utilisateurs de créer des itinéraires de voyage. + +![](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/water.png) + + +## 🪶 Fonctionnalités + +Lors de votre arrivée sur l'application, vous retrouverez une carte avec votre emplacement actuel. Naviguez sur la carte pour découvrir vos environs. + +Appuyez 2 fois sur la carte pour créer un point d'intérêt, ajoutez en plusieurs afin de construire un itinéraire. + +Validez ensuite votre voyage en cliquant sur le bouton ✅ en bas à gauche de l'écran et donnez lui un nom. + +Retrouvez vos voyages dans l'onglet "Roadtrips" en bas de l'écran. + +Accédez aux informations de votre voyage en cliquant dessus dans la liste déroulante. Vous retrouverez la liste des points d'intérêts que vous avez ajouté, ainsi que les adresses de chacun d'entre eux. + +Vous pouvez supprimer un voyage à tout moment avec le bouton en bas de votre écran + + + +![](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/water.png) + +## 💽 Lancer l'application + +Une fois le dépot cloné, vous pourrez lancer l'application sur votre téléphone Android grâce aux outils fournis par Android Studio. Si vous n'avez pas de téléphone Android, vous pouvez utiliser un émulateur. + +![](https://raw.githubusercontent.com/andreasbm/readme/master/assets/lines/water.png) + +## 🤖 Made by + +Arthur VALIN : **Arthur.VALIN@etu.uca.fr** + + + + +
+
+ +Baptiste BONNEAU : **Baptiste.BONNEAU@etu.uca.fr** + + + + + + + + + -J'ai laissé des commentaires dans la vue diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bfc7f2c..8ee6b3b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,9 +16,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/app_logo" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/app_logo_round" android:supportsRtl="true" android:theme="@style/Theme.Geocaching" android:enableOnBackInvokedCallback="true" diff --git a/app/src/main/app_logo-playstore.png b/app/src/main/app_logo-playstore.png new file mode 100644 index 0000000..09a538f Binary files /dev/null and b/app/src/main/app_logo-playstore.png differ diff --git a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt index c00714f..0e3fca1 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/recyclerview/PlacesAdapter.kt @@ -1,6 +1,7 @@ package uca.baptistearthur.geocaching.recyclerview import android.annotation.SuppressLint +import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView @@ -17,9 +18,9 @@ class PlacesAdapter (val places: List) : RecyclerView.Adapter - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/app_logo_foreground.xml b/app/src/main/res/drawable/app_logo_foreground.xml new file mode 100644 index 0000000..c8c299b --- /dev/null +++ b/app/src/main/res/drawable/app_logo_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/bin.xml b/app/src/main/res/drawable/bin.xml deleted file mode 100644 index 10025ad..0000000 --- a/app/src/main/res/drawable/bin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/bottom_border.xml b/app/src/main/res/drawable/bottom_border.xml index d117938..62d8838 100644 --- a/app/src/main/res/drawable/bottom_border.xml +++ b/app/src/main/res/drawable/bottom_border.xml @@ -3,7 +3,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/right_arrow.xml b/app/src/main/res/drawable/right_arrow.xml deleted file mode 100644 index 72736fb..0000000 --- a/app/src/main/res/drawable/right_arrow.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/cell_one_roadtrip.xml b/app/src/main/res/layout/cell_one_roadtrip.xml index c233193..8387913 100644 --- a/app/src/main/res/layout/cell_one_roadtrip.xml +++ b/app/src/main/res/layout/cell_one_roadtrip.xml @@ -6,13 +6,9 @@ android:layout_width="match_parent" android:layout_height="45dp" android:layout_gravity="start" - android:backgroundTint="@color/white" - android:drawableStart="@drawable/right_arrow" - android:drawableLeft="@drawable/right_arrow" android:gravity="left" android:textColor="@color/black" android:textSize="20sp" - android:text="> TMP name" tools:ignore="RtlHardcoded" android:layout_marginRight="10dp" android:layout_marginLeft="10dp" diff --git a/app/src/main/res/layout/cell_place.xml b/app/src/main/res/layout/cell_place.xml index a88ac49..2028bab 100644 --- a/app/src/main/res/layout/cell_place.xml +++ b/app/src/main/res/layout/cell_place.xml @@ -9,41 +9,26 @@ android:background="@drawable/corner_radius" > - - - - - - - - - - + diff --git a/app/src/main/res/layout/fragment_roadtrip.xml b/app/src/main/res/layout/fragment_roadtrip.xml index 28d7105..2ab06be 100644 --- a/app/src/main/res/layout/fragment_roadtrip.xml +++ b/app/src/main/res/layout/fragment_roadtrip.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/roadtrip_title" - android:background="@color/main_turquoise_200" + android:background="@color/main_turquoise_500" android:textColor="@color/main_turquoise_50" android:padding="10dp" android:textSize="20sp"/> diff --git a/app/src/main/res/layout/roadtrip_detail.xml b/app/src/main/res/layout/roadtrip_detail.xml index 0ce7f7f..bdda4e1 100644 --- a/app/src/main/res/layout/roadtrip_detail.xml +++ b/app/src/main/res/layout/roadtrip_detail.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="TMP/ Roadtrip Name" - android:background="@color/main_turquoise_200" + android:background="@color/main_turquoise_500" android:textColor="@color/main_turquoise_50" android:paddingTop="10dp" android:paddingLeft="10dp" @@ -25,7 +25,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="TMP/ Date" - android:background="@color/main_turquoise_200" + android:background="@color/main_turquoise_500" android:textColor="@color/main_turquoise_50" android:textSize="15sp" android:paddingLeft="10dp" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/btnDeleteRoadTrip" - android:backgroundTint="@color/main_turquoise_500" + android:backgroundTint="@color/main_turquoise_200" android:layout_margin="10dp"/> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/app_logo.xml b/app/src/main/res/mipmap-anydpi-v26/app_logo.xml new file mode 100644 index 0000000..75e1f94 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/app_logo.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/app_logo_round.xml b/app/src/main/res/mipmap-anydpi-v26/app_logo_round.xml new file mode 100644 index 0000000..75e1f94 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/app_logo_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ 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 eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/app_logo.png b/app/src/main/res/mipmap-hdpi/app_logo.png new file mode 100644 index 0000000..367cf5b Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-hdpi/app_logo_round.png b/app/src/main/res/mipmap-hdpi/app_logo_round.png new file mode 100644 index 0000000..7891a81 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/app_logo_round.png differ 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 c209e78..0000000 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 b2dfe3d..0000000 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-mdpi/app_logo.png b/app/src/main/res/mipmap-mdpi/app_logo.png new file mode 100644 index 0000000..60b1175 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-mdpi/app_logo_round.png b/app/src/main/res/mipmap-mdpi/app_logo_round.png new file mode 100644 index 0000000..5e24fe6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/app_logo_round.png 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 4f0f1d6..0000000 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 62b611d..0000000 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-xhdpi/app_logo.png b/app/src/main/res/mipmap-xhdpi/app_logo.png new file mode 100644 index 0000000..c6df9e5 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xhdpi/app_logo_round.png b/app/src/main/res/mipmap-xhdpi/app_logo_round.png new file mode 100644 index 0000000..74bcd76 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/app_logo_round.png 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 948a307..0000000 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 1b9a695..0000000 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-xxhdpi/app_logo.png b/app/src/main/res/mipmap-xxhdpi/app_logo.png new file mode 100644 index 0000000..7e0190f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/app_logo_round.png b/app/src/main/res/mipmap-xxhdpi/app_logo_round.png new file mode 100644 index 0000000..c9b4fde Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/app_logo_round.png 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 28d4b77..0000000 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 9287f50..0000000 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-xxxhdpi/app_logo.png b/app/src/main/res/mipmap-xxxhdpi/app_logo.png new file mode 100644 index 0000000..2b5efc1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/app_logo.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/app_logo_round.png b/app/src/main/res/mipmap-xxxhdpi/app_logo_round.png new file mode 100644 index 0000000..0c9aaff Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/app_logo_round.png 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 aa7d642..0000000 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 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values/app_logo_background.xml b/app/src/main/res/values/app_logo_background.xml new file mode 100644 index 0000000..02a4978 --- /dev/null +++ b/app/src/main/res/values/app_logo_background.xml @@ -0,0 +1,4 @@ + + + #52796F + \ No newline at end of file