From aa6e77d981c9ff60ccb84942eb45950eabc5f4f3 Mon Sep 17 00:00:00 2001 From: leavesCZY <1990724437@qq.com> Date: Sun, 9 Jun 2024 18:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- app/src/main/res/values/colors.xml | 27 ++++++++++--------- app/src/main/res/values/strings.xml | 1 - .../matisse/internal/ui/MatissePage.kt | 4 +-- .../matisse/internal/ui/MatissePreviewPage.kt | 16 +++++------ matisse/src/main/res/values-night/colors.xml | 11 +++++--- matisse/src/main/res/values/colors.xml | 17 +++++++----- 7 files changed, 43 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index f4dea38..3c00aa8 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,4 @@ | 日间主题 | 夜间主题 | 自定义主题 | |:----------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------:| -| ![](https://github.com/leavesCZY/Matisse/assets/30774063/4cc36e0f-3cdd-4833-ab14-0ff3f6a8603d) | ![](https://github.com/leavesCZY/Matisse/assets/30774063/80f43542-9bea-4bd0-9a16-52af2ac20b25) | ![](https://github.com/leavesCZY/Matisse/assets/30774063/b187f39a-07e5-44a6-ab4f-6622b28553d6) | \ No newline at end of file +| ![](https://github.com/leavesCZY/Matisse/assets/30774063/f2a0f801-d450-4c2c-81f8-07f71d6f6fd6) | ![](https://github.com/leavesCZY/Matisse/assets/30774063/7960c579-6ca7-4a63-bce7-f81d182e1df3) | ![](https://github.com/leavesCZY/Matisse/assets/30774063/d5a8b2cd-63fb-4c36-ad45-0659f4154bc5) | \ 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 66ef753..34f9286 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,30 +3,33 @@ 3 false true - #FF42A5F5 + #FF03A9F4 #FFFFFFFF #FFFFFFFF - #FF22202A - #FF2B2A34 #66CCCCCC #80000000 - #FFFFFFFF - #FF42A5F5 + #66CCCCCC + #FFFFFFFF + #FF03A9F4 #FFFFFFFF #FFFFFFFF #FFFFFFFF #FF000000 #FFFFFFFF - #FF03A9F4 - #8003A9F4 + #FF000000 + #FFC6CCD2 #FF03A9F4 - #8003A9F4 - #FFFFFFFF + #6003A9F4 + #FF22202A + #FF2B2A34 + #FFFFFFFF + #EF5350 + #FFEE58 #FFFFFFFF - #80FFFFFF - #FF42A5F5 + #60FFFFFF + #FF03A9F4 #FFFFFFFF - #FF42A5F5 + #FF03A9F4 #FFFFFFFF #FF22202A \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bf93826..ce77991 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,5 @@ Matisse - 所有图片 请授予相册访问权限后重试 ~ 请授予存储写入权限后重试 ~ diff --git a/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePage.kt b/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePage.kt index d5b191d..03c5986 100644 --- a/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePage.kt +++ b/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePage.kt @@ -143,7 +143,7 @@ private fun LazyGridItemScope.CaptureItem(onClick: () -> Unit) { .padding(all = 1.dp) .aspectRatio(ratio = 1f) .clip(shape = RoundedCornerShape(size = 4.dp)) - .background(color = colorResource(id = R.color.matisse_media_item_background_color)) + .background(color = colorResource(id = R.color.matisse_capture_item_background_color)) .clickable(onClick = onClick) ) { Icon( @@ -151,7 +151,7 @@ private fun LazyGridItemScope.CaptureItem(onClick: () -> Unit) { .fillMaxSize(fraction = 0.5f) .align(alignment = Alignment.Center), imageVector = Icons.Filled.PhotoCamera, - tint = colorResource(id = R.color.matisse_capture_icon_color), + tint = colorResource(id = R.color.matisse_capture_item_icon_color), contentDescription = "Capture" ) } diff --git a/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePreviewPage.kt b/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePreviewPage.kt index 2e2c73e..06f374f 100644 --- a/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePreviewPage.kt +++ b/matisse/src/main/java/github/leavesczy/matisse/internal/ui/MatissePreviewPage.kt @@ -212,7 +212,7 @@ private fun BoxScope.BottomController( Box( modifier = Modifier .align(alignment = Alignment.BottomCenter) - .background(color = colorResource(id = R.color.matisse_preview_page_controller_background_color)) + .background(color = colorResource(id = R.color.matisse_preview_page_bottom_navigation_bar_background_color)) .navigationBarsPadding() .fillMaxWidth() .height(height = bottomControllerHeight) @@ -225,9 +225,9 @@ private fun BoxScope.BottomController( .padding(horizontal = 24.dp) .wrapContentSize(align = Alignment.Center), text = stringResource(id = R.string.matisse_back), + color = colorResource(id = R.color.matisse_preview_page_back_text_color), textAlign = TextAlign.Center, - fontSize = 16.sp, - color = colorResource(id = R.color.matisse_back_text_color) + fontSize = 16.sp ) MatisseCheckbox( modifier = Modifier @@ -257,15 +257,15 @@ private fun BoxScope.BottomController( .padding(horizontal = 24.dp) .wrapContentSize(align = Alignment.Center), text = pageViewState.sureButtonText, - textAlign = TextAlign.Center, - fontSize = 16.sp, color = colorResource( id = if (pageViewState.sureButtonClickable) { - R.color.matisse_sure_text_color + R.color.matisse_preview_page_sure_text_color } else { - R.color.matisse_sure_text_color_if_disable + R.color.matisse_preview_page_sure_text_color_if_disable } - ) + ), + textAlign = TextAlign.Center, + fontSize = 16.sp ) } } \ No newline at end of file diff --git a/matisse/src/main/res/values-night/colors.xml b/matisse/src/main/res/values-night/colors.xml index 3126457..05c9b04 100644 --- a/matisse/src/main/res/values-night/colors.xml +++ b/matisse/src/main/res/values-night/colors.xml @@ -6,11 +6,10 @@ #FF2B2A34 #FF2B2A34 #FF22202A - #FF22202A - #FF2B2A34 #CCFFFFFF #80000000 - #FFFFFFFF + #CCFFFFFF + #FFFFFFFF #FF2B2A34 #FFFFFFFF #FFFFFFFF @@ -21,7 +20,11 @@ #99FFFFFF #FFFFFFFF #99FFFFFF - #FFFFFFFF + #FF22202A + #FF2B2A34 + #FFFFFFFF + #FFFFFFFF + #99FFFFFF #FFFFFFFF #80FFFFFF #FF009688 diff --git a/matisse/src/main/res/values/colors.xml b/matisse/src/main/res/values/colors.xml index fa39120..aa1a662 100644 --- a/matisse/src/main/res/values/colors.xml +++ b/matisse/src/main/res/values/colors.xml @@ -6,11 +6,10 @@ #FFFFFFFF #FFFFFFFF #FFFFFFFF - #FF22202A - #FF2B2A34 #66CCCCCC #80000000 - #66000000 + #66CCCCCC + #FFFFFFFF #FFFFFFFF #FF000000 #FF000000 @@ -18,10 +17,14 @@ #FF000000 #FFFFFFFF #FF000000 - #99000000 - #FF03A9F4 - #8003A9F4 - #FFFFFFFF + #FFC6CCD2 + #FF000000 + #FFC6CCD2 + #FF22202A + #FF2B2A34 + #FFFFFFFF + #FFFFFFFF + #80FFFFFF #FFFFFFFF #80FFFFFF #FF03A9F4