diff --git a/app/build.gradle b/app/build.gradle index aab76679e..1389cdc06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ import com.android.tools.profgen.ArtProfileKt import com.android.tools.profgen.ArtProfileSerializer import com.android.tools.profgen.DexFile +import com.mikepenz.aboutlibraries.plugin.DuplicateMode plugins { alias libs.plugins.android.application @@ -11,6 +12,7 @@ plugins { alias libs.plugins.checkstyle alias libs.plugins.sonarqube alias libs.plugins.hilt + alias libs.plugins.aboutlibraries } android { @@ -181,6 +183,13 @@ kapt { correctErrorTypes true } +aboutLibraries { + // note: offline mode prevents the plugin from fetching licenses at build time, which would be + // harmful for reproducible builds + offlineMode = true + duplicationMode = DuplicateMode.MERGE +} + dependencies { /** Desugaring **/ coreLibraryDesugaring libs.desugar.jdk.libs.nio @@ -290,6 +299,9 @@ dependencies { // Coroutines interop implementation libs.kotlinx.coroutines.rx3 + // Library loading for About screen + implementation libs.aboutlibraries.compose.m3 + // Hilt implementation libs.hilt.android kapt(libs.hilt.compiler) diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt index 60a1cff37..b437c6acb 100644 --- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt +++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt @@ -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)) + setContent { + AppTheme { + ScaffoldWithToolbar( + title = stringResource(R.string.title_activity_about), + onBackClick = { onBackPressedDispatcher.onBackPressed() } + ) { padding -> + AboutScreen(padding) + } } } - - 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") - } - } - - 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 - ), - ) } } diff --git a/app/src/main/java/org/schabi/newpipe/about/License.kt b/app/src/main/java/org/schabi/newpipe/about/License.kt deleted file mode 100644 index 117ff9bf5..000000000 --- a/app/src/main/java/org/schabi/newpipe/about/License.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.schabi.newpipe.about - -import android.os.Parcelable -import kotlinx.parcelize.Parcelize -import java.io.Serializable - -/** - * Class for storing information about a software license. - */ -@Parcelize -class License(val name: String, val abbreviation: String, val filename: String) : Parcelable, Serializable diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt deleted file mode 100644 index 9f5ad2a7a..000000000 --- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.kt +++ /dev/null @@ -1,140 +0,0 @@ -package org.schabi.newpipe.about - -import android.os.Bundle -import android.util.Base64 -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.webkit.WebView -import androidx.appcompat.app.AlertDialog -import androidx.core.os.bundleOf -import androidx.fragment.app.Fragment -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers -import io.reactivex.rxjava3.core.Observable -import io.reactivex.rxjava3.disposables.CompositeDisposable -import io.reactivex.rxjava3.disposables.Disposable -import io.reactivex.rxjava3.schedulers.Schedulers -import org.schabi.newpipe.BuildConfig -import org.schabi.newpipe.R -import org.schabi.newpipe.databinding.FragmentLicensesBinding -import org.schabi.newpipe.databinding.ItemSoftwareComponentBinding -import org.schabi.newpipe.ktx.parcelableArrayList -import org.schabi.newpipe.util.Localization -import org.schabi.newpipe.util.external_communication.ShareUtils - -/** - * Fragment containing the software licenses. - */ -class LicenseFragment : Fragment() { - private lateinit var softwareComponents: List - private var activeSoftwareComponent: SoftwareComponent? = null - private val compositeDisposable = CompositeDisposable() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - softwareComponents = arguments?.parcelableArrayList(ARG_COMPONENTS)!! - .sortedBy { it.name } // Sort components by name - activeSoftwareComponent = savedInstanceState?.getSerializable(SOFTWARE_COMPONENT_KEY) as? SoftwareComponent - } - - override fun onDestroy() { - compositeDisposable.dispose() - super.onDestroy() - } - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - val binding = FragmentLicensesBinding.inflate(inflater, container, false) - binding.licensesAppReadLicense.setOnClickListener { - compositeDisposable.add( - showLicense(NEWPIPE_SOFTWARE_COMPONENT) - ) - } - for (component in softwareComponents) { - val componentBinding = ItemSoftwareComponentBinding - .inflate(inflater, container, false) - componentBinding.name.text = component.name - componentBinding.copyright.text = getString( - R.string.copyright, - component.years, - component.copyrightOwner, - component.license.abbreviation - ) - val root: View = componentBinding.root - root.tag = component - root.setOnClickListener { - compositeDisposable.add( - showLicense(component) - ) - } - binding.licensesSoftwareComponents.addView(root) - registerForContextMenu(root) - } - activeSoftwareComponent?.let { compositeDisposable.add(showLicense(it)) } - return binding.root - } - - override fun onSaveInstanceState(savedInstanceState: Bundle) { - super.onSaveInstanceState(savedInstanceState) - activeSoftwareComponent?.let { savedInstanceState.putSerializable(SOFTWARE_COMPONENT_KEY, it) } - } - - private fun showLicense( - softwareComponent: SoftwareComponent - ): Disposable { - return if (context == null) { - Disposable.empty() - } else { - val context = requireContext() - activeSoftwareComponent = softwareComponent - Observable.fromCallable { getFormattedLicense(context, softwareComponent.license) } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { formattedLicense -> - val webViewData = Base64.encodeToString( - formattedLicense.toByteArray(), Base64.NO_PADDING - ) - val webView = WebView(context) - webView.loadData(webViewData, "text/html; charset=UTF-8", "base64") - - Localization.assureCorrectAppLanguage(context) - val builder = AlertDialog.Builder(requireContext()) - .setTitle(softwareComponent.name) - .setView(webView) - .setOnCancelListener { activeSoftwareComponent = null } - .setOnDismissListener { activeSoftwareComponent = null } - .setPositiveButton(R.string.done) { dialog, _ -> dialog.dismiss() } - - if (softwareComponent != NEWPIPE_SOFTWARE_COMPONENT) { - builder.setNeutralButton(R.string.open_website_license) { _, _ -> - ShareUtils.openUrlInApp(requireContext(), softwareComponent.link) - } - } - - builder.show() - } - } - } - - companion object { - private const val ARG_COMPONENTS = "components" - private const val SOFTWARE_COMPONENT_KEY = "ACTIVE_SOFTWARE_COMPONENT" - private val NEWPIPE_SOFTWARE_COMPONENT = SoftwareComponent( - "NewPipe", - "2014-2023", - "Team NewPipe", - "https://newpipe.net/", - StandardLicenses.GPL3, - BuildConfig.VERSION_NAME - ) - - fun newInstance(softwareComponents: ArrayList): LicenseFragment { - val fragment = LicenseFragment() - fragment.arguments = bundleOf(ARG_COMPONENTS to softwareComponents) - return fragment - } - } -} diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt deleted file mode 100644 index 56e21c88a..000000000 --- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt +++ /dev/null @@ -1,52 +0,0 @@ -package org.schabi.newpipe.about - -import android.content.Context -import org.schabi.newpipe.R -import org.schabi.newpipe.util.ThemeHelper -import java.io.IOException - -/** - * @param context the context to use - * @param license the license - * @return String which contains a HTML formatted license page - * styled according to the context's theme - */ -fun getFormattedLicense(context: Context, license: License): String { - try { - return context.assets.open(license.filename).bufferedReader().use { it.readText() } - // split the HTML file and insert the stylesheet into the HEAD of the file - .replace("", "") - } catch (e: IOException) { - throw IllegalArgumentException("Could not get license file: ${license.filename}", e) - } -} - -/** - * @param context the Android context - * @return String which is a CSS stylesheet according to the context's theme - */ -fun getLicenseStylesheet(context: Context): String { - val isLightTheme = ThemeHelper.isLightThemeSelected(context) - val licenseBackgroundColor = getHexRGBColor( - context, if (isLightTheme) R.color.light_license_background_color else R.color.dark_license_background_color - ) - val licenseTextColor = getHexRGBColor( - context, if (isLightTheme) R.color.light_license_text_color else R.color.dark_license_text_color - ) - val youtubePrimaryColor = getHexRGBColor( - context, if (isLightTheme) R.color.light_youtube_primary_color else R.color.dark_youtube_primary_color - ) - return "body{padding:12px 15px;margin:0;background:#$licenseBackgroundColor;color:#$licenseTextColor}" + - "a[href]{color:#$youtubePrimaryColor}pre{white-space:pre-wrap}" -} - -/** - * Cast R.color to a hexadecimal color value. - * - * @param context the context to use - * @param color the color number from R.color - * @return a six characters long String with hexadecimal RGB values - */ -fun getHexRGBColor(context: Context, color: Int): String { - return context.getString(color).substring(3) -} diff --git a/app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.kt b/app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.kt deleted file mode 100644 index 262641caa..000000000 --- a/app/src/main/java/org/schabi/newpipe/about/SoftwareComponent.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.schabi.newpipe.about - -import android.os.Parcelable -import kotlinx.parcelize.Parcelize -import java.io.Serializable - -@Parcelize -class SoftwareComponent -@JvmOverloads -constructor( - val name: String, - val years: String, - val copyrightOwner: String, - val link: String, - val license: License, - val version: String? = null -) : Parcelable, Serializable diff --git a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt b/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt deleted file mode 100644 index c5b9618fe..000000000 --- a/app/src/main/java/org/schabi/newpipe/about/StandardLicenses.kt +++ /dev/null @@ -1,21 +0,0 @@ -package org.schabi.newpipe.about - -/** - * Class containing information about standard software licenses. - */ -object StandardLicenses { - @JvmField - val GPL3 = License("GNU General Public License, Version 3.0", "GPLv3", "gpl_3.html") - - @JvmField - val APACHE2 = License("Apache License, Version 2.0", "ALv2", "apache2.html") - - @JvmField - val MPL2 = License("Mozilla Public License, Version 2.0", "MPL 2.0", "mpl2.html") - - @JvmField - val MIT = License("MIT License", "MIT", "mit.html") - - @JvmField - val EPL1 = License("Eclipse Public License, Version 1.0", "EPL 1.0", "epl1.html") -} diff --git a/app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt b/app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt index e248b8b6c..c65b286cf 100644 --- a/app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt +++ b/app/src/main/java/org/schabi/newpipe/ktx/Bundle.kt @@ -1,14 +1,9 @@ package org.schabi.newpipe.ktx import android.os.Bundle -import android.os.Parcelable import androidx.core.os.BundleCompat import java.io.Serializable -inline fun Bundle.parcelableArrayList(key: String?): ArrayList? { - return BundleCompat.getParcelableArrayList(this, key, T::class.java) -} - inline fun Bundle.serializable(key: String?): T? { return BundleCompat.getSerializable(this, key, T::class.java) } diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt new file mode 100644 index 000000000..3bba5dba9 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt @@ -0,0 +1,147 @@ +package org.schabi.newpipe.ui.components.about + +import androidx.annotation.StringRes +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.runtime.NonRestartableComposable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewParameter +import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider +import androidx.compose.ui.unit.dp +import androidx.core.content.ContextCompat.getDrawable +import coil3.compose.AsyncImage +import my.nanihadesuka.compose.ColumnScrollbar +import org.schabi.newpipe.BuildConfig +import org.schabi.newpipe.R +import org.schabi.newpipe.ui.components.common.defaultThemedScrollbarSettings +import org.schabi.newpipe.util.external_communication.ShareUtils + +private val ABOUT_ITEMS = listOf( + AboutData(R.string.faq_title, R.string.faq_description, R.string.faq, R.string.faq_url), + AboutData( + R.string.contribution_title, R.string.contribution_encouragement, + R.string.view_on_github, R.string.github_url + ), + AboutData( + R.string.donation_title, R.string.donation_encouragement, R.string.give_back, + R.string.donation_url + ), + AboutData( + R.string.website_title, R.string.website_encouragement, R.string.open_in_browser, + R.string.website_url + ), + AboutData( + R.string.privacy_policy_title, R.string.privacy_policy_encouragement, + R.string.read_privacy_policy, R.string.privacy_policy_url + ) +) + +private class AboutData( + @StringRes val title: Int, + @StringRes val description: Int, + @StringRes val buttonText: Int, + @StringRes val url: Int +) + +private class AboutDataProvider : CollectionPreviewParameterProvider(ABOUT_ITEMS) + +@Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) +@Composable +@NonRestartableComposable +fun AboutTab() { + val scrollState = rememberScrollState() + + ColumnScrollbar(state = scrollState, settings = defaultThemedScrollbarSettings()) { + Column( + modifier = Modifier + .fillMaxWidth() + .verticalScroll(scrollState), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + Column( + modifier = Modifier + .padding(16.dp) + .fillMaxWidth() + .wrapContentSize(Alignment.Center), + horizontalAlignment = Alignment.CenterHorizontally + ) { + // note: the preview + val context = LocalContext.current + val launcherDrawable = remember { getDrawable(context, R.mipmap.ic_launcher) } + AsyncImage( + model = launcherDrawable, + contentDescription = stringResource(R.string.app_name), + ) + Spacer(Modifier.height(4.dp)) + Text( + text = stringResource(R.string.app_name), + style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, + ) + Text( + text = BuildConfig.VERSION_NAME, + style = MaterialTheme.typography.titleMedium, + textAlign = TextAlign.Center, + ) + Text( + modifier = Modifier.fillMaxWidth(), + text = stringResource(R.string.app_description), + textAlign = TextAlign.Center, + ) + } + + for (item in ABOUT_ITEMS) { + AboutItem(item, Modifier.padding(horizontal = 16.dp)) + } + + Spacer(Modifier.height(8.dp)) + } + } +} + +@Preview(backgroundColor = 0xFFFFFFFF, showBackground = true) +@Composable +@NonRestartableComposable +private fun AboutItem( + @PreviewParameter(AboutDataProvider::class) aboutData: AboutData, + modifier: Modifier = Modifier, +) { + Column(modifier = modifier) { + Text( + text = stringResource(aboutData.title), + style = MaterialTheme.typography.titleMedium + ) + Text( + text = stringResource(aboutData.description), + style = MaterialTheme.typography.bodyMedium + ) + + val context = LocalContext.current + TextButton( + modifier = Modifier + .fillMaxWidth() + .wrapContentWidth(Alignment.End), + onClick = { ShareUtils.openUrlInApp(context, context.getString(aboutData.url)) } + ) { + Text(text = stringResource(aboutData.buttonText)) + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/Library.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/Library.kt new file mode 100644 index 000000000..97a2be949 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/Library.kt @@ -0,0 +1,186 @@ +@file:OptIn(ExperimentalLayoutApi::class) + +package org.schabi.newpipe.ui.components.about + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.FlowRow +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Badge +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewParameter +import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider +import androidx.compose.ui.tooling.preview.datasource.LoremIpsum +import androidx.compose.ui.unit.dp +import com.mikepenz.aboutlibraries.entity.Developer +import com.mikepenz.aboutlibraries.entity.Library +import com.mikepenz.aboutlibraries.entity.License +import com.mikepenz.aboutlibraries.entity.Organization +import com.mikepenz.aboutlibraries.entity.Scm +import com.mikepenz.aboutlibraries.ui.compose.m3.util.author +import kotlinx.collections.immutable.toImmutableList +import kotlinx.collections.immutable.toImmutableSet +import org.schabi.newpipe.ui.theme.AppTheme +import org.schabi.newpipe.util.external_communication.ShareUtils + +@Composable +fun Library( + @PreviewParameter(LibraryProvider::class) library: Library, + showLicenseDialog: (licenseFilename: String) -> Unit, + descriptionMaxLines: Int, +) { + val spdxLicense = library.licenses.firstOrNull()?.spdxId?.takeIf { it.isNotBlank() } + val licenseAssetPath = spdxLicense?.let { SPDX_ID_TO_ASSET_PATH[it] } + val context = LocalContext.current + + Column( + modifier = ( + if (licenseAssetPath != null) { + Modifier.clickable { + showLicenseDialog(licenseAssetPath) + } + } else if (spdxLicense != null) { + Modifier.clickable { + ShareUtils.openUrlInBrowser(context, "https://spdx.org/licenses/$spdxLicense.html") + } + } else { + Modifier + } + ) + .padding(vertical = 8.dp, horizontal = 16.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + ) { + Text( + text = library.name, + modifier = Modifier.weight(0.75f), + style = MaterialTheme.typography.titleMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + val version = library.artifactVersion + if (!version.isNullOrBlank()) { + Text( + version, + modifier = if (version.length > 12) { + // limit the version size if it's too many characters (can happen e.g. if + // the version is a commit hash) + Modifier.weight(0.25f) + } else { + Modifier + }.padding(start = 8.dp), + style = MaterialTheme.typography.labelMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } + val author = library.author + if (author.isNotBlank()) { + Text( + text = author, + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + val description = library.description + if (!description.isNullOrBlank() && description != library.name) { + Spacer(Modifier.height(3.dp)) + Text( + text = description, + style = MaterialTheme.typography.bodySmall, + maxLines = descriptionMaxLines, + overflow = TextOverflow.Ellipsis, + ) + } + if (library.licenses.isNotEmpty()) { + FlowRow( + modifier = Modifier.padding(top = 6.dp, bottom = 4.dp), + horizontalArrangement = Arrangement.spacedBy(4.dp), + verticalArrangement = Arrangement.spacedBy(4.dp), + ) { + library.licenses.forEach { + Badge { + Text(text = it.spdxId?.takeIf { it.isNotBlank() } ?: it.name) + } + } + } + } + } +} + +@Preview(showBackground = true, backgroundColor = 0xFFFFFFFF) +@Composable +private fun LibraryPreview(@PreviewParameter(LibraryProvider::class) library: Library) { + AppTheme { + Library(library, {}, 2) + } +} + +private class LibraryProvider : CollectionPreviewParameterProvider( + listOf( + Library( + uniqueId = "org.schabi.newpipe.extractor", + artifactVersion = "v0.24.3", + name = "NewPipeExtractor", + description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.", + website = "https://newpipe.net", + developers = listOf(Developer("TeamNewPipe", "https://newpipe.net")).toImmutableList(), + organization = Organization("TeamNewPipe", "https://newpipe.net"), + scm = Scm(null, null, "https://github.com/TeamNewPipe/NewPipeExtractor"), + licenses = setOf( + License( + name = "GNU General Public License v3.0", + url = "https://api.github.com/licenses/gpl-3.0", + year = null, + spdxId = "GPL-3.0-only", + licenseContent = LoremIpsum().values.first(), + hash = "1234" + ), + License( + name = "GNU General Public License v3.0", + url = "https://api.github.com/licenses/gpl-3.0", + year = null, + spdxId = "GPL-3.0-only", + licenseContent = LoremIpsum().values.first(), + hash = "4321" + ) + ).toImmutableSet() + ), + Library( + uniqueId = "org.schabi.newpipe.extractor", + artifactVersion = "v0.24.3", + name = "NewPipeExtractor", + description = "NewPipe Extractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.", + website = null, + developers = listOf().toImmutableList(), + organization = null, + scm = null, + licenses = setOf( + License( + name = "GNU General Public License v3.0", + url = "https://api.github.com/licenses/gpl-3.0", + year = null, + spdxId = "GPL-3.0-only", + licenseContent = LoremIpsum().values.first(), + hash = "1234" + ) + ).toImmutableSet() + ) + ) +) diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/LibraryDefinitions.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LibraryDefinitions.kt new file mode 100644 index 000000000..c14bc8cef --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/LibraryDefinitions.kt @@ -0,0 +1,137 @@ +/** + * The library definitions for most libraries are autogenerated by the AboutLibraries plugin. + * This file is only for TeamNewPipe-related libraries. + */ + +package org.schabi.newpipe.ui.components.about + +import android.content.Context +import com.mikepenz.aboutlibraries.entity.Developer +import com.mikepenz.aboutlibraries.entity.Library +import com.mikepenz.aboutlibraries.entity.License +import com.mikepenz.aboutlibraries.entity.Scm +import kotlinx.collections.immutable.ImmutableSet +import kotlinx.collections.immutable.toImmutableList +import kotlinx.collections.immutable.toImmutableSet +import org.schabi.newpipe.BuildConfig +import org.schabi.newpipe.R + +val SPDX_ID_TO_ASSET_PATH = mapOf( + "Apache-2.0" to "apache2.html", + "EPL-1.0" to "epl1.html", + "GPL-3.0-only" to "gpl_3.html", + "MIT" to "mit.html", + "MPL-2.0" to "mpl2.html", +) + +fun getFirstPartyLibraries( + context: Context, + teamNewPipeLibraries: List, +): List { + val gpl3 = setOf( + License( + name = "GNU General Public License v3.0", + url = "https://www.gnu.org/licenses/gpl-3.0.txt", + year = null, + spdxId = "GPL-3.0-only", + licenseContent = null, + hash = "GPL-3.0-only", + ) + ).toImmutableSet() + + val npeId = "com.github.TeamNewPipe:NewPipeExtractor" + val npe = teamNewPipeLibraries.firstOrNull { it.uniqueId == npeId } + + return listOf( + Library( + uniqueId = BuildConfig.APPLICATION_ID, + artifactVersion = BuildConfig.VERSION_NAME, + name = context.getString(R.string.app_name), + description = context.getString(R.string.app_description), + website = context.getString(R.string.website_url), + developers = listOf( + Developer( + name = context.getString(R.string.team_newpipe), + organisationUrl = context.getString(R.string.website_url) + ) + ).toImmutableList(), + organization = null, + scm = Scm(null, null, context.getString(R.string.github_url)), + licenses = gpl3, + ), + Library( + uniqueId = npeId, + artifactVersion = npe?.artifactVersion, + name = context.getString(R.string.newpipe_extractor), + description = context.getString(R.string.newpipe_extractor_description), + website = context.getString(R.string.newpipe_extractor_github_url), + developers = listOf( + Developer( + name = context.getString(R.string.team_newpipe), + organisationUrl = context.getString(R.string.website_url) + ) + ).toImmutableList(), + organization = null, + scm = Scm(null, null, context.getString(R.string.newpipe_extractor_github_url)), + licenses = gpl3, + ), + ) +} + +fun getAdditionalThirdPartyLibraries( + context: Context, + teamNewPipeLibraries: List, + licenses: ImmutableSet, +): List { + val apache2 = licenses.firstOrNull { it.spdxId == "Apache-2.0" } + val mit = licenses.firstOrNull { it.spdxId == "MIT" } + val mpl2 = licenses.firstOrNull { it.spdxId == "MPL-2.0" } + + val nanojsonId = "com.github.TeamNewPipe:nanojson" + val nanojson = teamNewPipeLibraries.firstOrNull { it.uniqueId == nanojsonId } + val nnfpId = "com.github.TeamNewPipe:NoNonsense-FilePicker" + val nnfp = teamNewPipeLibraries.firstOrNull { it.uniqueId == nnfpId } + + return listOf( + Library( + uniqueId = nnfpId, + artifactVersion = nnfp?.artifactVersion, + name = "NoNonsense-FilePicker", + description = "A file/directory-picker for Android.", + website = "https://github.com/TeamNewPipe/NoNonsense-FilePicker", + developers = listOf( + Developer( + name = "Jonas Kalderstam", + organisationUrl = "https://github.com/spacecowboy/NoNonsense-FilePicker", + ), + Developer( + name = context.getString(R.string.team_newpipe), + organisationUrl = context.getString(R.string.website_url) + ) + ).toImmutableList(), + organization = null, + scm = Scm(null, null, "https://github.com/TeamNewPipe/NoNonsense-FilePicker"), + licenses = listOfNotNull(mpl2).toImmutableSet(), + ), + Library( + uniqueId = nanojsonId, + artifactVersion = nanojson?.artifactVersion, + name = "nanojson", + description = "nanojson is a tiny, fast, and compliant JSON parser and writer for Java.", + website = "https://github.com/TeamNewPipe/nanojson", + developers = listOf( + Developer( + name = "mmastrac", + organisationUrl = "https://github.com/mmastrac/nanojson", + ), + Developer( + name = context.getString(R.string.team_newpipe), + organisationUrl = context.getString(R.string.website_url) + ), + ).toImmutableList(), + organization = null, + scm = Scm(null, null, "https://github.com/TeamNewPipe/nanojson"), + licenses = listOfNotNull(mit, apache2).toImmutableSet() + ), + ) +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseDialog.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseDialog.kt new file mode 100644 index 000000000..24421a93a --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseDialog.kt @@ -0,0 +1,51 @@ +@file:OptIn(ExperimentalMaterial3Api::class) + +package org.schabi.newpipe.ui.components.about + +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Text +import androidx.compose.material3.contentColorFor +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.unit.dp +import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar +import org.schabi.newpipe.ui.components.common.LoadingIndicator + +@Composable +fun LicenseDialog(licenseHtml: AnnotatedString, onDismissRequest: () -> Unit) { + val lazyListState = rememberLazyListState() + + ModalBottomSheet(onDismissRequest) { + CompositionLocalProvider( + // contentColorFor(MaterialTheme.colorScheme.containerColor), i.e. ModalBottomSheet's + // default background color, does not resolve correctly, so need to manually set the + // content color for MaterialTheme.colorScheme.background instead + LocalContentColor provides contentColorFor(MaterialTheme.colorScheme.background) + ) { + LazyColumnThemedScrollbar(state = lazyListState) { + LazyColumn( + state = lazyListState + ) { + item { + if (licenseHtml.isEmpty()) { + LoadingIndicator(modifier = Modifier.padding(32.dp)) + } else { + Text( + text = licenseHtml, + modifier = Modifier.padding(horizontal = 12.dp), + ) + } + } + } + } + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt new file mode 100644 index 000000000..46e71ba56 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt @@ -0,0 +1,105 @@ +package org.schabi.newpipe.ui.components.about + +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.NonRestartableComposable +import androidx.compose.runtime.collectAsState +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import org.schabi.newpipe.R +import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar +import org.schabi.newpipe.ui.components.common.LoadingIndicator + +@Composable +@NonRestartableComposable +fun LicenseTab(viewModel: LicenseTabViewModel = viewModel()) { + val lazyListState = rememberLazyListState() + val stateFlow = viewModel.state.collectAsState() + val state = stateFlow.value + + if (state.licenseDialogHtml != null) { + LicenseDialog( + licenseHtml = state.licenseDialogHtml, + onDismissRequest = { viewModel.closeLicenseDialog() } + ) + } + + LazyColumnThemedScrollbar(state = lazyListState) { + LazyColumn( + state = lazyListState, + ) { + item { + Text( + text = stringResource(R.string.app_license_title), + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding( + start = 16.dp, + top = 16.dp, + end = 16.dp, + bottom = 8.dp + ), + ) + } + item { + Text( + text = stringResource(R.string.app_license), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding( + start = 16.dp, + end = 16.dp, + bottom = 8.dp + ), + ) + } + if (state.firstPartyLibraries == null) { + item { + LoadingIndicator(modifier = Modifier.padding(32.dp)) + } + } else { + for (library in state.firstPartyLibraries) { + item { + Library( + library = library, + showLicenseDialog = viewModel::showLicenseDialog, + descriptionMaxLines = Int.MAX_VALUE, + ) + } + } + } + + item { + Text( + text = stringResource(R.string.title_licenses), + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding( + start = 16.dp, + top = 16.dp, + end = 16.dp, + bottom = 8.dp + ), + ) + } + if (state.thirdPartyLibraries == null) { + item { + LoadingIndicator(modifier = Modifier.padding(32.dp)) + } + } else { + for (library in state.thirdPartyLibraries) { + item { + Library( + library = library, + showLicenseDialog = viewModel::showLicenseDialog, + descriptionMaxLines = 2, + ) + } + } + } + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTabViewModel.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTabViewModel.kt new file mode 100644 index 000000000..eeb87816c --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTabViewModel.kt @@ -0,0 +1,82 @@ +package org.schabi.newpipe.ui.components.about + +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.fromHtml +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.mikepenz.aboutlibraries.Libs +import com.mikepenz.aboutlibraries.entity.Library +import com.mikepenz.aboutlibraries.util.withContext +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import org.schabi.newpipe.App + +class LicenseTabViewModel : ViewModel() { + private val _state = MutableStateFlow(LicenseTabState(null, null, null)) + val state: StateFlow = _state + private var licenseLoadJob: Job? = null + + init { + viewModelScope.launch { + withContext(Dispatchers.IO) { + loadLibraries() + } + } + } + + private fun loadLibraries() { + val context = App.instance + val libs = Libs.Builder().withContext(context).build() + val (teamNewPipeLibraries, thirdParty) = libs.libraries + .toMutableList() + .partition { it.uniqueId.startsWith("com.github.TeamNewPipe") } + + val firstParty = getFirstPartyLibraries(context, teamNewPipeLibraries) + val allThirdParty = + getAdditionalThirdPartyLibraries(context, teamNewPipeLibraries, libs.licenses) + + thirdParty + + _state.update { + it.copy( + firstPartyLibraries = firstParty, + thirdPartyLibraries = allThirdParty, + ) + } + } + + fun showLicenseDialog(filename: String) { + licenseLoadJob?.cancel() + _state.update { it.copy(licenseDialogHtml = AnnotatedString("")) } + licenseLoadJob = viewModelScope.launch { + withContext(Dispatchers.IO) { + val text = App.instance.assets.open(filename).bufferedReader().use { it.readText() } + val parsedHtml = AnnotatedString.fromHtml(text) + _state.update { + if (it.licenseDialogHtml != null && isActive) { + it.copy(licenseDialogHtml = parsedHtml) + } else { + it + } + } + } + } + } + + fun closeLicenseDialog() { + licenseLoadJob?.cancel() + _state.update { it.copy(licenseDialogHtml = null) } + } + + data class LicenseTabState( + val firstPartyLibraries: List?, + val thirdPartyLibraries: List?, + // null if dialog closed, empty if loading, otherwise license HTML content + val licenseDialogHtml: AnnotatedString?, + ) +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt b/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt new file mode 100644 index 000000000..18139c7a6 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/components/common/ScaffoldWithToolbar.kt @@ -0,0 +1,63 @@ +package org.schabi.newpipe.ui.components.common + +import android.content.res.Configuration +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.RowScope +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun ScaffoldWithToolbar( + title: String, + onBackClick: () -> Unit, + actions: @Composable RowScope.() -> Unit = {}, + content: @Composable (PaddingValues) -> Unit +) { + Scaffold( + topBar = { + TopAppBar( + title = { Text(text = title) }, + // TODO decide whether to use default colors instead + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primaryContainer, + scrolledContainerColor = MaterialTheme.colorScheme.primaryContainer, + navigationIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + actionIconContentColor = MaterialTheme.colorScheme.onPrimaryContainer, + ), + navigationIcon = { + IconButton(onClick = onBackClick) { + Icon( + imageVector = Icons.AutoMirrored.Filled.ArrowBack, + contentDescription = null + ) + } + }, + actions = actions + ) + }, + content = content + ) +} + +@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +private fun ScaffoldWithToolbarPreview() { + ScaffoldWithToolbar( + title = "Example", + onBackClick = {}, + content = {} + ) +} diff --git a/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt new file mode 100644 index 000000000..673a22892 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/ui/screens/AboutScreen.kt @@ -0,0 +1,84 @@ +package org.schabi.newpipe.ui.screens + +import android.content.res.Configuration +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.pager.HorizontalPager +import androidx.compose.foundation.pager.rememberPagerState +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.NonRestartableComposable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import org.schabi.newpipe.R +import org.schabi.newpipe.ui.components.about.AboutTab +import org.schabi.newpipe.ui.components.about.LicenseTab +import org.schabi.newpipe.ui.theme.AppTheme + +private val TITLES = intArrayOf(R.string.tab_about, R.string.tab_licenses) + +@Composable +@NonRestartableComposable +fun AboutScreen(padding: PaddingValues) { + Column(modifier = Modifier.padding(padding)) { + var tabIndex by rememberSaveable { mutableIntStateOf(0) } + val pagerState = rememberPagerState { TITLES.size } + + LaunchedEffect(tabIndex) { + pagerState.animateScrollToPage(tabIndex) + } + LaunchedEffect(pagerState.currentPage) { + tabIndex = pagerState.currentPage + } + + TabRow( + selectedTabIndex = tabIndex, + containerColor = MaterialTheme.colorScheme.primaryContainer + ) { + TITLES.forEachIndexed { index, titleId -> + Tab( + text = { Text(text = stringResource(titleId)) }, + selected = tabIndex == index, + onClick = { tabIndex = index } + ) + } + } + + HorizontalPager( + state = pagerState, + modifier = Modifier + .fillMaxWidth() + .weight(1f) + ) { page -> + if (page == 0) { + AboutTab() + } else { + LicenseTab() + } + } + } +} + +@Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +private fun AboutScreenPreview() { + AppTheme { + Surface(color = MaterialTheme.colorScheme.background) { + AboutScreen(PaddingValues(8.dp)) + } + } +} diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml deleted file mode 100644 index 661c4affc..000000000 --- a/app/src/main/res/layout/activity_about.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml deleted file mode 100644 index 5e6e11d00..000000000 --- a/app/src/main/res/layout/fragment_about.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - -