Skip to content

Commit

Permalink
Revert "Update timer icons and received text bubble."
Browse files Browse the repository at this point in the history 
This reverts commits 26c9b51,
833f90c,
0ba7ff9 and 38adb03.
  • Loading branch information
@lucio-signal
lucio-signal committed Jul 26, 2021
1 parent 44a8421 commit dada7a4
Show file tree
Hide file tree
Showing 19 changed files with 163 additions and 209 deletions.
39 changes: 14 additions & 25 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file
Expand Up @@ -88,6 +88,7 @@
import org.thoughtcrime.securesms.database.AttachmentDatabase;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
Expand Down Expand Up @@ -176,7 +177,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
protected View replyIcon;
@Nullable protected ViewGroup contactPhotoHolder;
@Nullable private QuoteView quoteView;
private ViewGroup bodyFooterContainer;
private EmojiTextView bodyText;
private ConversationItemFooter footer;
private ConversationItemFooter stickerFooter;
Expand Down Expand Up @@ -245,7 +245,6 @@ protected void onFinishInflate() {

this.backgroundDrawable = new ClipProjectionDrawable(Objects.requireNonNull(ContextCompat.getDrawable(getContext(),
R.drawable.conversation_item_background)));
this.bodyFooterContainer = findViewById(R.id.conversation_body_footer_container);
this.bodyText = findViewById(R.id.conversation_item_body);
this.footer = findViewById(R.id.conversation_item_footer);
this.stickerFooter = findViewById(R.id.conversation_item_sticker_footer);
Expand Down Expand Up @@ -783,7 +782,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe

setSharedContactCorners(messageRecord, previousRecord, nextRecord, isGroupThread);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
footer.setVisibility(GONE);
} else if (hasLinkPreview(messageRecord) && messageRequestAccepted) {
Expand Down Expand Up @@ -811,13 +810,13 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe
setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, true);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
} else {
linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, true);
linkPreviewStub.get().setDownloadClickedListener(downloadClickListener);
setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, false);
ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
}

Expand Down Expand Up @@ -846,7 +845,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe
Log.w(TAG, "setMediaAttributes: could not register listener for audio slide " + audioViewStub.get().getAudioSlideUri());
}

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);

footer.setPlaybackSpeedListener(new AudioPlaybackSpeedToggleListener());
Expand All @@ -866,7 +865,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe
documentViewStub.get().setDownloadClickListener(singleDownloadClickListener);
documentViewStub.get().setOnLongClickListener(passthroughClickListener);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);

footer.setVisibility(VISIBLE);
Expand Down Expand Up @@ -895,7 +894,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe
stickerStub.get().setOnLongClickListener(passthroughClickListener);
stickerStub.get().setOnClickListener(passthroughClickListener);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);

footer.setVisibility(VISIBLE);
Expand Down Expand Up @@ -931,7 +930,7 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe

setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);

footer.setVisibility(VISIBLE);
Expand Down Expand Up @@ -960,16 +959,9 @@ private void setMediaAttributes(@NonNull MessageRecord messageRe
if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE);
if (revealableStub.resolved()) revealableStub.get().setVisibility(View.GONE);

ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);

if (messageRecord.isMms() && !messageRecord.isOutgoing() && isGroupThread && !hasQuote(messageRecord)) {
boolean startOfCluster = isStartOfMessageCluster(messageRecord, previousRecord, isGroupThread);
int margin = startOfCluster ? readDimen(R.dimen.message_bubble_quote_negative_margin) : readDimen(R.dimen.message_bubble_top_padding);

ViewUtil.setTopMargin(bodyText, margin);
}

footer.setVisibility(VISIBLE);
}
}
Expand Down Expand Up @@ -1132,7 +1124,6 @@ private void setStatusIcons(MessageRecord messageRecord, boolean hasWallpaper) {
}

