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

Renames class to match remaining utility method

Browse source
This commit is contained in:
Paul Hawke 2025-07-02 16:19:28 -05:00
parent 9d4d67fdaa
commit ed4e333651
5 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/fr/free/nrw/commons/AboutActivity.kt
View file

@ -18,7 +18,7 @@ import fr.free.nrw.commons.databinding.ActivityAboutBinding
import fr.free.nrw.commons.theme.BaseActivity import fr.free.nrw.commons.theme.BaseActivity
import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha import fr.free.nrw.commons.utils.ConfigUtils.getVersionNameWithSha
import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog import fr.free.nrw.commons.utils.DialogUtil.showAlertDialog
import fr.free.nrw.commons.utils.Utils import fr.free.nrw.commons.utils.UnderlineUtils
import fr.free.nrw.commons.utils.UrlUtils.handleWebUrl import fr.free.nrw.commons.utils.UrlUtils.handleWebUrl
import java.util.Collections import java.util.Collections
import androidx.core.net.toUri import androidx.core.net.toUri
@ -65,27 +65,27 @@ class AboutActivity : BaseActivity() {
binding!!.aboutImprove.setHtmlText(improveText) binding!!.aboutImprove.setHtmlText(improveText)
binding!!.aboutVersion.text = applicationContext.getVersionNameWithSha() binding!!.aboutVersion.text = applicationContext.getVersionNameWithSha()
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutFaq, R.string.about_faq, binding!!.aboutFaq, R.string.about_faq,
applicationContext applicationContext
) )
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutRateUs, R.string.about_rate_us, binding!!.aboutRateUs, R.string.about_rate_us,
applicationContext applicationContext
) )
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutUserGuide, R.string.user_guide, binding!!.aboutUserGuide, R.string.user_guide,
applicationContext applicationContext
) )
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutPrivacyPolicy, R.string.about_privacy_policy, binding!!.aboutPrivacyPolicy, R.string.about_privacy_policy,
applicationContext applicationContext
) )
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutTranslate, R.string.about_translate, binding!!.aboutTranslate, R.string.about_translate,
applicationContext applicationContext
) )
Utils.setUnderlinedText( UnderlineUtils.setUnderlinedText(
binding!!.aboutCredits, R.string.about_credits, binding!!.aboutCredits, R.string.about_credits,
applicationContext applicationContext
) )

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

