aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-12-30 12:44:40 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-12-30 12:44:40 +0000
commita60c249b168ed7ec628e1e0858e83689d66aa1ec (patch)
tree385ff57ea8b8ffc33f14c5f0a83ab29eedb811f5 /app/src/main/res
parentd74c7f50fa95220671326d83314235ca8aacc428 (diff)
downloadinfinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar.gz
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar.bz2
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar.lz
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar.xz
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.tar.zst
infinity-for-reddit-a60c249b168ed7ec628e1e0858e83689d66aa1ec.zip
View subreddit sidebar is now available.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_view_sidebar.xml44
-rw-r--r--app/src/main/res/layout/adapter_table_block.xml7
-rw-r--r--app/src/main/res/menu/view_subreddit_detail_activity.xml6
-rw-r--r--app/src/main/res/values/strings.xml3
4 files changed, 54 insertions, 6 deletions
diff --git a/app/src/main/res/layout/activity_view_sidebar.xml b/app/src/main/res/layout/activity_view_sidebar.xml
new file mode 100644
index 00000000..ae9dca32
--- /dev/null
+++ b/app/src/main/res/layout/activity_view_sidebar.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/backgroundColor"
+ tools:context=".Activity.ViewSidebarActivity">
+
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/appbar_layout_view_sidebar_activity"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?attr/toolbarAndTabBackgroundColor"
+ android:theme="@style/AppTheme.AppBarOverlay">
+
+ <com.google.android.material.appbar.CollapsingToolbarLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_scrollFlags="scroll|enterAlways"
+ app:titleEnabled="false"
+ app:toolbarId="@+id/toolbar_view_sidebar_activity">
+
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar_view_sidebar_activity"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:navigationIcon="?attr/homeAsUpIndicator" />
+
+ </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+ </com.google.android.material.appbar.AppBarLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/markdown_recycler_view_view_sidebar_activity"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:clipToPadding="false"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_table_block.xml b/app/src/main/res/layout/adapter_table_block.xml
index b3b63a27..35fc8986 100644
--- a/app/src/main/res/layout/adapter_table_block.xml
+++ b/app/src/main/res/layout/adapter_table_block.xml
@@ -2,12 +2,7 @@
<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:paddingLeft="16dp"
- android:paddingTop="8dp"
- android:paddingRight="16dp"
- android:paddingBottom="8dp"
+ android:layout_margin="16dp"
android:scrollbarStyle="outsideInset">
<TableLayout
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index c51b5b3a..d019e052 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -34,4 +34,10 @@
android:orderInCategory="5"
android:title="@string/action_change_post_layout"
app:showAsAction="never" />
+
+ <item
+ android:id="@+id/action_view_side_bar_view_subreddit_detail_activity"
+ android:orderInCategory="6"
+ android:title="@string/action_view_side_bar"
+ app:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a66a43b9..fd022e0c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,6 +43,7 @@
<string name="action_unmark_spoiler">Unmark Spoiler</string>
<string name="action_edit_flair">Edit Flair</string>
<string name="action_change_post_layout">Change Post Layout</string>
+ <string name="action_view_side_bar">View Sidebar</string>
<string name="parse_json_response_error">Error occurred when parsing the JSON response</string>
<string name="retrieve_token_error">Error Retrieving the token</string>
@@ -384,4 +385,6 @@
<string name="error_loading_subscriptions">Cannot sync subscriptions</string>
<string name="share_this_app">Check out Infinity for Reddit, an awesome Reddit client!\nhttps://play.google.com/store/apps/details?id=ml.docilealligator.infinityforreddit</string>
+
+ <string name="error_getting_subreddit_name">Error getting subreddit name</string>
</resources>