diff options
author | Alex Ning <chineseperson5@gmail.com> | 2019-12-16 16:32:37 +0000 |
---|---|---|
committer | Alex Ning <chineseperson5@gmail.com> | 2019-12-16 16:32:37 +0000 |
commit | 666ac642fc49b58e25eca153099181d2c6a1f338 (patch) | |
tree | 705f17f2d91b5f5676b11d4c97dc572990646391 /app/src/main/res | |
parent | b9893c6d145f91081c36a73cfc42120b6762cd0b (diff) | |
download | infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar.gz infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar.bz2 infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar.lz infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar.xz infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.tar.zst infinity-for-reddit-666ac642fc49b58e25eca153099181d2c6a1f338.zip |
Showing posts of multireddit is now available. Fix a typo.
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_view_multi_reddit_detail.xml | 119 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 4 |
4 files changed, 127 insertions, 2 deletions
diff --git a/app/src/main/res/layout/activity_view_multi_reddit_detail.xml b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml new file mode 100644 index 00000000..a1dc4622 --- /dev/null +++ b/app/src/main/res/layout/activity_view_multi_reddit_detail.xml @@ -0,0 +1,119 @@ +<?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:id="@+id/coordinator_layout_view_multi_reddit_detail_activity" + android:background="?attr/backgroundColor" + tools:context=".Activity.ViewMultiRedditDetailActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:id="@+id/appbar_layout_view_multi_reddit_detail" + 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:id="@+id/collapsing_toolbar_layout_view_multi_reddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:titleEnabled="false" + app:contentScrim="?attr/colorPrimary" + app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed" + app:toolbarId="@+id/toolbar"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/icon_gif_image_view_view_multi_reddit_detail_activity" + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_marginTop="-36dp" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:elevation="4dp" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="36dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:layout_below="@id/icon_gif_image_view_view_multi_reddit_detail_activity" + android:background="?attr/backgroundColor"> + + <TextView + android:id="@+id/multi_reddit_name_text_view_view_multi_reddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:textSize="?attr/font_18" + android:textColor="@color/colorAccent" + android:layout_gravity="center_horizontal"/> + + <com.google.android.material.chip.Chip + android:id="@+id/duplicate_multi_reddit_chip_view_multi_reddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@android:color/white" + android:layout_gravity="center_horizontal"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/owner_text_view_view_multi_reddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/usernameColor" + android:textSize="?attr/font_default"/> + + <TextView + android:id="@+id/subreddits_count_view_multi_reddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default"/> + + </LinearLayout> + + <TextView + android:id="@+id/description_text_view_view_multi_reddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:textColor="@color/primaryTextColor" + android:textSize="?attr/font_default" + android:visibility="gone"/> + + </LinearLayout> + + </RelativeLayout> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="pin" + app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed" + app:popupTheme="@style/AppTheme.PopupOverlay" + app:navigationIcon="?attr/homeAsUpIndicator" /> + + </com.google.android.material.appbar.CollapsingToolbarLayout> + + </com.google.android.material.appbar.AppBarLayout> + + <FrameLayout + android:id="@+id/frame_layout_view_multi_reddit_detail_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + 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/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml index 613e736e..faa42a70 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:id="@+id/coordinator_layout_view_subreddit_detail_activity" android:background="?attr/backgroundColor" - tools:application=".ViewSubredditDetailActivity"> + tools:application=".Activity.ViewSubredditDetailActivity"> <com.google.android.material.appbar.AppBarLayout android:id="@+id/appbar_layout_view_subreddit_detail" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c3302cc6..bf8487e6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -79,4 +79,8 @@ <color name="flairBackgroundColor">#00AA8C</color> <color name="authorFlairTextColor">#EE02C4</color> + + <color name="usernameColor">#0D47A1</color> + + <color name="subredditNameColor">#FF4081</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a610b48..2b279a05 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -293,7 +293,7 @@ <string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string> <string name="settings_volume_keys_navigate_comments_title">Use Volume Keys to Navigate Comments in Posts</string> <string name="settings_volume_keys_navigate_posts_title">Use Volume Keys to Navigate Posts</string> - <string name="settings_show_elapsed_time">Show Elpased Time in Posts and Comments</string> + <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string> <string name="swipe_to_go_back_from_post_detail">Swipe Right to Go Back From Comments</string> <string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string> <string name="settings_font_size_title">Font Size</string> @@ -372,4 +372,6 @@ <string name="elapsed_time_months_ago">%1$d Months</string> <string name="elapsed_time_a_year_ago">1 Year</string> <string name="elapsed_time_years_ago">%1$d Years</string> + + <string name="error_getting_multi_reddit_data">Error getting multireddit data</string> </resources> |