From 4b137a8e2cf53893271b785baa9e7207a974e0e8 Mon Sep 17 00:00:00 2001 From: Tlaster Date: Thu, 6 Feb 2020 15:58:34 +0800 Subject: [PATCH] Fix build --- twidere/build.gradle | 1 + twidere/proguard-rules.pro | 1 + .../kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt | 4 ++-- .../kotlin/org/mariotaku/twidere/activity/BaseActivity.kt | 6 ++++-- .../org/mariotaku/twidere/view/ExtendedFrameLayout.kt | 4 ++-- .../kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt | 4 ++-- .../org/mariotaku/twidere/view/ExtendedLinearLayout.kt | 4 ++-- .../org/mariotaku/twidere/view/ExtendedRelativeLayout.kt | 4 ++-- .../mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt | 4 ++-- .../org/mariotaku/twidere/view/ProfileBannerImageView.kt | 4 ++-- 10 files changed, 20 insertions(+), 16 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 1a3375233..2984d997d 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -237,6 +237,7 @@ dependencies { implementation "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}" implementation "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}" implementation "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}" + implementation("com.squareup.okio:okio:2.4.3") implementation 'com.lnikkila:extendedtouchview:0.1.1' implementation "com.google.dagger:dagger:${libVersions['Dagger']}" implementation 'org.attoparser:attoparser:2.0.4.RELEASE' diff --git a/twidere/proguard-rules.pro b/twidere/proguard-rules.pro index d0b9fa361..790064f42 100644 --- a/twidere/proguard-rules.pro +++ b/twidere/proguard-rules.pro @@ -18,6 +18,7 @@ -dontobfuscate +-dontwarn org.codehaus.mojo.animal_sniffer.* -dontwarn com.squareup.haha.** -dontwarn com.makeramen.roundedimageview.** -dontwarn jnamed** diff --git a/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt index 5f16bead3..b085d3b2e 100644 --- a/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt +++ b/twidere/src/main/kotlin/androidx/core/view/WindowInsetsCompatAccessor.kt @@ -19,8 +19,8 @@ package androidx.core.view -fun WindowInsetsCompat(obj: Any) = WindowInsetsCompat.wrap(obj) +fun createWindowInsetsCompat(obj: Any) = WindowInsetsCompat(obj) val WindowInsetsCompat.unwrapped: Any? @Suppress("RestrictedApi") - get() = WindowInsetsCompat.unwrap(this) \ No newline at end of file + get() = this.toWindowInsets() \ No newline at end of file diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt index 20d8d2471..bb8294151 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/BaseActivity.kt @@ -53,7 +53,6 @@ import org.mariotaku.kpreferences.KPreferences import org.mariotaku.kpreferences.get import org.mariotaku.ktextension.activityLabel import org.mariotaku.ktextension.getSystemWindowInsets -import org.mariotaku.ktextension.systemWindowInsets import org.mariotaku.ktextension.unregisterReceiverSafe import org.mariotaku.restfu.http.RestHttpClient import org.mariotaku.twidere.BuildConfig @@ -204,7 +203,10 @@ open class BaseActivity : ChameleonActivity(), IBaseActivity, IThe override fun onApplyWindowInsets(v: View, insets: WindowInsetsCompat): WindowInsetsCompat { if (systemWindowsInsets == null) { - systemWindowsInsets = insets.systemWindowInsets + systemWindowsInsets = Rect(insets.systemWindowInsets.left, + insets.systemWindowInsets.top, + insets.systemWindowInsets.right, + insets.systemWindowInsets.bottom) } else { insets.getSystemWindowInsets(systemWindowsInsets!!) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt index 26b7cb35a..eb7c0a5c1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedFrameLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets @@ -55,7 +55,7 @@ open class ExtendedFrameLayout(context: Context, attrs: AttributeSet? = null) : @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt index 0cd3e63c9..76b1a7081 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedImageView.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import androidx.appcompat.widget.AppCompatImageView import android.util.AttributeSet import android.view.MotionEvent @@ -64,7 +64,7 @@ class ExtendedImageView(context: Context, attrs: AttributeSet? = null) : @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt index d85c04097..d2b8280bd 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedLinearLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets @@ -54,7 +54,7 @@ class ExtendedLinearLayout(context: Context, attrs: AttributeSet? = null) : Line @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt index c0a63c885..21d9868e0 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedRelativeLayout.kt @@ -26,7 +26,7 @@ import android.graphics.Rect import android.graphics.drawable.Drawable import android.os.Build import androidx.annotation.DrawableRes -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets @@ -109,7 +109,7 @@ open class ExtendedRelativeLayout(context: Context, attrs: AttributeSet? = null) @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt index 56c13a857..0f728c13a 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ExtendedSwipeRefreshLayout.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.WindowInsets @@ -74,7 +74,7 @@ class ExtendedSwipeRefreshLayout(context: Context, attrs: AttributeSet? = null) @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt index a97275867..fd2227de7 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/view/ProfileBannerImageView.kt @@ -23,7 +23,7 @@ import android.annotation.SuppressLint import android.annotation.TargetApi import android.content.Context import android.os.Build -import androidx.core.view.WindowInsetsCompat +import androidx.core.view.createWindowInsetsCompat import android.util.AttributeSet import android.view.MotionEvent import android.view.View @@ -81,7 +81,7 @@ class ProfileBannerImageView(context: Context, attrs: AttributeSet) : @TargetApi(Build.VERSION_CODES.LOLLIPOP) override fun onApplyWindowInsets(insets: WindowInsets): WindowInsets { - onApplyWindowInsetsCompatListener?.onApplyWindowInsets(WindowInsetsCompat(insets)) + onApplyWindowInsetsCompatListener?.onApplyWindowInsets(createWindowInsetsCompat(insets)) return super.onApplyWindowInsets(insets) } }