From a27aa1963404712630f150971ebc3e030ab33507 Mon Sep 17 00:00:00 2001 From: zhwanng <48609908+zhwanng@users.noreply.github.com> Date: Mon, 4 Nov 2024 17:15:28 +0800 Subject: [PATCH 1/4] update item more icon - remove unused icon --- .../seadroid2/ui/repo/RepoQuickAdapter.java | 4 +-- .../ui/sdoc/profile/SDocProfileDialog.java | 4 +-- .../ui/star/StarredQuickFragment.java | 6 +++- .../main/res/color/selector_color_primary.xml | 2 +- .../main/res/drawable/baseline_star_24.xml | 9 ------ .../color_preference_widget_background.xml | 13 --------- app/src/main/res/drawable/ic_star2.xml | 9 ------ app/src/main/res/drawable/ic_star_32.xml | 9 ++++++ .../res/drawable/icon_file_ae_colorful.xml | 17 ----------- .../res/drawable/icon_file_ai_colorful.xml | 23 --------------- .../drawable/icon_file_android_colorful.xml | 26 ----------------- .../res/drawable/icon_file_audio_colorful.xml | 17 ----------- .../drawable/icon_file_calendar_colorful.xml | 17 ----------- .../res/drawable/icon_file_code_colorful.xml | 17 ----------- .../res/drawable/icon_file_csv_colorful.xml | 17 ----------- .../res/drawable/icon_file_excel_colorful.xml | 17 ----------- .../res/drawable/icon_file_image_colorful.xml | 20 ------------- .../drawable/icon_file_keynote_colorful.xml | 23 --------------- .../drawable/icon_file_link_blue_colorful.xml | 19 ------------ .../drawable/icon_file_link_deta_colorful.xml | 15 ---------- .../icon_file_nopermission_colorful.xml | 19 ------------ .../drawable/icon_file_numbers_colorful.xml | 29 ------------------- .../drawable/icon_file_otherfile_colorful.xml | 22 -------------- .../res/drawable/icon_file_pages_colorful.xml | 23 --------------- .../res/drawable/icon_file_pdf_colorful.xml | 15 ---------- .../res/drawable/icon_file_ppt_colorful.xml | 17 ----------- .../res/drawable/icon_file_ps_colorful.xml | 17 ----------- .../drawable/icon_file_sketch_colorful.xml | 17 ----------- .../res/drawable/icon_file_slide_colorful.xml | 17 ----------- .../res/drawable/icon_file_text_colorful.xml | 17 ----------- .../drawable/icon_file_unknow_colorful.xml | 19 ------------ .../res/drawable/icon_file_video_colorful.xml | 17 ----------- .../res/drawable/icon_file_word_colorful.xml | 20 ------------- .../res/drawable/icon_file_zip_colorful.xml | 17 ----------- app/src/main/res/drawable/icon_star.xml | 9 ------ app/src/main/res/drawable/icon_star_fill.xml | 9 ------ .../main/res/drawable/scrollbar_vertical.xml | 13 --------- .../res/drawable/scrollbar_vertical_bg.xml | 12 -------- .../res/drawable/selection_control_ripple.xml | 19 ++++++++++++ .../res/layout/activity_image_preview.xml | 2 +- .../res/layout/color_preference_widget.xml | 13 --------- app/src/main/res/layout/item_dirent.xml | 16 +++++----- app/src/main/res/layout/item_dirent_grid.xml | 8 ++--- app/src/main/res/layout/item_repo.xml | 20 ++++++------- app/src/main/res/layout/item_starred.xml | 26 ++++++++--------- .../main/res/menu/bottom_navigation_menu.xml | 3 +- .../main/res/menu/bottom_sheet_unstarred.xml | 7 +++-- app/src/main/res/values/colors.xml | 5 +++- app/src/main/res/values/colors_material.xml | 1 + app/src/main/res/values/styles.xml | 5 ++-- 50 files changed, 89 insertions(+), 629 deletions(-) delete mode 100644 app/src/main/res/drawable/baseline_star_24.xml delete mode 100644 app/src/main/res/drawable/color_preference_widget_background.xml delete mode 100644 app/src/main/res/drawable/ic_star2.xml create mode 100644 app/src/main/res/drawable/ic_star_32.xml delete mode 100644 app/src/main/res/drawable/icon_file_ae_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_ai_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_android_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_audio_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_calendar_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_code_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_csv_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_excel_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_image_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_keynote_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_link_blue_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_link_deta_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_nopermission_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_numbers_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_otherfile_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_pages_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_pdf_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_ppt_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_ps_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_sketch_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_slide_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_text_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_unknow_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_video_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_word_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_file_zip_colorful.xml delete mode 100644 app/src/main/res/drawable/icon_star.xml delete mode 100644 app/src/main/res/drawable/icon_star_fill.xml delete mode 100644 app/src/main/res/drawable/scrollbar_vertical.xml delete mode 100644 app/src/main/res/drawable/scrollbar_vertical_bg.xml create mode 100644 app/src/main/res/drawable/selection_control_ripple.xml delete mode 100644 app/src/main/res/layout/color_preference_widget.xml diff --git a/app/src/main/java/com/seafile/seadroid2/ui/repo/RepoQuickAdapter.java b/app/src/main/java/com/seafile/seadroid2/ui/repo/RepoQuickAdapter.java index 3b4af28af..cbfb0bd52 100644 --- a/app/src/main/java/com/seafile/seadroid2/ui/repo/RepoQuickAdapter.java +++ b/app/src/main/java/com/seafile/seadroid2/ui/repo/RepoQuickAdapter.java @@ -83,8 +83,8 @@ public void setSelectType(RepoSelectType selectType, int selectedMaxCount) { public Drawable getStarDrawable() { if (null == starDrawable) { - int DP_16 = SizeUtils.dp2px(16); - starDrawable = ContextCompat.getDrawable(getContext(), R.drawable.baseline_star_24); + int DP_16 = SizeUtils.dp2px(12); + starDrawable = ContextCompat.getDrawable(getContext(), R.drawable.ic_star_32); starDrawable.setBounds(0, 0, DP_16, DP_16); starDrawable.setTint(ContextCompat.getColor(getContext(), R.color.light_grey)); } diff --git a/app/src/main/java/com/seafile/seadroid2/ui/sdoc/profile/SDocProfileDialog.java b/app/src/main/java/com/seafile/seadroid2/ui/sdoc/profile/SDocProfileDialog.java index d795dc554..a8d9086f7 100644 --- a/app/src/main/java/com/seafile/seadroid2/ui/sdoc/profile/SDocProfileDialog.java +++ b/app/src/main/java/com/seafile/seadroid2/ui/sdoc/profile/SDocProfileDialog.java @@ -352,7 +352,7 @@ private int getIconByColumnType(String type) { case ColumnType.NUMBER: return R.drawable.ic_number; case ColumnType.RATE: - return R.drawable.ic_star2; + return R.drawable.ic_star_32; case ColumnType.URL: return R.drawable.ic_url; case ColumnType.LINK: @@ -642,7 +642,7 @@ private void parseRate(LinearLayout view, MetadataModel model) { ColorStateList stateList = ColorStateList.valueOf(t); ltr.setImageTintList(stateList); - ltr.setImageResource(R.drawable.ic_star2); + ltr.setImageResource(R.drawable.ic_star_32); view.findViewById(R.id.flex_box).addView(ltr, flexLayoutParams); } diff --git a/app/src/main/java/com/seafile/seadroid2/ui/star/StarredQuickFragment.java b/app/src/main/java/com/seafile/seadroid2/ui/star/StarredQuickFragment.java index 4b799c2f3..6b1975841 100644 --- a/app/src/main/java/com/seafile/seadroid2/ui/star/StarredQuickFragment.java +++ b/app/src/main/java/com/seafile/seadroid2/ui/star/StarredQuickFragment.java @@ -16,8 +16,10 @@ import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.annotation.OptIn; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; +import androidx.media3.common.util.UnstableApi; import com.blankj.utilcode.util.ToastUtils; import com.chad.library.adapter4.BaseQuickAdapter; @@ -26,6 +28,7 @@ import com.seafile.seadroid2.SeafException; import com.seafile.seadroid2.account.Account; import com.seafile.seadroid2.account.SupportAccountManager; +import com.seafile.seadroid2.annotation.Unstable; import com.seafile.seadroid2.bottomsheetmenu.BottomSheetHelper; import com.seafile.seadroid2.bottomsheetmenu.BottomSheetMenuFragment; import com.seafile.seadroid2.bottomsheetmenu.OnMenuClickListener; @@ -125,7 +128,7 @@ private void initAdapter() { }); - adapter.addOnItemChildClickListener(R.id.item_action, new BaseQuickAdapter.OnItemChildClickListener() { + adapter.addOnItemChildClickListener(R.id.expandable_toggle_button, new BaseQuickAdapter.OnItemChildClickListener() { @Override public void onItemClick(@NonNull BaseQuickAdapter baseQuickAdapter, @NonNull View view, int i) { showBottomSheet(adapter.getItems().get(i)); @@ -225,6 +228,7 @@ private void navTo(StarredModel starredModel) { } } + @OptIn(markerClass = Unstable.class) private void open(StarredModel model) { if (model.is_dir) { MainActivity.navToThis(requireContext(), model.repo_id, model.repo_name, model.path, model.is_dir); diff --git a/app/src/main/res/color/selector_color_primary.xml b/app/src/main/res/color/selector_color_primary.xml index 617987d0c..de16632b6 100644 --- a/app/src/main/res/color/selector_color_primary.xml +++ b/app/src/main/res/color/selector_color_primary.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/baseline_star_24.xml b/app/src/main/res/drawable/baseline_star_24.xml deleted file mode 100644 index 7cf531d99..000000000 --- a/app/src/main/res/drawable/baseline_star_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/color_preference_widget_background.xml b/app/src/main/res/drawable/color_preference_widget_background.xml deleted file mode 100644 index e91c2a973..000000000 --- a/app/src/main/res/drawable/color_preference_widget_background.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_star2.xml b/app/src/main/res/drawable/ic_star2.xml deleted file mode 100644 index 3077dd5bc..000000000 --- a/app/src/main/res/drawable/ic_star2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_star_32.xml b/app/src/main/res/drawable/ic_star_32.xml new file mode 100644 index 000000000..fbc02f523 --- /dev/null +++ b/app/src/main/res/drawable/ic_star_32.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/icon_file_ae_colorful.xml b/app/src/main/res/drawable/icon_file_ae_colorful.xml deleted file mode 100644 index 345333679..000000000 --- a/app/src/main/res/drawable/icon_file_ae_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_ai_colorful.xml b/app/src/main/res/drawable/icon_file_ai_colorful.xml deleted file mode 100644 index 66cf9460c..000000000 --- a/app/src/main/res/drawable/icon_file_ai_colorful.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/icon_file_android_colorful.xml b/app/src/main/res/drawable/icon_file_android_colorful.xml deleted file mode 100644 index 16b9a4bec..000000000 --- a/app/src/main/res/drawable/icon_file_android_colorful.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/icon_file_audio_colorful.xml b/app/src/main/res/drawable/icon_file_audio_colorful.xml deleted file mode 100644 index ab9347b42..000000000 --- a/app/src/main/res/drawable/icon_file_audio_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_calendar_colorful.xml b/app/src/main/res/drawable/icon_file_calendar_colorful.xml deleted file mode 100644 index 44783e1e2..000000000 --- a/app/src/main/res/drawable/icon_file_calendar_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_code_colorful.xml b/app/src/main/res/drawable/icon_file_code_colorful.xml deleted file mode 100644 index e19feb65a..000000000 --- a/app/src/main/res/drawable/icon_file_code_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_csv_colorful.xml b/app/src/main/res/drawable/icon_file_csv_colorful.xml deleted file mode 100644 index 1dbd47209..000000000 --- a/app/src/main/res/drawable/icon_file_csv_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_excel_colorful.xml b/app/src/main/res/drawable/icon_file_excel_colorful.xml deleted file mode 100644 index ff232f8d0..000000000 --- a/app/src/main/res/drawable/icon_file_excel_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_image_colorful.xml b/app/src/main/res/drawable/icon_file_image_colorful.xml deleted file mode 100644 index 925116130..000000000 --- a/app/src/main/res/drawable/icon_file_image_colorful.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_file_keynote_colorful.xml b/app/src/main/res/drawable/icon_file_keynote_colorful.xml deleted file mode 100644 index 86263a6e4..000000000 --- a/app/src/main/res/drawable/icon_file_keynote_colorful.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/icon_file_link_blue_colorful.xml b/app/src/main/res/drawable/icon_file_link_blue_colorful.xml deleted file mode 100644 index 6c1b39386..000000000 --- a/app/src/main/res/drawable/icon_file_link_blue_colorful.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_link_deta_colorful.xml b/app/src/main/res/drawable/icon_file_link_deta_colorful.xml deleted file mode 100644 index 9744979e8..000000000 --- a/app/src/main/res/drawable/icon_file_link_deta_colorful.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_nopermission_colorful.xml b/app/src/main/res/drawable/icon_file_nopermission_colorful.xml deleted file mode 100644 index 92d5d83b6..000000000 --- a/app/src/main/res/drawable/icon_file_nopermission_colorful.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_numbers_colorful.xml b/app/src/main/res/drawable/icon_file_numbers_colorful.xml deleted file mode 100644 index b2e5cb255..000000000 --- a/app/src/main/res/drawable/icon_file_numbers_colorful.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/icon_file_otherfile_colorful.xml b/app/src/main/res/drawable/icon_file_otherfile_colorful.xml deleted file mode 100644 index bfe822887..000000000 --- a/app/src/main/res/drawable/icon_file_otherfile_colorful.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_file_pages_colorful.xml b/app/src/main/res/drawable/icon_file_pages_colorful.xml deleted file mode 100644 index a41e3f0a5..000000000 --- a/app/src/main/res/drawable/icon_file_pages_colorful.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/icon_file_pdf_colorful.xml b/app/src/main/res/drawable/icon_file_pdf_colorful.xml deleted file mode 100644 index e4c99a5c9..000000000 --- a/app/src/main/res/drawable/icon_file_pdf_colorful.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_ppt_colorful.xml b/app/src/main/res/drawable/icon_file_ppt_colorful.xml deleted file mode 100644 index af0a6a503..000000000 --- a/app/src/main/res/drawable/icon_file_ppt_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_ps_colorful.xml b/app/src/main/res/drawable/icon_file_ps_colorful.xml deleted file mode 100644 index 6a60e2e36..000000000 --- a/app/src/main/res/drawable/icon_file_ps_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_sketch_colorful.xml b/app/src/main/res/drawable/icon_file_sketch_colorful.xml deleted file mode 100644 index 3bda5f114..000000000 --- a/app/src/main/res/drawable/icon_file_sketch_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_slide_colorful.xml b/app/src/main/res/drawable/icon_file_slide_colorful.xml deleted file mode 100644 index 9938e3282..000000000 --- a/app/src/main/res/drawable/icon_file_slide_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_text_colorful.xml b/app/src/main/res/drawable/icon_file_text_colorful.xml deleted file mode 100644 index c6844f504..000000000 --- a/app/src/main/res/drawable/icon_file_text_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_unknow_colorful.xml b/app/src/main/res/drawable/icon_file_unknow_colorful.xml deleted file mode 100644 index 3620b4829..000000000 --- a/app/src/main/res/drawable/icon_file_unknow_colorful.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_video_colorful.xml b/app/src/main/res/drawable/icon_file_video_colorful.xml deleted file mode 100644 index bf7c7b370..000000000 --- a/app/src/main/res/drawable/icon_file_video_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_file_word_colorful.xml b/app/src/main/res/drawable/icon_file_word_colorful.xml deleted file mode 100644 index 62459273b..000000000 --- a/app/src/main/res/drawable/icon_file_word_colorful.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/icon_file_zip_colorful.xml b/app/src/main/res/drawable/icon_file_zip_colorful.xml deleted file mode 100644 index 5bbb033cc..000000000 --- a/app/src/main/res/drawable/icon_file_zip_colorful.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/icon_star.xml b/app/src/main/res/drawable/icon_star.xml deleted file mode 100644 index 6d7dad89a..000000000 --- a/app/src/main/res/drawable/icon_star.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/icon_star_fill.xml b/app/src/main/res/drawable/icon_star_fill.xml deleted file mode 100644 index 64a9fa2df..000000000 --- a/app/src/main/res/drawable/icon_star_fill.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/scrollbar_vertical.xml b/app/src/main/res/drawable/scrollbar_vertical.xml deleted file mode 100644 index f98af17a0..000000000 --- a/app/src/main/res/drawable/scrollbar_vertical.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/scrollbar_vertical_bg.xml b/app/src/main/res/drawable/scrollbar_vertical_bg.xml deleted file mode 100644 index 8ff9db793..000000000 --- a/app/src/main/res/drawable/scrollbar_vertical_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selection_control_ripple.xml b/app/src/main/res/drawable/selection_control_ripple.xml new file mode 100644 index 000000000..6e36e0e6c --- /dev/null +++ b/app/src/main/res/drawable/selection_control_ripple.xml @@ -0,0 +1,19 @@ + + + diff --git a/app/src/main/res/layout/activity_image_preview.xml b/app/src/main/res/layout/activity_image_preview.xml index 7a00ac7fe..c1f5d7f55 100644 --- a/app/src/main/res/layout/activity_image_preview.xml +++ b/app/src/main/res/layout/activity_image_preview.xml @@ -18,7 +18,7 @@ android:gravity="end" android:orientation="horizontal" android:padding="@dimen/gallery_padding" - android:visibility="gone"> + android:visibility="visible"> - - - - diff --git a/app/src/main/res/layout/item_dirent.xml b/app/src/main/res/layout/item_dirent.xml index 909e9dc60..ecdff6837 100644 --- a/app/src/main/res/layout/item_dirent.xml +++ b/app/src/main/res/layout/item_dirent.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:foreground="?android:selectableItemBackground" android:paddingStart="8dp" - android:paddingEnd="16dp"> + android:paddingEnd="8dp"> - + app:layout_constraintTop_toTopOf="parent" + app:tint="@color/item_subtitle_color" /> + app:tint="@color/item_subtitle_color" /> diff --git a/app/src/main/res/layout/item_repo.xml b/app/src/main/res/layout/item_repo.xml index 2e43f96c0..885af7626 100644 --- a/app/src/main/res/layout/item_repo.xml +++ b/app/src/main/res/layout/item_repo.xml @@ -49,24 +49,24 @@ + app:layout_constraintTop_toTopOf="parent" + app:tint="@color/item_subtitle_color" /> + android:paddingEnd="8dp"> - + app:layout_constraintTop_toTopOf="parent" + app:tint="@color/item_subtitle_color" /> - - - + - + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e5649c725..05ae1fe06 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -24,6 +24,8 @@ #969696 #e1e2e3 + + #FFC783 #ea8201 #CF7300 @@ -60,12 +62,13 @@ #F1F1F1 #333333 - #888888 + @color/material_grey_500 #A0A0A0 #f9f9f9 #191919 #191919 + @color/material_grey_666 @color/blue_500 @color/white diff --git a/app/src/main/res/values/colors_material.xml b/app/src/main/res/values/colors_material.xml index 217a299c8..c4e98eb77 100644 --- a/app/src/main/res/values/colors_material.xml +++ b/app/src/main/res/values/colors_material.xml @@ -265,6 +265,7 @@ #BDBDBD #9E9E9E #757575 + #666666 #616161 #424242 #212121 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b506990eb..3d4f925bb 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -51,6 +51,7 @@ @null @color/selector_color_primary @color/selector_color_primary + @color/fancy_orange_light labeled ?actionBarSize 8dp @@ -59,7 +60,7 @@ - - - diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 274b0f164..ef9019a5a 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -8,13 +8,7 @@ 25dp - - 64dp - 48dp - - 32dp - 32dp 14sp 70dp 48dp diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 05ae1fe06..efae4f3c3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,18 +57,24 @@ #4A4A4A #86848B - + + @color/material_grey_50 + @color/material_grey_88 + @color/material_grey_900 + @color/material_grey_900 + @color/material_grey_666 + + @color/material_grey_50 + @color/material_grey_500 + #E3E3E3 #F1F1F1 + #333333 - @color/material_grey_500 + @color/material_grey_599 #A0A0A0 - #f9f9f9 - #191919 - #191919 - @color/material_grey_666 @color/blue_500 @color/white diff --git a/app/src/main/res/values/colors_material.xml b/app/src/main/res/values/colors_material.xml index c4e98eb77..658be85e3 100644 --- a/app/src/main/res/values/colors_material.xml +++ b/app/src/main/res/values/colors_material.xml @@ -259,17 +259,23 @@ #3E2723 #FAFAFA + #F8F8F8 #F5F5F5 #EEEEEE #E0E0E0 #BDBDBD #9E9E9E + #999999 #757575 #666666 #616161 #424242 #212121 + #222222 + #191919 + #111111 + #ECEFF1 #CFD8DC #B0BEC5 diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 7d1becc26..cc9727188 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -1,4 +1,16 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3d4f925bb..f1b3c242b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -60,18 +60,25 @@ - - @@ -63,9 +66,9 @@ 10dip -10dip wrap_content - @color/white - @color/white + @color/bar_background_color + @color/bar_background_color @@ -166,7 +169,7 @@