diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 121 |
1 files changed, 70 insertions, 51 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8d43bd79..5f50b6fa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,64 +13,83 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <android.support.design.widget.NavigationView - android:id="@+id/nav_view" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - android:fitsSystemWindows="true"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <include - android:id="@+id/nav_header_main_activity" - layout="@layout/nav_header_main" /> - - <LinearLayout + <android.support.design.widget.NavigationView + android:id="@+id/nav_view" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="start" + android:fitsSystemWindows="true"> + + <android.support.v4.widget.NestedScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="16dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground"> - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginEnd="32dp" - android:layout_gravity="center_vertical" - android:src="@drawable/ic_account_circle_grey_24dp"/> - - <TextView - android:layout_width="wrap_content" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/profile" - android:textColor="@android:color/black" - android:layout_gravity="center_vertical"/> + android:orientation="vertical"> - </LinearLayout> + <include + android:id="@+id/nav_header_main_activity" + layout="@layout/nav_header_main" /> - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="#E0E0E0"/> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/subscriptions" - android:layout_margin="16dp"/> + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginEnd="32dp" + android:layout_gravity="center_vertical" + android:src="@drawable/ic_account_circle_grey_24dp"/> - <android.support.v7.widget.RecyclerView - android:id="@+id/subscribed_subreddit_recycler_view_main_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/profile" + android:textColor="@android:color/black" + android:layout_gravity="center_vertical"/> + + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="#E0E0E0"/> + + <TextView + android:id="@+id/following_label_main_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/following" + android:layout_margin="16dp"/> + + <android.support.v7.widget.RecyclerView + android:id="@+id/subscribed_user_recycler_view_main_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/subscriptions_label_main_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/subscriptions" + android:layout_margin="16dp"/> + + <android.support.v7.widget.RecyclerView + android:id="@+id/subscribed_subreddit_recycler_view_main_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> - </LinearLayout> + </android.support.v4.widget.NestedScrollView> - </android.support.design.widget.NavigationView> + </android.support.design.widget.NavigationView> </android.support.v4.widget.DrawerLayout> |