kopia lustrzana https://github.com/ryukoposting/Signal-Android
rodzic
07b19402e6
commit
d5491a2e84
|
@ -12,10 +12,12 @@ import android.view.View
|
||||||
import android.widget.FrameLayout
|
import android.widget.FrameLayout
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import android.widget.SeekBar
|
import android.widget.SeekBar
|
||||||
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.appcompat.widget.AppCompatSeekBar
|
import androidx.appcompat.widget.AppCompatSeekBar
|
||||||
import androidx.constraintlayout.widget.Guideline
|
import androidx.constraintlayout.widget.Guideline
|
||||||
import androidx.core.animation.doOnEnd
|
import androidx.core.animation.doOnEnd
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
|
||||||
import com.airbnb.lottie.SimpleColorFilter
|
import com.airbnb.lottie.SimpleColorFilter
|
||||||
import com.google.android.material.switchmaterial.SwitchMaterial
|
import com.google.android.material.switchmaterial.SwitchMaterial
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
|
@ -92,6 +94,8 @@ class ImageEditorHudV2 @JvmOverloads constructor(
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun initializeViews() {
|
private fun initializeViews() {
|
||||||
|
colorIndicator.background = AppCompatResources.getDrawable(context, R.drawable.ic_color_preview)
|
||||||
|
|
||||||
undoButton.setOnClickListener { listener?.onUndo() }
|
undoButton.setOnClickListener { listener?.onUndo() }
|
||||||
clearAllButton.setOnClickListener { listener?.onClearAll() }
|
clearAllButton.setOnClickListener { listener?.onClearAll() }
|
||||||
cancelButton.setOnClickListener { listener?.onCancel() }
|
cancelButton.setOnClickListener { listener?.onCancel() }
|
||||||
|
|
|
@ -8,6 +8,7 @@ import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
|
import androidx.appcompat.content.res.AppCompatResources
|
||||||
import androidx.appcompat.widget.AppCompatSeekBar
|
import androidx.appcompat.widget.AppCompatSeekBar
|
||||||
import androidx.fragment.app.FragmentManager
|
import androidx.fragment.app.FragmentManager
|
||||||
import com.airbnb.lottie.SimpleColorFilter
|
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 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 colorIndicator: ImageView = view.findViewById(R.id.image_editor_hud_color_indicator)
|
||||||
val styleToggle: ImageView = view.findViewById(R.id.image_editor_hud_text_style_button)
|
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(
|
slider.setUpForColor(
|
||||||
Color.WHITE,
|
Color.WHITE,
|
||||||
{
|
{
|
||||||
|
|
|
@ -184,7 +184,6 @@
|
||||||
android:layout_height="80dp"
|
android:layout_height="80dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:alpha="0"
|
android:alpha="0"
|
||||||
android:background="@drawable/ic_color_preview"
|
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:paddingBottom="12dp"
|
android:paddingBottom="12dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
android:layout_height="80dp"
|
android:layout_height="80dp"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:alpha="0"
|
android:alpha="0"
|
||||||
android:background="@drawable/ic_color_preview"
|
|
||||||
android:importantForAccessibility="no"
|
android:importantForAccessibility="no"
|
||||||
android:paddingBottom="12dp"
|
android:paddingBottom="12dp"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
|
|
Ładowanie…
Reference in New Issue