Skip to content

Commit

Permalink
Merge pull request #4 from MoyeoRun/feature/default-style-setting
Browse files Browse the repository at this point in the history
[#2] 디폴트 스타일 설정
  • Loading branch information
heechokim authored Mar 20, 2022
2 parents 4aeb725 + 901aa1d commit 75ecb96
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 21 deletions.
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package="com.moyerun.moyeorun_android">

<application
android:name=".MoyeoRunApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.moyerun.moyeorun_android

import android.app.Application

class MoyeoRunApplication: Application() {

override fun onCreate() {
super.onCreate()
}
}
15 changes: 8 additions & 7 deletions app/src/main/res/values-night/themes.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.MoyeoRunandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.MoyeoRunandroid" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_200</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorPrimary">@color/main_blue</item>
<item name="colorPrimaryVariant">@color/main_blue</item>
<item name="colorOnPrimary">@color/main_white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_200</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorSecondary">@color/main_light_blue</item>
<item name="colorSecondaryVariant">@color/main_light_blue</item>
<item name="colorOnSecondary">@color/main_black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
<item name="android:colorBackground">@color/main_white</item>
</style>
</resources>
18 changes: 11 additions & 7 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<!-- brand colors -->
<color name="main_black">#FF000000</color>
<color name="main_white">#FFFFFFFF</color>
<color name="main_blue">#1162FF</color>
<color name="main_pink">#FC6BFF</color>
<color name="main_sky">#36F3FF</color>
<color name="main_green">#00F2B8</color>
<color name="main_yellow">#FFDD64</color>
<color name="main_light_blue">#EEF4FF</color>

<!-- extra colors -->
</resources>
15 changes: 8 additions & 7 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.MoyeoRunandroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.MoyeoRunandroid" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorPrimary">@color/main_blue</item>
<item name="colorPrimaryVariant">@color/main_blue</item>
<item name="colorOnPrimary">@color/main_white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_700</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorSecondary">@color/main_light_blue</item>
<item name="colorSecondaryVariant">@color/main_light_blue</item>
<item name="colorOnSecondary">@color/main_black</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->
<item name="android:colorBackground">@color/main_white</item>
</style>
</resources>

0 comments on commit 75ecb96

Please sign in to comment.