From 8673380b9ec49eb22b10645da99039a0672a4aec Mon Sep 17 00:00:00 2001 From: Dimitris Date: Tue, 23 Dec 2025 16:22:24 +0100 Subject: [PATCH] Icons and strings --- .../kouros/navigation/ui/NavigationSheet.kt | 2 +- .../com/kouros/navigation/ui/SearchSheet.kt | 2 +- app/src/main/res/xml/automotive_app_desc.xml | 19 +++++ automotive/src/main/res/values/strings.xml | 4 + .../src/main/res/xml/automotive_app_desc.xml | 19 +++++ .../src/main/res/xml/file_provider_paths.xml | 18 +++++ .../com/kouros/navigation/car/map/MapView.kt | 70 ++++++++++-------- .../navigation/car/screen/NavigationScreen.kt | 6 +- .../navigation/car/screen/PlaceListScreen.kt | 2 +- .../car/screen/RoutePreviewScreen.kt | 4 +- .../navigation/car/screen/SearchScreen.kt | 2 +- .../src/main/res/drawable/ev_station_48px.xml | 2 +- .../main/res/drawable/ic_close_white_24dp.xml | 26 +++++++ .../ic_favorite_filled_white_24dp.xml | 26 +++++++ .../res/drawable/ic_favorite_white_24dp.xml | 26 +++++++ .../data/src/main/res/drawable/ic_pan_24.xml | 28 +++++++ .../main/res/drawable/ic_place_white_24dp.xml | 25 +++++++ .../main/res/drawable/ic_roundabout_ccw.png | Bin 0 -> 2329 bytes .../main/res/drawable/ic_turn_destination.png | Bin 0 -> 461 bytes .../main/res/drawable/ic_turn_name_change.png | Bin 0 -> 396 bytes .../main/res/drawable/ic_turn_normal_left.png | Bin 0 -> 650 bytes .../res/drawable/ic_turn_normal_right.png | Bin 0 -> 651 bytes .../main/res/drawable/ic_turn_slight_left.png | Bin 0 -> 463 bytes .../res/drawable/ic_turn_slight_right.png | Bin 0 -> 464 bytes .../src/main/res/drawable/ic_zoom_in_24.xml | 25 +++++++ .../src/main/res/drawable/ic_zoom_out_24.xml | 25 +++++++ .../res/drawable/local_gas_station_48px.xml | 2 +- .../main/res/drawable/local_pharmacy_48px.xml | 2 +- .../src/main/res/drawable/navigation_24px.xml | 10 +++ .../src/main/res/drawable/navigation_48px.xml | 10 +++ .../src/main/res/drawable/pan_tool_48px.xml | 10 +++ .../src/main/res/drawable/search_48px.xml | 10 +++ .../drawable/settings_applications_48px.xml | 10 +++ .../main/res/drawable/speed_camera_48px.xml | 10 +++ common/data/src/main/res/values/attrs.xml | 23 ++++++ common/data/src/main/res/values/strings.xml | 33 +++++++++ common/data/src/main/res/values/styles.xml | 27 +++++++ 37 files changed, 435 insertions(+), 43 deletions(-) create mode 100644 app/src/main/res/xml/automotive_app_desc.xml create mode 100644 automotive/src/main/res/values/strings.xml create mode 100644 automotive/src/main/res/xml/automotive_app_desc.xml create mode 100644 automotive/src/main/res/xml/file_provider_paths.xml create mode 100644 common/data/src/main/res/drawable/ic_close_white_24dp.xml create mode 100644 common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml create mode 100644 common/data/src/main/res/drawable/ic_favorite_white_24dp.xml create mode 100644 common/data/src/main/res/drawable/ic_pan_24.xml create mode 100644 common/data/src/main/res/drawable/ic_place_white_24dp.xml create mode 100644 common/data/src/main/res/drawable/ic_roundabout_ccw.png create mode 100644 common/data/src/main/res/drawable/ic_turn_destination.png create mode 100644 common/data/src/main/res/drawable/ic_turn_name_change.png create mode 100644 common/data/src/main/res/drawable/ic_turn_normal_left.png create mode 100644 common/data/src/main/res/drawable/ic_turn_normal_right.png create mode 100644 common/data/src/main/res/drawable/ic_turn_slight_left.png create mode 100644 common/data/src/main/res/drawable/ic_turn_slight_right.png create mode 100644 common/data/src/main/res/drawable/ic_zoom_in_24.xml create mode 100644 common/data/src/main/res/drawable/ic_zoom_out_24.xml create mode 100644 common/data/src/main/res/drawable/navigation_24px.xml create mode 100644 common/data/src/main/res/drawable/navigation_48px.xml create mode 100644 common/data/src/main/res/drawable/pan_tool_48px.xml create mode 100644 common/data/src/main/res/drawable/search_48px.xml create mode 100644 common/data/src/main/res/drawable/settings_applications_48px.xml create mode 100644 common/data/src/main/res/drawable/speed_camera_48px.xml create mode 100644 common/data/src/main/res/values/attrs.xml create mode 100644 common/data/src/main/res/values/strings.xml create mode 100644 common/data/src/main/res/values/styles.xml diff --git a/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt b/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt index 84d8299..2795cdb 100755 --- a/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt +++ b/app/src/main/java/com/kouros/navigation/ui/NavigationSheet.kt @@ -55,7 +55,7 @@ fun NavigationSheet( simulateNavigation() }) { Icon( - painter = painterResource(id = R.drawable.assistant_navigation_48px), + painter = painterResource(id = R.drawable.navigation_48px), "Simulate", modifier = Modifier.size(24.dp, 24.dp), ) diff --git a/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt b/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt index 2cfa951..0ae2588 100644 --- a/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt +++ b/app/src/main/java/com/kouros/navigation/ui/SearchSheet.kt @@ -151,7 +151,7 @@ fun SearchBar( SearchBarDefaults.InputField( leadingIcon = { Icon( - painter = painterResource(id = R.drawable.ic_search_black36dp), + painter = painterResource(id = R.drawable.search_48px), "Search", modifier = Modifier.size(24.dp, 24.dp), ) diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml new file mode 100644 index 0000000..9dbd3ce --- /dev/null +++ b/app/src/main/res/xml/automotive_app_desc.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/automotive/src/main/res/values/strings.xml b/automotive/src/main/res/values/strings.xml new file mode 100644 index 0000000..4e441ec --- /dev/null +++ b/automotive/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Navigation + \ No newline at end of file diff --git a/automotive/src/main/res/xml/automotive_app_desc.xml b/automotive/src/main/res/xml/automotive_app_desc.xml new file mode 100644 index 0000000..9dbd3ce --- /dev/null +++ b/automotive/src/main/res/xml/automotive_app_desc.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/automotive/src/main/res/xml/file_provider_paths.xml b/automotive/src/main/res/xml/file_provider_paths.xml new file mode 100644 index 0000000..281517c --- /dev/null +++ b/automotive/src/main/res/xml/file_provider_paths.xml @@ -0,0 +1,18 @@ + + + + diff --git a/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt b/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt index 5cc062e..5451e07 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/map/MapView.kt @@ -1,5 +1,6 @@ package com.kouros.navigation.car.map +import android.annotation.SuppressLint import android.location.Location import android.content.Context import androidx.compose.foundation.Canvas @@ -115,41 +116,41 @@ fun MapLibre( fun RouteLayer(routeData: String?) { if (routeData != null && routeData.isNotEmpty()) { val routes = rememberGeoJsonSource(GeoJsonData.JsonString(routeData)) - LineLayer( - id = "routes-casing", - source = routes, - color = const(Color.White), - width = - interpolate( - type = exponential(1.2f), - input = zoom(), - 5 to const(0.4.dp), - 6 to const(0.8.dp), - 7 to const(2.0.dp), - 20 to const(24.dp), - ), - ) - LineLayer( - id = "routes", - source = routes, - color = const(RouteColor), - width = - interpolate( - type = exponential(1.2f), - input = zoom(), - 5 to const(0.4.dp), - 6 to const(0.7.dp), - 7 to const(1.75.dp), - 20 to const(22.dp), - ), - ) + LineLayer( + id = "routes-casing", + source = routes, + color = const(Color.White), + width = + interpolate( + type = exponential(1.2f), + input = zoom(), + 5 to const(0.4.dp), + 6 to const(0.8.dp), + 7 to const(2.0.dp), + 20 to const(24.dp), + ), + ) + LineLayer( + id = "routes", + source = routes, + color = const(RouteColor), + width = + interpolate( + type = exponential(1.2f), + input = zoom(), + 5 to const(0.4.dp), + 6 to const(0.7.dp), + 7 to const(1.75.dp), + 20 to const(22.dp), + ), + ) } } @Composable fun AmenityLayer(routeData: String?) { if (routeData != null && routeData.isNotEmpty()) { - val color = if (routeData.contains(Constants.PHARMACY)) { + val color = if (routeData.contains(Constants.PHARMACY)) { const(Color.Red) } else { const(Color.Green) @@ -164,6 +165,7 @@ fun AmenityLayer(routeData: String?) { ) } } + @Composable fun BuildingLayer(tiles: Source) { Anchor.Replace("building-3d") { @@ -177,7 +179,13 @@ fun BuildingLayer(tiles: Source) { } @Composable -fun DrawNavigationImages(padding: PaddingValues, speed: Float?, maxSpeed: Int, width: Int, height: Int) { +fun DrawNavigationImages( + padding: PaddingValues, + speed: Float?, + maxSpeed: Int, + width: Int, + height: Int +) { NavigationImage(padding, width, height) CurrentSpeed(width, height, speed) if (speed != null && maxSpeed > 0 && (speed * 3.6) > maxSpeed) { @@ -199,7 +207,7 @@ fun NavigationImage(padding: PaddingValues, width: Int, height: Int) { } } Icon( - painter = painterResource(id = R.drawable.navigation), + painter = painterResource(id = R.drawable.navigation_48px), "Navigation", tint = color.copy(alpha = 1f), modifier = Modifier.size(imageSize.dp, imageSize.dp), diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt index eeb6870..5044536 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/screen/NavigationScreen.kt @@ -294,7 +294,7 @@ class NavigationScreen( CarIcon.Builder( IconCompat.createWithResource( carContext, - R.drawable.assistant_navigation_48px + R.drawable.navigation_48px ) ) .build() @@ -328,7 +328,7 @@ class NavigationScreen( private fun searchAction(): Action { return Action.Builder() - .setIcon(routeModel.createCarIcon(carContext, R.drawable.ic_search_black36dp)) + .setIcon(routeModel.createCarIcon(carContext, R.drawable.search_48px)) .setOnClickListener { startSearchScreen() } @@ -337,7 +337,7 @@ class NavigationScreen( private fun settingsAction(): Action { return Action.Builder() - .setIcon(routeModel.createCarIcon(carContext, R.drawable.settings_24px)) + .setIcon(routeModel.createCarIcon(carContext, R.drawable.settings_applications_48px)) .setOnClickListener { screenManager.push(SettingsScreen(carContext)) } diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt index dc454b3..acd6776 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/screen/PlaceListScreen.kt @@ -152,7 +152,7 @@ class PlaceListScreen( .setIcon( RouteCarModel().createCarIcon( carContext, - R.drawable.ic_delete_foreground + R.drawable.ic_pan_24 ) ) .setOnClickListener { diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt index 39a3267..9b3d1b3 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/screen/RoutePreviewScreen.kt @@ -143,7 +143,7 @@ class RoutePreviewScreen( .getString(R.string.favorites) else carContext.getString( - R.string.not_favorite_toast_msg + R.string.favorites ), CarToast.LENGTH_SHORT ) @@ -165,7 +165,7 @@ class RoutePreviewScreen( CarIcon.Builder( IconCompat.createWithResource( carContext, - R.drawable.ic_delete_foreground + R.drawable.ic_pan_24 ) ) .build() diff --git a/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt b/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt index 44f3e37..d3313fb 100644 --- a/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt +++ b/common/car/src/main/java/com/kouros/navigation/car/screen/SearchScreen.kt @@ -137,7 +137,7 @@ class SearchScreen( R.drawable.ic_favorite_white_24dp } else -> { - R.drawable.navigation + R.drawable.navigation_48px } } return CarIcon.Builder( diff --git a/common/data/src/main/res/drawable/ev_station_48px.xml b/common/data/src/main/res/drawable/ev_station_48px.xml index 4681f9c..dce7655 100644 --- a/common/data/src/main/res/drawable/ev_station_48px.xml +++ b/common/data/src/main/res/drawable/ev_station_48px.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M337,746L425,606L372,606L372,501L285,641L337,641L337,746ZM220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM220,780L489,780L489,468L220,468L220,780ZM160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.71,468 649.36,482.64Q664,497.29 664,518L664,737Q664,759 681.5,773.5Q699,788 722,788Q745,788 765,773.5Q785,759 785,737L785,350L770,350Q757.25,350 748.63,341.37Q740,332.75 740,320L740,230L760,230L760,180L790,180L790,230L830,230L830,180L860,180L860,230L880,230L880,320Q880,332.75 871.38,341.37Q862.75,350 850,350L835,350L835,736.69Q835,780 801,810Q767,840 721.82,840Q677.66,840 645.83,810Q614,780 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM489,780L220,780L220,780L489,780Z"/> diff --git a/common/data/src/main/res/drawable/ic_close_white_24dp.xml b/common/data/src/main/res/drawable/ic_close_white_24dp.xml new file mode 100644 index 0000000..5832c5a --- /dev/null +++ b/common/data/src/main/res/drawable/ic_close_white_24dp.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml b/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml new file mode 100644 index 0000000..d3df144 --- /dev/null +++ b/common/data/src/main/res/drawable/ic_favorite_filled_white_24dp.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml b/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml new file mode 100644 index 0000000..7709015 --- /dev/null +++ b/common/data/src/main/res/drawable/ic_favorite_white_24dp.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/common/data/src/main/res/drawable/ic_pan_24.xml b/common/data/src/main/res/drawable/ic_pan_24.xml new file mode 100644 index 0000000..1dfeed1 --- /dev/null +++ b/common/data/src/main/res/drawable/ic_pan_24.xml @@ -0,0 +1,28 @@ + + + + + + diff --git a/common/data/src/main/res/drawable/ic_place_white_24dp.xml b/common/data/src/main/res/drawable/ic_place_white_24dp.xml new file mode 100644 index 0000000..1ba39ce --- /dev/null +++ b/common/data/src/main/res/drawable/ic_place_white_24dp.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/common/data/src/main/res/drawable/ic_roundabout_ccw.png b/common/data/src/main/res/drawable/ic_roundabout_ccw.png new file mode 100644 index 0000000000000000000000000000000000000000..478f371426cffda9f3b1d1a09f22ac88699b2cef GIT binary patch literal 2329 zcmZuz3p5nk8s76TX5=w96^+Ue84kuXIXR41rSeQDlNqjO9x?J527}UL#CQ~vlFms* zIpIWQjK`5d;YP=hj4~5R9-|nU%o*q0yY9N{_OHFx_y6Dj?QiY1_S$Rz7u;O-E68Ew z000V32OK;AfJjpaKq90-q}&Mx06FgDVC$I(nHf#L&~AiwZ2e8U=L6e61P1jaw3L^n zM~;u%Y}`wf>i-kJvUJ}0%svmNri}eYTpWTv45jXzyKW)O!72QHvkyxX?i-YOUZZS} zrkf)hCQ(?V_ZS+6i=s|MBiz0k*h|XTh{WK2R=^p4gKYB-x~mKoB3hxqv2el(O@LfK z;CDl^(4<8#%QBQ#YvDRVFCsL~1VHm&F!647oFhBdtDyVMKeN6-8mm8)`#OguPr%nLX1DurzrCyp57}wmJ5NBFSfeqKi%jNwD2_I6!Y#K3uVA803zR|`onI6ohbS>0uXEORfXS> zBrxZc0h((XP8}8R1A#wG5rwCq0J<9V3;Y4(bS)V-m9#?P?Y`Q}RNa zzuZsemfkQ>-gNrMVa8v2qb0z+Z=eh(sIRww*$;JvK3dnC)#4$b6`$MTj2~{tHkKbT zfdtZ1!zN=EYi1(Q#C}B~2@2YH>KCq(f^;&+GvY7(1RRnxLl0oV6IHlMUFnPQXH zOmUBit@|mbaj$VtgmJb6pCs0gEGcgc=^oo*G1pykKd)b>t|#}WR4?gma5MS59e8b( zfUU52Nz8Ir(iM~(?c$7Jp>BR&0Tq`PDK^i&5yG#&g1VSoRoOa3F%H)v;tZ*y)jhlN zSd9r!4+J*(-kO!UZL=#sSLdaAGUn&igmI9XSA`j@vw7eYxSY1%@FeqbOM|w@c>acm zN8j8ANw*kHZwAPH!qtq*r+y2kMf;s^?6;4{+HHA^ae=3}y;Th6y@3NX5j>H8FRBwuCg;7o$QY_fGCk1QH- znY1&bJ~8VG=Y9)+jf+(*s=vE<8I_>U9yc!=Tx?y|UmLMFr1Q97lEDk?%y2m^>0w)` zTan!=C!uF>)Kn44MJoiyNmEZ_@{+AX^IYpzhnC~|FHuyWc4l2Ae46F`H>*PXJ{6Xa z_)^&IqgFh9{i3?opGN{`*Y3~`H}hBcCo;3lyoNqk(y?BbOF1u&pkN7X55FJgKGPP@ z+S;dSG@n;tY!@^O%aI>rs;!P)pX?ad$;4q!DdKl^b`J=s3VYtGaSZs16jv%!MV=uW z-RLofn=4f6s_fa5wLQqfviX{)i$O?!Y_|;m9fkV%Uc020GKNJIemfz zp~^~;n6y;jZ0N98Nd|#&_}b?72@-k={bl*xYGNdq^8c4T@^b=x+Vrk1hE$Lzu_Syc z9>YGyie5qVB&qG!5M5a`};`eO@M zMG{Y;4gWzwX+-D3vQro4!q3ugI1}-ZEcKOK6PzcKsL7tZ+uDX-Gv$xgmfAkFBRBG# zE%t7T8De|H2RIrjZ2Ntp{p@jZL-*0ddX+4t^q&NWghj-(;Or9;cgqWq?6-wv<(0|} z8CY+I#PV_3HFJLQ#g-b*9Pafse?I5k}reWi}by!_wITdrDuDK8=hi z_K3pc!$Z*o>9=Ba?;jh~kr^n#6QO5Dd6Ya;y{AuLX{=AfZhF!a#J4ry01eGg-Lot$tQNAQ>0WiVqS^}jnUtdsOkvDya!Ou5evN=TpM*C{7Q7l#LSm%^^Ji>v3QN;N`zyztQn#ISLHCdCC#|5a5UCh%92kObp`}`uV|UnDQ~{+)>S^!SaFAXWG-pW}nP`w)b}6 z{lXi{`6bAEmNzx;dfpbjZ+c_(duB^jsZ@RdwYPJ}Mu^R300000NkvXXu0mjf Dw8P9| literal 0 HcmV?d00001 diff --git a/common/data/src/main/res/drawable/ic_turn_name_change.png b/common/data/src/main/res/drawable/ic_turn_name_change.png new file mode 100644 index 0000000000000000000000000000000000000000..363fc89a7ae479e28890b5bbe2d9e74cf528814c GIT binary patch literal 396 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58CaNs)Vi3hp+HJBz$e5NNdLzG9_MpefD-H_ zL4Lsu|2Y|%m|3(>u$ur4koR>f-sa#$yEa+1btp%=HE1tnf=Omf&=T)@J>!orwSTJS6Xntc8-53P;{vcZ9i4rYyi oL^Eo`=Ce+7R1IgJ>JAEE9$7`DEoI9>CIHzCp00i_>zopr0C>EP+yDRo literal 0 HcmV?d00001 diff --git a/common/data/src/main/res/drawable/ic_turn_normal_left.png b/common/data/src/main/res/drawable/ic_turn_normal_left.png new file mode 100644 index 0000000000000000000000000000000000000000..572a48ca44a98f16ecca6878cf1a098882e96bc7 GIT binary patch literal 650 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Flk7;1l8sr2k_ApdfA}Ih*et zP@7;$kY6yve^x0$NL)ng4g||#UV;lcO?YCM~)o_J*iJZb$hL!9dwhpftgZL*to<&N&fDk%2lXB({CJt{P`2^UVfAg3V;NKa9%@Vyw?6Q2 w!uDJH_yVfcP861$DEXmt?zmX|Bo$9MGFM@>Vf}9C@(JW7Pgg&ebxsLQ0Ono)0{{R3 literal 0 HcmV?d00001 diff --git a/common/data/src/main/res/drawable/ic_turn_normal_right.png b/common/data/src/main/res/drawable/ic_turn_normal_right.png new file mode 100644 index 0000000000000000000000000000000000000000..b9cc652f823953bc3d041a75f82a4128ae3f213f GIT binary patch literal 651 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Flk7;1l8sr2k_ApdfA}Ih*et zP@7;$kY6wZ>wiIU0bUkPMkYQER(58=>ydLd04@6F>Eakt!T9DvBPSE10L#YGU;4Mi zSX?TLG!>Z{&RIU6Q*5(-)k!XW4|z)93wdVS^ZQmzV%Mrxs9Er#@k8UhUj7a&(1U+R z!<`219Z(e8AZuWgP;uZx!$Zcy%x&yE{1S3dfxmhQ_LrZd2w|upUSNjghrIQCMFMOK zHM%CP2)eN9cl=uCHmS~y-{$Ual=pl1-9RmkN#^(gpN7jbrgIj^U4F#iwwnzYxDc@7 zC4;v`gZhO{jCUI3_zE;{GHgv})~Vmcd~55}o4+bP0l+XkKz@E~C literal 0 HcmV?d00001 diff --git a/common/data/src/main/res/drawable/ic_turn_slight_left.png b/common/data/src/main/res/drawable/ic_turn_slight_left.png new file mode 100644 index 0000000000000000000000000000000000000000..0a0d417d00eb1d7b90d1f524cae0e3fc3b2043bb GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58JL)Xl%kBoS0Ke1;1l8sr2hlKzkjkROSXWN zlmz(&GdMiEkp^OWx;TbZFuuLYn8xBL(E8B)h4Pu&R~(|N`ltP76Pdvgyg#G!JKu+| z*YdBwYOkF4yz+XT&-!ii9A2FLR&2UIq2TZ%2AhZX&a39^Xl8112vpD%5D{SMV)ATU z(4Y_?;=#qj%F?*VAxJ?(fkT9K5|bmN;{uHhrF$IZ{>$a?9QhcZ9GH--pfTb2e{nOm zM?dx#L%1RuTsb@}tVJv}e9CX$w>2(s2wHHDS^hCc?N2(Y2StGKyEOQ`v%B0>ASGK zPx(%?lVF&q#vw0G*BwDgf=&ib{C{L3TI4zw*oz+&lz|~GcY$67DMyp043>)=iv(Ge zr)01kXkdgg4%D-6sjlSOAk zpM>?^`~RQ)ymH?5^}My4%9w-auX$hnK;J@IWX7+Axl9}1ul-cd7{cPP+#z5=po7E< z5e_aBE)M3oOpc9ijEM_^6*MkrDDaeUv9L<9wlw-RKIeV(^YeqB*^2Y_%iGlZ_dK7^ zecoRB@z3wg&+kucV*2~l{Hj}{26K7SeW48xd8JsJm}D8lo945u;{23odN7FTD2uUt zxNy&&K-0!g3+5=S5AmCz{*mdKI;Vst0Ci=odjJ3c literal 0 HcmV?d00001 diff --git a/common/data/src/main/res/drawable/ic_zoom_in_24.xml b/common/data/src/main/res/drawable/ic_zoom_in_24.xml new file mode 100644 index 0000000..36d3282 --- /dev/null +++ b/common/data/src/main/res/drawable/ic_zoom_in_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/common/data/src/main/res/drawable/ic_zoom_out_24.xml b/common/data/src/main/res/drawable/ic_zoom_out_24.xml new file mode 100644 index 0000000..089d265 --- /dev/null +++ b/common/data/src/main/res/drawable/ic_zoom_out_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/common/data/src/main/res/drawable/local_gas_station_48px.xml b/common/data/src/main/res/drawable/local_gas_station_48px.xml index 8efba2b..301dd10 100644 --- a/common/data/src/main/res/drawable/local_gas_station_48px.xml +++ b/common/data/src/main/res/drawable/local_gas_station_48px.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M160,840L160,180Q160,156 178,138Q196,120 220,120L489,120Q513,120 531,138Q549,156 549,180L549,468L614,468Q634.63,468 649.31,482.69Q664,497.37 664,518L664,737Q664,758.68 679.5,773.34Q695,788 717,788Q739,788 754.5,773.34Q770,758.68 770,737L770,442Q759,448 747,451Q735,454 723,454Q683.52,454 656.26,426.74Q629,399.48 629,360Q629,328.39 647,303.19Q665,278 695,270L600,175L636,140L789,293Q803,307 811.5,323.5Q820,340 820,360L820,737Q820,780.26 790.18,810.13Q760.37,840 717.18,840Q674,840 644,810.13Q614,780.26 614,737L614,518Q614,518 614,518Q614,518 614,518L549,518L549,840L160,840ZM220,408L489,408L489,180Q489,180 489,180Q489,180 489,180L220,180Q220,180 220,180Q220,180 220,180L220,408ZM723,404Q741,404 754,391Q767,378 767,360Q767,342 754,329Q741,316 723,316Q705,316 692,329Q679,342 679,360Q679,378 692,391Q705,404 723,404ZM220,780L489,780L489,468L220,468L220,780ZM489,780L220,780L220,780L489,780Z"/> diff --git a/common/data/src/main/res/drawable/local_pharmacy_48px.xml b/common/data/src/main/res/drawable/local_pharmacy_48px.xml index c1ba6ad..c99e328 100644 --- a/common/data/src/main/res/drawable/local_pharmacy_48px.xml +++ b/common/data/src/main/res/drawable/local_pharmacy_48px.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M120,840L120,780L207,525L120,270L120,210L647,210L709,40L777,67L725,210L840,210L840,270L752,525L840,780L840,840L120,840ZM452,679L512,679L512,555L636,555L636,495L512,495L512,371L452,371L452,495L328,495L328,555L452,555L452,679ZM182,780L778,780L690,525L778,270L182,270L270,525L182,780ZM480,525L480,525L480,525L480,525L480,525L480,525Z"/> diff --git a/common/data/src/main/res/drawable/navigation_24px.xml b/common/data/src/main/res/drawable/navigation_24px.xml new file mode 100644 index 0000000..6c4832f --- /dev/null +++ b/common/data/src/main/res/drawable/navigation_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/drawable/navigation_48px.xml b/common/data/src/main/res/drawable/navigation_48px.xml new file mode 100644 index 0000000..e87c0a6 --- /dev/null +++ b/common/data/src/main/res/drawable/navigation_48px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/drawable/pan_tool_48px.xml b/common/data/src/main/res/drawable/pan_tool_48px.xml new file mode 100644 index 0000000..dc04dcd --- /dev/null +++ b/common/data/src/main/res/drawable/pan_tool_48px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/drawable/search_48px.xml b/common/data/src/main/res/drawable/search_48px.xml new file mode 100644 index 0000000..852066c --- /dev/null +++ b/common/data/src/main/res/drawable/search_48px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/drawable/settings_applications_48px.xml b/common/data/src/main/res/drawable/settings_applications_48px.xml new file mode 100644 index 0000000..b4c399f --- /dev/null +++ b/common/data/src/main/res/drawable/settings_applications_48px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/drawable/speed_camera_48px.xml b/common/data/src/main/res/drawable/speed_camera_48px.xml new file mode 100644 index 0000000..952d15a --- /dev/null +++ b/common/data/src/main/res/drawable/speed_camera_48px.xml @@ -0,0 +1,10 @@ + + + diff --git a/common/data/src/main/res/values/attrs.xml b/common/data/src/main/res/values/attrs.xml new file mode 100644 index 0000000..d6b0be2 --- /dev/null +++ b/common/data/src/main/res/values/attrs.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/common/data/src/main/res/values/strings.xml b/common/data/src/main/res/values/strings.xml new file mode 100644 index 0000000..7bb0ec6 --- /dev/null +++ b/common/data/src/main/res/values/strings.xml @@ -0,0 +1,33 @@ + + + Speed camera + Dismiss + Gas station + Pharmacy + Charging station + Category + On + Off + Use telephon settings + Dark mode + Display settings + 3D building + Arrived! + Drive now + Stop + Avoid highways + Avoid tolls rows + No places + Recent destination + Contacts + Favorites + Recent item deleted + Route preview + Display + Navigation settings + Settings + Accept + Reject + OK + Search + \ No newline at end of file diff --git a/common/data/src/main/res/values/styles.xml b/common/data/src/main/res/values/styles.xml new file mode 100644 index 0000000..d983543 --- /dev/null +++ b/common/data/src/main/res/values/styles.xml @@ -0,0 +1,27 @@ + + + + +