-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11282 from Isira-Seneviratne/About-Compose
Migrate about activity to Jetpack Compose
- Loading branch information
Showing
24 changed files
with
892 additions
and
703 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
202 changes: 15 additions & 187 deletions
202
app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,203 +1,31 @@ | ||
| package org.schabi.newpipe.about | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.MenuItem | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.Button | ||
| import androidx.annotation.StringRes | ||
| import androidx.activity.compose.setContent | ||
| import androidx.activity.enableEdgeToEdge | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.FragmentActivity | ||
| import androidx.viewpager2.adapter.FragmentStateAdapter | ||
| import com.google.android.material.tabs.TabLayoutMediator | ||
| import org.schabi.newpipe.BuildConfig | ||
| import androidx.compose.ui.res.stringResource | ||
| import org.schabi.newpipe.R | ||
| import org.schabi.newpipe.databinding.ActivityAboutBinding | ||
| import org.schabi.newpipe.databinding.FragmentAboutBinding | ||
| import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar | ||
| import org.schabi.newpipe.ui.screens.AboutScreen | ||
| import org.schabi.newpipe.ui.theme.AppTheme | ||
| import org.schabi.newpipe.util.Localization | ||
| import org.schabi.newpipe.util.ThemeHelper | ||
| import org.schabi.newpipe.util.external_communication.ShareUtils | ||
|
|
||
| class AboutActivity : AppCompatActivity() { | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| Localization.assureCorrectAppLanguage(this) | ||
| enableEdgeToEdge() | ||
| super.onCreate(savedInstanceState) | ||
| ThemeHelper.setTheme(this) | ||
| title = getString(R.string.title_activity_about) | ||
|
|
||
| val aboutBinding = ActivityAboutBinding.inflate(layoutInflater) | ||
| setContentView(aboutBinding.root) | ||
| setSupportActionBar(aboutBinding.aboutToolbar) | ||
| supportActionBar?.setDisplayHomeAsUpEnabled(true) | ||
|
|
||
| // Create the adapter that will return a fragment for each of the three | ||
| // primary sections of the activity. | ||
| val mAboutStateAdapter = AboutStateAdapter(this) | ||
| // Set up the ViewPager with the sections adapter. | ||
| aboutBinding.aboutViewPager2.adapter = mAboutStateAdapter | ||
| TabLayoutMediator( | ||
| aboutBinding.aboutTabLayout, | ||
| aboutBinding.aboutViewPager2 | ||
| ) { tab, position -> | ||
| tab.setText(mAboutStateAdapter.getPageTitle(position)) | ||
| }.attach() | ||
| } | ||
|
|
||
| override fun onOptionsItemSelected(item: MenuItem): Boolean { | ||
| if (item.itemId == android.R.id.home) { | ||
| finish() | ||
| return true | ||
| } | ||
| return super.onOptionsItemSelected(item) | ||
| } | ||
|
|
||
| /** | ||
| * A placeholder fragment containing a simple view. | ||
| */ | ||
| class AboutFragment : Fragment() { | ||
| private fun Button.openLink(@StringRes url: Int) { | ||
| setOnClickListener { | ||
| ShareUtils.openUrlInApp(context, requireContext().getString(url)) | ||
| } | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| FragmentAboutBinding.inflate(inflater, container, false).apply { | ||
| aboutAppVersion.text = BuildConfig.VERSION_NAME | ||
| aboutGithubLink.openLink(R.string.github_url) | ||
| aboutDonationLink.openLink(R.string.donation_url) | ||
| aboutWebsiteLink.openLink(R.string.website_url) | ||
| aboutPrivacyPolicyLink.openLink(R.string.privacy_policy_url) | ||
| faqLink.openLink(R.string.faq_url) | ||
| return root | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A [FragmentStateAdapter] that returns a fragment corresponding to | ||
| * one of the sections/tabs/pages. | ||
| */ | ||
| private class AboutStateAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) { | ||
| private val posAbout = 0 | ||
| private val posLicense = 1 | ||
| private val totalCount = 2 | ||
|
|
||
| override fun createFragment(position: Int): Fragment { | ||
| return when (position) { | ||
| posAbout -> AboutFragment() | ||
| posLicense -> LicenseFragment.newInstance(SOFTWARE_COMPONENTS) | ||
| else -> throw IllegalArgumentException("Unknown position for ViewPager2") | ||
| setContent { | ||
| AppTheme { | ||
| ScaffoldWithToolbar( | ||
| title = stringResource(R.string.title_activity_about), | ||
| onBackClick = { onBackPressedDispatcher.onBackPressed() } | ||
| ) { padding -> | ||
| AboutScreen(padding) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun getItemCount(): Int { | ||
| // Show 2 total pages. | ||
| return totalCount | ||
| } | ||
|
|
||
| fun getPageTitle(position: Int): Int { | ||
| return when (position) { | ||
| posAbout -> R.string.tab_about | ||
| posLicense -> R.string.tab_licenses | ||
| else -> throw IllegalArgumentException("Unknown position for ViewPager2") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| /** | ||
| * List of all software components. | ||
| */ | ||
| private val SOFTWARE_COMPONENTS = arrayListOf( | ||
| SoftwareComponent( | ||
| "ACRA", "2013", "Kevin Gaudin", | ||
| "https://github.com/ACRA/acra", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "AndroidX", "2005 - 2011", "The Android Open Source Project", | ||
| "https://developer.android.com/jetpack", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "ExoPlayer", "2014 - 2020", "Google, Inc.", | ||
| "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "GigaGet", "2014 - 2015", "Peter Cai", | ||
| "https://github.com/PaperAirplane-Dev-Team/GigaGet", StandardLicenses.GPL3 | ||
| ), | ||
| SoftwareComponent( | ||
| "Groupie", "2016", "Lisa Wray", | ||
| "https://github.com/lisawray/groupie", StandardLicenses.MIT | ||
| ), | ||
| SoftwareComponent( | ||
| "Android-State", "2018", "Evernote", | ||
| "https://github.com/Evernote/android-state", StandardLicenses.EPL1 | ||
| ), | ||
| SoftwareComponent( | ||
| "Bridge", "2021", "Livefront", | ||
| "https://github.com/livefront/bridge", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "Jsoup", "2009 - 2020", "Jonathan Hedley", | ||
| "https://github.com/jhy/jsoup", StandardLicenses.MIT | ||
| ), | ||
| SoftwareComponent( | ||
| "Markwon", "2019", "Dimitry Ivanov", | ||
| "https://github.com/noties/Markwon", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "Material Components for Android", "2016 - 2020", "Google, Inc.", | ||
| "https://github.com/material-components/material-components-android", | ||
| StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "NewPipe Extractor", "2017 - 2020", "Christian Schabesberger", | ||
| "https://github.com/TeamNewPipe/NewPipeExtractor", StandardLicenses.GPL3 | ||
| ), | ||
| SoftwareComponent( | ||
| "NoNonsense-FilePicker", "2016", "Jonas Kalderstam", | ||
| "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2 | ||
| ), | ||
| SoftwareComponent( | ||
| "OkHttp", "2019", "Square, Inc.", | ||
| "https://square.github.io/okhttp/", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "Coil", "2023", "Coil Contributors", | ||
| "https://coil-kt.github.io/coil/", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "PrettyTime", "2012 - 2020", "Lincoln Baxter, III", | ||
| "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "ProcessPhoenix", "2015", "Jake Wharton", | ||
| "https://github.com/JakeWharton/ProcessPhoenix", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "RxAndroid", "2015", "The RxAndroid authors", | ||
| "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "RxBinding", "2015", "Jake Wharton", | ||
| "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "RxJava", "2016 - 2020", "RxJava Contributors", | ||
| "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2 | ||
| ), | ||
| SoftwareComponent( | ||
| "SearchPreference", "2018", "ByteHamster", | ||
| "https://github.com/ByteHamster/SearchPreference", StandardLicenses.MIT | ||
| ), | ||
| ) | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.