diff options
| author | Александр Зацепин <az@mapswithme.com> | 2017-07-31 20:02:12 +0300 |
|---|---|---|
| committer | Roman Kuznetsov <r.kuznetsow@gmail.com> | 2017-08-01 10:27:55 +0300 |
| commit | 78fb60203386eb2916b2fc05b22d4bde2e0604a0 (patch) | |
| tree | 601125b55b67e2159559239e6fe72a263841e6b8 | |
| parent | ef2b582807ecbb2dca8fbad98e3fed61e5f3d7af (diff) | |
[android] Fixed android build after string mergebeta-942
| -rw-r--r-- | android/res/layout/card_loading.xml | 2 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java | 2 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/cian/CianAdapter.java | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/android/res/layout/card_loading.xml b/android/res/layout/card_loading.xml index 3829d57b3c..e79205530b 100644 --- a/android/res/layout/card_loading.xml +++ b/android/res/layout/card_loading.xml @@ -44,6 +44,6 @@ android:fontFamily="@string/robotoMedium" android:gravity="center" android:background="?windowBackgroundForced" - android:text="@string/details" + android:text="@string/preloader_cian_button" tools:targetApi="jelly_bean"/> </LinearLayout> diff --git a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java index a157e3f00d..304104808d 100644 --- a/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java +++ b/android/src/com/mapswithme/maps/base/BaseSponsoredAdapter.java @@ -36,7 +36,7 @@ public abstract class BaseSponsoredAdapter extends RecyclerView.Adapter<BaseSpon private static final int MARGING_QUARTER = UiUtils.dimen(MwmApplication.get(), R.dimen.margin_quarter); private static final String ERROR_SUBTITLE = MwmApplication - .get().getString(R.string.error_load_information); + .get().getString(R.string.preloader_cian_message); @Retention(RetentionPolicy.SOURCE) @IntDef({ TYPE_PRODUCT, TYPE_MORE, TYPE_LOADING }) diff --git a/android/src/com/mapswithme/maps/cian/CianAdapter.java b/android/src/com/mapswithme/maps/cian/CianAdapter.java index e47bc0fc25..d740f69e3e 100644 --- a/android/src/com/mapswithme/maps/cian/CianAdapter.java +++ b/android/src/com/mapswithme/maps/cian/CianAdapter.java @@ -21,9 +21,9 @@ import java.util.List; public final class CianAdapter extends BaseSponsoredAdapter { private static final String LOADING_TITLE = MwmApplication - .get().getString(R.string.title_cian_load_information); + .get().getString(R.string.preloader_cian_title); private static final String LOADING_SUBTITLE = MwmApplication - .get().getString(R.string.subtitle_cian_load_information); + .get().getString(R.string.preloader_cian_message); public CianAdapter(@NonNull String url, boolean hasError, @Nullable ItemSelectedListener listener) { |