Merge pull request feelfreelinux#130 from otwarty-wykop-mobilny/fix_l…

…ink_detais_preview
luk1337 · Dec 3, 2021 · 0a8b15a · 0a8b15a
2 parents d3da35e + f08b856
commit 0a8b15a
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 56 deletions.
diff --git a/app/src/main/kotlin/io/github/wykopmobilny/Const.kt b/app/src/main/kotlin/io/github/wykopmobilny/Const.kt
diff --git a/app/src/main/kotlin/io/github/wykopmobilny/ui/adapters/LinkDetailsAdapter.kt b/app/src/main/kotlin/io/github/wykopmobilny/ui/adapters/LinkDetailsAdapter.kt
@@ -50,7 +50,8 @@ class LinkDetailsAdapter @Inject constructor(
             if (holder.itemViewType == LinkHeaderViewHolder.TYPE_HEADER) {
                 link?.let {
                     (holder as LinkHeaderViewHolder).bindView(
-                        link = it, showMinifiedImages = showMinifiedImages,
+                        link = it,
+                        showMinifiedImages = false, // always use original version on details
                     )
                 }
             } else if (holder is BlockedViewHolder) {

diff --git a/app/src/main/kotlin/io/github/wykopmobilny/ui/modules/embedview/YTPlayer.kt b/app/src/main/kotlin/io/github/wykopmobilny/ui/modules/embedview/YTPlayer.kt
@@ -19,7 +19,7 @@ import com.google.android.youtube.player.YouTubePlayer
 import com.google.android.youtube.player.YouTubePlayer.ErrorReason
 import com.google.android.youtube.player.YouTubePlayerView
 import io.github.aakira.napier.Napier
-import io.github.wykopmobilny.GOOGLE_KEY
+import io.github.wykopmobilny.BuildConfig
 import io.github.wykopmobilny.utils.youtubeTimestampToMsOrNull
 import java.net.URLDecoder
 
@@ -102,7 +102,6 @@ class YTPlayer :
     YouTubePlayer.OnFullscreenListener,
     YouTubePlayer.PlayerStateChangeListener {
 
-    private var googleApiKey: String? = null
     private var videoId: String? = null
     private var timestampMs: Int? = null
 
@@ -121,7 +120,7 @@ class YTPlayer :
         initialize()
 
         playerView = YouTubePlayerView(this)
-        playerView.initialize(googleApiKey, this)
+        playerView.initialize(BuildConfig.GOOGLE_KEY, this)
 
         addContentView(playerView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
 
@@ -131,16 +130,6 @@ class YTPlayer :
     }
 
     private fun initialize() {
-        try {
-            googleApiKey = GOOGLE_KEY
-        } catch (notFound: PackageManager.NameNotFoundException) {
-            Napier.i("Failed to initialize YTplayer", notFound)
-        }
-
-        if (googleApiKey == null) {
-            throw NullPointerException("Google API key must not be null. Set your api key as meta data in AndroidManifest.xml file.")
-        }
-
         videoId = intent.getStringExtra(EXTRA_VIDEO_ID)
         if (videoId == null) {
             throw NullPointerException("Video ID must not be null")
@@ -221,7 +210,7 @@ class YTPlayer :
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == RECOVERY_DIALOG_REQUEST) {
             // Retry initialization if user performed a recovery action
-            playerView.initialize(googleApiKey, this)
+            playerView.initialize(BuildConfig.GOOGLE_KEY, this)
         }
     }
 

diff --git a/...rc/main/kotlin/io/github/wykopmobilny/ui/modules/links/linkdetails/LinkDetailsActivity.kt b/...rc/main/kotlin/io/github/wykopmobilny/ui/modules/links/linkdetails/LinkDetailsActivity.kt
@@ -170,22 +170,21 @@ class LinkDetailsActivity :
             R.id.refresh -> onRefresh()
             R.id.sortbyBest -> {
                 presenter.sortBy = "best"
-                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value = "best"))
+                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value_ = "best"))
                 setSubtitle()
                 presenter.loadComments()
                 binding.swiperefresh.isRefreshing = true
             }
             R.id.sortbyNewest -> {
                 presenter.sortBy = "new"
-                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value = "new"))
+                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value_ = "new"))
                 setSubtitle()
                 presenter.loadComments()
                 binding.swiperefresh.isRefreshing = true
             }
