diff options
author | Andrew Dolgov <[email protected]> | 2015-06-04 16:13:06 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-06-04 16:13:06 +0300 |
commit | 0dd21425bddc39279ccf741f4c9ae76b3b9fae90 (patch) | |
tree | 2dbdfbc3f70816e4b1b46ada30d4ff1aa763e416 /org.fox.ttrss/src/main/res | |
parent | 0112c0cc4f6f23f6fcb693cbae6edebcac701219 (diff) |
show drawer behind translucent statusbar, jesus fuck (2)
now with scriminsetwhatsitsface
Diffstat (limited to 'org.fox.ttrss/src/main/res')
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines.xml | 29 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/login.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values-v21/style.xml | 6 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/attrs.xml | 5 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/colors.xml | 4 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 5 |
6 files changed, 32 insertions, 19 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml index fefced8c..233a6a69 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines.xml @@ -1,11 +1,9 @@ -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <android.support.v4.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" android:id="@+id/headlines_drawer" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="fill_parent" + android:layout_height="fill_parent"> <FrameLayout android:fitsSystemWindows="true" @@ -23,17 +21,24 @@ </FrameLayout> + <org.fox.ttrss.util.ScrimInsetsFrameLayout + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/scrimInsetsFrameLayout" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="@android:color/white" + android:elevation="10dp" + android:fitsSystemWindows="true" + app:insetForeground="#4000"> <FrameLayout android:id="@+id/feeds_fragment" - android:layout_width="240dp" - android:layout_gravity="start" + android:layout_width="match_parent" android:background="?feedlistBackground" - android:elevation="4dp" android:layout_height="match_parent" > </FrameLayout> - </android.support.v4.widget.DrawerLayout> - + </org.fox.ttrss.util.ScrimInsetsFrameLayout> -</FrameLayout>
\ No newline at end of file + </android.support.v4.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/login.xml b/org.fox.ttrss/src/main/res/layout/login.xml index f64a14f1..a81faa56 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/login.xml +++ b/org.fox.ttrss/src/main/res/layout/login.xml @@ -1,11 +1,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/loading_container" + android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent" > <include layout="@layout/actionbar_toolbar" android:id="@+id/actionbar_toolbar" /> <TextView + android:background="?android:colorBackground" android:id="@+id/loading_message" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/org.fox.ttrss/src/main/res/values-v21/style.xml b/org.fox.ttrss/src/main/res/values-v21/style.xml index 8cbb25d7..0fd29784 100755 --- a/org.fox.ttrss/src/main/res/values-v21/style.xml +++ b/org.fox.ttrss/src/main/res/values-v21/style.xml @@ -1,11 +1,13 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="LightTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> - <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowDrawsSystemBarBackgrounds">true</item> + <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:windowBackground">@color/window_background</item> </style> <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> - <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowDrawsSystemBarBackgrounds">true</item> + <item name="android:statusBarColor">@android:color/transparent</item> <item name="android:windowBackground">@color/window_background_dark</item> </style> diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 83b06774..e6c661f6 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -22,7 +22,7 @@ <attr name="loadingBackground" format="reference|color" /> <attr name="articleNoteBackground" format="reference|color" /> <attr name="articleNoteTextColor" format="reference|color" /> - <attr name="statusBarHintColor" format="reference|color" /> + <!-- <attr name="statusBarHintColor" format="reference|color" /> --> <attr name="parentBtnBackground" format="reference|color" /> <attr name="articleHeader" format="reference|color" /> <attr name="articleHeaderTextColor" format="reference|color" /> @@ -38,4 +38,7 @@ <attr name="ic_keyboard_backspace" format="reference" /> <attr name="ic_settings" format="reference" /> <attr name="ic_filter_variant" format="reference" /> + <declare-styleable name="ScrimInsetsView"> + <attr format="reference|color" name="insetForeground"> + </attr></declare-styleable> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml index 79f6fa96..478e24ac 100755 --- a/org.fox.ttrss/src/main/res/values/colors.xml +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <item name="window_background" type="color">#526A8E</item> - <item name="window_background_dark" type="color">#455A64</item> + <item name="window_background" type="color">#FF526A8E</item> + <item name="window_background_dark" type="color">#FF455A64</item> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 5368daa4..396a71bc 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -1,13 +1,14 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="LightTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> + <item name="android:windowNoTitle">true</item> </style> <style name="LightTheme" parent="LightTheme.Base"> <item name="windowActionModeOverlay">true</item> - <item name="statusBarHintColor">?colorPrimary</item> + <!-- <item name="statusBarHintColor">?colorPrimary</item> --> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> <item name="feedlistBackground">#e0e0e0</item> <item name="unreadCounterColor">#909090</item> @@ -59,7 +60,7 @@ <style name="DarkTheme" parent="DarkTheme.Base"> <item name="windowActionModeOverlay">true</item> - <item name="statusBarHintColor">?colorPrimary</item> + <!-- <item name="statusBarHintColor">?colorPrimary</item> --> <item name="unreadCounterColor">#909090</item> <item name="feedlistTextColor">@android:color/primary_text_dark</item> <item name="headlineUnreadTextColor">@android:color/primary_text_dark</item> |