diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res')
5 files changed, 42 insertions, 49 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index e9fea26c..d14f6d88 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -5,7 +5,6 @@ android:layout_height="match_parent" android:background="?articleBackground"> - <FrameLayout android:id="@+id/article_fullscreen_video" android:visibility="invisible" @@ -14,14 +13,24 @@ <com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/article_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_marginBottom="72dp" + android:layout_marginRight="16dp" + android:src="@drawable/ic_action_web_site" + /> <com.google.android.material.appbar.AppBarLayout android:background="?articleHeader" android:elevation="0dp" app:elevation="0dp" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="match_parent"> <LinearLayout app:layout_scrollFlags="scroll|enterAlways" @@ -43,7 +52,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:text="My simple but hilariously and excessively long headline" android:textColor="?articleHeaderTextColor" android:textSize="18sp" /> @@ -114,27 +122,26 @@ </LinearLayout> + <View + android:layout_gravity="top|center_horizontal" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?articleHeaderSeparator"/> + </com.google.android.material.appbar.AppBarLayout> <androidx.core.widget.NestedScrollView android:id="@+id/article_scrollview" android:scrollbars="vertical|horizontal" - app:layout_behavior="@string/appbar_scrolling_view_behavior" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:fillViewport="false" > + android:layout_height="match_parent"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" > - <View - android:layout_gravity="top|center_horizontal" - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="?articleHeaderSeparator"/> - <TextView android:id="@+id/note" android:layout_width="match_parent" @@ -143,7 +150,6 @@ android:background="?articleNoteBackground" android:textColor="?articleNoteTextColor" android:textSize="12sp" - android:text="[Article note]" android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingRight="16dp" @@ -161,17 +167,6 @@ </com.otaliastudios.nestedscrollcoordinatorlayout.NestedScrollCoordinatorLayout> - <com.shamanland.fab.FloatingActionButton - android:id="@+id/article_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_marginRight="16dp" - android:layout_marginBottom="20dp" - app:floatingActionButtonColor="?colorAccent" - android:src="@drawable/ic_action_web_site" - /> - <TextView android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index 177ef32f..647afce8 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -19,15 +19,14 @@ android:layout_height="match_parent" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> - <com.shamanland.fab.FloatingActionButton - android:id="@+id/headlines_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_marginRight="16dp" - android:layout_marginBottom="20dp" - app:floatingActionButtonColor="?colorAccent" - android:src="@drawable/ic_refresh" - /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/headlines_fab" + app:layout_anchor="@id/headlines_fragment" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:src="@drawable/ic_refresh" + android:layout_marginBottom="72dp" + android:layout_marginRight="16dp" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml index 56a1137a..170eab8d 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml @@ -18,15 +18,14 @@ android:layout_height="match_parent" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> - <com.shamanland.fab.FloatingActionButton - android:id="@+id/headlines_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:layout_marginRight="16dp" - android:layout_marginBottom="20dp" - app:floatingActionButtonColor="?colorAccent" - android:src="@drawable/ic_refresh" - /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/headlines_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + app:layout_anchorGravity="end|bottom" + android:src="@drawable/ic_refresh" + android:layout_marginBottom="72dp" + android:layout_marginRight="16dp" /> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml index c81d4b31..e9b143df 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -29,7 +29,7 @@ <item name="feedlistSelectedTextColor">@android:color/white</item> <item name="articleHeader">@android:color/transparent</item> <item name="articleHeaderTextColor">@android:color/white</item> - <item name="floatingActionButtonStyle">@style/FabTheme</item> + <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> --> <item name="articleTextColor">#e0e0e0</item> <item name="headlineFooterColor">?colorPrimary</item> <item name="articleHeaderSeparator">#303030</item> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 6dbda125..ecc13527 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -36,7 +36,7 @@ <item name="articleHeader">@android:color/transparent</item> <item name="articleHeaderTextColor">@android:color/black</item> <item name="articleTextColor">@android:color/black</item> - <item name="floatingActionButtonStyle">@style/FabTheme</item> + <!-- <item name="floatingActionButtonStyle">@style/FabTheme</item> --> <item name="headlineFooterColor">?colorPrimary</item> <item name="articleHeaderSeparator">#cccccc</item> @@ -142,8 +142,8 @@ <style name="DarkDialogTheme" parent="android:Theme"></style> - <style name="FabTheme" parent="FloatingActionButton"> + <!-- <style name="FabTheme" parent="FloatingActionButton"> <item name="floatingActionButtonColor">?colorPrimaryDark</item> - </style> + </style> --> </resources>
\ No newline at end of file |