private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread, @NonNull ChatColors chatColors) {
boolean startOfCluster = isStartOfMessageCluster(current, previous, isGroupThread);
if (current.isMms() && !current.isMmsNotification() && ((MediaMmsMessageRecord)current).getQuote() != null) {
if (quoteView == null) {
throw new AssertionError();
Expand All @@ -1154,7 +1145,7 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR

quoteView.setOnLongClickListener(passthroughClickListener);

if (startOfCluster) {
if (isStartOfMessageCluster(current, previous, isGroupThread)) {
if (current.isOutgoing()) {
quoteView.setTopCornerSizes(true, true);
} else if (isGroupThread) {
Expand All @@ -1174,12 +1165,6 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR
ViewUtil.setTopMargin(mediaThumbnailStub.require(), readDimen(R.dimen.message_bubble_top_padding));
}

if (startOfCluster && !current.isOutgoing() && groupThread) {
ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_quote_negative_margin));
} else {
ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_top_padding));
}

if (linkPreviewStub.resolved() && !hasBigImageLinkPreview(current)) {
ViewUtil.setTopMargin(linkPreviewStub.get(), readDimen(R.dimen.message_bubble_top_padding));
}
Expand All @@ -1191,6 +1176,10 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR
if (mediaThumbnailStub.resolved()) {
ViewUtil.setTopMargin(mediaThumbnailStub.require(), 0);
}

if (linkPreviewStub.resolved()) {
ViewUtil.setTopMargin(linkPreviewStub.get(), 0);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_timer_00_12.xml
View file
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="12">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6.75,6a0.75,0.75 0,0 1,-1.5 0c0,-0.414 0.475,-3.581 0.5,-3.75S5.862,2 6,2s0.226,0.087 0.25,0.25S6.75,5.589 6.75,6ZM5.375,0.625A0.625,0.625 0,1 0,6 0,0.625 0.625,0 0,0 5.375,0.625ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM10.03,3.312a0.625,0.625 0,1 0,0.625 -0.624A0.626,0.626 0,0 0,10.03 3.312ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM8.063,1.345A0.625,0.625 0,1 0,8.688 0.72,0.624 0.624,0 0,0 8.063,1.345ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
android:pathData="M9.42,10.923a6.014,6.014 0,0 1,-0.865 0.5l-0.508,-0.88a4.959,4.959 0,0 0,0.866 -0.5ZM5.5,1.041a4.915,4.915 0,0 1,1 0L6.5,0.026a6.07,6.07 0,0 0,-1 0ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.923,2.579 L10.046,3.086a4.959,4.959 0,0 1,0.5 0.866l0.88,-0.508A6.014,6.014 0,0 0,10.923 2.58ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.042,1.463a5.008,5.008 0,0 1,0.866 0.5l0.513,-0.889a6.057,6.057 0,0 0,-0.866 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM1.464,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM6.25,2h-0.5l-0.5,4a0.75,0.75 0,0 0,1.5 0Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_timer_05_12.xml
View file
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="12">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6.65,6.375a0.75,0.75 0,0 1,-1.3 -0.75c0.208,-0.359 2.2,-2.864 2.308,-3a0.25,0.25 0,0 1,0.434 0.25C8.034,3.022 6.855,6.019 6.65,6.375ZM9.183,1.486A0.5,0.5 0,0 0,9 0.8,6 6,0 0,0 6,0 0.5,0.5 0,0 0,6 1a5,5 0,0 1,2.5 0.668,0.493 0.493,0 0,0 0.25,0.068A0.5,0.5 0,0 0,9.183 1.486ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM10.03,3.312a0.625,0.625 0,1 0,0.625 -0.624A0.626,0.626 0,0 0,10.03 3.312ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
android:pathData="M5.5,0.025A6,6 0,0 1,9.421 1.074l-0.513,0.889A4.972,4.972 0,0 0,5.5 1.041ZM10.536,8.042a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM8.913,10.042a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM10.544,3.949 L11.424,3.441a6.014,6.014 0,0 0,-0.5 -0.865l-0.877,0.507A4.959,4.959 0,0 1,10.544 3.953ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM2.581,1.076 L3.087,1.954a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.464,3.959a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM7.784,2.411 L5.351,5.625a0.75,0.75 0,0 0,1.3 0.75L8.216,2.661Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_timer_10_12.xml
View file
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="12">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6.375,6.65a0.75,0.75 0,0 1,-0.75 -1.3c0.359,-0.207 3.339,-1.379 3.5,-1.442A0.245,0.245 0,0 1,9.464 4a0.25,0.25 0,0 1,-0.091 0.342C9.251,4.439 6.731,6.444 6.375,6.65ZM11.014,3.682A0.5,0.5 0,0 0,11.2 3,6.021 6.021,0 0,0 6,0 0.5,0.5 0,0 0,6 1a5.021,5.021 0,0 1,4.331 2.5,0.5 0.5,0 0,0 0.433,0.25A0.49,0.49 0,0 0,11.014 3.682ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
android:pathData="M1.041,6.5L0.025,6.5a6.07,6.07 0,0 1,0 -1L1.04,5.5A4.915,4.915 0,0 0,1.041 6.5ZM5.5,1.041a4.988,4.988 0,0 1,5.044 2.912l0.88,-0.508A6,6 0,0 0,5.5 0.025ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.913,10.046a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM1.958,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.468,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM9.343,3.784L5.625,5.35a0.75,0.75 0,0 0,0.75 1.3L9.589,4.216Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_timer_15_12.xml
View file
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="12">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,6.75a0.75,0.75 0,0 1,0 -1.5c0.414,0 3.581,0.475 3.75,0.5S10,5.862 10,6s-0.087,0.226 -0.25,0.25S6.411,6.75 6,6.75ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5.006,5.006 0,0 1,5 5,0.5 0.5,0 0,0 1,0ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
android:pathData="M1.05,6.5h-1a5.963,5.963 0,0 1,0 -1h1A5.063,5.063 0,0 0,1.05 6.5ZM10.545,8.047a4.907,4.907 0,0 1,-0.5 0.865l0.874,0.5a5.94,5.94 0,0 0,0.491 -0.87ZM5.5,1.05A4.932,4.932 0,0 1,10.95 6.5h1A5.924,5.924 0,0 0,5.5 0.048ZM9.416,10.918 L8.916,10.044a4.907,4.907 0,0 1,-0.865 0.5l0.5,0.864A5.889,5.889 0,0 0,9.416 10.918ZM3.953,10.545a4.846,4.846 0,0 1,-0.865 -0.5l-0.5,0.874a5.94,5.94 0,0 0,0.87 0.491ZM6.5,10.945a5.063,5.063 0,0 1,-1 0v1a5.963,5.963 0,0 0,1 0ZM2.584,1.082l0.5,0.873a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM1.956,8.912a4.907,4.907 0,0 1,-0.5 -0.865l-0.864,0.5a5.94,5.94 0,0 0,0.491 0.87ZM1.456,3.953a4.907,4.907 0,0 1,0.5 -0.865l-0.874,-0.5a5.94,5.94 0,0 0,-0.491 0.87ZM6,5.25a0.75,0.75 0,0 0,0 1.5l4,-0.5v-0.5Z"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_timer_20_12.xml
View file
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="12">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M5.625,6.65a0.75,0.75 0,0 1,0.75 -1.3c0.359,0.208 2.864,2.2 3,2.308a0.25,0.25 0,0 1,-0.25 0.434C8.978,8.034 5.981,6.855 5.625,6.65ZM11.2,9A6,6 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5,5 0,0 1,4.331 7.5A0.5,0.5 0,0 0,11.2 9ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655Z"/>
android:pathData="M5.5,0.026A5.986,5.986 0,0 1,10.923 9.42l-0.877,-0.507A4.965,4.965 0,0 0,5.5 1.04ZM2.58,10.926a6.014,6.014 0,0 0,0.865 0.5l0.508,-0.88a4.959,4.959 0,0 1,-0.866 -0.5ZM1.041,5.5L0.025,5.5a6.07,6.07 0,0 0,0 1L1.04,6.5A4.915,4.915 0,0 1,1.041 5.5ZM9.421,10.926 L8.908,10.037a4.966,4.966 0,0 1,-0.866 0.5l0.513,0.889A6,6 0,0 0,9.421 10.926ZM6.5,10.96a4.915,4.915 0,0 1,-1 0v1.016a6.07,6.07 0,0 0,1 0ZM2.579,1.074l0.513,0.889a5.008,5.008 0,0 1,0.866 -0.5L3.445,0.575A6.057,6.057 0,0 0,2.579 1.074ZM1.963,8.908a4.966,4.966 0,0 1,-0.5 -0.866l-0.889,0.513a6,6 0,0 0,0.5 0.866ZM1.456,3.953a4.959,4.959 0,0 1,0.5 -0.866L1.077,2.58a6.014,6.014 0,0 0,-0.5 0.865ZM6.375,5.353a0.75,0.75 0,0 0,-0.75 1.3L9.339,8.216l0.25,-0.432Z"/>
</vector>

0 comments on commit dada7a4

Please sign in to comment.