From 7a9b159621cbcf5634ab2992dca0a29b411be6ee Mon Sep 17 00:00:00 2001 From: Baptiiiiste Date: Thu, 16 Mar 2023 21:53:52 +0100 Subject: [PATCH] Project redesign: Profile deleted & List edited to "RoadTrip" --- .../geocaching/model/Geocache.kt | 14 ----- .../baptistearthur/geocaching/model/Place.kt | 6 ++ .../geocaching/model/RoadTrip.kt | 14 +++++ .../services/GeocacheAPIServices.kt | 27 --------- .../geocaching/ui/activity/MainWindow.kt | 13 ++-- .../geocaching/ui/fragment/Profile.kt | 60 ------------------- .../ui/fragment/{List.kt => RoadTrip.kt} | 8 +-- app/src/main/res/drawable/profile.xml | 5 -- .../res/drawable/{list.xml => road_trip.xml} | 0 app/src/main/res/layout/fragment_profile.xml | 13 ---- ...ragment_list.xml => fragment_roadtrip.xml} | 4 +- app/src/main/res/menu/bottom_tabs.xml | 11 +--- app/src/main/res/values/strings.xml | 5 +- 13 files changed, 37 insertions(+), 143 deletions(-) delete mode 100644 app/src/main/java/uca/baptistearthur/geocaching/model/Geocache.kt create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt create mode 100644 app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt delete mode 100644 app/src/main/java/uca/baptistearthur/geocaching/services/GeocacheAPIServices.kt delete mode 100644 app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Profile.kt rename app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/{List.kt => RoadTrip.kt} (89%) delete mode 100644 app/src/main/res/drawable/profile.xml rename app/src/main/res/drawable/{list.xml => road_trip.xml} (100%) delete mode 100644 app/src/main/res/layout/fragment_profile.xml rename app/src/main/res/layout/{fragment_list.xml => fragment_roadtrip.xml} (78%) diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Geocache.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Geocache.kt deleted file mode 100644 index df1142d..0000000 --- a/app/src/main/java/uca/baptistearthur/geocaching/model/Geocache.kt +++ /dev/null @@ -1,14 +0,0 @@ -package uca.baptistearthur.geocaching.model - -import java.time.LocalDateTime - -data class Geocache( - val id: String, - val name: String, - val difficulty: Float, - val placedDate: LocalDateTime, - val backgroundImageUrl: String, - val findCount: Int, - val latitude: Double, - val longitude: Double -) \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt new file mode 100644 index 0000000..6904b27 --- /dev/null +++ b/app/src/main/java/uca/baptistearthur/geocaching/model/Place.kt @@ -0,0 +1,6 @@ +package uca.baptistearthur.geocaching.model + +data class Place( + val latitude : Long, + val longitude : Long +) diff --git a/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt new file mode 100644 index 0000000..cbabb74 --- /dev/null +++ b/app/src/main/java/uca/baptistearthur/geocaching/model/RoadTrip.kt @@ -0,0 +1,14 @@ +package uca.baptistearthur.geocaching.model + +import java.util.Date + +class RoadTrip( + val name: String, + val date: Date, + val places: ArrayList +){ + + fun addPlaceToRoadTripList(place: Place) = places.add(place) + fun addPlaceToRoadTripList(latitude: Long, longitude: Long) = places.add(Place(latitude, longitude)) + +} \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/services/GeocacheAPIServices.kt b/app/src/main/java/uca/baptistearthur/geocaching/services/GeocacheAPIServices.kt deleted file mode 100644 index a69f17a..0000000 --- a/app/src/main/java/uca/baptistearthur/geocaching/services/GeocacheAPIServices.kt +++ /dev/null @@ -1,27 +0,0 @@ -package uca.baptistearthur.geocaching.services - -import java.net.HttpURLConnection -import java.net.URL -import java.io.BufferedReader -import java.io.InputStreamReader - -class GeocacheAPIServices { - - fun fetchGeocacheAPI(linkToApi: String): String{ - val url = URL(linkToApi) - val connection = url.openConnection() as HttpURLConnection - connection.requestMethod = "GET" - val input = BufferedReader(InputStreamReader(connection.inputStream)) - val response = StringBuilder() - var inputLine: String? - while (input.readLine().also { inputLine = it } != null) { - response.append(inputLine) - } - input.close() - connection.disconnect() - return response.toString(); - } - - - -} \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt index 5e6fa3b..ceb0f0c 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/activity/MainWindow.kt @@ -7,7 +7,6 @@ import com.google.android.material.bottomnavigation.BottomNavigationView import uca.baptistearthur.geocaching.R import uca.baptistearthur.geocaching.ui.fragment.Map -import uca.baptistearthur.geocaching.ui.fragment.Profile class MainWindow: AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -22,16 +21,16 @@ class MainWindow: AppCompatActivity() { navigation.selectedItemId= R.id.map navigation.setOnItemSelectedListener { when (it.itemId) { - R.id.profile -> { - loadFragment(Profile()) - true - } +// R.id.profile -> { +// loadFragment(Profile()) +// true +// } R.id.map -> { loadFragment(map) true } - R.id.list -> { - loadFragment(uca.baptistearthur.geocaching.ui.fragment.List()) + R.id.roadTrip -> { + loadFragment(uca.baptistearthur.geocaching.ui.fragment.RoadTrip()) true } else -> false diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Profile.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Profile.kt deleted file mode 100644 index 6643ff3..0000000 --- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/Profile.kt +++ /dev/null @@ -1,60 +0,0 @@ -package uca.baptistearthur.geocaching.ui.fragment - -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import uca.baptistearthur.geocaching.R - -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" - -/** - * A simple [Fragment] subclass. - * Use the [Profile.newInstance] factory method to - * create an instance of this fragment. - */ -class Profile : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } - } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_profile, container, false) - } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment Profile. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - Profile().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/List.kt b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt similarity index 89% rename from app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/List.kt rename to app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt index 5588242..4dce937 100644 --- a/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/List.kt +++ b/app/src/main/java/uca/baptistearthur/geocaching/ui/fragment/RoadTrip.kt @@ -14,10 +14,10 @@ private const val ARG_PARAM2 = "param2" /** * A simple [Fragment] subclass. - * Use the [List.newInstance] factory method to + * Use the [RoadTrip.newInstance] factory method to * create an instance of this fragment. */ -class List : Fragment() { +class RoadTrip : Fragment() { // TODO: Rename and change types of parameters private var param1: String? = null private var param2: String? = null @@ -35,7 +35,7 @@ class List : Fragment() { savedInstanceState: Bundle? ): View? { // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_list, container, false) + return inflater.inflate(R.layout.fragment_roadtrip, container, false) } companion object { @@ -50,7 +50,7 @@ class List : Fragment() { // TODO: Rename and change types and number of parameters @JvmStatic fun newInstance(param1: String, param2: String) = - List().apply { + RoadTrip().apply { arguments = Bundle().apply { putString(ARG_PARAM1, param1) putString(ARG_PARAM2, param2) diff --git a/app/src/main/res/drawable/profile.xml b/app/src/main/res/drawable/profile.xml deleted file mode 100644 index d36b73c..0000000 --- a/app/src/main/res/drawable/profile.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/list.xml b/app/src/main/res/drawable/road_trip.xml similarity index 100% rename from app/src/main/res/drawable/list.xml rename to app/src/main/res/drawable/road_trip.xml diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml deleted file mode 100644 index 9049f19..0000000 --- a/app/src/main/res/layout/fragment_profile.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_roadtrip.xml similarity index 78% rename from app/src/main/res/layout/fragment_list.xml rename to app/src/main/res/layout/fragment_roadtrip.xml index c6232c3..23cccd5 100644 --- a/app/src/main/res/layout/fragment_list.xml +++ b/app/src/main/res/layout/fragment_roadtrip.xml @@ -3,11 +3,11 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.fragment.List"> + tools:context=".ui.fragment.RoadTrip"> + android:text="Mes voyages !" /> \ No newline at end of file diff --git a/app/src/main/res/menu/bottom_tabs.xml b/app/src/main/res/menu/bottom_tabs.xml index d8469db..0fabe7a 100644 --- a/app/src/main/res/menu/bottom_tabs.xml +++ b/app/src/main/res/menu/bottom_tabs.xml @@ -1,18 +1,13 @@ - + android:title="@string/voyages" + android:icon="@drawable/road_trip" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24696d9..101072f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,7 @@ - Geocaching - Profil + RoadTrip Carte - Liste + Voyages Hello blank fragment \ No newline at end of file