Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 04:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix vector load crash on Kitkat.

Browse Source 
Fixes #11628
This commit is contained in:
Alex Hart
2021-09-20 10:19:03 -03:00
parent 07b19402e6
commit d5491a2e84
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHudV2.kt
View File

@@ -12,10 +12,12 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.SeekBar
import androidx.appcompat.content.res.AppCompatResources
import androidx.appcompat.widget.AppCompatSeekBar
import androidx.constraintlayout.widget.Guideline
import androidx.core.animation.doOnEnd
import androidx.core.content.ContextCompat
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
import com.airbnb.lottie.SimpleColorFilter
import com.google.android.material.switchmaterial.SwitchMaterial
import org.thoughtcrime.securesms.R
@@ -92,6 +94,8 @@ class ImageEditorHudV2 @JvmOverloads constructor(
}
private fun initializeViews() {
colorIndicator.background = AppCompatResources.getDrawable(context, R.drawable.ic_color_preview)
undoButton.setOnClickListener { listener?.onUndo() }
clearAllButton.setOnClickListener { listener?.onClearAll() }
cancelButton.setOnClickListener { listener?.onCancel() }

4
app/src/main/java/org/thoughtcrime/securesms/scribbles/TextEntryDialogFragment.kt
View File

@@ -8,6 +8,7 @@ import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.appcompat.content.res.AppCompatResources
import androidx.appcompat.widget.AppCompatSeekBar
import androidx.fragment.app.FragmentManager
import com.airbnb.lottie.SimpleColorFilter
@@ -62,6 +63,9 @@ class TextEntryDialogFragment : KeyboardEntryDialogFragment(R.layout.v2_media_im
val slider: AppCompatSeekBar = view.findViewById(R.id.image_editor_hud_draw_color_bar)
val colorIndicator: ImageView = view.findViewById(R.id.image_editor_hud_color_indicator)
val styleToggle: ImageView = view.findViewById(R.id.image_editor_hud_text_style_button)
colorIndicator.background = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_color_preview)
slider.setUpForColor(
Color.WHITE,
{