diff options
Diffstat (limited to 'app/src/main/res')
4 files changed, 45 insertions, 11 deletions
diff --git a/app/src/main/res/drawable/ic_add_toolbar_24dp.xml b/app/src/main/res/drawable/ic_add_toolbar_24dp.xml deleted file mode 100644 index 133eda34..00000000 --- a/app/src/main/res/drawable/ic_add_toolbar_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="?attr/toolbarPrimaryTextAndIconColor" - android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/> -</vector> diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index 3337fc67..c76ada01 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -8,6 +8,12 @@ android:background="?attr/backgroundColor" tools:application=".Activity.ViewSubredditDetailActivity"> + <androidx.viewpager.widget.ViewPager + android:id="@+id/view_pager_view_subreddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_subreddit_detail" android:layout_width="match_parent" @@ -121,9 +127,22 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> + <com.google.android.material.tabs.TabLayout + android:id="@+id/tab_layout_view_subreddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:background="?attr/toolbarAndTabBackgroundColor" + app:layout_scrollFlags="scroll|enterAlways" + app:tabGravity="fill" + app:tabMode="fixed" + app:tabIndicatorHeight="3dp" + app:tabRippleColor="?attr/colorControlHighlight" + app:tabUnboundedRipple="false" /> + </com.google.android.material.appbar.AppBarLayout> - <include layout="@layout/content_view_subreddit_detail" /> + <!--<include layout="@layout/content_view_subreddit_detail" />--> <com.google.android.material.bottomappbar.BottomAppBar android:id="@+id/bottom_navigation_view_subreddit_detail_activity" diff --git a/app/src/main/res/layout/fragment_sidebar.xml b/app/src/main/res/layout/fragment_sidebar.xml new file mode 100644 index 00000000..118bbd0e --- /dev/null +++ b/app/src/main/res/layout/fragment_sidebar.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:application="ml.docilealligator.infinityforreddit.Fragment.SidebarFragment"> + + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipe_refresh_layout_sidebar_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/markdown_recycler_view_sidebar_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp" + android:clipToPadding="false" /> + + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/create_multi_reddit_activity.xml b/app/src/main/res/menu/create_multi_reddit_activity.xml index 44b154d9..93c89cab 100644 --- a/app/src/main/res/menu/create_multi_reddit_activity.xml +++ b/app/src/main/res/menu/create_multi_reddit_activity.xml @@ -5,6 +5,6 @@ android:id="@+id/action_create_create_multi_reddit_activity" android:orderInCategory="1" android:title="@string/action_send" - android:icon="@drawable/ic_add_toolbar_24dp" + android:icon="@drawable/ic_add_24dp" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file |