@ -8,7 +8,7 @@ import android.widget.TextView;
import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.PagerAdapter;
import fr.free.nrw.commons.utils.UrlUtils; import fr.free.nrw.commons.utils.UrlUtils;
import fr.free.nrw.commons.utils.Utils; import fr.free.nrw.commons.utils.UnderlineUtils;
public class WelcomePagerAdapter extends PagerAdapter { public class WelcomePagerAdapter extends PagerAdapter {
private static final int[] PAGE_LAYOUTS = new int[]{ private static final int[] PAGE_LAYOUTS = new int[]{
@ -48,7 +48,7 @@ public class WelcomePagerAdapter extends PagerAdapter {
if (position == PAGE_LAYOUTS.length - 1) { if (position == PAGE_LAYOUTS.length - 1) {
// Add link to more information // Add link to more information
TextView moreInfo = layout.findViewById(R.id.welcomeInfo); TextView moreInfo = layout.findViewById(R.id.welcomeInfo);
Utils.setUnderlinedText(moreInfo, R.string.welcome_help_button_text, container.getContext()); UnderlineUtils.setUnderlinedText(moreInfo, R.string.welcome_help_button_text, container.getContext());
moreInfo.setOnClickListener(view -> UrlUtils.handleWebUrl( moreInfo.setOnClickListener(view -> UrlUtils.handleWebUrl(
container.getContext(), container.getContext(),
Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents") Uri.parse("https://commons.wikimedia.org/wiki/Help:Contents")

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

@ -77,7 +77,7 @@ import fr.free.nrw.commons.CommonsApplication.Companion.instance
import fr.free.nrw.commons.Media import fr.free.nrw.commons.Media
import fr.free.nrw.commons.MediaDataExtractor import fr.free.nrw.commons.MediaDataExtractor
import fr.free.nrw.commons.R import fr.free.nrw.commons.R
import fr.free.nrw.commons.utils.Utils import fr.free.nrw.commons.utils.UnderlineUtils
import fr.free.nrw.commons.actions.ThanksClient import fr.free.nrw.commons.actions.ThanksClient
import fr.free.nrw.commons.auth.SessionManager import fr.free.nrw.commons.auth.SessionManager
import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
@ -320,7 +320,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
val view: View = binding.root val view: View = binding.root
Utils.setUnderlinedText(binding.seeMore, R.string.nominated_see_more, requireContext()) UnderlineUtils.setUnderlinedText(binding.seeMore, R.string.nominated_see_more, requireContext())
if (isCategoryImage) { if (isCategoryImage) {
binding.authorLinearLayout.visibility = View.VISIBLE binding.authorLinearLayout.visibility = View.VISIBLE

6
app/src/main/java/fr/free/nrw/commons/utils/Utils.java → app/src/main/java/fr/free/nrw/commons/utils/UnderlineUtils.java
View file

@ -5,7 +5,7 @@ import android.text.SpannableString;
import android.text.style.UnderlineSpan; import android.text.style.UnderlineSpan;
import android.widget.TextView; import android.widget.TextView;
public class Utils { public final class UnderlineUtils {
/** /**
* This method sets underlined string text to a TextView * This method sets underlined string text to a TextView
@ -14,8 +14,8 @@ public class Utils {
* @param stringResourceName string resource name * @param stringResourceName string resource name
* @param context * @param context
*/ */
public static void setUnderlinedText(TextView textView, int stringResourceName, Context context) { public static void setUnderlinedText(final TextView textView, final int stringResourceName, final Context context) {
SpannableString content = new SpannableString(context.getString(stringResourceName)); final SpannableString content = new SpannableString(context.getString(stringResourceName));
content.setSpan(new UnderlineSpan(), 0, content.length(), 0); content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
textView.setText(content); textView.setText(content);
} }

8
app/src/test/kotlin/fr/free/nrw/commons/upload/MediaLicensePresenterTest.kt
View file

@ -1,7 +1,7 @@
package fr.free.nrw.commons.upload package fr.free.nrw.commons.upload
import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verify
import fr.free.nrw.commons.utils.Utils import fr.free.nrw.commons.utils.UnderlineUtils
import fr.free.nrw.commons.kvstore.JsonKvStore import fr.free.nrw.commons.kvstore.JsonKvStore
import fr.free.nrw.commons.repository.UploadRepository import fr.free.nrw.commons.repository.UploadRepository
import fr.free.nrw.commons.upload.license.MediaLicenseContract import fr.free.nrw.commons.upload.license.MediaLicenseContract
@ -26,7 +26,7 @@ import org.robolectric.RobolectricTestRunner
*/ */
@RunWith(RobolectricTestRunner::class) @RunWith(RobolectricTestRunner::class)
@PrepareForTest(Utils::class) @PrepareForTest(UnderlineUtils::class)
class MediaLicensePresenterTest { class MediaLicensePresenterTest {
@Mock @Mock
internal lateinit var repository: UploadRepository internal lateinit var repository: UploadRepository
@ -40,7 +40,7 @@ class MediaLicensePresenterTest {
@InjectMocks @InjectMocks
lateinit var mediaLicensePresenter: MediaLicensePresenter lateinit var mediaLicensePresenter: MediaLicensePresenter
private lateinit var mockedUtil: MockedStatic<Utils> private lateinit var mockedUtil: MockedStatic<UnderlineUtils>
/** /**
* initial setup test environemnt * initial setup test environemnt
@ -50,7 +50,7 @@ class MediaLicensePresenterTest {
fun setUp() { fun setUp() {
MockitoAnnotations.openMocks(this) MockitoAnnotations.openMocks(this)
mediaLicensePresenter.onAttachView(view) mediaLicensePresenter.onAttachView(view)
mockedUtil = Mockito.mockStatic(Utils::class.java) mockedUtil = Mockito.mockStatic(UnderlineUtils::class.java)
`when`(Licenses.licenseNameFor(ArgumentMatchers.anyString())).thenReturn(1) `when`(Licenses.licenseNameFor(ArgumentMatchers.anyString())).thenReturn(1)
} }