diff options
| author | fupduck <fupduck@sacknagel.com> | 2017-12-14 06:00:38 -0800 |
|---|---|---|
| committer | fupduck <fupduck@sacknagel.com> | 2017-12-14 06:00:38 -0800 |
| commit | 18e24819eed388d349dbf6d7cd21534d7074bf5d (patch) | |
| tree | 3296760f98a3d67664e50b0f763bfc9f4f217f8a /app/src/main/res/values | |
| parent | f19e355b2e53af5d76880bb7450137c4c9a2e227 (diff) | |
| parent | 7fff5992eb7c3bf04990d652ac1bccd6df02b8bc (diff) | |
Merge branch '0.9.8/startActivity' into '0.9.8'
Add Splash StartActivity
See merge request leap/bitmask_android!19
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/attrs.xml | 8 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 12 |
3 files changed, 35 insertions, 8 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index cb503b86..00000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<resources> - <declare-styleable name="FileSelectLayout"> - <attr name="title" format="string|reference" /> -<!-- <attr name="taskid" format="integer" /> --> - </declare-styleable> -</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 00000000..1818312e --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="colorPrimary">#b39ddb</color> + <color name="colorPrimaryDark">#ac97d2</color> + + <color name="red200">#ef9a9a</color> + <color name="pink200">#f48fb1</color> + <color name="purple200">#ce93d8</color> + <color name="deepPurple200">#b39ddb</color> + <color name="indigo200">#9fa8da</color> + <color name="blue200">#90caf9</color> + <color name="lightBlue200">#81d4fa</color> + <color name="cyan200">#80deea</color> + <color name="teal200">#80cbc4</color> + <color name="green200">#a5d6a7</color> + <color name="lightGreen200">#c5e1a5</color> + <color name="lime200">#e6ee9c</color> + <color name="yellow200">#fff59d</color> + <color name="amber200">#ffe082</color> + <color name="orange200">#ffcc80</color> + <color name="deepOrange200">#ffab91</color> + +</resources> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 00000000..80607409 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimary</item> + </style> + <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar"> + <item name="colorPrimary">@color/colorPrimary</item> + <item name="colorPrimaryDark">@color/colorPrimary</item> + <item name="android:windowBackground">@drawable/splash_page</item> + </style> +</resources> |