Skip to content

Commit

Permalink
Update assets for image editor.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholas-signal authored and alex-signal committed Mar 7, 2024
1 parent 6383896 commit 83c16a4
Show file tree
Hide file tree
Showing 56 changed files with 490 additions and 236 deletions.
Expand Up @@ -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
Expand Down
@@ -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 {
Expand All @@ -10,6 +9,4 @@ object MediaAnimations {
*/
@JvmStatic
val interpolator: Interpolator = createDefaultCubicBezierInterpolator()

val toolIconInterpolator = LinearInterpolator()
}
Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
Expand Up @@ -122,16 +122,16 @@ private void presentText(@NonNull MmsMessageRecord messageRecord, boolean hasWal
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("");
Expand All @@ -140,11 +140,11 @@ private void presentText(@NonNull MmsMessageRecord messageRecord, boolean hasWal
} 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);
Expand Down
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand Down
Expand Up @@ -287,7 +287,7 @@ void bind(@NonNull RequestManager requestManager,
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);
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_arrow_down.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_arrow_down_24.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_arrow_down_circle_filled.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_arrow_down_circle_outline_24.xml

This file was deleted.

10 changes: 0 additions & 10 deletions app/src/main/res/drawable/ic_arrow_right_16.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_arrow_up_16.xml

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/drawable/ic_cancel_36.xml

This file was deleted.

14 changes: 0 additions & 14 deletions app/src/main/res/drawable/ic_confirm_36.xml

This file was deleted.

15 changes: 0 additions & 15 deletions app/src/main/res/drawable/ic_crop_lock_24.xml

This file was deleted.

15 changes: 0 additions & 15 deletions app/src/main/res/drawable/ic_crop_rotate_24.xml

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/res/drawable/ic_crop_unlock_24.xml

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/drawable/ic_text_tool_24.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_view_infinite_24.xml

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/res/drawable/ic_view_once_24.xml

This file was deleted.

0 comments on commit 83c16a4

Please sign in to comment.