From 976d7c3580d1edf426becfb01df27a355e6cefb4 Mon Sep 17 00:00:00 2001 From: Ferran Pons Date: Tue, 9 Jan 2018 16:38:06 +0100 Subject: [PATCH] Added resource prefix to avoid name clashes (#135) * Added resource prefix to avoid name clashes * upgraded lib version * renamed all resources * upgraded to api 27 * documentation updated * checkstyle issue --- .travis.yml | 4 +- README.md | 29 +++++++++------ app/src/main/AndroidManifest.xml | 8 ++-- app/src/main/res/values/strings.xml | 2 +- leku/build.gradle | 1 + leku/src/androidTest/AndroidManifest.xml | 4 +- leku/src/main/AndroidManifest.xml | 4 +- .../leku/LocationPickerActivity.java | 35 +++++++++--------- ...heck_light.png => leku_ic_check_light.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_gps_lime.png => leku_ic_gps_lime.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin ...heck_light.png => leku_ic_check_light.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_gps_lime.png => leku_ic_gps_lime.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin ...heck_light.png => leku_ic_check_light.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_gps_lime.png => leku_ic_gps_lime.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin ...heck_light.png => leku_ic_check_light.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_gps_lime.png => leku_ic_gps_lime.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin ...heck_light.png => leku_ic_check_light.png} | Bin .../{ic_clean.png => leku_ic_clean.png} | Bin .../{ic_gps_lime.png => leku_ic_gps_lime.png} | Bin .../{ic_mic.png => leku_ic_mic.png} | Bin .../{ic_search.png => leku_ic_search.png} | Bin ....xml => leku_adress_custom_background.xml} | 2 +- ...lite_off.xml => leku_ic_satellite_off.xml} | 0 ...ellite_on.xml => leku_ic_satellite_on.xml} | 0 ...xml => leku_toolbar_custom_background.xml} | 2 +- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ....xml => leku_activity_location_picker.xml} | 30 +++++++-------- ...ut_address.xml => leku_layout_address.xml} | 6 +-- ...inates.xml => leku_layout_coordinates.xml} | 8 ++-- ...bar_search.xml => leku_toolbar_search.xml} | 18 ++++----- ...toolbar_menu.xml => leku_toolbar_menu.xml} | 4 +- leku/src/main/res/values-es/strings.xml | 26 ++++++------- leku/src/main/res/values/colors.xml | 12 +++--- leku/src/main/res/values/dimens.xml | 4 +- leku/src/main/res/values/strings.xml | 28 +++++++------- .../{searchable.xml => leku_searchable.xml} | 2 +- version.properties | 4 +- 56 files changed, 196 insertions(+), 187 deletions(-) rename leku/src/main/res/drawable-hdpi/{ic_check_light.png => leku_ic_check_light.png} (100%) rename leku/src/main/res/drawable-hdpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-hdpi/{ic_gps_lime.png => leku_ic_gps_lime.png} (100%) rename leku/src/main/res/drawable-hdpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-hdpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable-ldpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-ldpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-ldpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable-mdpi/{ic_check_light.png => leku_ic_check_light.png} (100%) rename leku/src/main/res/drawable-mdpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-mdpi/{ic_gps_lime.png => leku_ic_gps_lime.png} (100%) rename leku/src/main/res/drawable-mdpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-mdpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable-xhdpi/{ic_check_light.png => leku_ic_check_light.png} (100%) rename leku/src/main/res/drawable-xhdpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-xhdpi/{ic_gps_lime.png => leku_ic_gps_lime.png} (100%) rename leku/src/main/res/drawable-xhdpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-xhdpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable-xxhdpi/{ic_check_light.png => leku_ic_check_light.png} (100%) rename leku/src/main/res/drawable-xxhdpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-xxhdpi/{ic_gps_lime.png => leku_ic_gps_lime.png} (100%) rename leku/src/main/res/drawable-xxhdpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-xxhdpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable-xxxhdpi/{ic_check_light.png => leku_ic_check_light.png} (100%) rename leku/src/main/res/drawable-xxxhdpi/{ic_clean.png => leku_ic_clean.png} (100%) rename leku/src/main/res/drawable-xxxhdpi/{ic_gps_lime.png => leku_ic_gps_lime.png} (100%) rename leku/src/main/res/drawable-xxxhdpi/{ic_mic.png => leku_ic_mic.png} (100%) rename leku/src/main/res/drawable-xxxhdpi/{ic_search.png => leku_ic_search.png} (100%) rename leku/src/main/res/drawable/{adress_custom_background.xml => leku_adress_custom_background.xml} (78%) rename leku/src/main/res/drawable/{ic_satellite_off.xml => leku_ic_satellite_off.xml} (100%) rename leku/src/main/res/drawable/{ic_satellite_on.xml => leku_ic_satellite_on.xml} (100%) rename leku/src/main/res/drawable/{toolbar_custom_background.xml => leku_toolbar_custom_background.xml} (80%) rename leku/src/main/res/layout-land/{activity_location_picker.xml => leku_activity_location_picker.xml} (83%) rename leku/src/main/res/layout-normal-v21/{activity_location_picker.xml => leku_activity_location_picker.xml} (84%) rename leku/src/main/res/layout-normal/{activity_location_picker.xml => leku_activity_location_picker.xml} (83%) rename leku/src/main/res/layout-xlarge-v21/{activity_location_picker.xml => leku_activity_location_picker.xml} (84%) rename leku/src/main/res/layout-xlarge/{activity_location_picker.xml => leku_activity_location_picker.xml} (83%) rename leku/src/main/res/layout/{activity_location_picker.xml => leku_activity_location_picker.xml} (83%) rename leku/src/main/res/layout/{layout_address.xml => leku_layout_address.xml} (88%) rename leku/src/main/res/layout/{layout_coordinates.xml => leku_layout_coordinates.xml} (85%) rename leku/src/main/res/layout/{toolbar_search.xml => leku_toolbar_search.xml} (74%) rename leku/src/main/res/menu/{toolbar_menu.xml => leku_toolbar_menu.xml} (71%) rename leku/src/main/res/xml/{searchable.xml => leku_searchable.xml} (86%) diff --git a/.travis.yml b/.travis.yml index 7ad02e66..20db8c2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ env: - DX_HEAP_SIZE=1536 - secure: "XcGPMdYdcDCrWZNWJKZDmmUX2BKkpaInTWF/OqInDHSAP8Qib/xw69YZvHGBUP9GBQ+C+9OzrCT0Kmg+d0SyS+uz8W6Yc9FzgDLs07lVyCGDpQKaTpcyct2nmh8+3iZiMYnlSYjgpZqwXKOC1cvrVcX8jA/NtwXhVVJHsaVKP0mV8Hw0hibxNTU+V+vl1rICePcLNe8WZnIe/ESn1cuFb/o2aUjENmIVD74hJIgjRph+YeZXerKbnjHU5IvNoSHnp25exUoH3COUwPabpt142EXKXOIqHs5OiqmlrnjuFrSe7/WKVgjKpAN/daVhKut0JlAMviU05Naj/sv/J+Zsqa6RkW4va/GP+qlmkSjgz7qJLp8OZfknxim1VhaOCdgoWi6fHSN5LeVXu4COjUg5G3hyfVSBRIydVOj68KulUBSvnxmC5NszdUaprivENy8FGkxqImZM2GeqlqlYtPis7GZQsmXjyva9IDWVaNy7XEl5w4fpW3Y5XEX0ITOUwcUmQ7D41CelYlg5gFXRdUn/5Xyl5obb58GkxJ5TNAp84cjqAubjpB0lVuhqK7izrRYq7bQLwY2M5VZSuDxX9liJK0SztjAs63MYeuZz/fgKDn7rqRKCUzM9kA1hOAcXyx1KpBKL9cVFIltswSgDyBTYl6OqpygVjHiNOLdEPuO3kSs=" - secure: "biJ1oYHr0J7wMouHbUbJ95zBDs63WzdmRwMjY3vydZGPn6brKsQNCvI+/bIjGqg7U03u06WRRQmuPO9bTjNbKj3H3pLn68nubAqz8YTNJvXdGZNowp8SoaTKeVBqVZXNTpcYmK3EBgAukSFGztC76TIg5+U7pO+X3Rc/ds/QMV3cJkgflcVndnwrCbN05szszUMD3n4s5MHtQ+KHyWwQXs3hl/i7wD6Yq8qUITmn1gHqzc6SxebiNo/kAF19+yQp2L6n0+JKPYlUSe88z1W8JEyNM1j4ohUM5OV7UtgYpJ9OqWIPBluV64ky5RMZBKA1mVxo3rLJ0SGTvZKAmQTiznnxKOxorfsQbRFt3DI8Bt1PoGcZsfTMVoE2vv7ycbCxaLQEZjf+DP44nFRDvdlwLuQlYTauYWDXsyQaeg7m0KfDhXJKH4cn2lSjDOMbR1Ym7xPMkoilAf7LhDG4PQ/RzM0L/ic97VZqnLAZAw+Sf62BDjHhoHANsjDqBNI/1LpVQ1QGII4wjU9J7b7ktmyc3+fjcqIKCpWchEZ3V+F1gjIem1UbLJekkbiFnrtMdOn8HiCwulglnxejrt6PBXvXr6hA5qy6tYDMbLI+j/RP/4Z0MvQ8Irt9xM3tupd0dSnqzTwUtTVYB4jFpcANaL3KxfTktxu478urIrf1d57okVU=" - - ANDROID_API=26 + - ANDROID_API=27 - EMULATOR_API=24 - - ANDROID_BUILD_TOOLS=26.0.2 + - ANDROID_BUILD_TOOLS=27.0.2 - ADB_INSTALL_TIMEOUT=5 before_cache: diff --git a/README.md b/README.md index 1739f818..46f0563a 100644 --- a/README.md +++ b/README.md @@ -76,11 +76,18 @@ Include the dependency in your app `build.gradle`: ```groovy dependencies { - compile 'com.schibstedspain.android:leku:3.6.2' + implementation 'com.schibstedspain.android:leku:3.7.0' } ``` -**IMPORTANT**: If you want support for Google Play Services version '8.4.0', and support library version '23.1.1' use version '1.0.0'. Beware that **version '1.0.0' is going not be maintained**. Also, if you want to use a version below 10.0.1 for Play Services you can use the version '2.3.1'. +Alternatively, if you are using a different version of Google Play Services than `11.8.0` use this instead: + +```groovy +implementation ('com.schibstedspain.android:leku:3.6.2') { + exclude group: 'com.google.android.gms' + exclude group: 'com.android.support' +} +``` ### Permissions @@ -123,7 +130,7 @@ To use the LocationPickerActivity first you need to add these lines to your Andr ```xml @@ -198,14 +205,14 @@ If you would like to add more language translations the only thing you have to d 2. Add all text translations for those strings: ```xml -Location Picker -Something went wrong. Please try again. -There are no results for your search -unknown location -Search by voice… -en-EN -Voice -Search +Location Picker +Something went wrong. Please try again. +There are no results for your search +unknown location +Search by voice… +en-EN +Voice +Search ``` Note that you have the **voice_search_extra_language** that is used for the language of the voice recognition. diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2544d456..aba54c4f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,7 @@ android:allowBackup="true" android:fullBackupContent="true" android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" + android:label="@string/leku_app_name" android:theme="@style/AppTheme" android:supportsRtl="true" tools:ignore="GoogleAppIndexingWarning" @@ -36,7 +36,7 @@ @@ -47,7 +47,7 @@ @@ -57,7 +57,7 @@ - Leku Demo + Leku Demo LAUNCH MAP LOCATION PICKER ACTIVITY LAUNCH MAP WITH POIS diff --git a/leku/build.gradle b/leku/build.gradle index 4a70d0f9..db482525 100644 --- a/leku/build.gradle +++ b/leku/build.gradle @@ -13,6 +13,7 @@ version = "${versionMajor}.${versionMinor}.${versionPatch}" android { compileSdkVersion 27 buildToolsVersion '27.0.2' + resourcePrefix 'leku_' defaultConfig { minSdkVersion 15 diff --git a/leku/src/androidTest/AndroidManifest.xml b/leku/src/androidTest/AndroidManifest.xml index e025f459..475897c3 100644 --- a/leku/src/androidTest/AndroidManifest.xml +++ b/leku/src/androidTest/AndroidManifest.xml @@ -17,7 +17,7 @@ @@ -25,7 +25,7 @@ + android:resource="@xml/leku_searchable" /> diff --git a/leku/src/main/AndroidManifest.xml b/leku/src/main/AndroidManifest.xml index d363e269..8d9c9172 100644 --- a/leku/src/main/AndroidManifest.xml +++ b/leku/src/main/AndroidManifest.xml @@ -20,8 +20,8 @@ - + diff --git a/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java b/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java index 6b3fb71f..28e09f14 100644 --- a/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java +++ b/leku/src/main/java/com/schibstedspain/leku/LocationPickerActivity.java @@ -136,7 +136,7 @@ public class LocationPickerActivity extends AppCompatActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_location_picker); + setContentView(R.layout.leku_activity_location_picker); setUpMainVariables(); setUpResultsList(); setUpToolBar(); @@ -236,7 +236,7 @@ public void onTextChanged(CharSequence charSequence, int start, int count, int a clearSearchButton.setVisibility(View.INVISIBLE); } if (searchOption != null) { - searchOption.setIcon(R.drawable.ic_mic); + searchOption.setIcon(R.drawable.leku_ic_mic); } } else { if (charSequence.length() > MIN_CHARACTERS) { @@ -246,7 +246,7 @@ public void onTextChanged(CharSequence charSequence, int start, int count, int a clearSearchButton.setVisibility(View.VISIBLE); } if (searchOption != null) { - searchOption.setIcon(R.drawable.ic_search); + searchOption.setIcon(R.drawable.leku_ic_search); } } } @@ -271,7 +271,8 @@ private void setUpFloatingButtons() { btnSatellite.setOnClickListener(view -> { if (map != null && btnSatellite != null) { map.setMapType(map.getMapType() == MAP_TYPE_SATELLITE ? MAP_TYPE_NORMAL : MAP_TYPE_SATELLITE); - btnSatellite.setImageResource(map.getMapType() == MAP_TYPE_SATELLITE ? R.drawable.ic_satellite_off : R.drawable.ic_satellite_on); + btnSatellite.setImageResource( + map.getMapType() == MAP_TYPE_SATELLITE ? R.drawable.leku_ic_satellite_off : R.drawable.leku_ic_satellite_on); } }); btnSatellite.setVisibility(enableSatelliteView ? View.VISIBLE : View.GONE); @@ -297,7 +298,7 @@ private void setUpMapIfNeeded() { @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.toolbar_menu, menu); + inflater.inflate(R.menu.leku_toolbar_menu, menu); searchOption = menu.findItem(R.id.action_voice); return true; } @@ -487,7 +488,7 @@ public void onMapClick(LatLng latLng) { private void setNewPosition(LatLng latLng) { if (currentLocation == null) { - currentLocation = new Location(getString(R.string.network_resource)); + currentLocation = new Location(getString(R.string.leku_network_resource)); } currentLocation.setLatitude(latLng.latitude); currentLocation.setLongitude(latLng.longitude); @@ -505,7 +506,7 @@ public void showLocations(List
addresses) { if (addresses != null) { fillLocationList(addresses); if (addresses.isEmpty()) { - Toast.makeText(getApplicationContext(), R.string.no_search_results, Toast.LENGTH_LONG) + Toast.makeText(getApplicationContext(), R.string.leku_no_search_results, Toast.LENGTH_LONG) .show(); } else { updateLocationNameList(addresses); @@ -592,7 +593,7 @@ private void updateAddressLayoutVisibility() { public void showLoadLocationError() { progressBar.setVisibility(View.GONE); changeListResultVisibility(View.GONE); - Toast.makeText(this, R.string.load_location_error, Toast.LENGTH_LONG).show(); + Toast.makeText(this, R.string.leku_load_location_error, Toast.LENGTH_LONG).show(); } @Override @@ -610,7 +611,7 @@ public void showLastLocation(Location location) { public void didGetLastLocation() { if (currentLocation != null) { if (!Geocoder.isPresent()) { - Toast.makeText(this, R.string.no_geocoder_available, Toast.LENGTH_LONG).show(); + Toast.makeText(this, R.string.leku_no_geocoder_available, Toast.LENGTH_LONG).show(); return; } setUpMapIfNeeded(); @@ -725,7 +726,7 @@ private void setLayoutVisibilityFromBundle(Bundle transitionBundle) { private void setLocationFromBundle(Bundle transitionBundle) { if (currentLocation == null) { - currentLocation = new Location(getString(R.string.network_resource)); + currentLocation = new Location(getString(R.string.leku_network_resource)); } currentLocation.setLatitude(transitionBundle.getDouble(LATITUDE)); currentLocation.setLongitude(transitionBundle.getDouble(LONGITUDE)); @@ -737,9 +738,9 @@ private void startVoiceRecognitionActivity() { Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM); - intent.putExtra(RecognizerIntent.EXTRA_PROMPT, getString(R.string.voice_search_promp)); + intent.putExtra(RecognizerIntent.EXTRA_PROMPT, getString(R.string.leku_voice_search_promp)); intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, - getString(R.string.voice_search_extra_language)); + getString(R.string.leku_voice_search_extra_language)); if (checkPlayServices()) { try { @@ -763,8 +764,8 @@ private boolean checkPlayServices() { } private void setCoordinatesInfo(LatLng latLng) { - this.latitude.setText(String.format("%s: %s", getString(R.string.latitude), latLng.latitude)); - this.longitude.setText(String.format("%s: %s", getString(R.string.longitude), latLng.longitude)); + this.latitude.setText(String.format("%s: %s", getString(R.string.leku_latitude), latLng.latitude)); + this.longitude.setText(String.format("%s: %s", getString(R.string.leku_longitude), latLng.longitude)); showCoordinatesLayout(); } @@ -812,7 +813,7 @@ public void onMarkerDrag(Marker marker) { @Override public void onMarkerDragEnd(Marker marker) { if (currentLocation == null) { - currentLocation = new Location(getString(R.string.network_resource)); + currentLocation = new Location(getString(R.string.leku_network_resource)); } currentLekuPoi = null; currentLocation.setLongitude(marker.getPosition().longitude); @@ -938,7 +939,7 @@ private void updateLocationNameList(List
addresses) { locationNameList.clear(); for (Address address : addresses) { if (address.getFeatureName() == null) { - locationNameList.add(getString(R.string.unknown_location)); + locationNameList.add(getString(R.string.leku_unknown_location)); } else { locationNameList.add(getFullAddressString(address)); } @@ -1047,7 +1048,7 @@ private Marker addPoiMarker(LatLng latLng, String title, String address) { private void setNewLocation(Address address) { this.selectedAddress = address; if (currentLocation == null) { - currentLocation = new Location(getString(R.string.network_resource)); + currentLocation = new Location(getString(R.string.leku_network_resource)); } currentLocation.setLatitude(address.getLatitude()); diff --git a/leku/src/main/res/drawable-hdpi/ic_check_light.png b/leku/src/main/res/drawable-hdpi/leku_ic_check_light.png similarity index 100% rename from leku/src/main/res/drawable-hdpi/ic_check_light.png rename to leku/src/main/res/drawable-hdpi/leku_ic_check_light.png diff --git a/leku/src/main/res/drawable-hdpi/ic_clean.png b/leku/src/main/res/drawable-hdpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-hdpi/ic_clean.png rename to leku/src/main/res/drawable-hdpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-hdpi/ic_gps_lime.png b/leku/src/main/res/drawable-hdpi/leku_ic_gps_lime.png similarity index 100% rename from leku/src/main/res/drawable-hdpi/ic_gps_lime.png rename to leku/src/main/res/drawable-hdpi/leku_ic_gps_lime.png diff --git a/leku/src/main/res/drawable-hdpi/ic_mic.png b/leku/src/main/res/drawable-hdpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-hdpi/ic_mic.png rename to leku/src/main/res/drawable-hdpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-hdpi/ic_search.png b/leku/src/main/res/drawable-hdpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-hdpi/ic_search.png rename to leku/src/main/res/drawable-hdpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable-ldpi/ic_clean.png b/leku/src/main/res/drawable-ldpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-ldpi/ic_clean.png rename to leku/src/main/res/drawable-ldpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-ldpi/ic_mic.png b/leku/src/main/res/drawable-ldpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-ldpi/ic_mic.png rename to leku/src/main/res/drawable-ldpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-ldpi/ic_search.png b/leku/src/main/res/drawable-ldpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-ldpi/ic_search.png rename to leku/src/main/res/drawable-ldpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable-mdpi/ic_check_light.png b/leku/src/main/res/drawable-mdpi/leku_ic_check_light.png similarity index 100% rename from leku/src/main/res/drawable-mdpi/ic_check_light.png rename to leku/src/main/res/drawable-mdpi/leku_ic_check_light.png diff --git a/leku/src/main/res/drawable-mdpi/ic_clean.png b/leku/src/main/res/drawable-mdpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-mdpi/ic_clean.png rename to leku/src/main/res/drawable-mdpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-mdpi/ic_gps_lime.png b/leku/src/main/res/drawable-mdpi/leku_ic_gps_lime.png similarity index 100% rename from leku/src/main/res/drawable-mdpi/ic_gps_lime.png rename to leku/src/main/res/drawable-mdpi/leku_ic_gps_lime.png diff --git a/leku/src/main/res/drawable-mdpi/ic_mic.png b/leku/src/main/res/drawable-mdpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-mdpi/ic_mic.png rename to leku/src/main/res/drawable-mdpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-mdpi/ic_search.png b/leku/src/main/res/drawable-mdpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-mdpi/ic_search.png rename to leku/src/main/res/drawable-mdpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable-xhdpi/ic_check_light.png b/leku/src/main/res/drawable-xhdpi/leku_ic_check_light.png similarity index 100% rename from leku/src/main/res/drawable-xhdpi/ic_check_light.png rename to leku/src/main/res/drawable-xhdpi/leku_ic_check_light.png diff --git a/leku/src/main/res/drawable-xhdpi/ic_clean.png b/leku/src/main/res/drawable-xhdpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-xhdpi/ic_clean.png rename to leku/src/main/res/drawable-xhdpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-xhdpi/ic_gps_lime.png b/leku/src/main/res/drawable-xhdpi/leku_ic_gps_lime.png similarity index 100% rename from leku/src/main/res/drawable-xhdpi/ic_gps_lime.png rename to leku/src/main/res/drawable-xhdpi/leku_ic_gps_lime.png diff --git a/leku/src/main/res/drawable-xhdpi/ic_mic.png b/leku/src/main/res/drawable-xhdpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-xhdpi/ic_mic.png rename to leku/src/main/res/drawable-xhdpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-xhdpi/ic_search.png b/leku/src/main/res/drawable-xhdpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-xhdpi/ic_search.png rename to leku/src/main/res/drawable-xhdpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable-xxhdpi/ic_check_light.png b/leku/src/main/res/drawable-xxhdpi/leku_ic_check_light.png similarity index 100% rename from leku/src/main/res/drawable-xxhdpi/ic_check_light.png rename to leku/src/main/res/drawable-xxhdpi/leku_ic_check_light.png diff --git a/leku/src/main/res/drawable-xxhdpi/ic_clean.png b/leku/src/main/res/drawable-xxhdpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-xxhdpi/ic_clean.png rename to leku/src/main/res/drawable-xxhdpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-xxhdpi/ic_gps_lime.png b/leku/src/main/res/drawable-xxhdpi/leku_ic_gps_lime.png similarity index 100% rename from leku/src/main/res/drawable-xxhdpi/ic_gps_lime.png rename to leku/src/main/res/drawable-xxhdpi/leku_ic_gps_lime.png diff --git a/leku/src/main/res/drawable-xxhdpi/ic_mic.png b/leku/src/main/res/drawable-xxhdpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-xxhdpi/ic_mic.png rename to leku/src/main/res/drawable-xxhdpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-xxhdpi/ic_search.png b/leku/src/main/res/drawable-xxhdpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-xxhdpi/ic_search.png rename to leku/src/main/res/drawable-xxhdpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable-xxxhdpi/ic_check_light.png b/leku/src/main/res/drawable-xxxhdpi/leku_ic_check_light.png similarity index 100% rename from leku/src/main/res/drawable-xxxhdpi/ic_check_light.png rename to leku/src/main/res/drawable-xxxhdpi/leku_ic_check_light.png diff --git a/leku/src/main/res/drawable-xxxhdpi/ic_clean.png b/leku/src/main/res/drawable-xxxhdpi/leku_ic_clean.png similarity index 100% rename from leku/src/main/res/drawable-xxxhdpi/ic_clean.png rename to leku/src/main/res/drawable-xxxhdpi/leku_ic_clean.png diff --git a/leku/src/main/res/drawable-xxxhdpi/ic_gps_lime.png b/leku/src/main/res/drawable-xxxhdpi/leku_ic_gps_lime.png similarity index 100% rename from leku/src/main/res/drawable-xxxhdpi/ic_gps_lime.png rename to leku/src/main/res/drawable-xxxhdpi/leku_ic_gps_lime.png diff --git a/leku/src/main/res/drawable-xxxhdpi/ic_mic.png b/leku/src/main/res/drawable-xxxhdpi/leku_ic_mic.png similarity index 100% rename from leku/src/main/res/drawable-xxxhdpi/ic_mic.png rename to leku/src/main/res/drawable-xxxhdpi/leku_ic_mic.png diff --git a/leku/src/main/res/drawable-xxxhdpi/ic_search.png b/leku/src/main/res/drawable-xxxhdpi/leku_ic_search.png similarity index 100% rename from leku/src/main/res/drawable-xxxhdpi/ic_search.png rename to leku/src/main/res/drawable-xxxhdpi/leku_ic_search.png diff --git a/leku/src/main/res/drawable/adress_custom_background.xml b/leku/src/main/res/drawable/leku_adress_custom_background.xml similarity index 78% rename from leku/src/main/res/drawable/adress_custom_background.xml rename to leku/src/main/res/drawable/leku_adress_custom_background.xml index 791b51dd..21072f73 100644 --- a/leku/src/main/res/drawable/adress_custom_background.xml +++ b/leku/src/main/res/drawable/leku_adress_custom_background.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/leku/src/main/res/drawable/ic_satellite_off.xml b/leku/src/main/res/drawable/leku_ic_satellite_off.xml similarity index 100% rename from leku/src/main/res/drawable/ic_satellite_off.xml rename to leku/src/main/res/drawable/leku_ic_satellite_off.xml diff --git a/leku/src/main/res/drawable/ic_satellite_on.xml b/leku/src/main/res/drawable/leku_ic_satellite_on.xml similarity index 100% rename from leku/src/main/res/drawable/ic_satellite_on.xml rename to leku/src/main/res/drawable/leku_ic_satellite_on.xml diff --git a/leku/src/main/res/drawable/toolbar_custom_background.xml b/leku/src/main/res/drawable/leku_toolbar_custom_background.xml similarity index 80% rename from leku/src/main/res/drawable/toolbar_custom_background.xml rename to leku/src/main/res/drawable/leku_toolbar_custom_background.xml index e11b1859..f8695ab5 100644 --- a/leku/src/main/res/drawable/toolbar_custom_background.xml +++ b/leku/src/main/res/drawable/leku_toolbar_custom_background.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/leku/src/main/res/layout-land/activity_location_picker.xml b/leku/src/main/res/layout-land/leku_activity_location_picker.xml similarity index 83% rename from leku/src/main/res/layout-land/activity_location_picker.xml rename to leku/src/main/res/layout-land/leku_activity_location_picker.xml index b45118f0..d7cc4151 100644 --- a/leku/src/main/res/layout-land/activity_location_picker.xml +++ b/leku/src/main/res/layout-land/leku_activity_location_picker.xml @@ -40,7 +40,7 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" tools:ignore="UnusedAttribute,elevation" /> @@ -48,7 +48,7 @@ @@ -114,8 +114,8 @@ android:layout_weight="1" > - - + + @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -136,5 +136,5 @@ - + diff --git a/leku/src/main/res/layout-normal-v21/activity_location_picker.xml b/leku/src/main/res/layout-normal-v21/leku_activity_location_picker.xml similarity index 84% rename from leku/src/main/res/layout-normal-v21/activity_location_picker.xml rename to leku/src/main/res/layout-normal-v21/leku_activity_location_picker.xml index 7db87b8a..734e27f5 100644 --- a/leku/src/main/res/layout-normal-v21/activity_location_picker.xml +++ b/leku/src/main/res/layout-normal-v21/leku_activity_location_picker.xml @@ -41,14 +41,14 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" /> @@ -80,13 +80,13 @@ android:layout_marginEnd="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" - android:src="@drawable/ic_gps_lime" + android:src="@drawable/leku_ic_gps_lime" app:fabSize="normal" android:tint="?colorPrimary" - app:backgroundTint="@color/white" - app:rippleColor="@color/soft_grey" + app:backgroundTint="@color/leku_white" + app:rippleColor="@color/leku_soft_grey" app:elevation="2dp" - tools:background="@color/white" + tools:background="@color/leku_white" tools:ignore="RtlHardcoded" /> @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:background="@drawable/adress_custom_background" + android:background="@drawable/leku_adress_custom_background" android:orientation="horizontal" tools:ignore="UselessParent" > @@ -120,8 +120,8 @@ android:layout_weight="1" > - - + + @@ -135,7 +135,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -147,5 +147,5 @@ - + diff --git a/leku/src/main/res/layout-normal/activity_location_picker.xml b/leku/src/main/res/layout-normal/leku_activity_location_picker.xml similarity index 83% rename from leku/src/main/res/layout-normal/activity_location_picker.xml rename to leku/src/main/res/layout-normal/leku_activity_location_picker.xml index 641819ed..91412f54 100644 --- a/leku/src/main/res/layout-normal/activity_location_picker.xml +++ b/leku/src/main/res/layout-normal/leku_activity_location_picker.xml @@ -40,7 +40,7 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" tools:ignore="UnusedAttribute" /> @@ -48,7 +48,7 @@ @@ -114,8 +114,8 @@ android:layout_weight="1" > - - + + @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -136,5 +136,5 @@ - + diff --git a/leku/src/main/res/layout-xlarge-v21/activity_location_picker.xml b/leku/src/main/res/layout-xlarge-v21/leku_activity_location_picker.xml similarity index 84% rename from leku/src/main/res/layout-xlarge-v21/activity_location_picker.xml rename to leku/src/main/res/layout-xlarge-v21/leku_activity_location_picker.xml index d8f7b4cb..a1973ab5 100644 --- a/leku/src/main/res/layout-xlarge-v21/activity_location_picker.xml +++ b/leku/src/main/res/layout-xlarge-v21/leku_activity_location_picker.xml @@ -41,14 +41,14 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" /> @@ -80,13 +80,13 @@ android:layout_marginEnd="16dp" android:layout_marginRight="16dp" android:layout_marginBottom="8dp" - android:src="@drawable/ic_gps_lime" + android:src="@drawable/leku_ic_gps_lime" app:fabSize="normal" android:tint="?colorPrimary" - app:backgroundTint="@color/white" - app:rippleColor="@color/soft_grey" + app:backgroundTint="@color/leku_white" + app:rippleColor="@color/leku_soft_grey" app:elevation="2dp" - tools:background="@color/white" + tools:background="@color/leku_white" tools:ignore="RtlHardcoded" /> @@ -106,7 +106,7 @@ android:layout_gravity="bottom|end" android:paddingStart="16dp" android:paddingEnd="16dp" - android:background="@drawable/adress_custom_background" + android:background="@drawable/leku_adress_custom_background" android:orientation="horizontal" tools:ignore="UselessParent" > @@ -118,8 +118,8 @@ android:layout_weight="1" > - - + + @@ -133,7 +133,7 @@ android:layout_marginStart="16dp" android:layout_marginLeft="16dp" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -145,5 +145,5 @@ - + diff --git a/leku/src/main/res/layout-xlarge/activity_location_picker.xml b/leku/src/main/res/layout-xlarge/leku_activity_location_picker.xml similarity index 83% rename from leku/src/main/res/layout-xlarge/activity_location_picker.xml rename to leku/src/main/res/layout-xlarge/leku_activity_location_picker.xml index 641819ed..91412f54 100644 --- a/leku/src/main/res/layout-xlarge/activity_location_picker.xml +++ b/leku/src/main/res/layout-xlarge/leku_activity_location_picker.xml @@ -40,7 +40,7 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" tools:ignore="UnusedAttribute" /> @@ -48,7 +48,7 @@ @@ -114,8 +114,8 @@ android:layout_weight="1" > - - + + @@ -124,7 +124,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -136,5 +136,5 @@ - + diff --git a/leku/src/main/res/layout/activity_location_picker.xml b/leku/src/main/res/layout/leku_activity_location_picker.xml similarity index 83% rename from leku/src/main/res/layout/activity_location_picker.xml rename to leku/src/main/res/layout/leku_activity_location_picker.xml index 165b90e6..9069f9a2 100644 --- a/leku/src/main/res/layout/activity_location_picker.xml +++ b/leku/src/main/res/layout/leku_activity_location_picker.xml @@ -40,7 +40,7 @@ android:headerDividersEnabled="true" android:elevation="2dp" android:minWidth="296dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" tools:visibility="gone" tools:ignore="UnusedAttribute" /> @@ -48,7 +48,7 @@ @@ -104,7 +104,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:background="@drawable/adress_custom_background" + android:background="@drawable/leku_adress_custom_background" android:orientation="horizontal" tools:ignore="UselessParent" > @@ -117,8 +117,8 @@ android:layout_weight="1" > - - + + @@ -127,7 +127,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top|end" - android:src="@drawable/ic_check_light" + android:src="@drawable/leku_ic_check_light" app:fabSize="normal" app:backgroundTint="?colorPrimary" app:rippleColor="?colorPrimaryDark" @@ -140,5 +140,5 @@ - + diff --git a/leku/src/main/res/layout/layout_address.xml b/leku/src/main/res/layout/leku_layout_address.xml similarity index 88% rename from leku/src/main/res/layout/layout_address.xml rename to leku/src/main/res/layout/leku_layout_address.xml index 996b5b9d..1b73d5ba 100644 --- a/leku/src/main/res/layout/layout_address.xml +++ b/leku/src/main/res/layout/leku_layout_address.xml @@ -15,7 +15,7 @@ android:layout_marginTop="16dp" android:textStyle="normal" android:textSize="18sp" - android:textColor="@color/strong_grey" + android:textColor="@color/leku_strong_grey" tools:text="Calle Mallorca, 150" /> @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textSize="14sp" - android:textColor="@color/mid_grey" + android:textColor="@color/leku_mid_grey" tools:text="Barcelona" /> @@ -36,7 +36,7 @@ android:layout_marginTop="4dp" android:layout_marginBottom="16dp" android:textSize="14sp" - android:textColor="@color/mid_grey" + android:textColor="@color/leku_mid_grey" tools:text="08032" /> \ No newline at end of file diff --git a/leku/src/main/res/layout/layout_coordinates.xml b/leku/src/main/res/layout/leku_layout_coordinates.xml similarity index 85% rename from leku/src/main/res/layout/layout_coordinates.xml rename to leku/src/main/res/layout/leku_layout_coordinates.xml index 94839ce1..9859430d 100644 --- a/leku/src/main/res/layout/layout_coordinates.xml +++ b/leku/src/main/res/layout/leku_layout_coordinates.xml @@ -13,8 +13,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:text="@string/coordinates" - android:textColor="@color/strong_grey" + android:text="@string/leku_coordinates" + android:textColor="@color/leku_strong_grey" android:textSize="18sp" android:textStyle="normal" /> @@ -23,7 +23,7 @@ android:id="@+id/latitude" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/mid_grey" + android:textColor="@color/leku_mid_grey" android:textSize="14sp" tools:text="15.184845" /> @@ -32,7 +32,7 @@ android:id="@+id/longitude" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/mid_grey" + android:textColor="@color/leku_mid_grey" android:layout_marginBottom="16dp" android:layout_marginTop="4dp" android:textSize="14sp" diff --git a/leku/src/main/res/layout/toolbar_search.xml b/leku/src/main/res/layout/leku_toolbar_search.xml similarity index 74% rename from leku/src/main/res/layout/toolbar_search.xml rename to leku/src/main/res/layout/leku_toolbar_search.xml index ebf82428..e391110c 100644 --- a/leku/src/main/res/layout/toolbar_search.xml +++ b/leku/src/main/res/layout/leku_toolbar_search.xml @@ -6,11 +6,11 @@ android:id="@+id/map_search_toolbar" android:layout_height="?attr/actionBarSize" android:layout_width="match_parent" - android:layout_marginTop="@dimen/gap" - android:layout_marginLeft="@dimen/gap" - android:layout_marginRight="@dimen/gap" + android:layout_marginTop="@dimen/leku_gap" + android:layout_marginLeft="@dimen/leku_gap" + android:layout_marginRight="@dimen/leku_gap" android:elevation="2dp" - android:background="@drawable/toolbar_custom_background" + android:background="@drawable/leku_toolbar_custom_background" app:theme="@style/ThemeOverlay.AppCompat.Light" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" tools:ignore="UnusedAttribute,elevation" @@ -30,8 +30,8 @@ android:layout_height="wrap_content" android:inputType="text" android:imeOptions="actionSearch" - android:background="@color/search_background" - android:hint="@string/search_hint" + android:background="@color/leku_search_background" + android:hint="@string/leku_search_hint" android:layout_weight="1" android:layout_gravity="center_vertical" /> @@ -40,9 +40,9 @@ android:id="@+id/leku_clear_search_image" android:layout_width="24dp" android:layout_height="wrap_content" - android:src="@drawable/ic_clean" - android:tint="@color/strong_grey" - android:contentDescription="@string/search_hint" + android:src="@drawable/leku_ic_clean" + android:tint="@color/leku_strong_grey" + android:contentDescription="@string/leku_search_hint" android:layout_weight="0" android:visibility="invisible" /> diff --git a/leku/src/main/res/menu/toolbar_menu.xml b/leku/src/main/res/menu/leku_toolbar_menu.xml similarity index 71% rename from leku/src/main/res/menu/toolbar_menu.xml rename to leku/src/main/res/menu/leku_toolbar_menu.xml index 8d9ec23f..284a4f16 100644 --- a/leku/src/main/res/menu/toolbar_menu.xml +++ b/leku/src/main/res/menu/leku_toolbar_menu.xml @@ -5,8 +5,8 @@ \ No newline at end of file diff --git a/leku/src/main/res/values-es/strings.xml b/leku/src/main/res/values-es/strings.xml index 08db9c30..0aed5182 100644 --- a/leku/src/main/res/values-es/strings.xml +++ b/leku/src/main/res/values-es/strings.xml @@ -1,16 +1,16 @@ - Location Picker - Servicio no disponible - Algo ha ido mal. Por favor inténtelo de nuevo. - No hay resultados para su búsqueda - network - ubicación desconocida - Búsqueda por voz… - es-ES - Voz - Buscar - Longitud - Latitud - Coordenadas + Location Picker + Servicio no disponible + Algo ha ido mal. Por favor inténtelo de nuevo. + No hay resultados para su búsqueda + network + ubicación desconocida + Búsqueda por voz… + es-ES + Voz + Buscar + Longitud + Latitud + Coordenadas \ No newline at end of file diff --git a/leku/src/main/res/values/colors.xml b/leku/src/main/res/values/colors.xml index 369b77b9..502d715f 100644 --- a/leku/src/main/res/values/colors.xml +++ b/leku/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ - #FFFFFF - #F2FFFFFF - #ECEEEF - #9199A1 - #50545A - #0000 + #FFFFFF + #F2FFFFFF + #ECEEEF + #9199A1 + #50545A + #0000 \ No newline at end of file diff --git a/leku/src/main/res/values/dimens.xml b/leku/src/main/res/values/dimens.xml index 10d8dcb5..44acb8bf 100644 --- a/leku/src/main/res/values/dimens.xml +++ b/leku/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ - 24dp - 8dp + 24dp + 8dp \ No newline at end of file diff --git a/leku/src/main/res/values/strings.xml b/leku/src/main/res/values/strings.xml index bf959306..a1eb8b21 100644 --- a/leku/src/main/res/values/strings.xml +++ b/leku/src/main/res/values/strings.xml @@ -1,17 +1,17 @@ - Leku - Location Picker - Service not available - Something went wrong. Please try again. - There are no results for your search - network - unknown location - Search by voice… - en-EN - Voice - Search - Longitude - Latitude - Coordinates + Leku + Location Picker + Service not available + Something went wrong. Please try again. + There are no results for your search + network + unknown location + Search by voice… + en-EN + Voice + Search + Longitude + Latitude + Coordinates diff --git a/leku/src/main/res/xml/searchable.xml b/leku/src/main/res/xml/leku_searchable.xml similarity index 86% rename from leku/src/main/res/xml/searchable.xml rename to leku/src/main/res/xml/leku_searchable.xml index 774b6bfd..e78ba764 100644 --- a/leku/src/main/res/xml/searchable.xml +++ b/leku/src/main/res/xml/leku_searchable.xml @@ -1,7 +1,7 @@