pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Updated strings for bookmarks catalog ui

Browse source
This commit is contained in:
Alexander Zatsepin 2018-08-09 20:56:06 +03:00 • committed by Aleksey Belousov
parent 65a69a78ec
commit beda1fae2a
9 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -244,7 +244,7 @@
<activity
android:name="com.mapswithme.maps.bookmarks.BookmarksCatalogActivity"
android:label="@string/routes_and_bookmarks"/>
android:label="@string/guides"/>
<activity-alias
android:name="com.mapswithme.maps.DownloadResourcesActivity"
@ -299,7 +299,7 @@
<activity
android:name="com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity"
android:configChanges="orientation|screenLayout|screenSize"
android:label="@string/bookmarks"
android:label="@string/bookmarks_guides"
android:parentActivityName="com.mapswithme.maps.MwmActivity"
android:windowSoftInputMode="adjustResize">
<!-- The meta-data element is needed for versions lower than 4.1 -->

6
android/res/layout/fragment_catalog_bookmark_categories.xml
View file

@ -27,7 +27,7 @@
android:layout_height="wrap_content">
<TextView
android:id="@+id/header_title"
android:text="@string/cached_bookmarks_placeholder_title"
android:text="@string/download_guides"
android:textAppearance="@style/MwmTextAppearance.Body1"
android:gravity="start|center_vertical"
android:paddingTop="@dimen/margin_half_plus"
@ -36,7 +36,7 @@
mapsme:layout_constraintLeft_toLeftOf="parent"/>
<TextView
android:id="@+id/header_description"
android:text="@string/cached_bookmarks_placeholder_subtitle"
android:text="@string/cached_guides_placeholder_subtitle"
android:textAppearance="@style/MwmTextAppearance.Body3"
android:paddingTop="@dimen/margin_half_plus"
android:paddingBottom="@dimen/margin_half_plus"
@ -89,7 +89,7 @@
style="@style/MwmWidget.Button.Accent"
android:layout_weight="0"
android:layout_marginTop="@dimen/margin_half"
android:text="@string/downloader_download_routers"
android:text="@string/download_guides"
android:textAppearance="@style/MwmTextAppearance.Body1.Light"/>
</LinearLayout>
<LinearLayout

4
android/res/layout/fragment_show_on_map_catalog_category.xml
View file

@ -13,7 +13,7 @@
android:paddingLeft="@dimen/margin_double">
<TextView
android:textAppearance="@style/MwmTheme.DialogTitleBase"
android:text="@string/bookmarks_downloaded_title"
android:text="@string/guide_downloaded_title"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/bookmarks_downloaded_subtitle"
android:text="@string/guide_downloaded_subtitle"
android:layout_marginTop="@dimen/margin_half"/>
<Button
android:id="@+id/show_on_map_accept_btn"

2
android/res/layout/menu_content.xml
View file

@ -23,7 +23,7 @@
android:drawableStart="@drawable/ic_menu_download_guides"
android:drawableTint="?attr/colorAccent"
android:textColor="?attr/colorAccent"
android:text="@string/download_routes"
android:text="@string/download_guides"
tools:background="#403033FF"
tools:targetApi="m"/>

2
android/res/layout/menu_content_grid.xml
View file

@ -19,7 +19,7 @@
style="@style/MwmTheme.Menu.Content.GridItem.Text"
android:drawableTop="@drawable/ic_menu_download_guides"
android:drawableTint="?colorAccent"
android:text="@string/download_routes"
android:text="@string/download_guides"
android:textColor="?attr/colorAccent"
tools:targetApi="m"/>

2
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -1199,7 +1199,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (!successful)
return;
Toast.makeText(this, R.string.bookmarks_downloaded_title, Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.guide_downloaded_title, Toast.LENGTH_LONG).show();
Statistics.INSTANCE.trackEvent(Statistics.EventName.BM_GUIDEDOWNLOADTOAST_SHOWN);
}

4
android/src/com/mapswithme/maps/bookmarks/AdapterResourceProvider.java
View file

@ -66,7 +66,7 @@ public interface AdapterResourceProvider
@Override
public int getHeaderText()
{
return R.string.bookmarks_groups_cached;
return R.string.guides_groups_cached;
}
@Override
@ -78,7 +78,7 @@ public interface AdapterResourceProvider
@Override
public int getFooterText()
{
return R.string.downloader_download_routers;
return R.string.download_guides;
}
}

4
android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java
View file

@ -22,7 +22,7 @@ public enum BookmarksPageFactory
@Override
public int getTitle()
{
return R.string.bookmarks_page_my;
return R.string.bookmarks;
}
},
CATALOG(new Analytics(Statistics.ParamValue.DOWNLOADED), new AdapterResourceProvider.Catalog())
@ -37,7 +37,7 @@ public enum BookmarksPageFactory
@Override
public int getTitle()
{
return R.string.bookmarks_page_downloaded;
return R.string.guides;
}
};

2
android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java
View file

@ -69,6 +69,6 @@ class CatalogListenerDecorator extends BookmarkManager.DefaultBookmarksCatalogLi
{
DialogUtils.showAlertDialog(fragment.getActivity(),
R.string.title_error_downloading_bookmarks,
R.string.subtitle_error_downloading_bookmarks);
R.string.subtitle_error_downloading_guide);
}
}