diff options
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/article_images_pager.xml | 1 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/drawer_header.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/layout/headlines.xml | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/headlines_articles.xml | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/layout/preferences.xml | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | org.fox.ttrss/src/main/res/values-v21/style.xml | 11 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/colors.xml | 6 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 12 |
10 files changed, 33 insertions, 4 deletions
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml index 9c4b76f1..9c4b76f1 100644..100755 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml index 02b42c10..05e3fdda 100644..100755 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml @@ -1,5 +1,6 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines" + android:fitsSystemWindows="true" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml index 949bd656..90840788 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml @@ -1,4 +1,5 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" android:id="@+id/article_images" android:layout_width="fill_parent" android:animateLayoutChanges="true" diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 66bbe9ad..9366633c 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="96dp" + android:layout_height="120dp" android:orientation="vertical" android:weightSum="1" android:clickable="false"> diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml index ece728ef..fefced8c 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines.xml @@ -8,6 +8,7 @@ android:layout_height="match_parent"> <FrameLayout + android:fitsSystemWindows="true" android:animateLayoutChanges="true" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml index 146ea3e9..de249cfb 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml @@ -1,5 +1,6 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/headlines" + android:fitsSystemWindows="true" android:animateLayoutChanges="true" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/org.fox.ttrss/src/main/res/layout/preferences.xml b/org.fox.ttrss/src/main/res/layout/preferences.xml index 55015d09..e030afb3 100644..100755 --- a/org.fox.ttrss/src/main/res/layout/preferences.xml +++ b/org.fox.ttrss/src/main/res/layout/preferences.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="match_parent"> <FrameLayout android:id="@+id/preferences_container" + android:background="?android:colorBackground" android:fitsSystemWindows="true" android:layout_width="match_parent" android:layout_height="502dp" 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 c3ac29a1..8cbb25d7 100644..100755 --- a/org.fox.ttrss/src/main/res/values-v21/style.xml +++ b/org.fox.ttrss/src/main/res/values-v21/style.xml @@ -1,5 +1,14 @@ <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:windowBackground">@color/window_background</item> + </style> + + <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> + <item name="android:windowTranslucentStatus">true</item> + <item name="android:windowBackground">@color/window_background_dark</item> + </style> + <style name="DarkDialogTheme" parent="android:Theme.Material.Dialog"> </style> diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml new file mode 100755 index 00000000..79f6fa96 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -0,0 +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> + +</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 ffb54b1f..5368daa4 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -1,6 +1,10 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar"> + <style name="LightTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> + + </style> + + <style name="LightTheme" parent="LightTheme.Base"> <item name="windowActionModeOverlay">true</item> <item name="statusBarHintColor">?colorPrimary</item> @@ -48,7 +52,11 @@ <item name="ic_filter_variant">@drawable/ic_filter_variant_dark</item> </style> - <style name="DarkTheme" parent="Theme.AppCompat.NoActionBar"> + <style name="DarkTheme.Base" parent="Theme.AppCompat.NoActionBar"> + + </style> + + <style name="DarkTheme" parent="DarkTheme.Base"> <item name="windowActionModeOverlay">true</item> <item name="statusBarHintColor">?colorPrimary</item> |