diff options
author | Allan Wang <me@allanwang.ca> | 2017-06-03 00:22:10 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-06-03 00:22:10 -0700 |
commit | 5796566137995c8d244720f87ba85bce0e0d2f00 (patch) | |
tree | 1736e12182c7cf2769ad953029dc6a645b803802 /app/src/main/res/values | |
parent | bc197ad5769ee792d930ac5b634e1e9000230689 (diff) | |
download | frost-5796566137995c8d244720f87ba85bce0e0d2f00.tar.gz frost-5796566137995c8d244720f87ba85bce0e0d2f00.tar.bz2 frost-5796566137995c8d244720f87ba85bce0e0d2f00.zip |
css updates and beginning login migration
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/strings.xml | 7 | ||||
-rw-r--r-- | app/src/main/res/values/styles.xml | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8bf0e417..a58e995e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,11 @@ <string name="friends">Friends</string> <string name="messages">Messages</string> <string name="notifications">Notifications</string> + <string name="activity_log">Activity Log</string> + <string name="pages">Pages</string> + <string name="groups">Groups</string> + <string name="saved">Saved</string> + <string name="birthdays">Birthdays</string> + <string name="chat">Chat</string> + <string name="photos">Photos</string> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 92c75507..ded59278 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,16 +1,18 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="MaterialDrawerTheme.Light.DarkToolbar.ActionBar"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> </style> + <style name="AppTheme.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> + <style name="AppTheme.Overlay" parent="AppTheme.NoActionBar"> <item name="android:windowIsTranslucent">true</item> <item name="android:activityOpenEnterAnimation">@anim/slide_in_right</item> @@ -18,10 +20,12 @@ <item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item> <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item> </style> + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> + <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> - <style name="Theme.Splash" parent="AppTheme"> + <style name="Theme.Splash" parent="Theme.AppCompat.NoActionBar"> <item name="android:windowBackground">@drawable/splash_screen</item> <item name="android:navigationBarColor">@color/splashBackground</item> <item name="colorPrimaryDark">@color/splashBackground</item> |