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

Inline the creation of a page title object

Browse source
This commit is contained in:
Paul Hawke 2025-07-02 16:00:20 -05:00
parent a06145bff5
commit a45edbd1da
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/fr/free/nrw/commons/Media.kt
View file

@ -1,8 +1,9 @@
package fr.free.nrw.commons package fr.free.nrw.commons
import android.os.Parcelable import android.os.Parcelable
import fr.free.nrw.commons.BuildConfig.COMMONS_URL
import fr.free.nrw.commons.location.LatLng import fr.free.nrw.commons.location.LatLng
import fr.free.nrw.commons.utils.Utils import fr.free.nrw.commons.wikidata.model.WikiSite
import fr.free.nrw.commons.wikidata.model.page.PageTitle import fr.free.nrw.commons.wikidata.model.page.PageTitle
import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@ -174,7 +175,8 @@ class Media constructor(
* Gets file page title * Gets file page title
* @return New media page title * @return New media page title
*/ */
val pageTitle: PageTitle get() = Utils.getPageTitle(filename!!) val pageTitle: PageTitle
get() = PageTitle(filename!!, WikiSite(COMMONS_URL))
/** /**
* Returns wikicode to use the media file on a MediaWiki site * Returns wikicode to use the media file on a MediaWiki site

6
app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.kt
View file

@ -13,6 +13,7 @@ import androidx.fragment.app.FragmentManager
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import fr.free.nrw.commons.BuildConfig.COMMONS_URL
import fr.free.nrw.commons.Media import fr.free.nrw.commons.Media
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.Utils
@ -23,6 +24,8 @@ import fr.free.nrw.commons.explore.categories.parent.ParentCategoriesFragment
import fr.free.nrw.commons.explore.categories.sub.SubCategoriesFragment import fr.free.nrw.commons.explore.categories.sub.SubCategoriesFragment
import fr.free.nrw.commons.media.MediaDetailPagerFragment import fr.free.nrw.commons.media.MediaDetailPagerFragment
import fr.free.nrw.commons.theme.BaseActivity import fr.free.nrw.commons.theme.BaseActivity
import fr.free.nrw.commons.wikidata.model.WikiSite
import fr.free.nrw.commons.wikidata.model.page.PageTitle
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
@ -199,7 +202,8 @@ class CategoryDetailsActivity : BaseActivity(),
override fun onOptionsItemSelected(item: MenuItem): Boolean { override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) { return when (item.itemId) {
R.id.menu_browser_current_category -> { R.id.menu_browser_current_category -> {
val title = Utils.getPageTitle(CATEGORY_PREFIX + categoryName) val title = PageTitle(CATEGORY_PREFIX + categoryName, WikiSite(COMMONS_URL))
Utils.handleWebUrl(this, Uri.parse(title.canonicalUri)) Utils.handleWebUrl(this, Uri.parse(title.canonicalUri))
true true
} }

9
app/src/main/java/fr/free/nrw/commons/utils/Utils.java
View file

@ -16,13 +16,10 @@ import androidx.browser.customtabs.CustomTabColorSchemeParams;
import androidx.browser.customtabs.CustomTabsIntent; import androidx.browser.customtabs.CustomTabsIntent;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import fr.free.nrw.commons.BuildConfig;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Urls; import fr.free.nrw.commons.Urls;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import fr.free.nrw.commons.wikidata.model.WikiSite;
import fr.free.nrw.commons.wikidata.model.page.PageTitle;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -33,10 +30,6 @@ import timber.log.Timber;
public class Utils { public class Utils {
public static PageTitle getPageTitle(@NonNull String title) {
return new PageTitle(title, new WikiSite(BuildConfig.COMMONS_URL));
}
/** /**
* Generates licence name with given ID * Generates licence name with given ID
* @param license License ID * @param license License ID
@ -63,8 +56,6 @@ public class Utils {
* @param license License ID * @param license License ID
* @return Url of license * @return Url of license
*/ */
@NonNull @NonNull
public static String licenseUrlFor(String license) { public static String licenseUrlFor(String license) {
switch (license) { switch (license) {