diff options
| author | Alex Ning <chineseperson5@gmail.com> | 2019-01-07 11:03:49 +0000 |
|---|---|---|
| committer | Alex Ning <chineseperson5@gmail.com> | 2019-01-07 11:03:49 +0000 |
| commit | 38be0ba01f6dd08c0be1a830e0d0389405949a56 (patch) | |
| tree | b083cf58f4737060f2f18ccabd4770e86ac58ccf /app/src/main/res | |
| parent | 9d729579bf7ea9e179774766c02ddae105d4ccd7 (diff) | |
| download | infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar.gz infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar.bz2 infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar.lz infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar.xz infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.tar.zst infinity-for-reddit-38be0ba01f6dd08c0be1a830e0d0389405949a56.zip | |
New feature: Subscribe or unsubscribe to a subreddit. Allow clear text traffic in Android Pie. Rewrite some code in lambda.
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_view_subreddit_detail.xml | 43 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 7 |
2 files changed, 35 insertions, 15 deletions
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 528518e8..97aad464 100644 --- a/app/src/main/res/layout/activity_view_subreddit_detail.xml +++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml @@ -47,6 +47,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingTop="36dp" + android:paddingBottom="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:layout_below="@id/banner_image_view_view_subreddit_detail_activity" android:background="@android:color/white"> @@ -54,33 +58,45 @@ android:id="@+id/subreddit_name_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="36dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" + android:layout_marginBottom="16dp" android:textSize="18sp" - android:textColor="@color/colorAccent"/> + android:textColor="@color/colorAccent" + android:layout_gravity="center_horizontal"/> + + <android.support.design.chip.Chip + android:id="@+id/subscribe_subreddit_chip_view_subreddit_detail_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@android:color/white" + android:layout_gravity="center_horizontal"/> + + <!--<RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="48dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp"> + + + + </RelativeLayout>--> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="16dp"> + android:layout_marginTop="16dp"> <TextView android:id="@+id/subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:textColor="@android:color/black" /> + android:textColor="@android:color/black" + android:layout_marginBottom="16dp"/> <TextView android:id="@+id/online_subscriber_count_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" android:layout_alignParentEnd="true" android:layout_toStartOf="@id/subscriber_count_text_view_view_subreddit_detail_activity" android:textColor="@android:color/black" /> @@ -91,9 +107,6 @@ android:id="@+id/description_text_view_view_subreddit_detail_activity" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:layout_marginBottom="16dp" android:textColor="@android:color/black" android:visibility="gone"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 325f4684..f9c75d07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,4 +118,11 @@ "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " "when a user tries to pick up one of cards.\n\n" </string> + + <string name="subscribe">Subscribe</string> + <string name="unsubscribe">Unsubscribe</string> + <string name="subscribed">Subscribed</string>" + <string name="subscribe_failed">Subscribe Failed</string> + <string name="unsubscribed">Unsubscribed</string>" + <string name="unsubscribe_failed">Unsubscribe Failed</string> </resources> |