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/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/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 702239d..c59f830 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" @@ -63,7 +63,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/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/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/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/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/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/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