mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added CDATA tag (#1836)

Browse source 
* Fix issue#1772

Add the CDATA tag to welcome_help_button_text string. Set the text of the corresponding textview using Html.fromHtml() function.

* Fix issue#1772

Add the CDATA tag to nominated_see_more string. Set the text of the corresponding textview using Html.fromHtml() function.
This commit is contained in:
Mansi Agarwal 2018-08-31 14:14:36 +05:30 • committed by neslihanturan
parent 2884bd934a
commit 430bf90310
6 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
View file

@ -19,6 +19,7 @@ public class WelcomeActivity extends BaseActivity {
private WelcomePagerAdapter adapter = new WelcomePagerAdapter();
private boolean isQuiz;
static String moreInformation;
/**
* Initialises exiting fields and dependencies
@ -30,6 +31,8 @@ public class WelcomeActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_welcome);
moreInformation = this.getString(R.string.welcome_help_button_text);
if(getIntent() != null) {
Bundle bundle = getIntent().getExtras();
if (bundle != null) {

8
app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java
View file

@ -3,6 +3,7 @@ package fr.free.nrw.commons;
import android.net.Uri;
import android.support.annotation.Nullable;
import android.support.v4.view.PagerAdapter;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -66,6 +67,13 @@ public class WelcomePagerAdapter extends PagerAdapter {
}
ViewHolder holder = new ViewHolder(layout);
layout.setTag(holder);
if(position == PAGE_FINAL){
TextView moreInfo = layout.findViewById(R.id.welcomeInfo);
moreInfo.setText(Html.fromHtml(WelcomeActivity.moreInformation));
ViewHolder holder1 = new ViewHolder(layout);
layout.setTag(holder1);
}
} else {
if (position == PAGE_FINAL) {
ViewHolder holder = new ViewHolder(layout);

2
app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file

@ -11,6 +11,7 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.Editable;
import android.text.Html;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.TypedValue;
@ -165,6 +166,7 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment {
final View view = inflater.inflate(R.layout.fragment_media_detail, container, false);
ButterKnife.bind(this,view);
seeMore.setText(Html.fromHtml(getString(R.string.nominated_see_more)));
if (isCategoryImage){
authorLayout.setVisibility(VISIBLE);