From b1426faaae34bb35d7c8693ccdc94446e779a296 Mon Sep 17 00:00:00 2001 From: kimdowoo <asasa0628@gs.cwnu.ac.kr> Date: Sat, 21 Oct 2023 19:32:39 +0900 Subject: [PATCH] =?UTF-8?q?refactor=20:=20app=20splash=20Icon=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/themes.xml | 2 +- .../component/DynamicAsyncImage.kt | 2 +- .../src/main/res/drawable/app_main_image.xml | 49 +++++++++++++++++++ .../src/main/res/drawable/appmainimage.xml | 41 ---------------- 4 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 core/designsystem/src/main/res/drawable/app_main_image.xml delete mode 100644 core/designsystem/src/main/res/drawable/appmainimage.xml diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 21ccc967..6258cefa 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -29,7 +29,7 @@ </style> <style name="Theme.Do.Splash" parent="NightAdjusted.Theme.Splash"> - <item name="windowSplashScreenAnimatedIcon">@drawable/appmainimage</item> + <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item> <item name="postSplashScreenTheme">@style/Theme.Do</item> </style> diff --git a/core/designsystem/src/main/kotlin/com/najudoryeong/mineme/core/designsystem/component/DynamicAsyncImage.kt b/core/designsystem/src/main/kotlin/com/najudoryeong/mineme/core/designsystem/component/DynamicAsyncImage.kt index 364b0c0e..ed7f22a5 100644 --- a/core/designsystem/src/main/kotlin/com/najudoryeong/mineme/core/designsystem/component/DynamicAsyncImage.kt +++ b/core/designsystem/src/main/kotlin/com/najudoryeong/mineme/core/designsystem/component/DynamicAsyncImage.kt @@ -44,7 +44,7 @@ fun DynamicAsyncImage( imageUrl: String, contentDescription: String?, modifier: Modifier = Modifier, - placeholder: Painter = painterResource(R.drawable.appmainimage), + placeholder: Painter = painterResource(R.drawable.app_main_image), completeTag: String = "Not_Yet", ) { var isLoading by remember { mutableStateOf(true) } diff --git a/core/designsystem/src/main/res/drawable/app_main_image.xml b/core/designsystem/src/main/res/drawable/app_main_image.xml new file mode 100644 index 00000000..86554f7c --- /dev/null +++ b/core/designsystem/src/main/res/drawable/app_main_image.xml @@ -0,0 +1,49 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="100dp" + android:height="100dp" + android:viewportWidth="100" + android:viewportHeight="100"> + <group> + <clip-path + android:pathData="M0,0h100v100h-100z"/> + <path + android:pathData="M77.89,0H22.11C9.9,0 0,9.9 0,22.11V77.89C0,90.1 9.9,100 22.11,100H77.89C90.1,100 100,90.1 100,77.89V22.11C100,9.9 90.1,0 77.89,0ZM53.23,34.53C53.97,37.49 53.67,42 51.32,42.92C49.85,43.51 47.79,42.57 46.75,41.21C44.52,38.31 46.59,33.17 48.84,30.33C49.2,29.89 49.57,29.49 49.95,29.12C51.19,30.3 52.62,32.07 53.23,34.53Z" + android:fillColor="#ffffff"/> + <path + android:pathData="M51.32,42.92C49.85,43.51 47.79,42.57 46.75,41.21C44.52,38.31 46.59,33.17 48.84,30.33C49.2,29.89 49.57,29.49 49.95,29.12C51.19,30.3 52.62,32.07 53.23,34.53C53.97,37.49 53.67,42 51.32,42.92Z" + android:strokeWidth="1.38672" + android:fillColor="#ffffff" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + <path + android:pathData="M83.37,51.7C81.06,62.16 73.48,67.94 71.07,69.72C61.74,76.6 51.74,76.36 47.79,76.21C43.52,76.04 34.29,75.68 26.72,68.86C21.49,64.15 19.53,58.61 18.33,55.13C16.39,49.55 14.39,43.79 16.8,37.2C20.1,28.15 28.97,25 29.58,24.8C36.46,22.49 43.75,24.16 48.46,27.85C48.86,28.16 49.38,28.58 49.95,29.12C49.57,29.49 49.2,29.89 48.84,30.33C46.59,33.17 44.52,38.31 46.75,41.2C47.79,42.57 49.85,43.51 51.32,42.92C53.67,42 53.97,37.49 53.23,34.53C52.62,32.07 51.19,30.3 49.95,29.12C52.84,26.35 56.46,25.57 58.38,25.18C64.71,23.91 74.98,24.87 80.7,32.62C85.99,39.8 84.11,48.33 83.37,51.7Z" + android:fillColor="#FFBBBB"/> + <path + android:pathData="M49.95,29.12C49.38,28.58 48.86,28.16 48.46,27.85C43.75,24.16 36.46,22.49 29.58,24.8C28.97,25 20.1,28.15 16.8,37.2C14.39,43.79 16.39,49.55 18.33,55.13C19.53,58.61 21.49,64.15 26.72,68.86C34.29,75.68 43.52,76.04 47.79,76.21C51.74,76.36 61.74,76.6 71.07,69.72C73.48,67.94 81.06,62.16 83.37,51.7C84.11,48.33 85.99,39.8 80.7,32.62C74.98,24.87 64.71,23.91 58.38,25.18C56.46,25.57 52.84,26.35 49.95,29.12ZM49.95,29.12C49.57,29.49 49.2,29.89 48.84,30.33C46.59,33.17 44.52,38.31 46.75,41.2C47.79,42.57 49.85,43.51 51.32,42.92C53.67,42 53.97,37.49 53.23,34.53C52.62,32.07 51.19,30.3 49.95,29.12Z" + android:strokeWidth="1.38672" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + <path + android:pathData="M38.77,46.46C38.77,46.46 35.33,47.61 34.57,50.28" + android:strokeWidth="1.38672" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + <path + android:pathData="M61.53,46.39C61.53,46.39 64.89,47.8 64.52,50.64" + android:strokeWidth="1.38672" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + <path + android:pathData="M45.21,51.95L52.54,52.53C52.54,52.53 54.08,52.53 53.12,54.65C52.15,56.77 50.42,60.44 50.42,60.44C50.42,60.44 49.07,61.4 48.3,57.93C47.53,54.46 47.91,52.15 47.91,52.15" + android:fillColor="#ffffff"/> + <path + android:pathData="M45.21,51.95L52.54,52.53C52.54,52.53 54.08,52.53 53.12,54.65C52.15,56.77 50.42,60.44 50.42,60.44C50.42,60.44 49.07,61.4 48.3,57.93C47.53,54.46 47.91,52.15 47.91,52.15" + android:strokeWidth="1.38672" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + </group> +</vector> diff --git a/core/designsystem/src/main/res/drawable/appmainimage.xml b/core/designsystem/src/main/res/drawable/appmainimage.xml deleted file mode 100644 index 42588575..00000000 --- a/core/designsystem/src/main/res/drawable/appmainimage.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright 2023 KDW03 - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<vector android:autoMirrored="true" android:height="100dp" - android:viewportHeight="100" android:viewportWidth="100" - android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <group> - <clip-path android:pathData="M0,0h100v100h-100z"/> - <path android:fillColor="#ffffff" android:pathData="M77.89,0H22.11C9.9,0 0,9.9 0,22.11V77.89C0,90.1 9.9,100 22.11,100H77.89C90.1,100 100,90.1 100,77.89V22.11C100,9.9 90.1,0 77.89,0ZM53.23,34.53C53.97,37.49 53.67,42 51.32,42.92C49.85,43.51 47.79,42.57 46.75,41.21C44.52,38.31 46.59,33.17 48.84,30.33C49.2,29.89 49.57,29.49 49.95,29.12C51.19,30.3 52.62,32.07 53.23,34.53Z"/> - <path android:fillColor="#ffffff" - android:pathData="M51.32,42.92C49.85,43.51 47.79,42.57 46.75,41.21C44.52,38.31 46.59,33.17 48.84,30.33C49.2,29.89 49.57,29.49 49.95,29.12C51.19,30.3 52.62,32.07 53.23,34.53C53.97,37.49 53.67,42 51.32,42.92Z" - android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="1.38672"/> - <path android:fillColor="#FFBBBB" android:pathData="M83.37,51.7C81.06,62.16 73.48,67.94 71.07,69.72C61.74,76.6 51.74,76.36 47.79,76.21C43.52,76.04 34.29,75.68 26.72,68.86C21.49,64.15 19.53,58.61 18.33,55.13C16.39,49.55 14.39,43.79 16.8,37.2C20.1,28.15 28.97,25 29.58,24.8C36.46,22.49 43.75,24.16 48.46,27.85C48.86,28.16 49.38,28.58 49.95,29.12C49.57,29.49 49.2,29.89 48.84,30.33C46.59,33.17 44.52,38.31 46.75,41.2C47.79,42.57 49.85,43.51 51.32,42.92C53.67,42 53.97,37.49 53.23,34.53C52.62,32.07 51.19,30.3 49.95,29.12C52.84,26.35 56.46,25.57 58.38,25.18C64.71,23.91 74.98,24.87 80.7,32.62C85.99,39.8 84.11,48.33 83.37,51.7Z"/> - <path android:fillColor="#00000000" - android:pathData="M49.95,29.12C49.38,28.58 48.86,28.16 48.46,27.85C43.75,24.16 36.46,22.49 29.58,24.8C28.97,25 20.1,28.15 16.8,37.2C14.39,43.79 16.39,49.55 18.33,55.13C19.53,58.61 21.49,64.15 26.72,68.86C34.29,75.68 43.52,76.04 47.79,76.21C51.74,76.36 61.74,76.6 71.07,69.72C73.48,67.94 81.06,62.16 83.37,51.7C84.11,48.33 85.99,39.8 80.7,32.62C74.98,24.87 64.71,23.91 58.38,25.18C56.46,25.57 52.84,26.35 49.95,29.12ZM49.95,29.12C49.57,29.49 49.2,29.89 48.84,30.33C46.59,33.17 44.52,38.31 46.75,41.2C47.79,42.57 49.85,43.51 51.32,42.92C53.67,42 53.97,37.49 53.23,34.53C52.62,32.07 51.19,30.3 49.95,29.12Z" - android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="1.38672"/> - <path android:fillColor="#00000000" - android:pathData="M38.77,46.46C38.77,46.46 35.33,47.61 34.57,50.28" - android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="1.38672"/> - <path android:fillColor="#00000000" - android:pathData="M61.53,46.39C61.53,46.39 64.89,47.8 64.52,50.64" - android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="1.38672"/> - <path android:fillColor="#ffffff" android:pathData="M45.21,51.95L52.54,52.53C52.54,52.53 54.08,52.53 53.12,54.65C52.15,56.77 50.42,60.44 50.42,60.44C50.42,60.44 49.07,61.4 48.3,57.93C47.53,54.46 47.91,52.15 47.91,52.15"/> - <path android:fillColor="#00000000" - android:pathData="M45.21,51.95L52.54,52.53C52.54,52.53 54.08,52.53 53.12,54.65C52.15,56.77 50.42,60.44 50.42,60.44C50.42,60.44 49.07,61.4 48.3,57.93C47.53,54.46 47.91,52.15 47.91,52.15" - android:strokeColor="#000000" android:strokeLineCap="round" android:strokeWidth="1.38672"/> - </group> -</vector>