sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Bump about_libraries from 8.9.4 to 10.2.0 (#1858)

Browse Source
This commit is contained in:
dependabot[bot] 2022-05-14 14:35:58 +00:00 committed by GitHub
parent 459c8330f9
commit facf84d9a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -132,7 +132,7 @@ android {
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "11"
freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"] freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
} }
packagingOptions { packagingOptions {

1
app/src/hms/java/io/github/wulkanowy/utils/InAppReviewHelper.kt
View File

@ -7,6 +7,7 @@ import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
@Suppress("UNUSED_PARAMETER", "unused")
class InAppReviewHelper @Inject constructor( class InAppReviewHelper @Inject constructor(
@ApplicationContext private val context: Context @ApplicationContext private val context: Context
) { ) {

5
app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseAdapter.kt
View File

@ -23,8 +23,9 @@ class LicenseAdapter @Inject constructor() : RecyclerView.Adapter<LicenseAdapter
val item = items[position] val item = items[position]
with(holder.binding) { with(holder.binding) {
licenseItemName.text = item.libraryName licenseItemName.text = item.name
licenseItemSummary.text = item.licenses?.firstOrNull()?.licenseName?.takeIf { it.isNotBlank() } ?: item.libraryVersion licenseItemSummary.text = item.licenses.firstOrNull()?.name?.takeIf { it.isNotBlank() }
?: item.artifactVersion
root.setOnClickListener { onClickListener(item) } root.setOnClickListener { onClickListener(item) }
} }

5
app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseFragment.kt
View File

@ -9,6 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.Libs
import com.mikepenz.aboutlibraries.entity.Library import com.mikepenz.aboutlibraries.entity.Library
import com.mikepenz.aboutlibraries.util.withContext
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import io.github.wulkanowy.R import io.github.wulkanowy.R
import io.github.wulkanowy.databinding.FragmentLicenseBinding import io.github.wulkanowy.databinding.FragmentLicenseBinding
@ -28,7 +29,9 @@ class LicenseFragment : BaseFragment<FragmentLicenseBinding>(R.layout.fragment_l
override val titleStringId get() = R.string.license_title override val titleStringId get() = R.string.license_title
override val appLibraries by lazy { Libs(requireContext()).libraries } override val appLibraries by lazy {
Libs.Builder().withContext(requireContext()).build().libraries
}
companion object { companion object {
fun newInstance() = LicenseFragment() fun newInstance() = LicenseFragment()

2
app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt
View File

@ -22,7 +22,7 @@ class LicensePresenter @Inject constructor(
} }
fun onItemSelected(library: Library) { fun onItemSelected(library: Library) {
view?.run { library.licenses?.firstOrNull()?.licenseDescription?.let { openLicense(it) } } view?.run { library.licenses.firstOrNull()?.licenseContent?.let { openLicense(it) } }
} }
private fun loadData() { private fun loadData() {

2
build.gradle
View File

@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = '1.6.21' kotlin_version = '1.6.21'
about_libraries = '8.9.4' about_libraries = '10.2.0'
hilt_version = "2.42" hilt_version = "2.42"
} }
repositories { repositories {