Skip to content

Commit

Permalink
[fix]: fix design system
Browse files Browse the repository at this point in the history
  • Loading branch information
@kez-lab
kez-lab committed Jan 8, 2024
1 parent e1c2eda commit 7dc0c71
Show file tree
Hide file tree
Showing 9 changed files with 238 additions and 38 deletions.
9 changes: 4 additions & 5 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ dependencies {

// Feature
implementation(projects.feature.statistics)
implementation(projects.feature.login)
implementation(projects.feature.onboarding)
implementation(projects.feature.main)

// Domain
implementation(projects.domain.usagestats)
Expand All @@ -68,6 +71,7 @@ dependencies {
// Core
implementation(projects.core.common)
implementation(projects.core.designSystem)
implementation(projects.core.database)

// Firebase
implementation(platform(libs.firebase))
Expand All @@ -76,11 +80,6 @@ dependencies {
// Splash
implementation(libs.splash.screen)

// Features
implementation(projects.feature.login)
implementation(projects.feature.onboarding)
implementation(projects.feature.main)

// kakao
implementation(libs.kakao.login)
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.HMHAndroid"
android:theme="@style/Base.Theme.HMH"
tools:targetApi="31">
<activity
android:name=".SampleActivity"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_sample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="?white_btn">

</androidx.constraintlayout.widget.ConstraintLayout>
11 changes: 1 addition & 10 deletions app/src/main/res/values/themes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.HMHAndroid" parent="Theme.Material3.Light.NoActionBar" />

<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#121212</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_background</item>
<item name="postSplashScreenTheme">@style/Theme.HMHAndroid</item>
</style>
</resources>
<resources> </resources>
2 changes: 2 additions & 0 deletions core/design_system/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ android {
}

dependencies {
// Splash
implementation(libs.splash.screen)
}
170 changes: 170 additions & 0 deletions core/design_system/src/main/res/drawable/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>
30 changes: 30 additions & 0 deletions core/design_system/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
38 changes: 19 additions & 19 deletions ...esign_system/src/main/res/values/attr.xml → ...sign_system/src/main/res/values/attrs.xml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="blackground" format="reference" />
<attr name="gray8" format="reference" />
<attr name="gray7" format="reference" />
<attr name="gray6" format="reference" />
<attr name="gray5" format="reference" />
<attr name="gray4" format="reference" />
<attr name="gray3" format="reference" />
<attr name="gray2" format="reference" />
<attr name="gray1" format="reference" />
<attr name="white_text" format="reference" />
<attr name="blue_purple_button" format="reference" />
<attr name="blue_purple_line" format="reference" />
<attr name="blue_purple_progress" format="reference" />
<attr name="blue_purple_text" format="reference" />
<attr name="blue_purple_opacity_70" format="reference" />
<attr name="blue_purple_opacity_22" format="reference" />
<attr name="white_btn" format="reference" />
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="blackground" format="reference" />
<attr name="gray8" format="reference" />
<attr name="gray7" format="reference" />
<attr name="gray6" format="reference" />
<attr name="gray5" format="reference" />
<attr name="gray4" format="reference" />
<attr name="gray3" format="reference" />
<attr name="gray2" format="reference" />
<attr name="gray1" format="reference" />
<attr name="white_text" format="reference" />
<attr name="blue_purple_button" format="reference" />
<attr name="blue_purple_line" format="reference" />
<attr name="blue_purple_progress" format="reference" />
<attr name="blue_purple_text" format="reference" />
<attr name="blue_purple_opacity_70" format="reference" />
<attr name="blue_purple_opacity_22" format="reference" />
<attr name="white_btn" format="reference" />
</resources>
12 changes: 10 additions & 2 deletions core/design_system/src/main/res/values/themes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources>
<!-- Base application theme. -->
<style name="Base.Theme.HMH" parent="Theme.MaterialComponents.Light.NoActionBar">
<style name="Base.Theme.HMH" parent="Theme.Material3.Light.NoActionBar">

<!-- Customize your theme here. -->
<item name="blackground">@color/blackground</item>
Expand Down Expand Up @@ -47,4 +47,12 @@
<item name="textAppearanceLabelMedium">@style/TextAppearance.Hmh.LabelMedium</item>
</style>

</resources>
<style name="Theme.Pophory" parent="Base.Theme.HMH" />

<style name="Theme.App.Starting" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#121212</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_background</item>
<item name="postSplashScreenTheme">@style/Theme.Pophory</item>
</style>

</resources>

0 comments on commit 7dc0c71

Please sign in to comment.