Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 03:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update assets for image editor.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-03-05 16:51:39 -05:00
committed by Alex Hart
parent 6383896a79
commit 83c16a46de
56 changed files with 490 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/transfercontrols/TransferProgressView.kt
View File

@@ -51,8 +51,8 @@ class TransferProgressView @JvmOverloads constructor(
private val progressRect = RectF()
private val stopIconRect = RectF()
private val downloadDrawable = ContextCompat.getDrawable(context, R.drawable.ic_arrow_down_24)
private val uploadDrawable = ContextCompat.getDrawable(context, R.drawable.ic_arrow_up_16)
private val downloadDrawable = ContextCompat.getDrawable(context, R.drawable.symbol_arrow_down_24)
private val uploadDrawable = ContextCompat.getDrawable(context, R.drawable.symbol_arrow_up_24)
private var progressPercent = 0f
private var currentState = State.UNINITIALIZED

3
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaAnimations.kt
View File

@@ -1,7 +1,6 @@
package org.thoughtcrime.securesms.mediasend.v2
import android.view.animation.Interpolator
import android.view.animation.LinearInterpolator
import org.thoughtcrime.securesms.util.createDefaultCubicBezierInterpolator
object MediaAnimations {
@@ -10,6 +9,4 @@ object MediaAnimations {
*/
@JvmStatic
val interpolator: Interpolator = createDefaultCubicBezierInterpolator()
val toolIconInterpolator = LinearInterpolator()
}

6
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/review/MediaReviewFragment.kt
View File

@@ -367,7 +367,7 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
getString(R.string.MediaReviewFragment__photo_set_to_view_once)
}
MediaReviewToastPopupWindow.show(controls, R.drawable.ic_view_once_24, description)
MediaReviewToastPopupWindow.show(controls, R.drawable.symbol_view_once_24, description)
}
private fun presentQualityToggleToast(state: MediaSelectionState) {
@@ -494,8 +494,8 @@ class MediaReviewFragment : Fragment(R.layout.v2_media_review_fragment), Schedul
}
val sendButtonForegroundDrawable = when {
recipient != null -> ContextCompat.getDrawable(requireContext(), R.drawable.ic_send_24)
else -> ContextCompat.getDrawable(requireContext(), R.drawable.ic_arrow_end_24)
recipient != null -> ContextCompat.getDrawable(requireContext(), R.drawable.symbol_send_24)
else -> ContextCompat.getDrawable(requireContext(), R.drawable.symbol_arrow_end_24)
}
val sendButtonForegroundTint = when {

10
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageView.java
View File

@@ -122,16 +122,16 @@ public class ViewOnceMessageView extends LinearLayout {
if (messageRecord.isViewed()) {
iconColor = openedIconColor;
text.setText(R.string.RevealableMessageView_viewed);
icon.setImageResource(R.drawable.ic_viewed_once_24);
icon.setImageResource(R.drawable.symbol_view_once_dash_24);
} else {
iconColor = unopenedIconColor;
text.setText(R.string.RevealableMessageView_media);
icon.setImageResource(R.drawable.ic_view_once_24);
icon.setImageResource(R.drawable.symbol_view_once_24);
}
} else if (ViewOnceUtil.isViewable(messageRecord)) {
iconColor = unopenedIconColor;
text.setText(getDescriptionId(messageRecord));
icon.setImageResource(R.drawable.ic_view_once_24);
icon.setImageResource(R.drawable.symbol_view_once_24);
} else if (networkInProgress(messageRecord)) {
iconColor = unopenedIconColor;
text.setText("");
@@ -140,11 +140,11 @@ public class ViewOnceMessageView extends LinearLayout {
} else if (requiresTapToDownload(messageRecord)) {
iconColor = unopenedIconColor;
text.setText(formatFileSize(messageRecord));
icon.setImageResource(R.drawable.ic_arrow_down_circle_outline_24);
icon.setImageResource(R.drawable.symbol_arrow_circle_down_24);
} else {
iconColor = openedIconColor;
text.setText(R.string.RevealableMessageView_viewed);
icon.setImageResource(R.drawable.ic_viewed_once_24);
icon.setImageResource(R.drawable.symbol_view_once_dash_24);
}
text.setTextColor(textColor);

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

@@ -146,9 +146,9 @@ class ImageEditorHudV2 @JvmOverloads constructor(
cropAspectLockButton.setOnClickListener {
listener?.onCropAspectLock()
if (listener?.isCropAspectLocked == true) {
cropAspectLockButton.setImageResource(R.drawable.ic_crop_lock_24)
cropAspectLockButton.setImageResource(R.drawable.symbol_crop_lock_24)
} else {
cropAspectLockButton.setImageResource(R.drawable.ic_crop_unlock_24)
cropAspectLockButton.setImageResource(R.drawable.symbol_crop_unlock_24)
}
}
@@ -355,7 +355,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
private fun presentModeDraw() {
drawButton.isSelected = true
brushToggle.setImageResource(R.drawable.ic_draw_white_24)
brushToggle.setImageResource(R.drawable.symbol_brush_pen_24)
widthSeekBar.progress = SignalStore.imageEditorValues().getMarkerPercentage()
listener?.onColorChange(getActiveColor())
updateColorIndicator()
@@ -368,7 +368,7 @@ class ImageEditorHudV2 @JvmOverloads constructor(
private fun presentModeHighlight() {
drawButton.isSelected = true
brushToggle.setImageResource(R.drawable.ic_marker_24)
brushToggle.setImageResource(R.drawable.symbol_brush_highlighter_24)
widthSeekBar.progress = SignalStore.imageEditorValues().getHighlighterPercentage()
listener?.onColorChange(getActiveColor())
updateColorIndicator()

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
View File

@@ -287,7 +287,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
shareButtonImage.setVisibility(View.VISIBLE);
shareButton.setOnClickListener(v -> eventListener.onStickerPackShareClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
} else {
actionButtonImage.setImageResource(R.drawable.ic_arrow_down);
actionButtonImage.setImageResource(R.drawable.symbol_arrow_down_24);
actionButton.setOnClickListener(v -> eventListener.onStickerPackInstallClicked(stickerPack.getPackId(), stickerPack.getPackKey()));
shareButton.setVisibility(View.GONE);