diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java index c1bc37f46..74247a02f 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java @@ -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) { diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java index bca548632..8bc82be98 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomePagerAdapter.java @@ -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); diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java index 61b121390..b46789ba0 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java @@ -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); diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml index a3d11530a..dc88a63b4 100644 --- a/app/src/main/res/layout/fragment_media_detail.xml +++ b/app/src/main/res/layout/fragment_media_detail.xml @@ -305,7 +305,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="@string/nominated_see_more" android:paddingTop="@dimen/standard_gap" android:textColor="@color/primaryTextColor" android:textSize="@dimen/normal_text" diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml index 561e660aa..6a1d36c2a 100644 --- a/app/src/main/res/layout/welcome_final.xml +++ b/app/src/main/res/layout/welcome_final.xml @@ -78,7 +78,6 @@ android:id="@+id/welcomeInfo" android:textSize="@dimen/normal_text" android:textColor="@android:color/white" - android:text="@string/welcome_help_button_text" android:layout_marginBottom="@dimen/large_gap" android:paddingBottom="@dimen/large_gap" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 690aec4d9..672ae3fc0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -153,7 +153,7 @@ Avoid copyrighted materials you found from the Internet as well as images of posters, book covers, etc. You think you got it? Yes! - More Information + More Information]]> Categories Loading… None selected @@ -245,7 +245,7 @@ Error! URL not found Nominate for Deletion This image has been nominated for deletion. - See webpage for details + See webpage for details]] View in Browser Skip Log in