mirror of
https://github.com/k0shk0sh/FastHub.git
synced 2025-12-08 19:05:54 +00:00
this commit fixes dark theme issue to close #205 and drops auto theme
This commit is contained in:
Kosh
parent
7f0aeb145b
commit
94b6ebac43
@ -17,11 +17,10 @@
|
||||
android:resizeableActivity="true"
|
||||
android:roundIcon="@mipmap/ic_launcher"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme"
|
||||
android:theme="@style/SplashTheme"
|
||||
tools:replace="android:allowBackup">
|
||||
<activity
|
||||
android:name="com.fastaccess.ui.modules.main.MainView"
|
||||
android:theme="@style/SplashTheme">
|
||||
android:name="com.fastaccess.ui.modules.main.MainView">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
|
||||
@ -57,4 +57,18 @@ import lombok.Setter;
|
||||
|
||||
@Override public ReactionsModel[] newArray(int size) {return new ReactionsModel[size];}
|
||||
};
|
||||
|
||||
@Override public String toString() {
|
||||
return "ReactionsModel{" +
|
||||
"id=" + id +
|
||||
", url='" + url + '\'' +
|
||||
", total_count=" + total_count +
|
||||
", plusOne=" + plusOne +
|
||||
", minusOne=" + minusOne +
|
||||
", laugh=" + laugh +
|
||||
", hooray=" + hooray +
|
||||
", confused=" + confused +
|
||||
", heart=" + heart +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,12 +17,10 @@ import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
public class PrefGetter {
|
||||
|
||||
public static final int AUTO = 0;
|
||||
public static final int LIGHT = 1;
|
||||
public static final int DARK = 2;
|
||||
|
||||
@IntDef({
|
||||
AUTO,
|
||||
LIGHT,
|
||||
DARK,
|
||||
})
|
||||
@ -145,7 +143,7 @@ public class PrefGetter {
|
||||
String appTheme = PrefHelper.getString("appTheme");
|
||||
if (!InputHelper.isEmpty(appTheme)) {
|
||||
if (appTheme.equalsIgnoreCase(resources.getString(R.string.auto_theme_mode))) {
|
||||
return AUTO;
|
||||
return LIGHT;
|
||||
} else if (appTheme.equalsIgnoreCase(resources.getString(R.string.dark_theme_mode))) {
|
||||
return DARK;
|
||||
} else if (appTheme.equalsIgnoreCase(resources.getString(R.string.light_theme_mode))) {
|
||||
|
||||
@ -53,13 +53,30 @@ public class ViewHelper {
|
||||
}
|
||||
|
||||
@ColorInt public static int getIconColor(@NonNull Context context) {
|
||||
return getPrimaryTextColor(context);
|
||||
return getColorAttr(context, R.attr.icon_color);
|
||||
}
|
||||
|
||||
@ColorInt public static int getWindowBackground(@NonNull Context context) {
|
||||
return getColorAttr(context, android.R.attr.windowBackground);
|
||||
}
|
||||
|
||||
@ColorInt public static int getListDivider(@NonNull Context context) {
|
||||
Logger.e(getColorAttr(context, R.attr.dividerColor));
|
||||
return getColorAttr(context, R.attr.dividerColor);
|
||||
}
|
||||
|
||||
@ColorInt public static int getPatchAdditionColor(@NonNull Context context) {
|
||||
return getColorAttr(context, R.attr.patch_addition);
|
||||
}
|
||||
|
||||
@ColorInt public static int getPatchDeletionColor(@NonNull Context context) {
|
||||
return getColorAttr(context, R.attr.patch_deletion);
|
||||
}
|
||||
|
||||
@ColorInt public static int getPatchRefColor(@NonNull Context context) {
|
||||
return getColorAttr(context, R.attr.patch_ref);
|
||||
}
|
||||
|
||||
@ColorInt private static int getColorAttr(@NonNull Context context, int attr) {
|
||||
Resources.Theme theme = context.getTheme();
|
||||
TypedArray typedArray = theme.obtainStyledAttributes(new int[]{attr});
|
||||
|
||||
@ -12,8 +12,14 @@ import com.fastaccess.provider.tasks.git.ReactionService;
|
||||
* Created by Kosh on 30 Mar 2017, 6:44 PM
|
||||
*/
|
||||
|
||||
public class CommentsHandler {
|
||||
public class CommentsHelper {
|
||||
|
||||
private static final int LAUGH = 0x1F601;
|
||||
private static final int SAD = 0x1F615;
|
||||
private static final int THUMBS_UP = 0x1f44d;
|
||||
private static final int THUMBS_DOWN = 0x1f44e;
|
||||
private static final int HOORAY = 0x1f389;
|
||||
private static final int HEART = 0x2764;
|
||||
|
||||
public static void handleReactions(@NonNull Context context, @NonNull String login, @NonNull String repoId,
|
||||
@IdRes int id, long commentId, boolean isCommit) {
|
||||
@ -43,4 +49,32 @@ public class CommentsHandler {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getEmojiByUnicode(int unicode) {
|
||||
return new String(Character.toChars(unicode));
|
||||
}
|
||||
|
||||
public static String getLaugh() {
|
||||
return getEmojiByUnicode(LAUGH);
|
||||
}
|
||||
|
||||
public static String getSad() {
|
||||
return getEmojiByUnicode(SAD);
|
||||
}
|
||||
|
||||
public static String getThumbsUp() {
|
||||
return getEmojiByUnicode(THUMBS_UP);
|
||||
}
|
||||
|
||||
public static String getThumbsDown() {
|
||||
return getEmojiByUnicode(THUMBS_DOWN);
|
||||
}
|
||||
|
||||
public static String getHooray() {
|
||||
return getEmojiByUnicode(HOORAY);
|
||||
}
|
||||
|
||||
public static String getHeart() {
|
||||
return getEmojiByUnicode(HEART);
|
||||
}
|
||||
|
||||
}
|
||||
@ -6,15 +6,18 @@ import android.support.v7.widget.AppCompatImageView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.fastaccess.R;
|
||||
import com.fastaccess.data.dao.model.Comment;
|
||||
import com.fastaccess.data.dao.model.ReactionsModel;
|
||||
import com.fastaccess.helper.InputHelper;
|
||||
import com.fastaccess.helper.ParseDateFormat;
|
||||
import com.fastaccess.provider.comments.CommentsHelper;
|
||||
import com.fastaccess.ui.adapter.callback.OnToggleView;
|
||||
import com.fastaccess.ui.widgets.AvatarLayout;
|
||||
import com.fastaccess.ui.widgets.FontTextView;
|
||||
import com.fastaccess.ui.widgets.SpannableBuilder;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseRecyclerAdapter;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder;
|
||||
import com.prettifier.pretty.PrettifyWebView;
|
||||
@ -44,12 +47,13 @@ public class CommentsViewHolder extends BaseViewHolder<Comment> {
|
||||
@BindView(R.id.commentOptions) View commentOptions;
|
||||
@BindView(R.id.toggleHolder) View toggleHolder;
|
||||
@BindView(R.id.emojiesList) View emojiesList;
|
||||
@BindView(R.id.reactionsText) TextView reactionsText;
|
||||
private String login;
|
||||
private OnToggleView onToggleView;
|
||||
private boolean showEmojies;
|
||||
|
||||
@Override public void onClick(View v) {
|
||||
if (v.getId() == R.id.toggle || v.getId() == R.id.toggleHolder) {
|
||||
if (v.getId() == R.id.toggle || v.getId() == R.id.toggleHolder || v.getId() == R.id.reactionsText) {
|
||||
if (onToggleView != null) {
|
||||
int position = getAdapterPosition();
|
||||
onToggleView.onToggle(position, !onToggleView.isCollapsed(position));
|
||||
@ -69,30 +73,25 @@ public class CommentsViewHolder extends BaseViewHolder<Comment> {
|
||||
switch (v.getId()) {
|
||||
case R.id.heart:
|
||||
reactionsModel.setHeart(reactionsModel.getHeart() + 1);
|
||||
heart.setText(String.format("%s", reactionsModel.getHeart()));
|
||||
break;
|
||||
case R.id.sad:
|
||||
reactionsModel.setConfused(reactionsModel.getConfused() + 1);
|
||||
sad.setText(String.format("%s", reactionsModel.getConfused()));
|
||||
break;
|
||||
case R.id.thumbsDown:
|
||||
reactionsModel.setMinusOne(reactionsModel.getMinusOne() + 1);
|
||||
thumbsDown.setText(String.format("%s", reactionsModel.getMinusOne()));
|
||||
break;
|
||||
case R.id.thumbsUp:
|
||||
reactionsModel.setPlusOne(reactionsModel.getPlusOne() + 1);
|
||||
thumbsUp.setText(String.format("%s", reactionsModel.getPlusOne()));
|
||||
break;
|
||||
case R.id.laugh:
|
||||
reactionsModel.setLaugh(reactionsModel.getLaugh() + 1);
|
||||
laugh.setText(String.format("%s", reactionsModel.getLaugh()));
|
||||
break;
|
||||
case R.id.hurray:
|
||||
reactionsModel.setHooray(reactionsModel.getHooray() + 1);
|
||||
hooray.setText(String.format("%s", reactionsModel.getHooray()));
|
||||
break;
|
||||
}
|
||||
comment.setReactions(reactionsModel);
|
||||
appendEmojies(reactionsModel);
|
||||
bind(comment);
|
||||
}
|
||||
}
|
||||
@ -116,6 +115,7 @@ public class CommentsViewHolder extends BaseViewHolder<Comment> {
|
||||
thumbsUp.setOnClickListener(this);
|
||||
hooray.setOnClickListener(this);
|
||||
heart.setOnClickListener(this);
|
||||
reactionsText.setOnClickListener(this);
|
||||
}
|
||||
|
||||
public static CommentsViewHolder newInstance(@NonNull ViewGroup viewGroup, @Nullable BaseRecyclerAdapter adapter,
|
||||
@ -140,21 +140,90 @@ public class CommentsViewHolder extends BaseViewHolder<Comment> {
|
||||
if (showEmojies) {
|
||||
if (commentsModel.getReactions() != null) {
|
||||
ReactionsModel reaction = commentsModel.getReactions();
|
||||
thumbsUp.setText(String.valueOf(reaction.getPlusOne()));
|
||||
thumbsDown.setText(String.valueOf(reaction.getMinusOne()));
|
||||
sad.setText(String.valueOf(reaction.getConfused()));
|
||||
laugh.setText(String.valueOf(reaction.getLaugh()));
|
||||
hooray.setText(String.valueOf(reaction.getHooray()));
|
||||
heart.setText(String.valueOf(reaction.getHeart()));
|
||||
appendEmojies(reaction);
|
||||
}
|
||||
}
|
||||
emojiesList.setVisibility(showEmojies ? View.VISIBLE : View.GONE);
|
||||
if (onToggleView != null) onToggle(onToggleView.isCollapsed(getAdapterPosition()));
|
||||
}
|
||||
|
||||
private void appendEmojies(ReactionsModel reaction) {
|
||||
SpannableBuilder spannableBuilder = SpannableBuilder.builder();
|
||||
reactionsText.setText("");
|
||||
thumbsUp.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getThumbsUp()).append(" ")
|
||||
.append(String.valueOf(reaction.getPlusOne()))
|
||||
.append(" "));
|
||||
thumbsDown.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getThumbsDown()).append(" ")
|
||||
.append(String.valueOf(reaction.getMinusOne()))
|
||||
.append(" "));
|
||||
hooray.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getHooray()).append(" ")
|
||||
.append(String.valueOf(reaction.getHooray()))
|
||||
.append(" "));
|
||||
sad.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getSad()).append(" ")
|
||||
.append(String.valueOf(reaction.getConfused()))
|
||||
.append(" "));
|
||||
laugh.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getLaugh()).append(" ")
|
||||
.append(String.valueOf(reaction.getLaugh()))
|
||||
.append(" "));
|
||||
heart.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getHeart()).append(" ")
|
||||
.append(String.valueOf(reaction.getHeart())));
|
||||
if (reaction.getPlusOne() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getThumbsUp())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getPlusOne()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getMinusOne() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getThumbsDown())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getMinusOne()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getLaugh() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getLaugh())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getLaugh()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getHooray() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getHooray())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getHooray()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getConfused() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getSad())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getConfused()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getHeart() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getHeart())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getHeart()));
|
||||
}
|
||||
if (spannableBuilder.length() > 0) {
|
||||
reactionsText.setText(spannableBuilder);
|
||||
if (!onToggleView.isCollapsed(getAdapterPosition())) {
|
||||
reactionsText.setVisibility(View.VISIBLE);
|
||||
}
|
||||
} else {
|
||||
reactionsText.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
private void onToggle(boolean expanded) {
|
||||
toggle.setRotation(!expanded ? 0.0F : 180F);
|
||||
commentOptions.setVisibility(!expanded ? View.GONE : View.VISIBLE);
|
||||
if (!InputHelper.isEmpty(reactionsText)) {
|
||||
reactionsText.setVisibility(!expanded ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@ import android.view.ViewGroup;
|
||||
|
||||
import com.fastaccess.R;
|
||||
import com.fastaccess.data.dao.CommitFileModel;
|
||||
import com.fastaccess.helper.ViewHelper;
|
||||
import com.fastaccess.ui.adapter.callback.OnToggleView;
|
||||
import com.fastaccess.ui.widgets.DiffLineSpan;
|
||||
import com.fastaccess.ui.widgets.FontTextView;
|
||||
@ -19,7 +20,6 @@ import com.fastaccess.ui.widgets.SpannableBuilder;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseRecyclerAdapter;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder;
|
||||
|
||||
import butterknife.BindColor;
|
||||
import butterknife.BindString;
|
||||
import butterknife.BindView;
|
||||
|
||||
@ -39,9 +39,9 @@ public class CommitFilesViewHolder extends BaseViewHolder<CommitFileModel> {
|
||||
@BindString(R.string.addition) String additionText;
|
||||
@BindString(R.string.delete) String deletionText;
|
||||
@BindString(R.string.status) String statusText;
|
||||
@BindColor(R.color.patch_addition_color) int patchAdditionColor;
|
||||
@BindColor(R.color.patch_deletion_color) int patchDeletionColor;
|
||||
@BindColor(R.color.patch_ref_color) int patchRefColor;
|
||||
private final int patchAdditionColor;
|
||||
private final int patchDeletionColor;
|
||||
private final int patchRefColor;
|
||||
|
||||
private String pathText;
|
||||
private OnToggleView onToggleView;
|
||||
@ -68,6 +68,9 @@ public class CommitFilesViewHolder extends BaseViewHolder<CommitFileModel> {
|
||||
@NonNull OnToggleView onToggleView) {
|
||||
super(itemView, adapter);
|
||||
this.onToggleView = onToggleView;
|
||||
patchAdditionColor = ViewHelper.getPatchAdditionColor(itemView.getContext());
|
||||
patchDeletionColor = ViewHelper.getPatchDeletionColor(itemView.getContext());
|
||||
patchRefColor = ViewHelper.getPatchRefColor(itemView.getContext());
|
||||
}
|
||||
|
||||
public static CommitFilesViewHolder newInstance(ViewGroup viewGroup, BaseRecyclerAdapter adapter,
|
||||
|
||||
@ -6,6 +6,7 @@ import android.support.v7.widget.AppCompatImageView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.fastaccess.R;
|
||||
import com.fastaccess.data.dao.TimelineModel;
|
||||
@ -13,9 +14,11 @@ import com.fastaccess.data.dao.model.Comment;
|
||||
import com.fastaccess.data.dao.model.ReactionsModel;
|
||||
import com.fastaccess.helper.InputHelper;
|
||||
import com.fastaccess.helper.ParseDateFormat;
|
||||
import com.fastaccess.provider.comments.CommentsHelper;
|
||||
import com.fastaccess.ui.adapter.callback.OnToggleView;
|
||||
import com.fastaccess.ui.widgets.AvatarLayout;
|
||||
import com.fastaccess.ui.widgets.FontTextView;
|
||||
import com.fastaccess.ui.widgets.SpannableBuilder;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseRecyclerAdapter;
|
||||
import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder;
|
||||
import com.prettifier.pretty.PrettifyWebView;
|
||||
@ -45,12 +48,13 @@ public class TimelineCommentsViewHolder extends BaseViewHolder<TimelineModel> {
|
||||
@BindView(R.id.commentOptions) View commentOptions;
|
||||
@BindView(R.id.toggleHolder) View toggleHolder;
|
||||
@BindView(R.id.emojiesList) View emojiesList;
|
||||
@BindView(R.id.reactionsText) TextView reactionsText;
|
||||
private String login;
|
||||
private OnToggleView onToggleView;
|
||||
private boolean showEmojies;
|
||||
|
||||
@Override public void onClick(View v) {
|
||||
if (v.getId() == R.id.toggle || v.getId() == R.id.toggleHolder) {
|
||||
if (v.getId() == R.id.toggle || v.getId() == R.id.toggleHolder || v.getId() == R.id.reactionsText) {
|
||||
if (onToggleView != null) {
|
||||
int position = getAdapterPosition();
|
||||
onToggleView.onToggle(position, !onToggleView.isCollapsed(position));
|
||||
@ -72,30 +76,25 @@ public class TimelineCommentsViewHolder extends BaseViewHolder<TimelineModel> {
|
||||
switch (v.getId()) {
|
||||
case R.id.heart:
|
||||
reactionsModel.setHeart(reactionsModel.getHeart() + 1);
|
||||
heart.setText(String.format("%s", reactionsModel.getHeart()));
|
||||
break;
|
||||
case R.id.sad:
|
||||
reactionsModel.setConfused(reactionsModel.getConfused() + 1);
|
||||
sad.setText(String.format("%s", reactionsModel.getConfused()));
|
||||
break;
|
||||
case R.id.thumbsDown:
|
||||
reactionsModel.setMinusOne(reactionsModel.getMinusOne() + 1);
|
||||
thumbsDown.setText(String.format("%s", reactionsModel.getMinusOne()));
|
||||
break;
|
||||
case R.id.thumbsUp:
|
||||
reactionsModel.setPlusOne(reactionsModel.getPlusOne() + 1);
|
||||
thumbsUp.setText(String.format("%s", reactionsModel.getPlusOne()));
|
||||
break;
|
||||
case R.id.laugh:
|
||||
reactionsModel.setLaugh(reactionsModel.getLaugh() + 1);
|
||||
laugh.setText(String.format("%s", reactionsModel.getLaugh()));
|
||||
break;
|
||||
case R.id.hurray:
|
||||
reactionsModel.setHooray(reactionsModel.getHooray() + 1);
|
||||
hooray.setText(String.format("%s", reactionsModel.getHooray()));
|
||||
break;
|
||||
}
|
||||
comment.setReactions(reactionsModel);
|
||||
appendEmojies(reactionsModel);
|
||||
timelineModel.setComment(comment);
|
||||
}
|
||||
}
|
||||
@ -119,6 +118,7 @@ public class TimelineCommentsViewHolder extends BaseViewHolder<TimelineModel> {
|
||||
thumbsUp.setOnClickListener(this);
|
||||
hooray.setOnClickListener(this);
|
||||
heart.setOnClickListener(this);
|
||||
reactionsText.setOnClickListener(this);
|
||||
}
|
||||
|
||||
public static TimelineCommentsViewHolder newInstance(@NonNull ViewGroup viewGroup, @Nullable BaseRecyclerAdapter adapter,
|
||||
@ -144,21 +144,90 @@ public class TimelineCommentsViewHolder extends BaseViewHolder<TimelineModel> {
|
||||
if (showEmojies) {
|
||||
if (commentsModel.getReactions() != null) {
|
||||
ReactionsModel reaction = commentsModel.getReactions();
|
||||
thumbsUp.setText(String.valueOf(reaction.getPlusOne()));
|
||||
thumbsDown.setText(String.valueOf(reaction.getMinusOne()));
|
||||
sad.setText(String.valueOf(reaction.getConfused()));
|
||||
laugh.setText(String.valueOf(reaction.getLaugh()));
|
||||
hooray.setText(String.valueOf(reaction.getHooray()));
|
||||
heart.setText(String.valueOf(reaction.getHeart()));
|
||||
appendEmojies(reaction);
|
||||
}
|
||||
}
|
||||
emojiesList.setVisibility(showEmojies ? View.VISIBLE : View.GONE);
|
||||
if (onToggleView != null) onToggle(onToggleView.isCollapsed(getAdapterPosition()));
|
||||
}
|
||||
|
||||
private void appendEmojies(ReactionsModel reaction) {
|
||||
SpannableBuilder spannableBuilder = SpannableBuilder.builder();
|
||||
reactionsText.setText("");
|
||||
thumbsUp.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getThumbsUp()).append(" ")
|
||||
.append(String.valueOf(reaction.getPlusOne()))
|
||||
.append(" "));
|
||||
thumbsDown.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getThumbsDown()).append(" ")
|
||||
.append(String.valueOf(reaction.getMinusOne()))
|
||||
.append(" "));
|
||||
hooray.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getHooray()).append(" ")
|
||||
.append(String.valueOf(reaction.getHooray()))
|
||||
.append(" "));
|
||||
sad.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getSad()).append(" ")
|
||||
.append(String.valueOf(reaction.getConfused()))
|
||||
.append(" "));
|
||||
laugh.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getLaugh()).append(" ")
|
||||
.append(String.valueOf(reaction.getLaugh()))
|
||||
.append(" "));
|
||||
heart.setText(SpannableBuilder.builder()
|
||||
.append(CommentsHelper.getHeart()).append(" ")
|
||||
.append(String.valueOf(reaction.getHeart())));
|
||||
if (reaction.getPlusOne() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getThumbsUp())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getPlusOne()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getMinusOne() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getThumbsDown())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getMinusOne()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getLaugh() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getLaugh())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getLaugh()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getHooray() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getHooray())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getHooray()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getConfused() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getSad())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getConfused()))
|
||||
.append(" ");
|
||||
}
|
||||
if (reaction.getHeart() > 0) {
|
||||
spannableBuilder.append(CommentsHelper.getHeart())
|
||||
.append(" ")
|
||||
.append(String.valueOf(reaction.getHeart()));
|
||||
}
|
||||
if (spannableBuilder.length() > 0) {
|
||||
reactionsText.setText(spannableBuilder);
|
||||
if (!onToggleView.isCollapsed(getAdapterPosition())) {
|
||||
reactionsText.setVisibility(View.VISIBLE);
|
||||
}
|
||||
} else {
|
||||
reactionsText.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
private void onToggle(boolean expanded) {
|
||||
toggle.setRotation(!expanded ? 0.0F : 180F);
|
||||
commentOptions.setVisibility(!expanded ? View.GONE : View.VISIBLE);
|
||||
if (!InputHelper.isEmpty(reactionsText)) {
|
||||
reactionsText.setVisibility(!expanded ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -8,7 +8,6 @@ import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.annotation.StringRes;
|
||||
import android.support.design.widget.AppBarLayout;
|
||||
import android.support.v7.app.AppCompatDelegate;
|
||||
import android.support.v7.widget.Toolbar;
|
||||
import android.text.TextUtils;
|
||||
import android.view.Menu;
|
||||
@ -270,13 +269,11 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
|
||||
|
||||
private void setupTheme() {
|
||||
int themeMode = PrefGetter.getThemeType(getApplicationContext());
|
||||
int mode = AppCompatDelegate.MODE_NIGHT_AUTO;
|
||||
if (themeMode == PrefGetter.LIGHT) {
|
||||
mode = AppCompatDelegate.MODE_NIGHT_NO;
|
||||
setTheme(R.style.ThemeLight);
|
||||
} else if (themeMode == PrefGetter.DARK) {
|
||||
mode = AppCompatDelegate.MODE_NIGHT_YES;
|
||||
setTheme(R.style.ThemeDark);
|
||||
}
|
||||
AppCompatDelegate.setDefaultNightMode(mode);
|
||||
}
|
||||
|
||||
@Nullable private View getToolbarNavigationIcon(Toolbar toolbar) {
|
||||
|
||||
@ -73,7 +73,7 @@ public class LoginView extends BaseActivity<LoginMvp.View, LoginPresenter> imple
|
||||
}
|
||||
|
||||
@Override public void onRequire2Fa() {
|
||||
showMessage(R.string.error, R.string.two_factors_otp_error);
|
||||
Toasty.warning(this, getString(R.string.two_factors_otp_error)).show();
|
||||
twoFactor.setVisibility(View.VISIBLE);
|
||||
hideProgress();
|
||||
}
|
||||
|
||||
@ -66,7 +66,6 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
|
||||
}
|
||||
|
||||
@Override protected void onCreate(Bundle savedInstanceState) {
|
||||
setTheme(R.style.AppTheme);
|
||||
super.onCreate(savedInstanceState);
|
||||
navigationView.getMenu().findItem(R.id.enableAds).setChecked(PrefGetter.isAdsEnabled());
|
||||
hideShowShadow(navType == MainMvp.FEEDS);
|
||||
|
||||
@ -10,7 +10,7 @@ import com.fastaccess.data.dao.model.Comment;
|
||||
import com.fastaccess.data.dao.model.Login;
|
||||
import com.fastaccess.helper.BundleConstant;
|
||||
import com.fastaccess.helper.RxHelper;
|
||||
import com.fastaccess.provider.comments.CommentsHandler;
|
||||
import com.fastaccess.provider.comments.CommentsHelper;
|
||||
import com.fastaccess.provider.rest.RestProvider;
|
||||
import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
|
||||
|
||||
@ -137,7 +137,7 @@ class CommitCommentsPresenter extends BasePresenter<CommitCommentsMvp.View> impl
|
||||
getView().onEditComment(item);
|
||||
}
|
||||
} else {
|
||||
CommentsHandler.handleReactions(v.getContext(), login, repoId, v.getId(), item.getId(), true);
|
||||
CommentsHelper.handleReactions(v.getContext(), login, repoId, v.getId(), item.getId(), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@ import com.fastaccess.data.dao.model.Issue;
|
||||
import com.fastaccess.data.dao.model.IssueEvent;
|
||||
import com.fastaccess.data.dao.model.Login;
|
||||
import com.fastaccess.helper.BundleConstant;
|
||||
import com.fastaccess.provider.comments.CommentsHandler;
|
||||
import com.fastaccess.provider.comments.CommentsHelper;
|
||||
import com.fastaccess.provider.rest.RestProvider;
|
||||
import com.fastaccess.provider.scheme.SchemeParser;
|
||||
import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
|
||||
@ -49,7 +49,7 @@ public class IssueTimelinePresenter extends BasePresenter<IssueTimelineMvp.View>
|
||||
}
|
||||
} else {
|
||||
if (login() != null && repoId() != null) {
|
||||
CommentsHandler.handleReactions(v.getContext(), login(), repoId(), v.getId(), item.getComment().getId(), false);
|
||||
CommentsHelper.handleReactions(v.getContext(), login(), repoId(), v.getId(), item.getComment().getId(), false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,8 +9,8 @@ import android.support.annotation.StringRes;
|
||||
import android.view.View;
|
||||
|
||||
import com.fastaccess.R;
|
||||
import com.fastaccess.data.dao.TimelineModel;
|
||||
import com.fastaccess.data.dao.SparseBooleanArrayParcelable;
|
||||
import com.fastaccess.data.dao.TimelineModel;
|
||||
import com.fastaccess.data.dao.model.Comment;
|
||||
import com.fastaccess.data.dao.model.Issue;
|
||||
import com.fastaccess.data.dao.model.User;
|
||||
@ -194,8 +194,9 @@ public class IssueTimelineView extends BaseFragment<IssueTimelineMvp.View, Issue
|
||||
}
|
||||
|
||||
@Override public void onToggle(int position, boolean isCollapsed) {
|
||||
getSparseBooleanArray().clear();
|
||||
getSparseBooleanArray().put(position, isCollapsed);
|
||||
|
||||
adapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
@Override public boolean isCollapsed(int position) {
|
||||
|
||||
@ -13,7 +13,7 @@ import com.fastaccess.data.dao.model.IssueEvent;
|
||||
import com.fastaccess.data.dao.model.Login;
|
||||
import com.fastaccess.data.dao.model.PullRequest;
|
||||
import com.fastaccess.helper.BundleConstant;
|
||||
import com.fastaccess.provider.comments.CommentsHandler;
|
||||
import com.fastaccess.provider.comments.CommentsHelper;
|
||||
import com.fastaccess.provider.rest.RestProvider;
|
||||
import com.fastaccess.provider.scheme.SchemeParser;
|
||||
import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
|
||||
@ -49,7 +49,7 @@ public class PullRequestTimelinePresenter extends BasePresenter<PullRequestTimel
|
||||
}
|
||||
} else {
|
||||
if (login() != null && repoId() != null) {
|
||||
CommentsHandler.handleReactions(v.getContext(), login(), repoId(), v.getId(), item.getComment().getId(), false);
|
||||
CommentsHelper.handleReactions(v.getContext(), login(), repoId(), v.getId(), item.getComment().getId(), false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -117,8 +117,9 @@ public class PullRequestTimelineView extends BaseFragment<PullRequestTimelineMvp
|
||||
}
|
||||
|
||||
@Override public void onToggle(int position, boolean isCollapsed) {
|
||||
getSparseBooleanArray().clear();
|
||||
getSparseBooleanArray().put(position, isCollapsed);
|
||||
|
||||
adapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
@Override public boolean isCollapsed(int position) {
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
package com.fastaccess.ui.widgets;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.support.annotation.ColorInt;
|
||||
import android.text.SpannableStringBuilder;
|
||||
import android.text.style.BackgroundColorSpan;
|
||||
import android.text.style.ForegroundColorSpan;
|
||||
import android.text.style.ImageSpan;
|
||||
import android.text.style.StyleSpan;
|
||||
import android.text.style.URLSpan;
|
||||
import android.view.View;
|
||||
@ -45,6 +47,14 @@ public class SpannableBuilder extends SpannableStringBuilder {
|
||||
return this;
|
||||
}
|
||||
|
||||
public SpannableBuilder append(Drawable drawable) {
|
||||
if (drawable != null) {
|
||||
drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
|
||||
append(' ', new ImageSpan(drawable));
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public SpannableBuilder append(final char text, final Object span) {
|
||||
append(text);
|
||||
if (!InputHelper.isEmpty(span)) {
|
||||
@ -65,12 +75,12 @@ public class SpannableBuilder extends SpannableStringBuilder {
|
||||
return this;
|
||||
}
|
||||
|
||||
public SpannableBuilder foreground(final CharSequence text, @ColorInt final int color) {
|
||||
public SpannableBuilder foreground(final CharSequence text, @ColorInt int color) {
|
||||
if (!InputHelper.isEmpty(text)) return append(text, new ForegroundColorSpan(color));
|
||||
return this;
|
||||
}
|
||||
|
||||
public SpannableBuilder foreground(final char text, @ColorInt final int color) {
|
||||
public SpannableBuilder foreground(final char text, @ColorInt int color) {
|
||||
return append(text, new ForegroundColorSpan(color));
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,6 @@ import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.content.ContextCompat;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
@ -111,7 +110,7 @@ public class DynamicRecyclerView extends RecyclerView {
|
||||
if (!ViewHelper.isTablet(getContext())) {
|
||||
Resources resources = getResources();
|
||||
addItemDecoration(new InsetDividerDecoration(resources.getDimensionPixelSize(R.dimen.divider_height),
|
||||
resources.getDimensionPixelSize(R.dimen.keyline_2), ContextCompat.getColor(getContext(), R.color.divider)));
|
||||
resources.getDimensionPixelSize(R.dimen.keyline_2), ViewHelper.getListDivider(getContext())));
|
||||
}
|
||||
}
|
||||
|
||||
@ -119,7 +118,7 @@ public class DynamicRecyclerView extends RecyclerView {
|
||||
if (!ViewHelper.isTablet(getContext())) {
|
||||
Resources resources = getResources();
|
||||
addItemDecoration(new InsetDividerDecoration(resources.getDimensionPixelSize(R.dimen.divider_height), 0,
|
||||
ContextCompat.getColor(getContext(), R.color.divider)));
|
||||
ViewHelper.getListDivider(getContext())));
|
||||
}
|
||||
}
|
||||
|
||||
@ -131,7 +130,7 @@ public class DynamicRecyclerView extends RecyclerView {
|
||||
if (!ViewHelper.isTablet(getContext())) {
|
||||
Resources resources = getResources();
|
||||
addItemDecoration(new InsetDividerDecoration(resources.getDimensionPixelSize(R.dimen.divider_height), 0,
|
||||
ContextCompat.getColor(getContext(), R.color.divider), toDivide));
|
||||
ViewHelper.getListDivider(getContext()), toDivide));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<shape android:shape="rectangle">
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="@color/bluish_accent"/>
|
||||
android:color="?colorAccent"/>
|
||||
<solid android:color="@color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,11h-2L11,5h2v6zM13,15h-2v-2h2v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M7,10l5,5 5,-5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
|
||||
</vector>
|
||||
|
||||
@ -5,6 +5,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M17.42,15C17.79,14.09 18,13.07 18,12C18,8.13 15.31,5 12,5C8.69,5 6,8.13 6,12C6,15.87 8.69,19 12,19C13.54,19 15,19 16,18.22V20.55C15,21 13.46,21 12,21C7.58,21 4,16.97 4,12C4,7.03 7.58,3 12,3C16.42,3 20,7.03 20,12C20,13.85 19.5,15.57 18.65,17H14V15.5C13.36,16.43 12.5,17 11.5,17C9.57,17 8,14.76 8,12C8,9.24 9.57,7 11.5,7C12.5,7 13.36,7.57 14,8.5V8H16V15H17.42M12,9C10.9,9 10,10.34 10,12C10,13.66 10.9,15 12,15C13.1,15 14,13.66 14,12C14,10.34 13.1,9 12,9Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
|
||||
</vector>
|
||||
|
||||
@ -5,6 +5,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M13,14C9.64,14 8.54,15.35 8.18,16.24C9.25,16.7 10,17.76 10,19A3,3 0 0,1 7,22A3,3 0 0,1 4,19C4,17.69 4.83,16.58 6,16.17V7.83C4.83,7.42 4,6.31 4,5A3,3 0 0,1 7,2A3,3 0 0,1 10,5C10,6.31 9.17,7.42 8,7.83V13.12C8.88,12.47 10.16,12 12,12C14.67,12 15.56,10.66 15.85,9.77C14.77,9.32 14,8.25 14,7A3,3 0 0,1 17,4A3,3 0 0,1 20,7C20,8.34 19.12,9.5 17.91,9.86C17.65,11.29 16.68,14 13,14M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M7,4A1,1 0 0,0 6,5A1,1 0 0,0 7,6A1,1 0 0,0 8,5A1,1 0 0,0 7,4M17,6A1,1 0 0,0 16,7A1,1 0 0,0 17,8A1,1 0 0,0 18,7A1,1 0 0,0 17,6Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="64"
|
||||
android:viewportWidth="64">
|
||||
<path
|
||||
android:fillColor="#FF1744"
|
||||
android:pathData="M61.072 18.16C54.677 1.242 33.918 8.832 31.998 17.281 29.357 8.277 9.107 1.561 2.928 18.172 -3.953 36.674 29.598 53.279 31.998 56 34.396 53.838 67.951 36.361 61.072 18.16Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M15,7H20.5L15,1.5V7M8,0H16L22,6V18A2,2 0 0,1 20,20H8C6.89,20 6,19.1 6,18V2A2,2 0 0,1 8,0M4,4V22H20V24H4A2,2 0 0,1 2,22V4H4Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M6,2A3,3 0 0,1 9,5C9,6.28 8.19,7.38 7.06,7.81C7.15,8.27 7.39,8.83 8,9.63C9,10.92 11,12.83 12,14.17C13,12.83 15,10.92 16,9.63C16.61,8.83 16.85,8.27 16.94,7.81C15.81,7.38 15,6.28 15,5A3,3 0 0,1 18,2A3,3 0 0,1 21,5C21,6.32 20.14,7.45 18.95,7.85C18.87,8.37 18.64,9 18,9.83C17,11.17 15,13.08 14,14.38C13.39,15.17 13.15,15.73 13.06,16.19C14.19,16.62 15,17.72 15,19A3,3 0 0,1 12,22A3,3 0 0,1 9,19C9,17.72 9.81,16.62 10.94,16.19C10.85,15.73 10.61,15.17 10,14.38C9,13.08 7,11.17 6,9.83C5.36,9 5.13,8.37 5.05,7.85C3.86,7.45 3,6.32 3,5A3,3 0 0,1 6,2M6,4A1,1 0 0,0 5,5A1,1 0 0,0 6,6A1,1 0 0,0 7,5A1,1 0 0,0 6,4M18,4A1,1 0 0,0 17,5A1,1 0 0,0 18,6A1,1 0 0,0 19,5A1,1 0 0,0 18,4M12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19A1,1 0 0,0 12,18Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M6,2A3,3 0 0,1 9,5C9,6.28 8.19,7.38 7.06,7.81C7.15,8.27 7.39,8.83 8,9.63C9,10.92 11,12.83 12,14.17C13,12.83 15,10.92 16,9.63C16.61,8.83 16.85,8.27 16.94,7.81C15.81,7.38 15,6.28 15,5A3,3 0 0,1 18,2A3,3 0 0,1 21,5C21,6.32 20.14,7.45 18.95,7.85C18.87,8.37 18.64,9 18,9.83C17,11.17 15,13.08 14,14.38C13.39,15.17 13.15,15.73 13.06,16.19C14.19,16.62 15,17.72 15,19A3,3 0 0,1 12,22A3,3 0 0,1 9,19C9,17.72 9.81,16.62 10.94,16.19C10.85,15.73 10.61,15.17 10,14.38C9,13.08 7,11.17 6,9.83C5.36,9 5.13,8.37 5.05,7.85C3.86,7.45 3,6.32 3,5A3,3 0 0,1 6,2M6,4A1,1 0 0,0 5,5A1,1 0 0,0 6,6A1,1 0 0,0 7,5A1,1 0 0,0 6,4M18,4A1,1 0 0,0 17,5A1,1 0 0,0 18,6A1,1 0 0,0 19,5A1,1 0 0,0 18,4M12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19A1,1 0 0,0 12,18Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M10,19h4v-3h-4v3zM5,4v3h5v3h4V7h5V4H5zM3,14h18v-2H3v2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,5 +4,5 @@
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z" />
|
||||
<path android:fillColor="?icon_color" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z" />
|
||||
</vector>
|
||||
@ -4,5 +4,5 @@
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z" />
|
||||
<path android:fillColor="?icon_color" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z" />
|
||||
</vector>
|
||||
@ -4,5 +4,5 @@
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z" />
|
||||
<path android:fillColor="?icon_color" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z" />
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
|
||||
</vector>
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="64"
|
||||
android:viewportWidth="64">
|
||||
<path
|
||||
android:fillColor="#f7b600"
|
||||
android:pathData="M2 61L10.552 58.01 4.085 54.996Z"/>
|
||||
<path
|
||||
android:fillColor="#ffdd7d"
|
||||
android:pathData="M26.943 36.398L14.785 24.177 12.826 29.821Z"/>
|
||||
<path
|
||||
android:fillColor="#f7b600"
|
||||
android:pathData="M12.826 29.821L10.64 36.115 37.449 48.605 38.662 48.182 26.943 36.398Z"/>
|
||||
<path
|
||||
android:fillColor="#ffdd7d"
|
||||
android:pathData="M8.455 42.408L28.482 51.74 37.449 48.605 10.64 36.115Z"/>
|
||||
<path
|
||||
android:fillColor="#f7b600"
|
||||
android:pathData="M6.27 48.703L19.518 54.875 28.482 51.74 8.455 42.408Z"/>
|
||||
<path
|
||||
android:fillColor="#ffdd7d"
|
||||
android:pathData="M6.27 48.703l-2.185 6.293 6.467 3.014 8.966 -3.135z"/>
|
||||
<path
|
||||
android:fillColor="#493816"
|
||||
android:pathData="M31.889 31.202c6.746 6.638 10.229 13.974 7.779 16.386 -2.451 2.41 -9.91 -1.016 -16.656 -7.654 -6.746 -6.637 -10.227 -13.974 -7.776 -16.385 2.45 -2.412 9.907 1.014 16.653 7.653z"/>
|
||||
<path
|
||||
android:fillColor="#42ade2"
|
||||
android:pathData="M23.496 14.48c-1.631 -2.264 0.139 -3.275 2.309 -2.87 -2.063 -2.538 -0.791 -4.297 2.461 -3.607 1.016 0.216 -0.398 1.933 -1.309 1.869 2.734 2.048 1.234 4.21 -1.661 3.701 2.56 3.515 -1.839 2.649 -3.762 2.796C21.031 19 24.036 22 23.034 22 20.795 22 17.23 13.699 23.496 14.48Z"/>
|
||||
<path
|
||||
android:fillColor="#ff8736"
|
||||
android:pathData="M44.545 19.334C43.066 20 38.838 13.39 44.02 13.333 41.045 10.628 41.428 9.323 45.42 9.244 40.846 4.66 48.074 3 48.836 5.455c0.227 0.735 -2.213 -0.648 -3.008 0.67 -0.918 1.521 5.629 5.361 -1.127 5.134 2.484 2.529 2.635 3.709 -1.328 4.134 0.518 0.716 2.111 3.518 1.172 3.941z"/>
|
||||
<path
|
||||
android:fillColor="#ed4c5c"
|
||||
android:pathData="M46.225 34.936l1.52 -1.291c0 0 1.436 2.074 2.445 2.861 0.775 -3.56 0.568 -5.724 4.719 -3.254 -2.346 -6.197 1.52 -3.856 5.174 -2.177 -0.211 -1.572 0.033 -1.406 1.615 -1.851 1.404 5.268 -2.369 3.743 -5.447 2.012 1.762 4.753 -0.082 4.535 -3.932 2.91 -0.066 2.015 -0.725 4.299 -1.934 4.494 -1.375 0.223 -4.16 -3.704 -4.16 -3.704z"/>
|
||||
<path
|
||||
android:fillColor="#c28fef"
|
||||
android:pathData="M35.012 20.053c-1.846 2.403 -4.66 3.745 -6.793 5.847 -2.219 2.188 -3.545 8.208 -3.545 8.208 0 0 0.793 -6.278 2.914 -8.694 1.92 -2.185 4.666 -3.777 6.152 -6.319 2.658 -4.546 0.285 -10.63 -3.107 -14.104 0.713 -0.635 1.658 -1.438 2.23 -1.989 3.192 4.095 6.03 12.004 2.149 17.051z"/>
|
||||
<path
|
||||
android:fillColor="#ff8736"
|
||||
android:pathData="M38.086 25.181c-2.645 1.901 -4.463 4.66 -6.305 7.289 -1.627 2.321 -6.709 5.169 -6.709 5.169 0 0 4.83 -3.256 6.264 -5.699 1.766 -3.009 3.572 -6.106 6.375 -8.28 5.604 -4.347 13.682 -3.859 20.02 -1.572L56.624 24.9c0 0 -13.198 -3.556 -18.538 0.281z"/>
|
||||
<path
|
||||
android:fillColor="#42ade2"
|
||||
android:pathData="M49.246 24.718c-1.682 2.229 -2.547 4.921 -3.836 7.37 -1.199 2.283 -2.783 4.49 -5.129 5.701 -2.553 1.32 -8.328 0.869 -8.328 0.869 0 0 5.744 -0.068 8.106 -1.658 2.41 -1.625 3.674 -4.373 4.617 -7.022 1.766 -4.955 3.98 -10.373 9.193 -12.578l1.049 2.836c0 0 -2.869 0.764 -5.672 4.482zM3.221 14.266L6.049 11.438 8.878 14.266 6.05 17.094Z"/>
|
||||
<path
|
||||
android:fillColor="#ff8736"
|
||||
android:pathData="M7.168 23.197l2.83 -2.829 2.828 2.829 -2.83 2.829z"/>
|
||||
<path
|
||||
android:fillColor="#ed4c5c"
|
||||
android:pathData="M14.39 9.828l2.829 -2.83 2.83 2.83 -2.829 2.828z"/>
|
||||
<path
|
||||
android:fillColor="#c28fef"
|
||||
android:pathData="M45.183 43.657l2.828 -2.829 2.83 2.83 -2.83 2.828z"/>
|
||||
<path
|
||||
android:fillColor="#ed4c5c"
|
||||
android:pathData="M38.876 53.357l2.829 -2.829 2.828 2.829 -2.828 2.828z"/>
|
||||
<path
|
||||
android:fillColor="#ff8736"
|
||||
android:pathData="M51.283 55.594l2.829 -2.829 2.829 2.83 -2.829 2.828z"/>
|
||||
<path
|
||||
android:fillColor="#42ade2"
|
||||
android:pathData="M54.113 42.708l2.828 -2.829 2.829 2.829 -2.829 2.828zM49.391 12.83L52.219 10l2.83 2.83 -2.829 2.828z"/>
|
||||
<path
|
||||
android:fillColor="#ed4c5c"
|
||||
android:pathData="M19.049 29.829L21.877 27l2.829 2.829 -2.829 2.828z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
|
||||
</vector>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,3C9.31,3 7.41,4.22 7.41,4.22L6,9H18L16.59,4.22C16.59,4.22 14.69,3 12,3M12,11C9.27,11 5.39,11.54 5.13,11.59C4.09,11.87 3.25,12.15 2.59,12.41C1.58,12.75 1,13 1,13H23C23,13 22.42,12.75 21.41,12.41C20.75,12.15 19.89,11.87 18.84,11.59C18.84,11.59 14.82,11 12,11M7.5,14A3.5,3.5 0 0,0 4,17.5A3.5,3.5 0 0,0 7.5,21A3.5,3.5 0 0,0 11,17.5C11,17.34 11,17.18 10.97,17.03C11.29,16.96 11.63,16.9 12,16.91C12.37,16.91 12.71,16.96 13.03,17.03C13,17.18 13,17.34 13,17.5A3.5,3.5 0 0,0 16.5,21A3.5,3.5 0 0,0 20,17.5A3.5,3.5 0 0,0 16.5,14C15.03,14 13.77,14.9 13.25,16.19C12.93,16.09 12.55,16 12,16C11.45,16 11.07,16.09 10.75,16.19C10.23,14.9 8.97,14 7.5,14M7.5,15A2.5,2.5 0 0,1 10,17.5A2.5,2.5 0 0,1 7.5,20A2.5,2.5 0 0,1 5,17.5A2.5,2.5 0 0,1 7.5,15M16.5,15A2.5,2.5 0 0,1 19,17.5A2.5,2.5 0 0,1 16.5,20A2.5,2.5 0 0,1 14,17.5A2.5,2.5 0 0,1 16.5,15Z"
|
||||
tools:ignore="VectorPath"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="14.70"
|
||||
android:viewportHeight="14.70">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M7.73 1.73C7.26 1.26 6.62 1 5.96 1H3.5C2.13 1 1 2.13 1 3.5v2.47c0 .66.27 1.3.73 1.77l6.06 6.06c.39.39 1.02.39 1.41 0l4.59-4.59a.996.996 0 0 0 0-1.41L7.73 1.73zM2.38 7.09c-.31-.3-.47-.7-.47-1.13V3.5c0-.88.72-1.59 1.59-1.59h2.47c.42 0 .83.16 1.13.47l6.14 6.13-4.73 4.73-6.13-6.15zM3.01 3h2v2H3V3h.01z"/>
|
||||
</vector>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"
|
||||
tools:ignore="VectorPath"/>
|
||||
</vector>
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:viewportWidth="64"
|
||||
android:viewportHeight="64"
|
||||
android:width="24dp"
|
||||
android:height="24dp">
|
||||
<path
|
||||
android:pathData="M62 32A30 30 0 0 1 32 62 30 30 0 0 1 2 32 30 30 0 0 1 32 2 30 30 0 0 1 62 32Z"
|
||||
android:fillColor="#ffdd67" />
|
||||
<path
|
||||
android:pathData="M28.526 27.916c-1.859 -5.112 -4.66 -7.669 -7.461 -7.669 -2.801 0 -5.602 2.558 -7.46 7.669 -0.184 0.515 0.774 1.442 1.254 0.938 1.802 -1.902 3.957 -2.659 6.206 -2.659 2.25 0 4.405 0.757 6.207 2.659 0.479 0.504 1.438 -0.423 1.254 -0.938zm21.87 0c-1.859 -5.112 -4.66 -7.669 -7.461 -7.669 -2.801 0 -5.602 2.558 -7.461 7.669 -0.184 0.515 0.775 1.442 1.254 0.938 1.803 -1.902 3.957 -2.659 6.207 -2.659 2.25 0 4.404 0.757 6.207 2.659 0.478 0.504 1.437 -0.423 1.254 -0.938z"
|
||||
android:fillColor="#664e27" />
|
||||
<path
|
||||
android:pathData="M54 37.41C54 36.607 53.386 35.601 51.642 35.344 47.159 34.682 40.535 34 31.999 34l-0.001 0C23.463 34 16.839 34.682 12.357 35.344 10.611 35.602 10 36.607 10 37.41 10 47 13.492 50 27.81 50l8.381 0C50.508 50 54 47 54 37.41Z"
|
||||
android:fillColor="#664e27" />
|
||||
<path
|
||||
android:pathData="M48.934 38.169C49.127 37.662 48.88 37.187 48.385 37.111 48.385 37.111 40.992 36 32 36c-8.993 0 -16.385 1.111 -16.385 1.111 -0.496 0.075 -0.743 0.551 -0.549 1.058l1.115 2.909C16.375 41.585 16.943 42 17.443 42l29.114 0c0.501 0 1.069 -0.415 1.263 -0.922l1.114 -2.909zM32 48c6.376 0 15.467 0 15.223 -2.053"
|
||||
android:fillColor="#ffffff" />
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,3C10.73,3 9.6,3.8 9.18,5H3V7H4.95L2,14C1.53,16 3,17 5.5,17C8,17 9.56,16 9,14L6.05,7H9.17C9.5,7.85 10.15,8.5 11,8.83V20H2V22H22V20H13V8.82C13.85,8.5 14.5,7.85 14.82,7H17.95L15,14C14.53,16 16,17 18.5,17C21,17 22.56,16 22,14L19.05,7H21V5H14.83C14.4,3.8 13.27,3 12,3M12,5A1,1 0 0,1 13,6A1,1 0 0,1 12,7A1,1 0 0,1 11,6A1,1 0 0,1 12,5M5.5,10.25L7,14H4L5.5,10.25M18.5,10.25L20,14H17L18.5,10.25Z"/>
|
||||
</vector>
|
||||
@ -4,5 +4,5 @@
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M7,13H21V11H7M7,19H21V17H7M7,7H21V5H7M2,11H3.8L2,13.1V14H5V13H3.2L5,10.9V10H2M3,8H4V4H2V5H3M2,17H4V17.5H3V18.5H4V19H2V20H5V16H2V17Z" />
|
||||
<path android:fillColor="?icon_color" android:pathData="M7,13H21V11H7M7,19H21V17H7M7,7H21V5H7M2,11H3.8L2,13.1V14H5V13H3.2L5,10.9V10H2M3,8H4V4H2V5H3M2,17H4V17.5H3V18.5H4V19H2V20H5V16H2V17Z" />
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M7,3A3,3 0 0,1 10,6C10,7.29 9.19,8.39 8.04,8.81C8.58,13.81 13.08,14.77 15.19,14.96C15.61,13.81 16.71,13 18,13A3,3 0 0,1 21,16A3,3 0 0,1 18,19C16.69,19 15.57,18.16 15.16,17C10.91,16.8 9.44,15.19 8,13.39V15.17C9.17,15.58 10,16.69 10,18A3,3 0 0,1 7,21A3,3 0 0,1 4,18C4,16.69 4.83,15.58 6,15.17V8.83C4.83,8.42 4,7.31 4,6A3,3 0 0,1 7,3M7,5A1,1 0 0,0 6,6A1,1 0 0,0 7,7A1,1 0 0,0 8,6A1,1 0 0,0 7,5M7,17A1,1 0 0,0 6,18A1,1 0 0,0 7,19A1,1 0 0,0 8,18A1,1 0 0,0 7,17M18,15A1,1 0 0,0 17,16A1,1 0 0,0 18,17A1,1 0 0,0 19,16A1,1 0 0,0 18,15Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="14.0"
|
||||
android:viewportWidth="14.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M8 2H6V0h2v2zm4 5H2c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h10l2 2-2 2zM8 4H6v2h2V4zM6 16h2V8H6v8z"/>
|
||||
</vector>
|
||||
@ -4,5 +4,5 @@
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="?android:textColorPrimary" android:pathData="M19,13H5V11H19V13Z" />
|
||||
<path android:fillColor="?icon_color" android:pathData="M19,13H5V11H19V13Z" />
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zM18,16v-5c0,-3.07 -1.63,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.64,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2zM16,17L8,17v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5v6z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24"
|
||||
android:viewportWidth="24">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M6,3A3,3 0 0,1 9,6C9,7.31 8.17,8.42 7,8.83V15.17C8.17,15.58 9,16.69 9,18A3,3 0 0,1 6,21A3,3 0 0,1 3,18C3,16.69 3.83,15.58 5,15.17V8.83C3.83,8.42 3,7.31 3,6A3,3 0 0,1 6,3M6,5A1,1 0 0,0 5,6A1,1 0 0,0 6,7A1,1 0 0,0 7,6A1,1 0 0,0 6,5M6,17A1,1 0 0,0 5,18A1,1 0 0,0 6,19A1,1 0 0,0 7,18A1,1 0 0,0 6,17M21,18A3,3 0 0,1 18,21A3,3 0 0,1 15,18C15,16.69 15.83,15.58 17,15.17V7H15V10.25L10.75,6L15,1.75V5H17A2,2 0 0,1 19,7V15.17C20.17,15.58 21,16.69 21,18M18,17A1,1 0 0,0 17,18A1,1 0 0,0 18,19A1,1 0 0,0 19,18A1,1 0 0,0 18,17Z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
|
||||
</vector>
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="64"
|
||||
android:viewportWidth="64">
|
||||
<path
|
||||
android:fillColor="#ffdd67"
|
||||
android:pathData="M62 32A30 30 0 0 1 32 62 30 30 0 0 1 2 32 30 30 0 0 1 32 2 30 30 0 0 1 62 32Z"/>
|
||||
<path
|
||||
android:fillColor="#664e27"
|
||||
android:pathData="M25.5 26.591a5 5 0 0 1 -5 5 5 5 0 0 1 -5 -5 5 5 0 0 1 5 -5 5 5 0 0 1 5 5z"/>
|
||||
<path
|
||||
android:fillColor="#664e27"
|
||||
android:pathData="M48.5 26.591a5 5 0 0 1 -5 5 5 5 0 0 1 -5 -5 5 5 0 0 1 5 -5 5 5 0 0 1 5 5z"/>
|
||||
<path
|
||||
android:fillColor="#664e27"
|
||||
android:pathData="M23.011 47.624c5.793 -4.8 12.22 -4.771 17.978 0 0.693 0.573 1.318 -0.421 0.848 -1.339 -1.755 -3.434 -5.299 -6.492 -9.837 -6.492 -4.538 0 -8.081 3.059 -9.836 6.492 -0.472 0.918 0.153 1.912 0.847 1.339z"/>
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
|
||||
</vector>
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
|
||||
tools:ignore="VectorPath"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="@color/white"
|
||||
android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
|
||||
</vector>
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="64"
|
||||
android:viewportWidth="64">
|
||||
<path
|
||||
android:fillColor="#fed0ac"
|
||||
android:pathData="M31.766 36.905c0 0 -4.355 -0.869 -0.754 6.613 2.608 5.418 2.349 11.709 0 15.049C27.256 63.911 19.944 62.159 20.701 59.09 23.308 48.543 17.418 45.401 14.373 38.744 11.287 31.998 11.627 22.423 13.045 13.897 13.932 8.57 16.184 1.999 24.494 1.999l11.486 0 -4.214 34.906z"/>
|
||||
<path
|
||||
android:fillColor="#e0a372"
|
||||
android:pathData="M25.75 3.482c-8.311 0 -10.131 6.569 -11.018 11.897 -1.42 8.524 -1.646 15.328 1.082 22.219 2.969 7.498 6.096 7.717 6.096 22.543 0 0.742 0.393 1.23 0.793 1.557 -1.406 -0.467 -2.186 -1.289 -2.186 -2.492 0 -11.086 -3.1 -13.805 -6.145 -20.461C11.286 31.999 11.626 22.424 13.044 13.898 13.932 8.57 16.184 1.999 24.494 1.999l11.486 0 0 1.483 -10.23 0z"/>
|
||||
<path
|
||||
android:fillColor="#fed0ac"
|
||||
android:pathData="M45.998 28.183l-14.232 0c-4.965 0 -4.965 8.723 0 8.723l14.232 0c4.965 -0.001 4.965 -8.723 0 -8.723z"/>
|
||||
<path
|
||||
android:fillColor="#e0a372"
|
||||
android:pathData="M47.103 29.632l-14.232 0c-3.352 0 -4.432 3.965 -3.26 6.549 -2.654 -2.08 -1.945 -7.998 2.148 -7.998l14.231 0c1.614 0 2.694 0.927 3.259 2.173 -0.564 -0.447 -1.274 -0.724 -2.146 -0.724z"/>
|
||||
<path
|
||||
android:fillColor="#fed0ac"
|
||||
android:pathData="M47.532 19.426l-17.079 0c-5.957 0 -5.957 8.722 0 8.722l17.079 0c5.957 -0.001 5.957 -8.722 0 -8.722z"/>
|
||||
<path
|
||||
android:fillColor="#e0a372"
|
||||
android:pathData="M48.857 20.874l-17.078 0c-4.02 0 -5.316 3.967 -3.91 6.548 -3.186 -2.08 -2.334 -7.996 2.576 -7.996l17.078 0c1.938 0 3.234 0.927 3.911 2.171 -0.677 -0.444 -1.531 -0.723 -2.577 -0.723z"/>
|
||||
<path
|
||||
android:fillColor="#fed0ac"
|
||||
android:pathData="M45.931 10.703l-14.437 0c-5.035 0 -5.035 8.723 0 8.723l14.437 0c5.036 0 5.036 -8.723 0 -8.723z"/>
|
||||
<path
|
||||
android:fillColor="#e0a372"
|
||||
android:pathData="M47.051 12.151l-14.436 0c-3.398 0 -4.492 3.968 -3.307 6.551 -2.693 -2.082 -1.973 -7.999 2.18 -7.999l14.438 0c1.636 0 2.731 0.929 3.306 2.174 -0.575 -0.445 -1.295 -0.726 -2.181 -0.726z"/>
|
||||
<path
|
||||
android:fillColor="#fed0ac"
|
||||
android:pathData="M44.381 1.999l-9.329 0c-5.386 0 -5.386 8.721 0 8.721l9.329 0c5.388 0 5.388 -8.721 0 -8.721z"/>
|
||||
<path
|
||||
android:fillColor="#e0a372"
|
||||
android:pathData="M45.58 3.446l-9.333 0c-3.632 0 -4.804 3.968 -3.532 6.551 -2.881 -2.082 -2.109 -7.998 2.33 -7.998l9.329 0c1.75 0 2.923 0.928 3.535 2.172C47.296 3.728 46.528 3.446 45.58 3.446Z"/>
|
||||
</vector>
|
||||
@ -1,37 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:viewportWidth="64"
|
||||
android:viewportHeight="64"
|
||||
android:width="24dp"
|
||||
android:height="25dp">
|
||||
<path
|
||||
android:pathData="M31.766 27.095c0 0 -4.354 0.869 -0.753 -6.613 2.608 -5.418 2.349 -11.709 0 -15.049C27.256 0.089 19.945 1.841 20.702 4.91 23.309 15.456 17.418 18.598 14.374 25.255 11.288 32 11.627 41.575 13.046 50.101 13.933 55.429 16.184 62 24.494 62l11.487 0 -4.215 -34.905z"
|
||||
android:fillColor="#fed0ac" />
|
||||
<path
|
||||
android:pathData="M25.75 60.517c-8.31 0 -10.131 -6.569 -11.018 -11.897 -1.419 -8.524 -1.646 -15.328 1.082 -22.219 2.969 -7.497 6.097 -7.717 6.097 -22.542 0 -0.742 0.392 -1.231 0.793 -1.558 -1.407 0.468 -2.186 1.289 -2.186 2.492 0 11.087 -3.101 13.805 -6.145 20.461C11.288 32 11.627 41.575 13.046 50.101 13.933 55.429 16.184 62 24.494 62l11.487 0 0 -1.483 -10.231 0z"
|
||||
android:fillColor="#e0a372" />
|
||||
<path
|
||||
android:pathData="M45.998 35.816l-14.232 0c-4.965 0 -4.965 -8.722 0 -8.722l14.232 0c4.965 0.001 4.965 8.722 0 8.722z"
|
||||
android:fillColor="#fed0ac" />
|
||||
<path
|
||||
android:pathData="M47.103 34.367l-14.232 0c-3.351 0 -4.432 -3.965 -3.26 -6.548 -2.654 2.08 -1.944 7.997 2.148 7.997l14.231 0c1.614 0 2.694 -0.927 3.259 -2.173 -0.564 0.447 -1.274 0.724 -2.146 0.724z"
|
||||
android:fillColor="#e0a372" />
|
||||
<path
|
||||
android:pathData="M47.532 44.573l-17.078 0c-5.957 0 -5.957 -8.722 0 -8.722l17.078 0c5.957 0.001 5.957 8.722 0 8.722z"
|
||||
android:fillColor="#fed0ac" />
|
||||
<path
|
||||
android:pathData="M48.857 43.125l-17.077 0c-4.021 0 -5.317 -3.967 -3.91 -6.548 -3.187 2.08 -2.334 7.996 2.576 7.996l17.077 0c1.938 0 3.234 -0.927 3.911 -2.171 -0.677 0.444 -1.531 0.723 -2.577 0.723z"
|
||||
android:fillColor="#e0a372" />
|
||||
<path
|
||||
android:pathData="M45.931 53.296l-14.437 0c-5.035 0 -5.035 -8.723 0 -8.723l14.437 0c5.036 0 5.036 8.723 0 8.723z"
|
||||
android:fillColor="#fed0ac" />
|
||||
<path
|
||||
android:pathData="M47.051 51.848l-14.436 0c-3.398 0 -4.492 -3.968 -3.307 -6.551 -2.692 2.082 -1.972 7.999 2.18 7.999l14.438 0c1.636 0 2.731 -0.929 3.306 -2.174 -0.575 0.445 -1.295 0.726 -2.181 0.726z"
|
||||
android:fillColor="#e0a372" />
|
||||
<path
|
||||
android:pathData="M44.381 62l-9.328 0c-5.386 0 -5.386 -8.721 0 -8.721l9.328 0c5.388 0 5.388 8.721 0 8.721z"
|
||||
android:fillColor="#fed0ac" />
|
||||
<path
|
||||
android:pathData="M45.58 60.553l-9.332 0c-3.632 0 -4.805 -3.968 -3.532 -6.551 -2.881 2.082 -2.11 7.998 2.33 7.998l9.328 0c1.75 0 2.923 -0.928 3.535 -2.172 -0.613 0.443 -1.381 0.725 -2.329 0.725z"
|
||||
android:fillColor="#e0a372" />
|
||||
</vector>
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
|
||||
</vector>
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="?android:textColorPrimary"
|
||||
android:fillColor="?icon_color"
|
||||
android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
|
||||
</vector>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
android:right="@dimen/spacing_normal"/>
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="@color/bluish_accent"/>
|
||||
android:color="?colorAccent"/>
|
||||
<solid android:color="@color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
android:right="@dimen/spacing_normal"/>
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="@color/bluish_accent"/>
|
||||
android:color="?colorAccent"/>
|
||||
<solid android:color="@color/transparent"/>
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user