Author: Adam <git@apiote.xyz>
rename and fix dark theme for drawables fixup rename + dark theme icons
app/src/main/java/ml/adamsprogs/bimba/api/Structs.kt | 6 app/src/main/java/ml/adamsprogs/bimba/dashboard/MainActivity.kt | 14 app/src/main/java/ml/adamsprogs/bimba/search/Results.kt | 2 | 2 | 2 | 0 app/src/main/res/drawable/ic_circle_white_24dp.xml | 9 - | 0 | 2 | 0 | 0 | 0 | 0 | 0 app/src/main/res/drawable/ic_radar_black_24dp.xml | 9 - | 2 app/src/main/res/drawable/ic_square_white_24dp.xml | 5 | 2 | 2 | 2 | 0 | 2 | 2 | 2 | 0 | 0 | 2 app/src/main/res/drawable/radar.xml | 5 app/src/main/res/layout/departure.xml | 2 app/src/main/res/layout/departure_bottom_sheet.xml | 26 +- app/src/main/res/layout/fragment_home.xml | 2 app/src/main/res/menu/bottom_nav_menu.xml | 6
diff --git a/app/src/main/java/ml/adamsprogs/bimba/api/Structs.kt b/app/src/main/java/ml/adamsprogs/bimba/api/Structs.kt index a9da169aef88fa460e7559d3ca47ef093c6a9185..8c13ba605ef96f1a907c5b9523a1971897a6d237 100644 --- a/app/src/main/java/ml/adamsprogs/bimba/api/Structs.kt +++ b/app/src/main/java/ml/adamsprogs/bimba/api/Structs.kt @@ -305,9 +305,9 @@ dpToPixelI(10.4f) ), Paint().apply { color = colour.toInt() }) val iconID = when (type) { - LineType.BUS -> R.drawable.ic_bus_black_24dp - LineType.TRAM -> R.drawable.ic_tram_black_24dp - LineType.UNKNOWN -> R.drawable.ic_commute_black_24dp + LineType.BUS -> R.drawable.bus_black + LineType.TRAM -> R.drawable.tram_black + LineType.UNKNOWN -> R.drawable.vehicle_black } val icon = AppCompatResources.getDrawable(context, iconID)?.mutate() // todo(code) move context out diff --git a/app/src/main/java/ml/adamsprogs/bimba/dashboard/MainActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/dashboard/MainActivity.kt index b7050351283bcb2b9de8b36629e81e9bb8fa4f2e..1e0f19e5af94bb4648d681dfa8e150ad139734a2 100644 --- a/app/src/main/java/ml/adamsprogs/bimba/dashboard/MainActivity.kt +++ b/app/src/main/java/ml/adamsprogs/bimba/dashboard/MainActivity.kt @@ -142,21 +142,21 @@ startActivity(intent) } private fun setNavbarIcons(f: Fragment) { - binding.bottomNavigation.menu[2].setIcon(R.drawable.ic_voyage_outline_24dp) - binding.bottomNavigation.menu[1].setIcon(R.drawable.ic_home_outline_24dp) - binding.bottomNavigation.menu[0].setIcon(R.drawable.ic_map_outline_24dp) + binding.bottomNavigation.menu[2].setIcon(R.drawable.voyage_outline) + binding.bottomNavigation.menu[1].setIcon(R.drawable.home_outline) + binding.bottomNavigation.menu[0].setIcon(R.drawable.map_outline) when (f) { is HomeFragment -> { - binding.bottomNavigation.menu[1].setIcon(R.drawable.ic_home_black_24dp) + binding.bottomNavigation.menu[1].setIcon(R.drawable.home_black) } is VoyageFragment -> { - binding.bottomNavigation.menu[2].setIcon(R.drawable.ic_voyage_black_24dp) + binding.bottomNavigation.menu[2].setIcon(R.drawable.voyage_black) } is MapFragment -> { - binding.bottomNavigation.menu[0].setIcon(R.drawable.ic_map_black_24dp) + binding.bottomNavigation.menu[0].setIcon(R.drawable.map_black) } else -> { - binding.bottomNavigation.menu[1].setIcon(R.drawable.ic_home_black_24dp) + binding.bottomNavigation.menu[1].setIcon(R.drawable.home_black) } } } diff --git a/app/src/main/java/ml/adamsprogs/bimba/search/Results.kt b/app/src/main/java/ml/adamsprogs/bimba/search/Results.kt index bcc2e5cbc4286454282862dcacfd1655da85d70c..0b7b80f155331f96e61085904576486cd1762cbd 100644 --- a/app/src/main/java/ml/adamsprogs/bimba/search/Results.kt +++ b/app/src/main/java/ml/adamsprogs/bimba/search/Results.kt @@ -40,7 +40,7 @@ } @SuppressLint("SetTextI18n") fun bindStop(stop: Stop, holder: BimbaViewHolder?) { - holder?.icon?.setImageResource(R.drawable.ic_stop_black_24dp) // todo(ui,dark) stop icon // todo dark theme colour + holder?.icon?.setImageResource(R.drawable.stop) holder?.title?.text = "${stop.name} [${stop.code}]" holder?.description?.text = stop.changeOptions.groupBy { it.line } diff --git a/app/src/main/res/drawable/ac.xml b/app/src/main/res/drawable/ac.xml new file mode 100644 index 0000000000000000000000000000000000000000..95dfbd1694a17e2a90e69a2af23b1a7116ea12cd --- /dev/null +++ b/app/src/main/res/drawable/ac.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M22,11h-4.17l3.24,-3.24 -1.41,-1.42L15,11h-2V9l4.66,-4.66 -1.42,-1.41L13,6.17V2h-2v4.17L7.76,2.93 6.34,4.34 11,9v2H9L4.34,6.34 2.93,7.76 6.17,11H2v2h4.17l-3.24,3.24 1.41,1.42L9,13h2v2l-4.66,4.66 1.42,1.41L11,17.83V22h2v-4.17l3.24,3.24 1.42,-1.41L13,15v-2h2l4.66,4.66 1.41,-1.42L17.83,13H22z"/> +</vector> diff --git a/app/src/main/res/drawable/bike.xml b/app/src/main/res/drawable/bike.xml new file mode 100644 index 0000000000000000000000000000000000000000..1c5af85fe1c842642c65d6ae5f592f2dfd898cda --- /dev/null +++ b/app/src/main/res/drawable/bike.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M18.18,10l-1.7,-4.68C16.19,4.53 15.44,4 14.6,4H12v2h2.6l1.46,4h-4.81l-0.36,-1H12V7H7v2h1.75l1.82,5H9.9c-0.44,-2.23 -2.31,-3.88 -4.65,-3.99C2.45,9.87 0,12.2 0,15c0,2.8 2.2,5 5,5c2.46,0 4.45,-1.69 4.9,-4h4.2c0.44,2.23 2.31,3.88 4.65,3.99c2.8,0.13 5.25,-2.19 5.25,-5c0,-2.8 -2.2,-5 -5,-5H18.18zM7.82,16c-0.4,1.17 -1.49,2 -2.82,2c-1.68,0 -3,-1.32 -3,-3s1.32,-3 3,-3c1.33,0 2.42,0.83 2.82,2H5v2H7.82zM14.1,14h-1.4l-0.73,-2H15C14.56,12.58 14.24,13.25 14.1,14zM19,18c-1.68,0 -3,-1.32 -3,-3c0,-0.93 0.41,-1.73 1.05,-2.28l0.96,2.64l1.88,-0.68l-0.97,-2.67c0.03,0 0.06,-0.01 0.09,-0.01c1.68,0 3,1.32 3,3S20.68,18 19,18z"/> +</vector> diff --git a/app/src/main/res/drawable/bus_black.xml b/app/src/main/res/drawable/bus_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..e2b18a05948d28b39cd2b4bfb102cac858c738bf --- /dev/null +++ b/app/src/main/res/drawable/bus_black.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/> +</vector> diff --git a/app/src/main/res/drawable/crowd.xml b/app/src/main/res/drawable/crowd.xml new file mode 100644 index 0000000000000000000000000000000000000000..76bd1cd501a769b0b3cdda828de7d686ba8baf10 --- /dev/null +++ b/app/src/main/res/drawable/crowd.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M12,12.75c1.63,0 3.07,0.39 4.24,0.9c1.08,0.48 1.76,1.56 1.76,2.73L18,18H6l0,-1.61c0,-1.18 0.68,-2.26 1.76,-2.73C8.93,13.14 10.37,12.75 12,12.75zM4,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C2,12.1 2.9,13 4,13zM5.13,14.1C4.76,14.04 4.39,14 4,14c-0.99,0 -1.93,0.21 -2.78,0.58C0.48,14.9 0,15.62 0,16.43V18l4.5,0v-1.61C4.5,15.56 4.73,14.78 5.13,14.1zM20,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C18,12.1 18.9,13 20,13zM24,16.43c0,-0.81 -0.48,-1.53 -1.22,-1.85C21.93,14.21 20.99,14 20,14c-0.39,0 -0.76,0.04 -1.13,0.1c0.4,0.68 0.63,1.46 0.63,2.29V18l4.5,0V16.43zM12,6c1.66,0 3,1.34 3,3c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3C9,7.34 10.34,6 12,6z"/> +</vector> diff --git a/app/src/main/res/drawable/gps_black.xml b/app/src/main/res/drawable/gps_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..163afecbe1383daef7f8c60f9d47b953b215bff9 --- /dev/null +++ b/app/src/main/res/drawable/gps_black.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" /> +</vector> diff --git a/app/src/main/res/drawable/home_black.xml b/app/src/main/res/drawable/home_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..3f84525033ec8e08025d8ab4d84173f1bc47ab97 --- /dev/null +++ b/app/src/main/res/drawable/home_black.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" /> +</vector> diff --git a/app/src/main/res/drawable/home_outline.xml b/app/src/main/res/drawable/home_outline.xml new file mode 100644 index 0000000000000000000000000000000000000000..0a8b6b30cdc7ce7fcdabbda270b20ac23e18ca0a --- /dev/null +++ b/app/src/main/res/drawable/home_outline.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z" /> +</vector> diff --git a/app/src/main/res/drawable/ic_ac_black_24dp.xml b/app/src/main/res/drawable/ic_ac_black_24dp.xml deleted file mode 100644 index 0b4c72a0cb1aa0371cbb33f87e9eb0355249af9e..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_ac_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M22,11h-4.17l3.24,-3.24 -1.41,-1.42L15,11h-2V9l4.66,-4.66 -1.42,-1.41L13,6.17V2h-2v4.17L7.76,2.93 6.34,4.34 11,9v2H9L4.34,6.34 2.93,7.76 6.17,11H2v2h4.17l-3.24,3.24 1.41,1.42L9,13h2v2l-4.66,4.66 1.42,1.41L11,17.83V22h2v-4.17l3.24,3.24 1.42,-1.41L13,15v-2h2l4.66,4.66 1.41,-1.42L17.83,13H22z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_bike_black_24dp.xml b/app/src/main/res/drawable/ic_bike_black_24dp.xml deleted file mode 100644 index 6c449259d5df2a29eb3a6c460aa4f9cc13163d34..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_bike_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M18.18,10l-1.7,-4.68C16.19,4.53 15.44,4 14.6,4H12v2h2.6l1.46,4h-4.81l-0.36,-1H12V7H7v2h1.75l1.82,5H9.9c-0.44,-2.23 -2.31,-3.88 -4.65,-3.99C2.45,9.87 0,12.2 0,15c0,2.8 2.2,5 5,5c2.46,0 4.45,-1.69 4.9,-4h4.2c0.44,2.23 2.31,3.88 4.65,3.99c2.8,0.13 5.25,-2.19 5.25,-5c0,-2.8 -2.2,-5 -5,-5H18.18zM7.82,16c-0.4,1.17 -1.49,2 -2.82,2c-1.68,0 -3,-1.32 -3,-3s1.32,-3 3,-3c1.33,0 2.42,0.83 2.82,2H5v2H7.82zM14.1,14h-1.4l-0.73,-2H15C14.56,12.58 14.24,13.25 14.1,14zM19,18c-1.68,0 -3,-1.32 -3,-3c0,-0.93 0.41,-1.73 1.05,-2.28l0.96,2.64l1.88,-0.68l-0.97,-2.67c0.03,0 0.06,-0.01 0.09,-0.01c1.68,0 3,1.32 3,3S20.68,18 19,18z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_bus_black_24dp.xml b/app/src/main/res/drawable/ic_bus_black_24dp.xml deleted file mode 100644 index e2b18a05948d28b39cd2b4bfb102cac858c738bf..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_bus_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_circle_white_24dp.xml b/app/src/main/res/drawable/ic_circle_white_24dp.xml deleted file mode 100644 index 5aaede4f20494018750d6c4d5403633bdba10779..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_circle_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_commute_black_24dp.xml b/app/src/main/res/drawable/ic_commute_black_24dp.xml deleted file mode 100644 index 5a564641966c51b347cffdc46b8967bc498796b8..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_commute_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M12,4L5,4C3.34,4 2,5.34 2,7v8c0,1.66 1.34,3 3,3l-1,1v1h1l2,-2.03L9,18v-5L4,13L4,5.98L13,6v2h2L15,7c0,-1.66 -1.34,-3 -3,-3zM5,14c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM20.57,9.66c-0.14,-0.4 -0.52,-0.66 -0.97,-0.66h-7.19c-0.46,0 -0.83,0.26 -0.98,0.66L10,13.77l0.01,5.51c0,0.38 0.31,0.72 0.69,0.72h0.62c0.38,0 0.68,-0.38 0.68,-0.76L12,18h8v1.24c0,0.38 0.31,0.76 0.69,0.76h0.61c0.38,0 0.69,-0.34 0.69,-0.72l0.01,-1.37v-4.14l-1.43,-4.11zM12.41,10h7.19l1.03,3h-9.25l1.03,-3zM12,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM20,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_crowd_black_24dp.xml b/app/src/main/res/drawable/ic_crowd_black_24dp.xml deleted file mode 100644 index 211e9db40fe9762c961537c4ec38c3baeee72ba9..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_crowd_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M12,12.75c1.63,0 3.07,0.39 4.24,0.9c1.08,0.48 1.76,1.56 1.76,2.73L18,18H6l0,-1.61c0,-1.18 0.68,-2.26 1.76,-2.73C8.93,13.14 10.37,12.75 12,12.75zM4,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C2,12.1 2.9,13 4,13zM5.13,14.1C4.76,14.04 4.39,14 4,14c-0.99,0 -1.93,0.21 -2.78,0.58C0.48,14.9 0,15.62 0,16.43V18l4.5,0v-1.61C4.5,15.56 4.73,14.78 5.13,14.1zM20,13c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2C18,12.1 18.9,13 20,13zM24,16.43c0,-0.81 -0.48,-1.53 -1.22,-1.85C21.93,14.21 20.99,14 20,14c-0.39,0 -0.76,0.04 -1.13,0.1c0.4,0.68 0.63,1.46 0.63,2.29V18l4.5,0V16.43zM12,6c1.66,0 3,1.34 3,3c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3C9,7.34 10.34,6 12,6z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_gps_black_24dp.xml b/app/src/main/res/drawable/ic_gps_black_24dp.xml deleted file mode 100644 index 163afecbe1383daef7f8c60f9d47b953b215bff9..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_gps_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100644 index 3f84525033ec8e08025d8ab4d84173f1bc47ab97..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_home_outline_24dp.xml b/app/src/main/res/drawable/ic_home_outline_24dp.xml deleted file mode 100644 index 0a8b6b30cdc7ce7fcdabbda270b20ac23e18ca0a..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_home_outline_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M12,5.69l5,4.5V18h-2v-6H9v6H7v-7.81l5,-4.5M12,3L2,12h3v8h6v-6h2v6h6v-8h3L12,3z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_map_black_24dp.xml b/app/src/main/res/drawable/ic_map_black_24dp.xml deleted file mode 100644 index 7e18171d1dbc285c53c53fb4bdcd4acebc216c02..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_map_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_map_outline_24dp.xml b/app/src/main/res/drawable/ic_map_outline_24dp.xml deleted file mode 100644 index 7d60b16d2a17887332a400f41434d035dac33a12..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_map_outline_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_radar_black_24dp.xml b/app/src/main/res/drawable/ic_radar_black_24dp.xml deleted file mode 100644 index a15b4cdfec5219c8f31da1a5f9db2ce56180360e..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_radar_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:pathData="M19.74,18.33C21.15,16.6 22,14.4 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12s4.48,10 10,10c2.4,0 4.6,-0.85 6.33,-2.26c0.27,-0.22 0.53,-0.46 0.78,-0.71c0.03,-0.03 0.05,-0.06 0.07,-0.08C19.38,18.75 19.57,18.54 19.74,18.33zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8c0,1.85 -0.63,3.54 -1.69,4.9l-1.43,-1.43c0.69,-0.98 1.1,-2.17 1.1,-3.46c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6s2.69,6 6,6c1.3,0 2.51,-0.42 3.49,-1.13l1.42,1.42C15.54,19.37 13.85,20 12,20zM13.92,12.51c0.17,-0.66 0.02,-1.38 -0.49,-1.9l-0.02,-0.02c-0.77,-0.77 -2,-0.78 -2.78,-0.04c-0.01,0.01 -0.03,0.02 -0.05,0.04c-0.78,0.78 -0.78,2.05 0,2.83l0.02,0.02c0.52,0.51 1.25,0.67 1.91,0.49l1.51,1.51c-0.6,0.36 -1.29,0.58 -2.04,0.58c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4s4,1.79 4,4c0,0.73 -0.21,1.41 -0.56,2L13.92,12.51z" - android:fillColor="#000000"/> -</vector> diff --git a/app/src/main/res/drawable/ic_speed_black_24dp.xml b/app/src/main/res/drawable/ic_speed_black_24dp.xml deleted file mode 100644 index 99fe648585a8d2da8b66de2be5a82dbca837c54d..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_speed_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58L5.07,18A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44zM10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_square_white_24dp.xml b/app/src/main/res/drawable/ic_square_white_24dp.xml deleted file mode 100644 index c3963cf6bf7715f31cfd1f5e9c5ebce6fcff0029..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_square_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#FFFFFF" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M6,6h12v12H6z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_stop_black_24dp.xml b/app/src/main/res/drawable/ic_stop_black_24dp.xml deleted file mode 100644 index 14756c18e895b90db0ddfeddf4d937b7471c367f..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_stop_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M2,12C2,6.48 6.48,2 12,2s10,4.48 10,10 -4.48,10 -10,10S2,17.52 2,12zM12,18c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6 -6,2.69 -6,6 2.69,6 6,6z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_ticket_black_24dp.xml b/app/src/main/res/drawable/ic_ticket_black_24dp.xml deleted file mode 100644 index b7c4363d4c9ee91f2005dc92275385a56f795049..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_ticket_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M22,10V6c0,-1.11 -0.9,-2 -2,-2H4C2.9,4 2.01,4.89 2.01,6v4C3.11,10 4,10.9 4,12s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2S20.9,10 22,10zM13,17.5h-2v-2h2V17.5zM13,13h-2v-2h2V13zM13,8.5h-2v-2h2V8.5z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_traffic_black_24dp.xml b/app/src/main/res/drawable/ic_traffic_black_24dp.xml deleted file mode 100644 index b087ad91bf87a51a958e5f81137414b61060a098..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_traffic_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M20,10h-3L17,8.86c1.72,-0.45 3,-2 3,-3.86h-3L17,4c0,-0.55 -0.45,-1 -1,-1L8,3c-0.55,0 -1,0.45 -1,1v1L4,5c0,1.86 1.28,3.41 3,3.86L7,10L4,10c0,1.86 1.28,3.41 3,3.86L7,15L4,15c0,1.86 1.28,3.41 3,3.86L7,20c0,0.55 0.45,1 1,1h8c0.55,0 1,-0.45 1,-1v-1.14c1.72,-0.45 3,-2 3,-3.86h-3v-1.14c1.72,-0.45 3,-2 3,-3.86zM12,19c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,14c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,9c-1.11,0 -2,-0.9 -2,-2 0,-1.11 0.89,-2 2,-2 1.1,0 2,0.89 2,2 0,1.1 -0.89,2 -2,2z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_tram_black_24dp.xml b/app/src/main/res/drawable/ic_tram_black_24dp.xml deleted file mode 100644 index 989349cbc9a456e6458fff607d6ad99c1e9d1c79..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_tram_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M19,16.94L19,8.5c0,-2.79 -2.61,-3.4 -6.01,-3.49l0.76,-1.51L17,3.5L17,2L7,2v1.5h4.75l-0.76,1.52C7.86,5.11 5,5.73 5,8.5v8.44c0,1.45 1.19,2.66 2.59,2.97L6,21.5v0.5h2.23l2,-2L14,20l2,2h2v-0.5L16.5,20h-0.08c1.69,0 2.58,-1.37 2.58,-3.06zM12,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM17,14L7,14L7,9h10v5z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_transfer_black_24dp.xml b/app/src/main/res/drawable/ic_transfer_black_24dp.xml deleted file mode 100644 index 0d410e80f6d0d96892bd55a47b43a20e2cc75d31..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_transfer_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M16.49,15.5v-1.75L14,16.25l2.49,2.5L16.49,17L22,17v-1.5zM19.51,19.75L14,19.75v1.5h5.51L19.51,23L22,20.5 19.51,18zM9.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5.75,8.9L3,23h2.1l1.75,-8L9,17v6h2v-7.55L8.95,13.4l0.6,-3C10.85,12 12.8,13 15,13v-2c-1.85,0 -3.45,-1 -4.35,-2.45l-0.95,-1.6C9.35,6.35 8.7,6 8,6c-0.25,0 -0.5,0.05 -0.75,0.15L2,8.3L2,13h2L4,9.65l1.75,-0.75"/> -</vector> diff --git a/app/src/main/res/drawable/ic_usb_black_24dp.xml b/app/src/main/res/drawable/ic_usb_black_24dp.xml deleted file mode 100644 index d4e91d959c5cd6c0f5e68d2e79a2883abd8fb6a4..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_usb_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M15,7v4h1v2h-3V5h2l-3,-4 -3,4h2v8H8v-2.07c0.7,-0.37 1.2,-1.08 1.2,-1.93 0,-1.21 -0.99,-2.2 -2.2,-2.2 -1.21,0 -2.2,0.99 -2.2,2.2 0,0.85 0.5,1.56 1.2,1.93V13c0,1.11 0.89,2 2,2h3v3.05c-0.71,0.37 -1.2,1.1 -1.2,1.95 0,1.22 0.99,2.2 2.2,2.2 1.21,0 2.2,-0.98 2.2,-2.2 0,-0.85 -0.49,-1.58 -1.2,-1.95V15h3c1.11,0 2,-0.89 2,-2v-2h1V7h-4z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_voice_black_24dp.xml b/app/src/main/res/drawable/ic_voice_black_24dp.xml deleted file mode 100644 index 8d70cbee2230841b41009250f1a99518e11a2d58..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_voice_black_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ -<vector android:height="24dp" android:tint="#000000" - android:viewportHeight="24" android:viewportWidth="24" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M10,9m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"/> - <path android:fillColor="@android:color/white" android:pathData="M16.39,15.56C14.71,14.7 12.53,14 10,14c-2.53,0 -4.71,0.7 -6.39,1.56C2.61,16.07 2,17.1 2,18.22V21h16v-2.78C18,17.1 17.39,16.07 16.39,15.56z"/> - <path android:fillColor="@android:color/white" android:pathData="M16,1h-2c0,4.97 4.03,9 9,9V8C19.14,8 16,4.86 16,1z"/> - <path android:fillColor="@android:color/white" android:pathData="M20,1h-2c0,2.76 2.24,5 5,5V4C21.35,4 20,2.65 20,1z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_voyage_black_24dp.xml b/app/src/main/res/drawable/ic_voyage_black_24dp.xml deleted file mode 100644 index 64e7679467a84913e63d3c35fe2a7593046316c5..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_voyage_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_voyage_outline_24dp.xml b/app/src/main/res/drawable/ic_voyage_outline_24dp.xml deleted file mode 100644 index 9818555ef3e8d71d8f9cfeb13831e94c194c88d8..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_voyage_outline_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:tint="#000000" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="@android:color/white" - android:pathData="M22.43,10.59l-9.01,-9.01c-0.75,-0.75 -2.07,-0.76 -2.83,0l-9,9c-0.78,0.78 -0.78,2.04 0,2.82l9,9c0.39,0.39 0.9,0.58 1.41,0.58 0.51,0 1.02,-0.19 1.41,-0.58l8.99,-8.99c0.79,-0.76 0.8,-2.02 0.03,-2.82zM12.01,20.99l-9,-9 9,-9 9,9 -9,9zM8,11v4h2v-3h4v2.5l3.5,-3.5L14,7.5L14,10L9,10c-0.55,0 -1,0.45 -1,1z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_wheelchair_black_24dp.xml b/app/src/main/res/drawable/ic_wheelchair_black_24dp.xml deleted file mode 100644 index 48109d461e87bd70a9ddc026ae7ee079b9be6c49..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_wheelchair_black_24dp.xml +++ /dev/null @@ -1,6 +0,0 @@ -<vector android:autoMirrored="true" android:height="24dp" - android:tint="#000000" android:viewportHeight="24" - android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@android:color/white" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/> - <path android:fillColor="@android:color/white" android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z"/> -</vector> diff --git a/app/src/main/res/drawable/map_black.xml b/app/src/main/res/drawable/map_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..7e18171d1dbc285c53c53fb4bdcd4acebc216c02 --- /dev/null +++ b/app/src/main/res/drawable/map_black.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z" /> +</vector> diff --git a/app/src/main/res/drawable/map_outline.xml b/app/src/main/res/drawable/map_outline.xml new file mode 100644 index 0000000000000000000000000000000000000000..7d60b16d2a17887332a400f41434d035dac33a12 --- /dev/null +++ b/app/src/main/res/drawable/map_outline.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" /> +</vector> diff --git a/app/src/main/res/drawable/radar.xml b/app/src/main/res/drawable/radar.xml new file mode 100644 index 0000000000000000000000000000000000000000..4a9b66f5dfd56a6902bcb4f73c755edfbb32a8d6 --- /dev/null +++ b/app/src/main/res/drawable/radar.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M19.74,18.33C21.15,16.6 22,14.4 22,12c0,-5.52 -4.48,-10 -10,-10S2,6.48 2,12s4.48,10 10,10c2.4,0 4.6,-0.85 6.33,-2.26c0.27,-0.22 0.53,-0.46 0.78,-0.71c0.03,-0.03 0.05,-0.06 0.07,-0.08C19.38,18.75 19.57,18.54 19.74,18.33zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8s8,3.59 8,8c0,1.85 -0.63,3.54 -1.69,4.9l-1.43,-1.43c0.69,-0.98 1.1,-2.17 1.1,-3.46c0,-3.31 -2.69,-6 -6,-6s-6,2.69 -6,6s2.69,6 6,6c1.3,0 2.51,-0.42 3.49,-1.13l1.42,1.42C15.54,19.37 13.85,20 12,20zM13.92,12.51c0.17,-0.66 0.02,-1.38 -0.49,-1.9l-0.02,-0.02c-0.77,-0.77 -2,-0.78 -2.78,-0.04c-0.01,0.01 -0.03,0.02 -0.05,0.04c-0.78,0.78 -0.78,2.05 0,2.83l0.02,0.02c0.52,0.51 1.25,0.67 1.91,0.49l1.51,1.51c-0.6,0.36 -1.29,0.58 -2.04,0.58c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4s4,1.79 4,4c0,0.73 -0.21,1.41 -0.56,2L13.92,12.51z" /> +</vector> diff --git a/app/src/main/res/drawable/speed.xml b/app/src/main/res/drawable/speed.xml new file mode 100644 index 0000000000000000000000000000000000000000..8bd6c25c1798adb28ad2093bf615d11565b828ec --- /dev/null +++ b/app/src/main/res/drawable/speed.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58L5.07,18A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44zM10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/> +</vector> diff --git a/app/src/main/res/drawable/stop.xml b/app/src/main/res/drawable/stop.xml new file mode 100644 index 0000000000000000000000000000000000000000..6152d3c023e5b38f7777e0e0ea49369a119b4833 --- /dev/null +++ b/app/src/main/res/drawable/stop.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M2,12C2,6.48 6.48,2 12,2s10,4.48 10,10 -4.48,10 -10,10S2,17.52 2,12zM12,18c3.31,0 6,-2.69 6,-6s-2.69,-6 -6,-6 -6,2.69 -6,6 2.69,6 6,6z"/> +</vector> diff --git a/app/src/main/res/drawable/ticket.xml b/app/src/main/res/drawable/ticket.xml new file mode 100644 index 0000000000000000000000000000000000000000..fff78c3e5c8aa8da77179e6da442ffd733e8590a --- /dev/null +++ b/app/src/main/res/drawable/ticket.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M22,10V6c0,-1.11 -0.9,-2 -2,-2H4C2.9,4 2.01,4.89 2.01,6v4C3.11,10 4,10.9 4,12s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2S20.9,10 22,10zM13,17.5h-2v-2h2V17.5zM13,13h-2v-2h2V13zM13,8.5h-2v-2h2V8.5z"/> +</vector> diff --git a/app/src/main/res/drawable/traffic.xml b/app/src/main/res/drawable/traffic.xml new file mode 100644 index 0000000000000000000000000000000000000000..a90fc1adaa70dfaabc28ac064f12b98bd2bdd3a0 --- /dev/null +++ b/app/src/main/res/drawable/traffic.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M20,10h-3L17,8.86c1.72,-0.45 3,-2 3,-3.86h-3L17,4c0,-0.55 -0.45,-1 -1,-1L8,3c-0.55,0 -1,0.45 -1,1v1L4,5c0,1.86 1.28,3.41 3,3.86L7,10L4,10c0,1.86 1.28,3.41 3,3.86L7,15L4,15c0,1.86 1.28,3.41 3,3.86L7,20c0,0.55 0.45,1 1,1h8c0.55,0 1,-0.45 1,-1v-1.14c1.72,-0.45 3,-2 3,-3.86h-3v-1.14c1.72,-0.45 3,-2 3,-3.86zM12,19c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,14c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,9c-1.11,0 -2,-0.9 -2,-2 0,-1.11 0.89,-2 2,-2 1.1,0 2,0.89 2,2 0,1.1 -0.89,2 -2,2z"/> +</vector> diff --git a/app/src/main/res/drawable/tram_black.xml b/app/src/main/res/drawable/tram_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..989349cbc9a456e6458fff607d6ad99c1e9d1c79 --- /dev/null +++ b/app/src/main/res/drawable/tram_black.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M19,16.94L19,8.5c0,-2.79 -2.61,-3.4 -6.01,-3.49l0.76,-1.51L17,3.5L17,2L7,2v1.5h4.75l-0.76,1.52C7.86,5.11 5,5.73 5,8.5v8.44c0,1.45 1.19,2.66 2.59,2.97L6,21.5v0.5h2.23l2,-2L14,20l2,2h2v-0.5L16.5,20h-0.08c1.69,0 2.58,-1.37 2.58,-3.06zM12,18.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM17,14L7,14L7,9h10v5z"/> +</vector> diff --git a/app/src/main/res/drawable/transfer.xml b/app/src/main/res/drawable/transfer.xml new file mode 100644 index 0000000000000000000000000000000000000000..9bbd348b35582a1b326e1945f339eb2f550c23f1 --- /dev/null +++ b/app/src/main/res/drawable/transfer.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M16.49,15.5v-1.75L14,16.25l2.49,2.5L16.49,17L22,17v-1.5zM19.51,19.75L14,19.75v1.5h5.51L19.51,23L22,20.5 19.51,18zM9.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM5.75,8.9L3,23h2.1l1.75,-8L9,17v6h2v-7.55L8.95,13.4l0.6,-3C10.85,12 12.8,13 15,13v-2c-1.85,0 -3.45,-1 -4.35,-2.45l-0.95,-1.6C9.35,6.35 8.7,6 8,6c-0.25,0 -0.5,0.05 -0.75,0.15L2,8.3L2,13h2L4,9.65l1.75,-0.75"/> +</vector> diff --git a/app/src/main/res/drawable/usb.xml b/app/src/main/res/drawable/usb.xml new file mode 100644 index 0000000000000000000000000000000000000000..be1c47a4c753e537073fbab2636757cbb623a2c3 --- /dev/null +++ b/app/src/main/res/drawable/usb.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M15,7v4h1v2h-3V5h2l-3,-4 -3,4h2v8H8v-2.07c0.7,-0.37 1.2,-1.08 1.2,-1.93 0,-1.21 -0.99,-2.2 -2.2,-2.2 -1.21,0 -2.2,0.99 -2.2,2.2 0,0.85 0.5,1.56 1.2,1.93V13c0,1.11 0.89,2 2,2h3v3.05c-0.71,0.37 -1.2,1.1 -1.2,1.95 0,1.22 0.99,2.2 2.2,2.2 1.21,0 2.2,-0.98 2.2,-2.2 0,-0.85 -0.49,-1.58 -1.2,-1.95V15h3c1.11,0 2,-0.89 2,-2v-2h1V7h-4z"/> +</vector> diff --git a/app/src/main/res/drawable/vehicle_black.xml b/app/src/main/res/drawable/vehicle_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..5a564641966c51b347cffdc46b8967bc498796b8 --- /dev/null +++ b/app/src/main/res/drawable/vehicle_black.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#000000" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M12,4L5,4C3.34,4 2,5.34 2,7v8c0,1.66 1.34,3 3,3l-1,1v1h1l2,-2.03L9,18v-5L4,13L4,5.98L13,6v2h2L15,7c0,-1.66 -1.34,-3 -3,-3zM5,14c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM20.57,9.66c-0.14,-0.4 -0.52,-0.66 -0.97,-0.66h-7.19c-0.46,0 -0.83,0.26 -0.98,0.66L10,13.77l0.01,5.51c0,0.38 0.31,0.72 0.69,0.72h0.62c0.38,0 0.68,-0.38 0.68,-0.76L12,18h8v1.24c0,0.38 0.31,0.76 0.69,0.76h0.61c0.38,0 0.69,-0.34 0.69,-0.72l0.01,-1.37v-4.14l-1.43,-4.11zM12.41,10h7.19l1.03,3h-9.25l1.03,-3zM12,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM20,16c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/> +</vector> diff --git a/app/src/main/res/drawable/voice.xml b/app/src/main/res/drawable/voice.xml new file mode 100644 index 0000000000000000000000000000000000000000..5025538b7a1049c792bec4ed32094a28e4325965 --- /dev/null +++ b/app/src/main/res/drawable/voice.xml @@ -0,0 +1,8 @@ +<vector android:height="24dp" android:tint="?attr/colorOnSurface" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M10,9m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"/> + <path android:fillColor="@android:color/white" android:pathData="M16.39,15.56C14.71,14.7 12.53,14 10,14c-2.53,0 -4.71,0.7 -6.39,1.56C2.61,16.07 2,17.1 2,18.22V21h16v-2.78C18,17.1 17.39,16.07 16.39,15.56z"/> + <path android:fillColor="@android:color/white" android:pathData="M16,1h-2c0,4.97 4.03,9 9,9V8C19.14,8 16,4.86 16,1z"/> + <path android:fillColor="@android:color/white" android:pathData="M20,1h-2c0,2.76 2.24,5 5,5V4C21.35,4 20,2.65 20,1z"/> +</vector> diff --git a/app/src/main/res/drawable/voyage_black.xml b/app/src/main/res/drawable/voyage_black.xml new file mode 100644 index 0000000000000000000000000000000000000000..64e7679467a84913e63d3c35fe2a7593046316c5 --- /dev/null +++ b/app/src/main/res/drawable/voyage_black.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M21.71,11.29l-9,-9c-0.39,-0.39 -1.02,-0.39 -1.41,0l-9,9c-0.39,0.39 -0.39,1.02 0,1.41l9,9c0.39,0.39 1.02,0.39 1.41,0l9,-9c0.39,-0.38 0.39,-1.01 0,-1.41zM14,14.5V12h-4v3H8v-4c0,-0.55 0.45,-1 1,-1h5V7.5l3.5,3.5 -3.5,3.5z" /> +</vector> diff --git a/app/src/main/res/drawable/voyage_outline.xml b/app/src/main/res/drawable/voyage_outline.xml new file mode 100644 index 0000000000000000000000000000000000000000..9818555ef3e8d71d8f9cfeb13831e94c194c88d8 --- /dev/null +++ b/app/src/main/res/drawable/voyage_outline.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="#000000" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M22.43,10.59l-9.01,-9.01c-0.75,-0.75 -2.07,-0.76 -2.83,0l-9,9c-0.78,0.78 -0.78,2.04 0,2.82l9,9c0.39,0.39 0.9,0.58 1.41,0.58 0.51,0 1.02,-0.19 1.41,-0.58l8.99,-8.99c0.79,-0.76 0.8,-2.02 0.03,-2.82zM12.01,20.99l-9,-9 9,-9 9,9 -9,9zM8,11v4h2v-3h4v2.5l3.5,-3.5L14,7.5L14,10L9,10c-0.55,0 -1,0.45 -1,1z" /> +</vector> diff --git a/app/src/main/res/drawable/wheelchair.xml b/app/src/main/res/drawable/wheelchair.xml new file mode 100644 index 0000000000000000000000000000000000000000..4bba0d4e74fafecb1856557c12e547e2064af8e8 --- /dev/null +++ b/app/src/main/res/drawable/wheelchair.xml @@ -0,0 +1,6 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="?attr/colorOnSurface" android:viewportHeight="24" + android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/> + <path android:fillColor="@android:color/white" android:pathData="M19,13v-2c-1.54,0.02 -3.09,-0.75 -4.07,-1.83l-1.29,-1.43c-0.17,-0.19 -0.38,-0.34 -0.61,-0.45 -0.01,0 -0.01,-0.01 -0.02,-0.01L13,7.28c-0.35,-0.2 -0.75,-0.3 -1.19,-0.26C10.76,7.11 10,8.04 10,9.09L10,15c0,1.1 0.9,2 2,2h5v5h2v-5.5c0,-1.1 -0.9,-2 -2,-2h-3v-3.45c1.29,1.07 3.25,1.94 5,1.95zM12.83,18c-0.41,1.16 -1.52,2 -2.83,2 -1.66,0 -3,-1.34 -3,-3 0,-1.31 0.84,-2.41 2,-2.83L9,12.1c-2.28,0.46 -4,2.48 -4,4.9 0,2.76 2.24,5 5,5 2.42,0 4.44,-1.72 4.9,-4h-2.07z"/> +</vector> diff --git a/app/src/main/res/layout/departure.xml b/app/src/main/res/layout/departure.xml index c603a8f6e1c94e90b7759c8be2d18ff0f25c3c5b..de205dcb54a7edb9a2abaf46c1537bce6d9fcf62 100644 --- a/app/src/main/res/layout/departure.xml +++ b/app/src/main/res/layout/departure.xml @@ -14,7 +14,7 @@ android:layout_marginStart="8dp" app:layout_constraintBottom_toTopOf="@+id/departure_headsign" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/departure_time" - tools:srcCompat="@drawable/ic_bus_black_24dp" /> + tools:srcCompat="@drawable/bus_black" /> <TextView android:id="@+id/departure_time" diff --git a/app/src/main/res/layout/departure_bottom_sheet.xml b/app/src/main/res/layout/departure_bottom_sheet.xml index 02439c5cdd0599326b322c811f0e336cfa2adbec..3e23d61b28f76ee2f04df27ab8f67b968ee90ab4 100644 --- a/app/src/main/res/layout/departure_bottom_sheet.xml +++ b/app/src/main/res/layout/departure_bottom_sheet.xml @@ -33,7 +33,6 @@ app:layout_constraintBaseline_toBaselineOf="@+id/time" app:layout_constraintStart_toEndOf="@+id/time" tool:text="(+2 mins)" /> - <!-- todo dark theme --> <ImageView android:id="@+id/rt_icon" android:layout_width="24dp" @@ -43,9 +42,8 @@ android:contentDescription="departure is realtime" app:layout_constraintBottom_toBottomOf="@+id/time" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/time" - app:srcCompat="@drawable/ic_radar_black_24dp" /> + app:srcCompat="@drawable/radar" /> - <!-- todo dark theme --> <ImageView android:id="@+id/wheelchair_icon" android:layout_width="24dp" @@ -54,7 +52,7 @@ android:layout_marginStart="8dp" android:contentDescription="vehicle is wheelchair accessible" app:layout_constraintStart_toEndOf="@id/rt_icon" app:layout_constraintTop_toTopOf="@+id/rt_icon" - app:srcCompat="@drawable/ic_wheelchair_black_24dp" /> + app:srcCompat="@drawable/wheelchair" /> <!-- todo center text --> <com.google.android.material.textview.MaterialTextView @@ -77,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="8dp" android:text="Show on map" - app:icon="@drawable/ic_map_black_24dp" + app:icon="@drawable/map_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/line" /> @@ -92,7 +90,7 @@ android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/boarding_text" app:layout_constraintEnd_toStartOf="@+id/boarding_text" app:layout_constraintTop_toTopOf="@+id/boarding_text" - app:srcCompat="@drawable/ic_transfer_black_24dp" /> + app:srcCompat="@drawable/transfer" /> <com.google.android.material.textview.MaterialTextView android:id="@+id/boarding_text" @@ -116,7 +114,7 @@ android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/speed_text" app:layout_constraintEnd_toStartOf="@+id/speed_text" app:layout_constraintTop_toTopOf="@+id/speed_text" - app:srcCompat="@drawable/ic_speed_black_24dp" /> + app:srcCompat="@drawable/speed" /> <com.google.android.material.textview.MaterialTextView android:id="@+id/speed_text" @@ -140,7 +138,7 @@ android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/congestion_text" app:layout_constraintStart_toStartOf="@+id/middle" app:layout_constraintTop_toTopOf="@+id/congestion_text" - app:srcCompat="@drawable/ic_traffic_black_24dp" /> + app:srcCompat="@drawable/traffic" /> <com.google.android.material.textview.MaterialTextView android:id="@+id/congestion_text" @@ -165,7 +163,7 @@ android:importantForAccessibility="no" app:layout_constraintBottom_toBottomOf="@+id/occupancy_text" app:layout_constraintStart_toStartOf="@+id/middle" app:layout_constraintTop_toTopOf="@+id/occupancy_text" - app:srcCompat="@drawable/ic_crowd_black_24dp" /> + app:srcCompat="@drawable/crowd" /> <com.google.android.material.textview.MaterialTextView android:id="@+id/occupancy_text" @@ -206,7 +204,7 @@ android:id="@+id/ac" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="air condition" - app:srcCompat="@drawable/ic_ac_black_24dp" + app:srcCompat="@drawable/ac" tool:ignore="MissingConstraints" /> <ImageView @@ -214,7 +212,7 @@ android:id="@+id/bike" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="bicycles allowed" - app:srcCompat="@drawable/ic_bike_black_24dp" + app:srcCompat="@drawable/bike" tool:ignore="MissingConstraints" /> <ImageView @@ -222,7 +220,7 @@ android:id="@+id/voice" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="voice announcements" - app:srcCompat="@drawable/ic_voice_black_24dp" + app:srcCompat="@drawable/voice" tool:ignore="MissingConstraints" /> <ImageView @@ -230,7 +228,7 @@ android:id="@+id/ticket" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="tickets sold" - app:srcCompat="@drawable/ic_ticket_black_24dp" + app:srcCompat="@drawable/ticket" tool:ignore="MissingConstraints" /> <ImageView @@ -238,6 +236,6 @@ android:id="@+id/usb" android:layout_width="24dp" android:layout_height="24dp" android:contentDescription="USB charging" - app:srcCompat="@drawable/ic_usb_black_24dp" + app:srcCompat="@drawable/usb" tool:ignore="MissingConstraints" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 0504b5921a271c78e6e719f39a2f86e8570c29d2..be113fd08116a6888dee343876f422088b67fc2e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="16dp" android:contentDescription="@string/home_fab_description" - android:src="@drawable/ic_gps_black_24dp" + android:src="@drawable/gps_black" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml index 7d860592c1f0d2e341a9b74b1a9e4321753633e1..51c38c91f6a9ef5d57eab41c7a6b49862b091dbc 100644 --- a/app/src/main/res/menu/bottom_nav_menu.xml +++ b/app/src/main/res/menu/bottom_nav_menu.xml @@ -2,14 +2,14 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/navigation_map" - android:icon="@drawable/ic_map_outline_24dp" + android:icon="@drawable/map_outline" android:title="@string/title_map" /> <item android:id="@+id/navigation_home" - android:icon="@drawable/ic_home_outline_24dp" + android:icon="@drawable/home_outline" android:title="@string/title_home" /> <item android:id="@+id/navigation_voyage" - android:icon="@drawable/ic_voyage_outline_24dp" + android:icon="@drawable/voyage_outline" android:title="@string/title_voyage" /> </menu> \ No newline at end of file