-
             R.id.sortbyOldest -> {
                 presenter.sortBy = "old"
-                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value = "old"))
+                appStorage.preferencesQueries.insertOrReplace(PreferenceEntity(key = "settings.links.comments_sort", value_ = "old"))
                 setSubtitle()
                 presenter.loadComments()
                 binding.swiperefresh.isRefreshing = true

diff --git a/app/src/main/kotlin/io/github/wykopmobilny/ui/modules/links/upcoming/UpcomingFragment.kt b/app/src/main/kotlin/io/github/wykopmobilny/ui/modules/links/upcoming/UpcomingFragment.kt
@@ -53,10 +53,7 @@ class UpcomingFragment : BaseLinksFragment(), UpcomingView {
             R.id.sortByComments -> {
                 presenter.sortBy = UpcomingPresenter.SORTBY_COMMENTS
                 appStorage.preferencesQueries.insertOrReplace(
-                    PreferenceEntity(
-                        key = "settings.links.upcoming_sort",
-                        value = UpcomingPresenter.SORTBY_COMMENTS,
-                    ),
+                    preferenceEntity = PreferenceEntity(key = "settings.links.upcoming_sort", UpcomingPresenter.SORTBY_COMMENTS),
                 )
                 setSubtitle()
                 binding.swipeRefresh.isRefreshing = true
@@ -65,10 +62,7 @@ class UpcomingFragment : BaseLinksFragment(), UpcomingView {
             R.id.sortByVotes -> {
                 presenter.sortBy = UpcomingPresenter.SORTBY_VOTES
                 appStorage.preferencesQueries.insertOrReplace(
-                    PreferenceEntity(
-                        key = "settings.links.upcoming_sort",
-                        value = UpcomingPresenter.SORTBY_VOTES,
-                    ),
+                    preferenceEntity = PreferenceEntity(key = "settings.links.upcoming_sort", UpcomingPresenter.SORTBY_VOTES),
                 )
                 setSubtitle()
                 binding.swipeRefresh.isRefreshing = true
@@ -77,10 +71,7 @@ class UpcomingFragment : BaseLinksFragment(), UpcomingView {
             R.id.sortByDate -> {
                 presenter.sortBy = UpcomingPresenter.SORTBY_DATE
                 appStorage.preferencesQueries.insertOrReplace(
-                    PreferenceEntity(
-                        key = "settings.links.upcoming_sort",
-                        value = UpcomingPresenter.SORTBY_DATE,
-                    ),
+                    preferenceEntity = PreferenceEntity(key = "settings.links.upcoming_sort", UpcomingPresenter.SORTBY_DATE),
                 )
                 setSubtitle()
                 binding.swipeRefresh.isRefreshing = true
@@ -89,10 +80,7 @@ class UpcomingFragment : BaseLinksFragment(), UpcomingView {
             R.id.sortByActive -> {
                 presenter.sortBy = UpcomingPresenter.SORTBY_ACTIVE
                 appStorage.preferencesQueries.insertOrReplace(
-                    PreferenceEntity(
-                        key = "settings.links.upcoming_sort",
-                        value = UpcomingPresenter.SORTBY_ACTIVE,
-                    ),
+                    preferenceEntity = PreferenceEntity(key = "settings.links.upcoming_sort", UpcomingPresenter.SORTBY_ACTIVE),
                 )
                 setSubtitle()
                 binding.swipeRefresh.isRefreshing = true

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id("com.starter.versioning")
     id("com.gradleup.auto.manifest")
     id("com.osacky.doctor") version("0.7.3")
-    id("com.starter.easylauncher") version("4.1.1") apply(false)
+    id("com.starter.easylauncher") version("4.2.0") apply(false)
     id "com.github.ben-manes.versions" version "0.39.0"
 }
 

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("java-gradle-plugin")
     id("org.jetbrains.kotlin.jvm") version "1.5.31"
@@ -15,17 +13,19 @@ dependencies {
     implementation("com.project.starter:android:0.38.0")
     implementation("com.gradleup:auto-manifest-plugin:1.0.4")
     implementation("com.google.gms:google-services:4.3.10")
-    implementation("com.google.firebase:firebase-crashlytics-gradle:2.8.0")
+    implementation("com.google.firebase:firebase-crashlytics-gradle:2.8.1")
     implementation("com.slack.keeper:keeper:0.11.1")
     implementation("com.google.firebase:perf-plugin:1.4.0")
-    implementation("com.squareup.sqldelight:gradle-plugin:1.5.2")
+    implementation("com.squareup.sqldelight:gradle-plugin:1.5.3")
     implementation("com.android.tools:common:30.0.3")
     implementation("com.karumi:shot:5.11.2")
     implementation("pl.droidsonroids.gradle:plugin:1.0.9")
 }
 
-tasks.withType(KotlinCompile).configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.current()
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 gradlePlugin {

diff --git a/...screenshot-test-helpers/src/main/kotlin/io/github/wykopmobilny/screenshots/IHateGoogle.kt b/...screenshot-test-helpers/src/main/kotlin/io/github/wykopmobilny/screenshots/IHateGoogle.kt
@@ -109,7 +109,7 @@ class FragmentScenarioIHateGoogle<F : Fragment>(
             internal val FACTORY: ViewModelProvider.Factory =
                 object : ViewModelProvider.Factory {
                     @Suppress("UNCHECKED_CAST")
-                    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
+                    override fun <T : ViewModel> create(modelClass: Class<T>): T {
                         val viewModel = FragmentFactoryHolderViewModel()
                         return viewModel as T
                     }

diff --git a/data/cache/sqldelight/build.gradle b/data/cache/sqldelight/build.gradle
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     id("com.starter.library.android")
     id("org.jetbrains.kotlin.kapt")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-google-lifecycle = "2.3.1"
-google-appcompat = "1.4.0-beta01"
+google-lifecycle = "2.4.0"
+google-appcompat = "1.4.0"
 google-swiperefreshlayout = "1.1.0"
 google-recyclerView = "1.2.1"
-google-constraintlayout = "2.1.1"
+google-constraintlayout = "2.1.2"
 google-androidtest = "1.4.0"
 google-androidtestext = "1.1.3"
 google-androidArchCore = "2.1.0"
 google-material = "1.4.0"
-google-work = "2.7.0"
+google-work = "2.7.1"
 google-preference = "1.1.1"
-google-paging = "3.0.1"
+google-paging = "3.1.0"
 google-browser = "1.3.0"
 google-viewpager2 = "1.0.0"
-google-androidxcore = "1.6.0"
+google-androidxcore = "1.7.0"
 google-activity = "1.4.0"
-google-fragment = "1.3.6"
+google-fragment = "1.4.0"
 google-datastore = "1.0.0"
 google-cardview = "1.0.0"
 google-exifinterface = "1.3.3"
@@ -31,7 +31,7 @@ mavencentral-datetime = "0.3.1"
 mavencentral-store = "4.0.2-KT15"
 mavencentral-retrofit = "2.9.0"
 mavencentral-moshi = "1.12.0"
-mavencentral-sqldelight = "1.5.2"
+mavencentral-sqldelight = "1.5.3"
 mavencentral-jspoon = "1.3.2"
 mavencentral-jsoup = "1.14.3"
 mavencentral-slidr = "3.0.0"