diff options
| author |  Renard1911
| 2016-04-11 17:52:55 -0300 |
|---|---|---|
| committer | Renard1911
| 2016-04-11 17:52:55 -0300 |
| commit | c94f0e1d27f0a92a17b2e65363bdce6461249d95 (patch) | |
| tree | 6990d471d884ad87a2be9234e40fd2a91f6bb827 /app/src/main/res/values | |
| parent | 0f3adf23154e6d7e0eaced70a31676d71bef8e34 (diff) | |
| parent | 90ee611af8ba4c38e70f27eb0df55e9134ad625c (diff) | |
| download | BaiApp-1.6.0.tar.gz BaiApp-1.6.0.tar.xz BaiApp-1.6.0.zip | |
Merge pull request #1 from Renard1911/devv1.6.0
Dev
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/colors.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/drawables.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 14 |
4 files changed, 18 insertions, 5 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5806545..8274b32 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,8 +14,8 @@ <color name="nightMarginColor">#58636c</color> <!-- 3 58636c--> <color name="nightTextColor">#979ea3</color> <!-- 6 --> <color name="nightLinkColor">#c0c4c8</color> <!-- 8 --> - <color name="nightNameColor">#2e5f96</color> - <color name="nightSageColor">#5f962e</color> + <color name="nightNameColor">#5f962e</color> + <color name="nightSageColor">#2e5f96</color> <color name="nightTripcodeColor">#962e5f</color> <color name="headlineBackground">#DDDDDD</color> <!-- 1 --> diff --git a/app/src/main/res/values/drawables.xml b/app/src/main/res/values/drawables.xml index 52c6a6c..9036d27 100644 --- a/app/src/main/res/values/drawables.xml +++ b/app/src/main/res/values/drawables.xml @@ -1,4 +1,4 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> +<resources> <item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item> <item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item> <item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7fa3e34..f5be573 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -73,4 +73,7 @@ <string name="title_activity_settings">Opciones</string> + <!-- TODO: Remove or change this placeholder text --> + <string name="hello_blank_fragment">Hello blank fragment</string> + </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5cadb6e..4d0766f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -31,7 +31,12 @@ <item name="isDarkTheme">true</item> </style> - <style name="AppTheme.HeadLine.Activity" parent="AppTheme.NoActionBar"> + <style name="AppTheme.HeadLineActionBar.NoActionBar" parent="AppTheme.HeadLineActionBar"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + </style> + + <style name="AppTheme.HeadLineActionBar"> <item name="colorPrimary">@color/headlineTextColor</item> <item name="colorPrimaryDark">@color/blackBackground</item> <item name="colorAccent">@color/headlineLinkColor</item> @@ -53,7 +58,12 @@ <item name="isDarkTheme">false</item> </style> - <style name="AppTheme.Black.Activity" parent="AppTheme.NoActionBar"> + <style name="AppTheme.BlackActionBar.NoActionBar" parent="AppTheme.BlackActionBar"> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + </style> + + <style name="AppTheme.BlackActionBar"> <item name="colorPrimary">@color/blackBackground</item> <item name="colorPrimaryDark">@color/blackMarginColor</item> <item name="colorAccent">@color/blackMarginColor</item> |