From 94b6ebac43ef275195335104f48baa09884f2d47 Mon Sep 17 00:00:00 2001 From: Kosh Date: Sun, 2 Apr 2017 10:39:48 +0800 Subject: [PATCH] this commit fixes dark theme issue to close #205 and drops auto theme --- app/src/main/AndroidManifest.xml | 5 +- .../data/dao/model/ReactionsModel.java | 14 +++ .../com/fastaccess/helper/PrefGetter.java | 4 +- .../com/fastaccess/helper/ViewHelper.java | 19 +++- ...mmentsHandler.java => CommentsHelper.java} | 36 ++++++- .../viewholder/CommentsViewHolder.java | 95 ++++++++++++++++--- .../viewholder/CommitFilesViewHolder.java | 11 ++- .../TimelineCommentsViewHolder.java | 95 ++++++++++++++++--- .../com/fastaccess/ui/base/BaseActivity.java | 7 +- .../ui/modules/login/LoginView.java | 2 +- .../fastaccess/ui/modules/main/MainView.java | 1 - .../comments/CommitCommentsPresenter.java | 4 +- .../timeline/IssueTimelinePresenter.java | 4 +- .../details/timeline/IssueTimelineView.java | 5 +- .../PullRequestTimelinePresenter.java | 4 +- .../timeline/PullRequestTimelineView.java | 3 +- .../ui/widgets/SpannableBuilder.java | 14 ++- .../recyclerview/DynamicRecyclerView.java | 7 +- app/src/main/res/drawable/bottom_border.xml | 2 +- app/src/main/res/drawable/ic_add.xml | 2 +- app/src/main/res/drawable/ic_announcement.xml | 2 +- .../main/res/drawable/ic_arrow_drop_down.xml | 2 +- app/src/main/res/drawable/ic_arrow_right.xml | 2 +- app/src/main/res/drawable/ic_at.xml | 2 +- app/src/main/res/drawable/ic_back.xml | 2 +- app/src/main/res/drawable/ic_bookmark.xml | 2 +- app/src/main/res/drawable/ic_branch.xml | 2 +- app/src/main/res/drawable/ic_brower.xml | 2 +- app/src/main/res/drawable/ic_bug.xml | 2 +- app/src/main/res/drawable/ic_clear.xml | 2 +- app/src/main/res/drawable/ic_clear_all.xml | 2 +- app/src/main/res/drawable/ic_clear_black.xml | 2 +- app/src/main/res/drawable/ic_code.xml | 2 +- app/src/main/res/drawable/ic_comment.xml | 2 +- app/src/main/res/drawable/ic_copy.xml | 2 +- app/src/main/res/drawable/ic_done.xml | 2 +- app/src/main/res/drawable/ic_download.xml | 2 +- app/src/main/res/drawable/ic_edit.xml | 2 +- app/src/main/res/drawable/ic_email.xml | 2 +- app/src/main/res/drawable/ic_emoji_heart.xml | 10 -- app/src/main/res/drawable/ic_eye.xml | 2 +- app/src/main/res/drawable/ic_eye_off.xml | 2 +- app/src/main/res/drawable/ic_file_multi.xml | 2 +- app/src/main/res/drawable/ic_fork.xml | 2 +- app/src/main/res/drawable/ic_fork_small.xml | 2 +- app/src/main/res/drawable/ic_format_bold.xml | 2 +- .../main/res/drawable/ic_format_italic.xml | 2 +- .../res/drawable/ic_format_list_bulleted.xml | 2 +- app/src/main/res/drawable/ic_format_quote.xml | 2 +- .../res/drawable/ic_format_strikethrough.xml | 2 +- .../res/drawable/ic_format_underlined.xml | 2 +- app/src/main/res/drawable/ic_gists.xml | 2 +- app/src/main/res/drawable/ic_github.xml | 2 +- app/src/main/res/drawable/ic_group.xml | 2 +- app/src/main/res/drawable/ic_header_one.xml | 2 +- app/src/main/res/drawable/ic_header_three.xml | 2 +- app/src/main/res/drawable/ic_header_two.xml | 2 +- app/src/main/res/drawable/ic_heart.xml | 2 +- app/src/main/res/drawable/ic_home.xml | 2 +- app/src/main/res/drawable/ic_huray.xml | 67 ------------- app/src/main/res/drawable/ic_image.xml | 2 +- app/src/main/res/drawable/ic_incognito.xml | 2 +- app/src/main/res/drawable/ic_insert_link.xml | 2 +- app/src/main/res/drawable/ic_issues.xml | 2 +- app/src/main/res/drawable/ic_label.xml | 2 +- app/src/main/res/drawable/ic_language.xml | 2 +- app/src/main/res/drawable/ic_laughing.xml | 19 ---- app/src/main/res/drawable/ic_license.xml | 2 +- app/src/main/res/drawable/ic_list_numbers.xml | 2 +- app/src/main/res/drawable/ic_location.xml | 2 +- app/src/main/res/drawable/ic_lock.xml | 2 +- app/src/main/res/drawable/ic_logout.xml | 2 +- app/src/main/res/drawable/ic_menu.xml | 2 +- app/src/main/res/drawable/ic_merge.xml | 2 +- app/src/main/res/drawable/ic_milestone.xml | 2 +- app/src/main/res/drawable/ic_minus.xml | 2 +- .../res/drawable/ic_notifications_none.xml | 2 +- app/src/main/res/drawable/ic_pin.xml | 2 +- app/src/main/res/drawable/ic_profile.xml | 2 +- .../main/res/drawable/ic_pull_requests.xml | 2 +- app/src/main/res/drawable/ic_redo.xml | 2 +- app/src/main/res/drawable/ic_ring.xml | 2 +- app/src/main/res/drawable/ic_sad.xml | 19 ---- app/src/main/res/drawable/ic_search.xml | 2 +- app/src/main/res/drawable/ic_send.xml | 2 +- app/src/main/res/drawable/ic_settings.xml | 2 +- app/src/main/res/drawable/ic_share.xml | 2 +- app/src/main/res/drawable/ic_star.xml | 2 +- app/src/main/res/drawable/ic_star_filled.xml | 2 +- app/src/main/res/drawable/ic_star_small.xml | 2 +- app/src/main/res/drawable/ic_sync.xml | 2 +- app/src/main/res/drawable/ic_thumbs_down.xml | 37 -------- app/src/main/res/drawable/ic_thumbs_up.xml | 37 -------- app/src/main/res/drawable/ic_time.xml | 2 +- app/src/main/res/drawable/ic_time_small.xml | 2 +- app/src/main/res/drawable/ic_trash.xml | 2 +- app/src/main/res/drawable/ic_undo.xml | 2 +- app/src/main/res/drawable/ic_unlock.xml | 2 +- app/src/main/res/drawable/left_border.xml | 2 +- app/src/main/res/drawable/right_border.xml | 2 +- .../res/drawable/splash_screen_drawable.xml | 2 +- app/src/main/res/drawable/top_border.xml | 2 +- .../layout-land/header_title_with_toolbar.xml | 4 +- .../header_title_with_toolbar.xml | 4 +- .../layout/centered_tabbed_viewpager.xml | 2 +- .../layout/commit_pager_activity.xml | 6 +- .../layout/create_gist_layout.xml | 4 +- .../layout/create_issue_layout.xml | 4 +- .../layout/create_milestone_layout.xml | 4 +- .../layout/gists_pager_layout.xml | 4 +- .../layout/header_title_with_toolbar.xml | 4 +- .../layout/issue_pager_activity.xml | 4 +- .../main_layouts/layout/login_layout.xml | 2 +- .../layout/notification_activity_layout.xml | 7 +- .../layout/repo_header_icons_layout.xml | 6 +- .../main_layouts/layout/search_layout.xml | 6 +- .../layout/small_grid_refresh_list.xml | 1 - .../main_layouts/layout/tabbed_viewpager.xml | 2 +- .../layout/vertical_refresh_list.xml | 1 - .../layout-land/appbar_start_margin.xml | 8 +- .../layout-sw600dp/appbar_start_margin.xml | 7 +- .../layout/appbar_elevation_dark.xml | 8 +- .../layout/appbar_start_margin.xml | 7 +- .../layout/appbar_tabbed_elevation.xml | 9 +- .../other_layouts/layout/message_dialog.xml | 2 +- .../layout/comments_dropdown_layout.xml | 40 ++------ .../row_layouts/layout/comments_row_item.xml | 15 ++- .../layout/commit_file_row_item.xml | 2 +- .../layout/gist_files_row_item.xml | 2 +- .../layout/issue_detail_header_row_item.xml | 4 +- .../layout/issue_timeline_row_item.xml | 2 +- .../layout/profile_overview_layout.xml | 4 +- app/src/main/res/menu/bottom_nav_menu.xml | 2 +- .../main/res/menu/repo_bottom_nav_menu.xml | 2 +- app/src/main/res/values-night/colors.xml | 16 ---- app/src/main/res/values-night/styles.xml | 15 --- app/src/main/res/values-night/themes.xml | 20 ---- app/src/main/res/values-v23/colors.xml | 4 - app/src/main/res/values-v23/themes.xml | 25 ----- app/src/main/res/values/arrays.xml | 1 - app/src/main/res/values/colors.xml | 15 --- app/src/main/res/values/styles.xml | 10 -- app/src/main/res/values/theme_attrs.xml | 10 ++ app/src/main/res/values/theme_dark.xml | 58 +++++++++++ app/src/main/res/values/theme_light.xml | 58 +++++++++++ app/src/main/res/values/themes.xml | 79 +++++---------- 146 files changed, 578 insertions(+), 587 deletions(-) rename app/src/main/java/com/fastaccess/provider/comments/{CommentsHandler.java => CommentsHelper.java} (58%) delete mode 100644 app/src/main/res/drawable/ic_emoji_heart.xml delete mode 100644 app/src/main/res/drawable/ic_huray.xml delete mode 100644 app/src/main/res/drawable/ic_laughing.xml delete mode 100644 app/src/main/res/drawable/ic_sad.xml delete mode 100644 app/src/main/res/drawable/ic_thumbs_down.xml delete mode 100644 app/src/main/res/drawable/ic_thumbs_up.xml delete mode 100644 app/src/main/res/values-night/colors.xml delete mode 100644 app/src/main/res/values-night/styles.xml delete mode 100644 app/src/main/res/values-night/themes.xml delete mode 100644 app/src/main/res/values-v23/colors.xml delete mode 100644 app/src/main/res/values-v23/themes.xml create mode 100644 app/src/main/res/values/theme_attrs.xml create mode 100644 app/src/main/res/values/theme_dark.xml create mode 100644 app/src/main/res/values/theme_light.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1584da14..a7011918 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -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"> + android:name="com.fastaccess.ui.modules.main.MainView"> diff --git a/app/src/main/java/com/fastaccess/data/dao/model/ReactionsModel.java b/app/src/main/java/com/fastaccess/data/dao/model/ReactionsModel.java index 9240422b..2473b665 100644 --- a/app/src/main/java/com/fastaccess/data/dao/model/ReactionsModel.java +++ b/app/src/main/java/com/fastaccess/data/dao/model/ReactionsModel.java @@ -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 + + '}'; + } } diff --git a/app/src/main/java/com/fastaccess/helper/PrefGetter.java b/app/src/main/java/com/fastaccess/helper/PrefGetter.java index 96045071..c798f4a4 100644 --- a/app/src/main/java/com/fastaccess/helper/PrefGetter.java +++ b/app/src/main/java/com/fastaccess/helper/PrefGetter.java @@ -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))) { diff --git a/app/src/main/java/com/fastaccess/helper/ViewHelper.java b/app/src/main/java/com/fastaccess/helper/ViewHelper.java index c238bd4c..d598c06b 100644 --- a/app/src/main/java/com/fastaccess/helper/ViewHelper.java +++ b/app/src/main/java/com/fastaccess/helper/ViewHelper.java @@ -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}); diff --git a/app/src/main/java/com/fastaccess/provider/comments/CommentsHandler.java b/app/src/main/java/com/fastaccess/provider/comments/CommentsHelper.java similarity index 58% rename from app/src/main/java/com/fastaccess/provider/comments/CommentsHandler.java rename to app/src/main/java/com/fastaccess/provider/comments/CommentsHelper.java index 387114d7..b7914054 100644 --- a/app/src/main/java/com/fastaccess/provider/comments/CommentsHandler.java +++ b/app/src/main/java/com/fastaccess/provider/comments/CommentsHelper.java @@ -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); + } + } diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java index 0aea2156..a68fbcc9 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommentsViewHolder.java @@ -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 { @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 { 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 { 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 { 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); + } } } diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java index 0b8a7a9a..99581c10 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/CommitFilesViewHolder.java @@ -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 { @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 { @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, diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java index c0f243ba..57ca1277 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/TimelineCommentsViewHolder.java @@ -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 { @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 { 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 { 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 { 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); + } } } diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java index 9b20ee4a..92b3c840 100644 --- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java +++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java @@ -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 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(); } diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java index c5dadfe1..88dcd331 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java @@ -66,7 +66,6 @@ public class MainView extends BaseActivity 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); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsPresenter.java index 08d06c92..2007ea50 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsPresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/commit/details/comments/CommitCommentsPresenter.java @@ -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 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); } } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java index 5dabb6c5..3f0a1260 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelinePresenter.java @@ -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 } } 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); } } } diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java index f7308e8a..4efe36b9 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/issues/issue/details/timeline/IssueTimelineView.java @@ -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 + android:color="?colorAccent"/> diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 37e97182..0c7b1dd3 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_announcement.xml b/app/src/main/res/drawable/ic_announcement.xml index fd4f8614..d95a686c 100644 --- a/app/src/main/res/drawable/ic_announcement.xml +++ b/app/src/main/res/drawable/ic_announcement.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_arrow_drop_down.xml b/app/src/main/res/drawable/ic_arrow_drop_down.xml index a5dfaa7d..711e7343 100644 --- a/app/src/main/res/drawable/ic_arrow_drop_down.xml +++ b/app/src/main/res/drawable/ic_arrow_drop_down.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml index f016f94b..6c900883 100644 --- a/app/src/main/res/drawable/ic_arrow_right.xml +++ b/app/src/main/res/drawable/ic_arrow_right.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_at.xml b/app/src/main/res/drawable/ic_at.xml index c0cec35e..e7d9e2c9 100644 --- a/app/src/main/res/drawable/ic_at.xml +++ b/app/src/main/res/drawable/ic_at.xml @@ -5,6 +5,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml index 236d3fb0..5b537948 100644 --- a/app/src/main/res/drawable/ic_back.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml index 87d38584..334f718b 100644 --- a/app/src/main/res/drawable/ic_bookmark.xml +++ b/app/src/main/res/drawable/ic_bookmark.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_branch.xml b/app/src/main/res/drawable/ic_branch.xml index cde10edf..f96be0c0 100644 --- a/app/src/main/res/drawable/ic_branch.xml +++ b/app/src/main/res/drawable/ic_branch.xml @@ -5,6 +5,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_brower.xml b/app/src/main/res/drawable/ic_brower.xml index 809460a2..2085b09e 100644 --- a/app/src/main/res/drawable/ic_brower.xml +++ b/app/src/main/res/drawable/ic_brower.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_bug.xml b/app/src/main/res/drawable/ic_bug.xml index 43ec7450..e68bc607 100644 --- a/app/src/main/res/drawable/ic_bug.xml +++ b/app/src/main/res/drawable/ic_bug.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml index a4896745..485a2c60 100644 --- a/app/src/main/res/drawable/ic_clear.xml +++ b/app/src/main/res/drawable/ic_clear.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_clear_all.xml b/app/src/main/res/drawable/ic_clear_all.xml index e39fd34b..9d237d38 100644 --- a/app/src/main/res/drawable/ic_clear_all.xml +++ b/app/src/main/res/drawable/ic_clear_all.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_clear_black.xml b/app/src/main/res/drawable/ic_clear_black.xml index 137b7dd1..231d1b71 100644 --- a/app/src/main/res/drawable/ic_clear_black.xml +++ b/app/src/main/res/drawable/ic_clear_black.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml index e2375e53..3bd7d38c 100644 --- a/app/src/main/res/drawable/ic_code.xml +++ b/app/src/main/res/drawable/ic_code.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml index bab4e717..d37f1309 100644 --- a/app/src/main/res/drawable/ic_comment.xml +++ b/app/src/main/res/drawable/ic_comment.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml index a35f5b0c..fb71a7a9 100644 --- a/app/src/main/res/drawable/ic_copy.xml +++ b/app/src/main/res/drawable/ic_copy.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml index 4ff98272..af7f579f 100644 --- a/app/src/main/res/drawable/ic_done.xml +++ b/app/src/main/res/drawable/ic_done.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index 48c6612e..5f20f60d 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml index 18e8bedd..d7a4fc7c 100644 --- a/app/src/main/res/drawable/ic_edit.xml +++ b/app/src/main/res/drawable/ic_edit.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml index eb2d4c2e..b7184972 100644 --- a/app/src/main/res/drawable/ic_email.xml +++ b/app/src/main/res/drawable/ic_email.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_emoji_heart.xml b/app/src/main/res/drawable/ic_emoji_heart.xml deleted file mode 100644 index 7a4462a1..00000000 --- a/app/src/main/res/drawable/ic_emoji_heart.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml index 712c3483..6abeed84 100644 --- a/app/src/main/res/drawable/ic_eye.xml +++ b/app/src/main/res/drawable/ic_eye.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml index 89e687c0..08b47510 100644 --- a/app/src/main/res/drawable/ic_eye_off.xml +++ b/app/src/main/res/drawable/ic_eye_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_file_multi.xml b/app/src/main/res/drawable/ic_file_multi.xml index cdfcf212..47e8efbf 100644 --- a/app/src/main/res/drawable/ic_file_multi.xml +++ b/app/src/main/res/drawable/ic_file_multi.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml index 9e2db957..3bb6af69 100644 --- a/app/src/main/res/drawable/ic_fork.xml +++ b/app/src/main/res/drawable/ic_fork.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_fork_small.xml b/app/src/main/res/drawable/ic_fork_small.xml index 8ed3744c..a1e25859 100644 --- a/app/src/main/res/drawable/ic_fork_small.xml +++ b/app/src/main/res/drawable/ic_fork_small.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_format_bold.xml b/app/src/main/res/drawable/ic_format_bold.xml index 630cb3ab..1f3b4cbb 100644 --- a/app/src/main/res/drawable/ic_format_bold.xml +++ b/app/src/main/res/drawable/ic_format_bold.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_format_italic.xml b/app/src/main/res/drawable/ic_format_italic.xml index 652dfa05..6e750fd5 100644 --- a/app/src/main/res/drawable/ic_format_italic.xml +++ b/app/src/main/res/drawable/ic_format_italic.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_format_list_bulleted.xml b/app/src/main/res/drawable/ic_format_list_bulleted.xml index dc063207..071ef0e2 100644 --- a/app/src/main/res/drawable/ic_format_list_bulleted.xml +++ b/app/src/main/res/drawable/ic_format_list_bulleted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_format_quote.xml b/app/src/main/res/drawable/ic_format_quote.xml index f76df19f..b965d703 100644 --- a/app/src/main/res/drawable/ic_format_quote.xml +++ b/app/src/main/res/drawable/ic_format_quote.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_format_strikethrough.xml b/app/src/main/res/drawable/ic_format_strikethrough.xml index 33b10bda..24989ee5 100644 --- a/app/src/main/res/drawable/ic_format_strikethrough.xml +++ b/app/src/main/res/drawable/ic_format_strikethrough.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_format_underlined.xml b/app/src/main/res/drawable/ic_format_underlined.xml index 76b1fca6..41b6ca89 100644 --- a/app/src/main/res/drawable/ic_format_underlined.xml +++ b/app/src/main/res/drawable/ic_format_underlined.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_gists.xml b/app/src/main/res/drawable/ic_gists.xml index 9f5f79f8..da2c3ebd 100644 --- a/app/src/main/res/drawable/ic_gists.xml +++ b/app/src/main/res/drawable/ic_gists.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml index 20e911f1..5feae964 100644 --- a/app/src/main/res/drawable/ic_github.xml +++ b/app/src/main/res/drawable/ic_github.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml index 177176e8..528d8893 100644 --- a/app/src/main/res/drawable/ic_group.xml +++ b/app/src/main/res/drawable/ic_group.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_header_one.xml b/app/src/main/res/drawable/ic_header_one.xml index edc00f63..5a4a197b 100644 --- a/app/src/main/res/drawable/ic_header_one.xml +++ b/app/src/main/res/drawable/ic_header_one.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_header_three.xml b/app/src/main/res/drawable/ic_header_three.xml index 88c6a1ec..d903f28f 100644 --- a/app/src/main/res/drawable/ic_header_three.xml +++ b/app/src/main/res/drawable/ic_header_three.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_header_two.xml b/app/src/main/res/drawable/ic_header_two.xml index a4c828a2..7bbb9211 100644 --- a/app/src/main/res/drawable/ic_header_two.xml +++ b/app/src/main/res/drawable/ic_header_two.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml index c817e4f3..d46ecf73 100644 --- a/app/src/main/res/drawable/ic_heart.xml +++ b/app/src/main/res/drawable/ic_heart.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml index 665e72af..ee27401b 100644 --- a/app/src/main/res/drawable/ic_home.xml +++ b/app/src/main/res/drawable/ic_home.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_huray.xml b/app/src/main/res/drawable/ic_huray.xml deleted file mode 100644 index 3199a500..00000000 --- a/app/src/main/res/drawable/ic_huray.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml index 9237345b..811cdf85 100644 --- a/app/src/main/res/drawable/ic_image.xml +++ b/app/src/main/res/drawable/ic_image.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_incognito.xml b/app/src/main/res/drawable/ic_incognito.xml index bb3cf234..1252613d 100644 --- a/app/src/main/res/drawable/ic_incognito.xml +++ b/app/src/main/res/drawable/ic_incognito.xml @@ -5,7 +5,7 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_insert_link.xml b/app/src/main/res/drawable/ic_insert_link.xml index a12edb78..01227379 100644 --- a/app/src/main/res/drawable/ic_insert_link.xml +++ b/app/src/main/res/drawable/ic_insert_link.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_issues.xml b/app/src/main/res/drawable/ic_issues.xml index 71ff66c6..2c4264e9 100644 --- a/app/src/main/res/drawable/ic_issues.xml +++ b/app/src/main/res/drawable/ic_issues.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml index 4eeff629..86b79562 100644 --- a/app/src/main/res/drawable/ic_label.xml +++ b/app/src/main/res/drawable/ic_label.xml @@ -4,6 +4,6 @@ android:viewportWidth="14.70" android:viewportHeight="14.70"> diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml index 24ea5815..abaa9aa3 100644 --- a/app/src/main/res/drawable/ic_language.xml +++ b/app/src/main/res/drawable/ic_language.xml @@ -5,7 +5,7 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_laughing.xml b/app/src/main/res/drawable/ic_laughing.xml deleted file mode 100644 index 2314eb03..00000000 --- a/app/src/main/res/drawable/ic_laughing.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml index e5349aa8..600f0ac3 100644 --- a/app/src/main/res/drawable/ic_license.xml +++ b/app/src/main/res/drawable/ic_license.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_list_numbers.xml b/app/src/main/res/drawable/ic_list_numbers.xml index 23744e56..81199791 100644 --- a/app/src/main/res/drawable/ic_list_numbers.xml +++ b/app/src/main/res/drawable/ic_list_numbers.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml index 1b8f3e7b..83a4c34b 100644 --- a/app/src/main/res/drawable/ic_location.xml +++ b/app/src/main/res/drawable/ic_location.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index 9757fa7c..c701af67 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml index 71b74dcc..b6db8cf5 100644 --- a/app/src/main/res/drawable/ic_logout.xml +++ b/app/src/main/res/drawable/ic_logout.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml index 5d2528f1..81c040a4 100644 --- a/app/src/main/res/drawable/ic_menu.xml +++ b/app/src/main/res/drawable/ic_menu.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_merge.xml b/app/src/main/res/drawable/ic_merge.xml index ed73eaf7..edb9f08a 100644 --- a/app/src/main/res/drawable/ic_merge.xml +++ b/app/src/main/res/drawable/ic_merge.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml index bb086eff..05e7c965 100644 --- a/app/src/main/res/drawable/ic_milestone.xml +++ b/app/src/main/res/drawable/ic_milestone.xml @@ -4,6 +4,6 @@ android:viewportHeight="14.0" android:viewportWidth="14.0"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml index 24bb371a..45951f69 100644 --- a/app/src/main/res/drawable/ic_minus.xml +++ b/app/src/main/res/drawable/ic_minus.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_notifications_none.xml b/app/src/main/res/drawable/ic_notifications_none.xml index 135428d1..4838f051 100644 --- a/app/src/main/res/drawable/ic_notifications_none.xml +++ b/app/src/main/res/drawable/ic_notifications_none.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml index fd5e9d06..d48192c4 100644 --- a/app/src/main/res/drawable/ic_pin.xml +++ b/app/src/main/res/drawable/ic_pin.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml index d190667b..2c2f3a35 100644 --- a/app/src/main/res/drawable/ic_profile.xml +++ b/app/src/main/res/drawable/ic_profile.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_pull_requests.xml b/app/src/main/res/drawable/ic_pull_requests.xml index 595559c3..67a31cbc 100644 --- a/app/src/main/res/drawable/ic_pull_requests.xml +++ b/app/src/main/res/drawable/ic_pull_requests.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_redo.xml b/app/src/main/res/drawable/ic_redo.xml index 62b886a5..de42c00b 100644 --- a/app/src/main/res/drawable/ic_redo.xml +++ b/app/src/main/res/drawable/ic_redo.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_ring.xml b/app/src/main/res/drawable/ic_ring.xml index 728cc620..bc5f31b2 100644 --- a/app/src/main/res/drawable/ic_ring.xml +++ b/app/src/main/res/drawable/ic_ring.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_sad.xml b/app/src/main/res/drawable/ic_sad.xml deleted file mode 100644 index 774d3f84..00000000 --- a/app/src/main/res/drawable/ic_sad.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index c83affdd..3fea0680 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml index 25d037d7..dec447e8 100644 --- a/app/src/main/res/drawable/ic_send.xml +++ b/app/src/main/res/drawable/ic_send.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index eb10e90e..4b601fc0 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -5,7 +5,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml index 729a9170..857c8f1c 100644 --- a/app/src/main/res/drawable/ic_share.xml +++ b/app/src/main/res/drawable/ic_share.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml index 6d17e915..cae0a2ed 100644 --- a/app/src/main/res/drawable/ic_star.xml +++ b/app/src/main/res/drawable/ic_star.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_star_filled.xml b/app/src/main/res/drawable/ic_star_filled.xml index 94cff0dd..ab3ce71a 100644 --- a/app/src/main/res/drawable/ic_star_filled.xml +++ b/app/src/main/res/drawable/ic_star_filled.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_star_small.xml b/app/src/main/res/drawable/ic_star_small.xml index 150c5f63..b1fed7ae 100644 --- a/app/src/main/res/drawable/ic_star_small.xml +++ b/app/src/main/res/drawable/ic_star_small.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml index e25ce979..740be7d9 100644 --- a/app/src/main/res/drawable/ic_sync.xml +++ b/app/src/main/res/drawable/ic_sync.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_thumbs_down.xml b/app/src/main/res/drawable/ic_thumbs_down.xml deleted file mode 100644 index 76c11679..00000000 --- a/app/src/main/res/drawable/ic_thumbs_down.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_thumbs_up.xml b/app/src/main/res/drawable/ic_thumbs_up.xml deleted file mode 100644 index 32f23592..00000000 --- a/app/src/main/res/drawable/ic_thumbs_up.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml index 64db8d0e..38263548 100644 --- a/app/src/main/res/drawable/ic_time.xml +++ b/app/src/main/res/drawable/ic_time.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_time_small.xml b/app/src/main/res/drawable/ic_time_small.xml index e237b2d1..5f6c2f35 100644 --- a/app/src/main/res/drawable/ic_time_small.xml +++ b/app/src/main/res/drawable/ic_time_small.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_trash.xml b/app/src/main/res/drawable/ic_trash.xml index 4d8737e6..8630be28 100644 --- a/app/src/main/res/drawable/ic_trash.xml +++ b/app/src/main/res/drawable/ic_trash.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_undo.xml b/app/src/main/res/drawable/ic_undo.xml index 88ccf8dc..7beccc4f 100644 --- a/app/src/main/res/drawable/ic_undo.xml +++ b/app/src/main/res/drawable/ic_undo.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_unlock.xml b/app/src/main/res/drawable/ic_unlock.xml index e58745ec..931933a6 100644 --- a/app/src/main/res/drawable/ic_unlock.xml +++ b/app/src/main/res/drawable/ic_unlock.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/left_border.xml b/app/src/main/res/drawable/left_border.xml index 93d03fad..a3cbfe9e 100644 --- a/app/src/main/res/drawable/left_border.xml +++ b/app/src/main/res/drawable/left_border.xml @@ -10,7 +10,7 @@ android:right="@dimen/spacing_normal"/> + android:color="?colorAccent"/> diff --git a/app/src/main/res/drawable/right_border.xml b/app/src/main/res/drawable/right_border.xml index 8733f5cf..10e72bd8 100644 --- a/app/src/main/res/drawable/right_border.xml +++ b/app/src/main/res/drawable/right_border.xml @@ -10,7 +10,7 @@ android:right="@dimen/spacing_normal"/> + android:color="?colorAccent"/> diff --git a/app/src/main/res/drawable/splash_screen_drawable.xml b/app/src/main/res/drawable/splash_screen_drawable.xml index f27a9f2b..8576025a 100644 --- a/app/src/main/res/drawable/splash_screen_drawable.xml +++ b/app/src/main/res/drawable/splash_screen_drawable.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/top_border.xml b/app/src/main/res/drawable/top_border.xml index b4040121..126719a1 100644 --- a/app/src/main/res/drawable/top_border.xml +++ b/app/src/main/res/drawable/top_border.xml @@ -9,7 +9,7 @@ android:top="@dimen/spacing_normal"/> + android:color="?colorAccent"/> diff --git a/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml b/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml index d0d28bdd..d9856d3c 100644 --- a/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml +++ b/app/src/main/res/layouts/main_layouts/layout-land/header_title_with_toolbar.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/bbn_bottom_navigation_width" android:background="@color/transparent" - android:theme="@style/ToolbarStyleDark" + android:theme="?android:toolbarStyle" app:elevation="0dp"> @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:background="?colorPrimary" android:minHeight="?actionBarSize" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> diff --git a/app/src/main/res/layouts/main_layouts/layout-sw600dp/header_title_with_toolbar.xml b/app/src/main/res/layouts/main_layouts/layout-sw600dp/header_title_with_toolbar.xml index 4b3ba434..33e5e698 100644 --- a/app/src/main/res/layouts/main_layouts/layout-sw600dp/header_title_with_toolbar.xml +++ b/app/src/main/res/layouts/main_layouts/layout-sw600dp/header_title_with_toolbar.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/bbn_bottom_navigation_width" android:background="@color/transparent" - android:theme="@style/ToolbarStyleDark" + android:theme="?android:toolbarStyle" app:elevation="0dp"> @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:background="?colorPrimary" android:minHeight="?actionBarSize" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> diff --git a/app/src/main/res/layouts/main_layouts/layout/centered_tabbed_viewpager.xml b/app/src/main/res/layouts/main_layouts/layout/centered_tabbed_viewpager.xml index 11017fa3..1ed3e420 100644 --- a/app/src/main/res/layouts/main_layouts/layout/centered_tabbed_viewpager.xml +++ b/app/src/main/res/layouts/main_layouts/layout/centered_tabbed_viewpager.xml @@ -14,7 +14,7 @@ android:elevation="@dimen/spacing_micro" app:tabGravity="fill" app:tabSelectedTextColor="?colorAccent" - app:tabTextColor="@color/dark_gray"/> + app:tabTextColor="?android:textColorTertiary"/> + android:theme="?android:toolbarStyle"> @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:background="?colorPrimary" android:minHeight="?actionBarSize" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + app:tabTextColor="?android:textColorTertiary"/> + android:theme="?android:toolbarStyle"> @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:background="?colorPrimary" app:tabSelectedTextColor="?colorAccent" - app:tabTextColor="@color/dark_gray"/> + app:tabTextColor="?android:textColorTertiary"/> @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:background="?colorPrimary" android:minHeight="?actionBarSize" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> diff --git a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml index a16c77d6..5fcb34f8 100644 --- a/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml +++ b/app/src/main/res/layouts/main_layouts/layout/issue_pager_activity.xml @@ -18,7 +18,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> @@ -58,7 +58,7 @@ android:background="?colorPrimary" app:tabMode="fixed" app:tabSelectedTextColor="?colorAccent" - app:tabTextColor="@color/dark_gray"/> + app:tabTextColor="?android:textColorTertiary"/> + android:theme="?android:toolbarStyle"> + android:theme="?android:toolbarStyle" + app:popupTheme="?android:toolbarStyle"> + android:theme="?android:toolbarStyle"> + android:textColorHint="?android:textColorSecondary"/> diff --git a/app/src/main/res/layouts/main_layouts/layout/small_grid_refresh_list.xml b/app/src/main/res/layouts/main_layouts/layout/small_grid_refresh_list.xml index 021367ec..4e975475 100644 --- a/app/src/main/res/layouts/main_layouts/layout/small_grid_refresh_list.xml +++ b/app/src/main/res/layouts/main_layouts/layout/small_grid_refresh_list.xml @@ -14,7 +14,6 @@ android:id="@+id/recycler" android:layout_width="match_parent" android:layout_height="match_parent" - android:listDivider="@color/divider" app:layoutManager="@string/staggered_layout_manager" app:spanCount="@integer/small_spans"/> diff --git a/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml b/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml index 38f3aacf..22ae4532 100644 --- a/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml +++ b/app/src/main/res/layouts/main_layouts/layout/tabbed_viewpager.xml @@ -17,7 +17,7 @@ app:tabGravity="center" android:background="?colorPrimary" app:tabSelectedTextColor="?colorAccent" - app:tabTextColor="@color/dark_gray" + app:tabTextColor="?android:textColorTertiary" tools:ignore="RtlSymmetry"/> diff --git a/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml index beb8a7c0..cd2f7e30 100644 --- a/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml +++ b/app/src/main/res/layouts/other_layouts/layout-land/appbar_start_margin.xml @@ -7,14 +7,12 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/bbn_bottom_navigation_width" android:stateListAnimator="@null" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + android:theme="?android:toolbarStyle" + app:layout_scrollFlags="scroll|enterAlways"/> \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml index beb8a7c0..6f1f12da 100644 --- a/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml +++ b/app/src/main/res/layouts/other_layouts/layout-sw600dp/appbar_start_margin.xml @@ -7,14 +7,13 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/bbn_bottom_navigation_width" android:stateListAnimator="@null" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + /> \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml index ae5c9321..7275e736 100644 --- a/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml +++ b/app/src/main/res/layouts/other_layouts/layout/appbar_elevation_dark.xml @@ -5,14 +5,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + android:theme="?android:toolbarStyle" + app:layout_scrollFlags="scroll|enterAlways"/> \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml index 2b6ab542..cb6c6111 100644 --- a/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml +++ b/app/src/main/res/layouts/other_layouts/layout/appbar_start_margin.xml @@ -6,14 +6,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:stateListAnimator="@null" - app:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + /> \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml b/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml index 59d84dc8..2d7c6f22 100644 --- a/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml +++ b/app/src/main/res/layouts/other_layouts/layout/appbar_tabbed_elevation.xml @@ -6,16 +6,15 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:theme="@style/ToolbarStyleDark"> + android:theme="?android:toolbarStyle"> + /> \ No newline at end of file diff --git a/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml index 4389bc43..ca913bd9 100644 --- a/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml +++ b/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/card_background" + android:background="?card_background" android:orientation="vertical"> + android:layout_height="wrap_content"> @@ -105,8 +85,8 @@ diff --git a/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml index 25ea9e57..9ebb5a16 100644 --- a/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml +++ b/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml @@ -6,11 +6,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="@dimen/grid_spacing" - android:background="@color/card_background" + android:background="?card_background" android:paddingBottom="@dimen/spacing_normal" android:paddingEnd="@dimen/spacing_xs_large" android:paddingTop="@dimen/spacing_normal" - app:cardBackgroundColor="@color/card_background"> + app:cardBackgroundColor="?card_background"> - + + \ No newline at end of file diff --git a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml index 22cd3f69..aaf08866 100644 --- a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml +++ b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml @@ -8,7 +8,7 @@ android:layout_margin="@dimen/spacing_micro" android:foreground="?android:selectableItemBackground" android:stateListAnimator="@animator/cardview_selector" - app:cardBackgroundColor="@color/card_background" + app:cardBackgroundColor="?card_background" app:contentPaddingBottom="@dimen/spacing_normal" app:contentPaddingLeft="@dimen/spacing_xs_large" app:contentPaddingRight="@dimen/spacing_xs_large" diff --git a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml index ff7cc0e6..b314c21b 100644 --- a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml +++ b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml @@ -8,7 +8,7 @@ android:layout_margin="@dimen/spacing_micro" android:foreground="?attr/selectableItemBackground" android:stateListAnimator="@animator/cardview_selector" - app:cardBackgroundColor="@color/card_background"> + app:cardBackgroundColor="?card_background"> + app:cardBackgroundColor="?card_background"> - - #2D3035 - #26282C - @color/material_blue_500 - #22252A - #fff - @color/material_grey_500 - @color/material_grey_300 - #2D3035 - @color/material_grey_500 - @color/material_green_900 - @color/material_red_900 - @color/material_blue_grey_500 - #10FFFFFF - \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 3c2b73e6..00000000 --- a/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml deleted file mode 100644 index 6201a75f..00000000 --- a/app/src/main/res/values-night/themes.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v23/colors.xml b/app/src/main/res/values-v23/colors.xml deleted file mode 100644 index d9c3cbb3..00000000 --- a/app/src/main/res/values-v23/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #E0E0E0 - \ No newline at end of file diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml deleted file mode 100644 index 68c47049..00000000 --- a/app/src/main/res/values-v23/themes.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index dc8c299a..847b07ca 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -15,7 +15,6 @@ - @string/auto_theme_mode @string/light_theme_mode @string/dark_theme_mode diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 901e0f05..f5867b59 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,25 +1,10 @@ - #F5F5F5 - #9E9E9E - #FAFAFA - @color/material_blue_accent_700 - #448AFF - #212121 - #727272 - #686868 - #B6B6B6 #00000000 #FF000000 #FFFFFF - @color/cardview_light_background - @color/primary_light #ffb2b2b2 @color/material_amber_800 - #FF616161 - #CCFFCC - #FFDDDD - #EEEEEE #FFECB3 #FFE082 #FFD54F diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 18fc9ffa..ab246745 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,5 @@ - - @@ -14,8 +8,4 @@ 220dp - - diff --git a/app/src/main/res/values/theme_attrs.xml b/app/src/main/res/values/theme_attrs.xml new file mode 100644 index 00000000..5c716ee9 --- /dev/null +++ b/app/src/main/res/values/theme_attrs.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/theme_dark.xml b/app/src/main/res/values/theme_dark.xml new file mode 100644 index 00000000..761ad8b1 --- /dev/null +++ b/app/src/main/res/values/theme_dark.xml @@ -0,0 +1,58 @@ + + + + #22252A + #10FFFFFF + @color/material_green_900 + @color/material_red_900 + @color/material_blue_grey_500 + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/theme_light.xml b/app/src/main/res/values/theme_light.xml new file mode 100644 index 00000000..c7e38104 --- /dev/null +++ b/app/src/main/res/values/theme_light.xml @@ -0,0 +1,58 @@ + + + + #FAFAFA + #B6B6B6 + #CCFFCC + #FFDDDD + #EEEEEE + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index be645b6a..819ec31b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,76 +1,49 @@ - + - - - - - -