Merge pull request #11282 from Isira-Seneviratne/About-Compose
Migrate about activity to Jetpack Compose
This commit is contained in:
Stypox
GitHub
commit
c0c08a4f63
|
|
@ -1,6 +1,7 @@
|
||||||
import com.android.tools.profgen.ArtProfileKt
|
import com.android.tools.profgen.ArtProfileKt
|
||||||
import com.android.tools.profgen.ArtProfileSerializer
|
import com.android.tools.profgen.ArtProfileSerializer
|
||||||
import com.android.tools.profgen.DexFile
|
import com.android.tools.profgen.DexFile
|
||||||
|
import com.mikepenz.aboutlibraries.plugin.DuplicateMode
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
alias libs.plugins.android.application
|
alias libs.plugins.android.application
|
||||||
|
|
@ -11,6 +12,7 @@ plugins {
|
||||||
alias libs.plugins.checkstyle
|
alias libs.plugins.checkstyle
|
||||||
alias libs.plugins.sonarqube
|
alias libs.plugins.sonarqube
|
||||||
alias libs.plugins.hilt
|
alias libs.plugins.hilt
|
||||||
|
alias libs.plugins.aboutlibraries
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
|
|
@ -181,6 +183,13 @@ kapt {
|
||||||
correctErrorTypes true
|
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 {
|
dependencies {
|
||||||
/** Desugaring **/
|
/** Desugaring **/
|
||||||
coreLibraryDesugaring libs.desugar.jdk.libs.nio
|
coreLibraryDesugaring libs.desugar.jdk.libs.nio
|
||||||
|
|
@ -290,6 +299,9 @@ dependencies {
|
||||||
// Coroutines interop
|
// Coroutines interop
|
||||||
implementation libs.kotlinx.coroutines.rx3
|
implementation libs.kotlinx.coroutines.rx3
|
||||||
|
|
||||||
|
// Library loading for About screen
|
||||||
|
implementation libs.aboutlibraries.compose.m3
|
||||||
|
|
||||||
// Hilt
|
// Hilt
|
||||||
implementation libs.hilt.android
|
implementation libs.hilt.android
|
||||||
kapt(libs.hilt.compiler)
|
kapt(libs.hilt.compiler)
|
||||||
|
|
|
||||||
|
|
@ -1,203 +1,31 @@
|
||||||
package org.schabi.newpipe.about
|
package org.schabi.newpipe.about
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import androidx.activity.compose.setContent
|
||||||
import android.view.MenuItem
|
import androidx.activity.enableEdgeToEdge
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.Button
|
|
||||||
import androidx.annotation.StringRes
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.fragment.app.FragmentActivity
|
|
||||||
import androidx.viewpager2.adapter.FragmentStateAdapter
|
|
||||||
import com.google.android.material.tabs.TabLayoutMediator
|
|
||||||
import org.schabi.newpipe.BuildConfig
|
|
||||||
import org.schabi.newpipe.R
|
import org.schabi.newpipe.R
|
||||||
import org.schabi.newpipe.databinding.ActivityAboutBinding
|
import org.schabi.newpipe.ui.components.common.ScaffoldWithToolbar
|
||||||
import org.schabi.newpipe.databinding.FragmentAboutBinding
|
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.Localization
|
||||||
import org.schabi.newpipe.util.ThemeHelper
|
|
||||||
import org.schabi.newpipe.util.external_communication.ShareUtils
|
|
||||||
|
|
||||||
class AboutActivity : AppCompatActivity() {
|
class AboutActivity : AppCompatActivity() {
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
Localization.assureCorrectAppLanguage(this)
|
Localization.assureCorrectAppLanguage(this)
|
||||||
|
enableEdgeToEdge()
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
ThemeHelper.setTheme(this)
|
|
||||||
title = getString(R.string.title_activity_about)
|
|
||||||
|
|
||||||
val aboutBinding = ActivityAboutBinding.inflate(layoutInflater)
|
setContent {
|
||||||
setContentView(aboutBinding.root)
|
AppTheme {
|
||||||
setSupportActionBar(aboutBinding.aboutToolbar)
|
ScaffoldWithToolbar(
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
title = stringResource(R.string.title_activity_about),
|
||||||
|
onBackClick = { onBackPressedDispatcher.onBackPressed() }
|
||||||
// Create the adapter that will return a fragment for each of the three
|
) { padding ->
|
||||||
// primary sections of the activity.
|
AboutScreen(padding)
|
||||||
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")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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<SoftwareComponent>
|
|
||||||
private var activeSoftwareComponent: SoftwareComponent? = null
|
|
||||||
private val compositeDisposable = CompositeDisposable()
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
softwareComponents = arguments?.parcelableArrayList<SoftwareComponent>(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<SoftwareComponent>): LicenseFragment {
|
|
||||||
val fragment = LicenseFragment()
|
|
||||||
fragment.arguments = bundleOf(ARG_COMPONENTS to softwareComponents)
|
|
||||||
return fragment
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -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("</head>", "<style>${getLicenseStylesheet(context)}</style></head>")
|
|
||||||
} 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)
|
|
||||||
}
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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")
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +1,9 @@
|
||||||
package org.schabi.newpipe.ktx
|
package org.schabi.newpipe.ktx
|
||||||
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Parcelable
|
|
||||||
import androidx.core.os.BundleCompat
|
import androidx.core.os.BundleCompat
|
||||||
import java.io.Serializable
|
import java.io.Serializable
|
||||||
|
|
||||||
inline fun <reified T : Parcelable> Bundle.parcelableArrayList(key: String?): ArrayList<T>? {
|
|
||||||
return BundleCompat.getParcelableArrayList(this, key, T::class.java)
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fun <reified T : Serializable> Bundle.serializable(key: String?): T? {
|
inline fun <reified T : Serializable> Bundle.serializable(key: String?): T? {
|
||||||
return BundleCompat.getSerializable(this, key, T::class.java)
|
return BundleCompat.getSerializable(this, key, T::class.java)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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<AboutData>(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))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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<Library>(
|
||||||
|
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<Developer>().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()
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
@ -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<Library>,
|
||||||
|
): List<Library> {
|
||||||
|
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<Library>,
|
||||||
|
licenses: ImmutableSet<License>,
|
||||||
|
): List<Library> {
|
||||||
|
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()
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -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),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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<LicenseTabState> = _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<Library>?,
|
||||||
|
val thirdPartyLibraries: List<Library>?,
|
||||||
|
// null if dialog closed, empty if loading, otherwise license HTML content
|
||||||
|
val licenseDialogHtml: AnnotatedString?,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -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 = {}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
@ -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))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
tools:context="org.schabi.newpipe.about.AboutActivity">
|
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="@dimen/appbar_padding_top"
|
|
||||||
android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
|
|
||||||
app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
|
|
||||||
|
|
||||||
<androidx.appcompat.widget.Toolbar
|
|
||||||
android:id="@+id/about_toolbar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?attr/actionBarSize"
|
|
||||||
android:background="?attr/colorPrimary"
|
|
||||||
android:theme="@style/ToolbarTheme"
|
|
||||||
app:layout_scrollFlags="scroll|enterAlways" />
|
|
||||||
|
|
||||||
<com.google.android.material.tabs.TabLayout
|
|
||||||
android:id="@+id/about_tabLayout"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:tabTextColor="@color/white"
|
|
||||||
app:tabIndicatorColor="@color/white" />
|
|
||||||
|
|
||||||
</com.google.android.material.appbar.AppBarLayout>
|
|
||||||
|
|
||||||
<androidx.viewpager2.widget.ViewPager2
|
|
||||||
android:id="@+id/about_viewPager2"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
|
|
||||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
|
||||||
|
|
@ -1,148 +0,0 @@
|
||||||
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context="org.schabi.newpipe.about.AboutActivity$AboutFragment">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:layout_marginBottom="8dp"
|
|
||||||
android:contentDescription="@string/app_name"
|
|
||||||
android:src="@mipmap/ic_launcher" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:text="@string/app_name"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Large" />
|
|
||||||
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:id="@+id/about_app_version"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="center_horizontal"
|
|
||||||
android:layout_marginBottom="16dp"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium"
|
|
||||||
tools:text="0.9.9" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingBottom="5dp"
|
|
||||||
android:text="@string/app_description" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:text="@string/faq_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/faq_description" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/faq_link"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:text="@string/faq" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:text="@string/contribution_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/contribution_encouragement" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/about_github_link"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:text="@string/view_on_github" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:text="@string/donation_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/donation_encouragement" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/about_donation_link"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:text="@string/give_back" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:text="@string/website_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/website_encouragement" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/about_website_link"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:text="@string/open_in_browser" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:text="@string/privacy_policy_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/privacy_policy_encouragement" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/about_privacy_policy_link"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:text="@string/read_privacy_policy" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
</androidx.core.widget.NestedScrollView>
|
|
||||||
|
|
@ -1,55 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:fillViewport="true">
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin">
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:layout_marginRight="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
android:text="@string/app_license_title"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Large" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:text="@string/app_license" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/licenses_app_read_license"
|
|
||||||
style="@style/Base.Widget.AppCompat.Button.Borderless"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="end"
|
|
||||||
android:layout_marginRight="@dimen/activity_vertical_margin"
|
|
||||||
android:text="@string/read_full_license" />
|
|
||||||
|
|
||||||
<org.schabi.newpipe.views.NewPipeTextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:text="@string/title_licenses"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/licenses_software_components"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical" />
|
|
||||||
</LinearLayout>
|
|
||||||
</androidx.core.widget.NestedScrollView>
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="?attr/selectableItemBackground"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/name"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="10dp"
|
|
||||||
android:textAppearance="@android:style/TextAppearance.Medium"
|
|
||||||
tools:text="Software Name" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/copyright"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_below="@id/name"
|
|
||||||
android:paddingBottom="10dp"
|
|
||||||
tools:text="@string/copyright" />
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
@ -18,10 +18,13 @@
|
||||||
<string name="sha1">SHA-1</string>
|
<string name="sha1">SHA-1</string>
|
||||||
<string name="recaptcha">reCAPTCHA</string>
|
<string name="recaptcha">reCAPTCHA</string>
|
||||||
<string name="github_url">https://github.com/TeamNewPipe/NewPipe</string>
|
<string name="github_url">https://github.com/TeamNewPipe/NewPipe</string>
|
||||||
|
<string name="newpipe_extractor_github_url">https://github.com/TeamNewPipe/NewPipeExtractor</string>
|
||||||
<string name="donation_url">https://newpipe.net/donate/</string>
|
<string name="donation_url">https://newpipe.net/donate/</string>
|
||||||
<string name="website_url">https://newpipe.net/</string>
|
<string name="website_url">https://newpipe.net/</string>
|
||||||
<string name="privacy_policy_url">https://newpipe.net/legal/privacy/</string>
|
<string name="privacy_policy_url">https://newpipe.net/legal/privacy/</string>
|
||||||
<string name="faq_url">https://newpipe.net/FAQ/</string>
|
<string name="faq_url">https://newpipe.net/FAQ/</string>
|
||||||
|
<string name="team_newpipe">TeamNewPipe</string>
|
||||||
|
<string name="newpipe_extractor">NewPipeExtractor</string>
|
||||||
<string name="service_kiosk_string">%1$s/%2$s</string>
|
<string name="service_kiosk_string">%1$s/%2$s</string>
|
||||||
<string name="youtube">YouTube</string>
|
<string name="youtube">YouTube</string>
|
||||||
<string name="preferred_open_action_share_menu_title">@string/app_name</string>
|
<string name="preferred_open_action_share_menu_title">@string/app_name</string>
|
||||||
|
|
|
||||||
|
|
@ -857,6 +857,7 @@
|
||||||
<string name="show_less">Show less</string>
|
<string name="show_less">Show less</string>
|
||||||
<string name="import_settings_vulnerable_format">The settings in the export being imported use a vulnerable format that was deprecated since NewPipe 0.27.0. Make sure the export being imported is from a trusted source, and prefer using only exports obtained from NewPipe 0.27.0 or newer in the future. Support for importing settings in this vulnerable format will soon be removed completely, and then old versions of NewPipe will not be able to import settings of exports from new versions anymore.</string>
|
<string name="import_settings_vulnerable_format">The settings in the export being imported use a vulnerable format that was deprecated since NewPipe 0.27.0. Make sure the export being imported is from a trusted source, and prefer using only exports obtained from NewPipe 0.27.0 or newer in the future. Support for importing settings in this vulnerable format will soon be removed completely, and then old versions of NewPipe will not be able to import settings of exports from new versions anymore.</string>
|
||||||
<string name="auto_queue_description">Next</string>
|
<string name="auto_queue_description">Next</string>
|
||||||
|
<string name="newpipe_extractor_description">NewPipeExtractor is a library for extracting things from streaming sites. It is a core component of NewPipe, but could be used independently.</string>
|
||||||
<plurals name="comments">
|
<plurals name="comments">
|
||||||
<item quantity="one">%d comment</item>
|
<item quantity="one">%d comment</item>
|
||||||
<item quantity="other">%d comments</item>
|
<item quantity="other">%d comments</item>
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,13 @@ buildscript {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
maven { url "https://plugins.gradle.org/m2/" }
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath libs.android.tools.build.gradle
|
classpath libs.android.tools.build.gradle
|
||||||
classpath libs.kotlin.gradle.plugin
|
classpath libs.kotlin.gradle.plugin
|
||||||
classpath libs.hilt.android.gradle.plugin
|
classpath libs.hilt.android.gradle.plugin
|
||||||
|
classpath libs.aboutlibraries.plugin
|
||||||
|
|
||||||
// NOTE: Do not place your application dependencies here; they belong
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
// in the individual module build.gradle files
|
// in the individual module build.gradle files
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
[versions]
|
[versions]
|
||||||
|
aboutLibraries = "11.2.3"
|
||||||
acraCore = "5.11.3"
|
acraCore = "5.11.3"
|
||||||
androidState = "1.4.1"
|
androidState = "1.4.1"
|
||||||
androidx-junit = "1.1.5"
|
androidx-junit = "1.1.5"
|
||||||
|
|
@ -58,6 +59,7 @@ viewpager2 = "1.1.0-beta02"
|
||||||
work = "2.8.1"
|
work = "2.8.1"
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
|
aboutlibraries = { id = "com.mikepenz.aboutlibraries.plugin" }
|
||||||
android-application = { id = "com.android.application" }
|
android-application = { id = "com.android.application" }
|
||||||
checkstyle = { id = "checkstyle" }
|
checkstyle = { id = "checkstyle" }
|
||||||
hilt = { id = "com.google.dagger.hilt.android" }
|
hilt = { id = "com.google.dagger.hilt.android" }
|
||||||
|
|
@ -68,6 +70,8 @@ kotlin-parcelize = { id = "kotlin-parcelize" }
|
||||||
sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
|
sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
aboutlibraries-compose-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "aboutLibraries" }
|
||||||
|
aboutlibraries-plugin = { group = "com.mikepenz.aboutlibraries.plugin", name = "aboutlibraries-plugin", version.ref = "aboutLibraries" }
|
||||||
acra-core = { group = "ch.acra", name = "acra-core", version.ref = "acraCore" }
|
acra-core = { group = "ch.acra", name = "acra-core", version.ref = "acraCore" }
|
||||||
android-state = { group = "com.evernote", name = "android-state", version.ref = "androidState" }
|
android-state = { group = "com.evernote", name = "android-state", version.ref = "androidState" }
|
||||||
android-state-processor = { group = "com.evernote", name = "android-state-processor", version.ref = "androidState" }
|
android-state-processor = { group = "com.evernote", name = "android-state-processor", version.ref = "androidState" }
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue