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

[android] Fixed whats new screen and strings for lp.

Browse source
This commit is contained in:
velichkomarija 2020-10-17 16:47:04 +03:00 • committed by Aleksandr Zatsepin
parent 7027391a8b
commit 4921a15d85
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/values/arrays.xml
View file

@ -11,7 +11,7 @@
</string-array>
<string-array name="news_messages_1">
<item>@string/whatsnew_lp_integration_message</item>
<item>@string/whatsnew_lp_message</item>
</string-array>
<string-array name="news_messages_2">

3
android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
View file

@ -56,8 +56,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
public String getTitle(int sectionIndex, @NonNull Resources rs)
{
if (sectionIndex == mCollectionSectionIndex)
// TODO (@velichkomarija): Replace categories for collections.
return rs.getString(R.string.categories);
return rs.getString(R.string.collections_title);
return rs.getString(R.string.categories);
}

3
android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java
View file

@ -100,8 +100,7 @@ public class BookmarkHeaderView extends LinearLayout
else
UiUtils.hide(mImageViewLogo);
//TODO: (@velichkomarija) : Replace with "Content by ".
CharSequence authorName = BookmarkCategory.Author.getRepresentation(context, author);
CharSequence authorName = BookmarkCategory.Author.getContentByString(context, author);
mAuthorTextView.setText(authorName);
}
}

6
android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java
View file

@ -273,6 +273,12 @@ public class BookmarkCategory implements Parcelable
return String.format(res.getString(R.string.author_name_by_prefix), author.getName());
}
public static String getContentByString(@NonNull Context context, @NonNull Author author)
{
Resources res = context.getResources();
return res.getString(R.string.content_by_component).concat(" ").concat(author.getName());
}
@Override
public void writeToParcel(Parcel dest, int flags)
{