Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Set default value for text arg of viewUrl

This commit is contained in:
kyori19 2020-05-04 13:13:19 +09:00
parent 1f2c14080e
commit 117c8fcce5
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt
View File

@ -47,7 +47,7 @@ class AboutActivity : BottomSheetActivity(), Injectable {
aboutBugsFeaturesInfoTextView.setClickableTextWithoutUnderlines(R.string.about_bug_feature_request_site)
tuskyProfileButton.setOnClickListener {
viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL, BuildConfig.SUPPORT_ACCOUNT_URL)
viewUrl(BuildConfig.SUPPORT_ACCOUNT_URL)
}
aboutLicensesButton.setOnClickListener {

2
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View File

@ -724,7 +724,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
}
override fun onViewUrl(url: String, text: String) {
viewUrl(url, text)
viewUrl(url, text = text)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {

2
app/src/main/java/com/keylesspalace/tusky/BottomSheetActivity.kt
View File

@ -65,7 +65,7 @@ abstract class BottomSheetActivity : BaseActivity() {
}
open fun viewUrl(url: String, text: String, lookupFallbackBehavior: PostLookupFallbackBehavior = PostLookupFallbackBehavior.OPEN_IN_BROWSER) {
open fun viewUrl(url: String, lookupFallbackBehavior: PostLookupFallbackBehavior = PostLookupFallbackBehavior.OPEN_IN_BROWSER, text: String = "") {
if (forceBrowser.contains(text)) {
openLink(url)
return

2
app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
View File

@ -321,7 +321,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
if (intent != null) {
val statusUrl = intent.getStringExtra(STATUS_URL)
if (statusUrl != null) {
viewUrl(statusUrl, statusUrl, PostLookupFallbackBehavior.DISPLAY_ERROR)
viewUrl(statusUrl, PostLookupFallbackBehavior.DISPLAY_ERROR)
}
}
}

2
app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt
View File

@ -93,7 +93,7 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
viewModel.checkUrl.observe(this, Observer {
if (!it.isNullOrBlank()) {
viewModel.urlChecked()
viewUrl(it, it)
viewUrl(it)
}
})
}

2
app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
View File

@ -125,7 +125,7 @@ abstract class SearchFragment<T> : Fragment(),
override fun onViewTag(tag: String) = startActivity(ViewTagActivity.getIntent(requireContext(), tag))
override fun onViewUrl(url: String, text: String) {
bottomSheetActivity?.viewUrl(url, text)
bottomSheetActivity?.viewUrl(url, text = text)
}
protected val bottomSheetActivity

2
app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchNotestockFragment.kt
View File

@ -139,7 +139,7 @@ class SearchNotestockFragment : SearchFragment<Pair<Status, StatusViewData.Concr
override fun onViewThread(position: Int) {
(adapter as? SearchStatusesAdapter)?.getItem(position)?.first?.let { status ->
val actionableStatus = status.actionableStatus
bottomSheetActivity?.viewUrl(actionableStatus.id, actionableStatus.id)
bottomSheetActivity?.viewUrl(actionableStatus.id)
}
}

2
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View File

@ -138,7 +138,7 @@ public abstract class SFragment extends BaseFragment implements Injectable {
}
public void onViewUrl(String url, String text) {
bottomSheetActivity.viewUrl(url, text, PostLookupFallbackBehavior.OPEN_IN_BROWSER);
bottomSheetActivity.viewUrl(url, PostLookupFallbackBehavior.OPEN_IN_BROWSER, text);
}
protected void reply(Status status) {

2
app/src/main/java/net/accelf/yuito/QuickTootHelper.java
View File

@ -116,7 +116,7 @@ public class QuickTootHelper {
@Override
public void onViewUrl(String url, String text) {
activity.viewUrl(url, text, PostLookupFallbackBehavior.OPEN_IN_BROWSER);
activity.viewUrl(url, PostLookupFallbackBehavior.OPEN_IN_BROWSER, text);
}
};
activity.mastodonApi.listAnnouncements()