diff options
Diffstat (limited to 'app/src/main/res')
18 files changed, 133 insertions, 21 deletions
diff --git a/app/src/main/res/layout/activity_edit_post.xml b/app/src/main/res/layout/activity_edit_post.xml new file mode 100644 index 00000000..e95ba34c --- /dev/null +++ b/app/src/main/res/layout/activity_edit_post.xml @@ -0,0 +1,64 @@ +<?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_edit_post_activity" + tools:context=".EditPostActivity"> + + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay"> + + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar_edit_post_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.AppBarLayout> + + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/post_title_text_view_edit_post_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="top" + android:padding="16dp" + android:textSize="18sp" + android:textColor="@color/primaryTextColor" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="@color/dividerColor" /> + + <EditText + android:id="@+id/post_text_content_edit_text_edit_post_activity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="top" + android:padding="16dp" + android:hint="@string/post_text_content_hint" + android:inputType="textCapSentences|textMultiLine" + android:textSize="18sp" + android:background="#00000000" + android:textColor="@color/primaryTextColor" /> + + </LinearLayout> + + </androidx.core.widget.NestedScrollView> + +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index 8410242b..2ea9b68b 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -87,7 +87,7 @@ android:textColor="@color/primaryTextColor" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -100,7 +100,7 @@ android:text="@string/spoiler" android:textColor="@color/primaryTextColor" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 77aba190..9de49a9e 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -87,7 +87,7 @@ android:textColor="@color/primaryTextColor" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -100,7 +100,7 @@ android:text="@string/spoiler" android:textColor="@color/primaryTextColor" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml index 6380d3d2..b9798901 100644 --- a/app/src/main/res/layout/activity_post_text.xml +++ b/app/src/main/res/layout/activity_post_text.xml @@ -87,7 +87,7 @@ android:textColor="@color/primaryTextColor" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -100,7 +100,7 @@ android:text="@string/spoiler" android:textColor="@color/primaryTextColor" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index 3dcce96d..512f0304 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -87,7 +87,7 @@ android:textColor="@color/primaryTextColor" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -100,7 +100,7 @@ android:text="@string/spoiler" android:textColor="@color/primaryTextColor" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml index c85a76cb..7917e45a 100644 --- a/app/src/main/res/layout/activity_view_user_detail.xml +++ b/app/src/main/res/layout/activity_view_user_detail.xml @@ -64,7 +64,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:textSize="18sp" - android:textColor="@color/textColorPrimaryDark" + android:textColor="@color/colorPrimaryDarkDayNightTheme" android:layout_gravity="center_horizontal"/> <TextView diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 973b4b44..82281e14 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -9,7 +9,7 @@ android:id="@+id/vertical_block_item_post_comment" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@color/textColorPrimaryDark"/> + android:background="@color/colorPrimaryDarkDayNightTheme"/> <LinearLayout android:layout_width="match_parent" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" - android:textColor="@color/textColorPrimaryDark"/> + android:textColor="@color/colorPrimaryDarkDayNightTheme"/> <TextView android:id="@+id/comment_time_text_view_item_post_comment" diff --git a/app/src/main/res/layout/item_load_more_comments_placeholder.xml b/app/src/main/res/layout/item_load_more_comments_placeholder.xml index 9979a6fe..0d967b27 100644 --- a/app/src/main/res/layout/item_load_more_comments_placeholder.xml +++ b/app/src/main/res/layout/item_load_more_comments_placeholder.xml @@ -8,7 +8,7 @@ android:id="@+id/vertical_block_item_load_more_comments" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@color/textColorPrimaryDark" /> + android:background="@color/colorPrimaryDarkDayNightTheme" /> <TextView android:id="@+id/placeholder_text_view_item_load_more_comments" diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 640f6c3f..4c536025 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -161,7 +161,7 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -176,7 +176,7 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index 4b75b2c0..a1fc7776 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -45,7 +45,7 @@ android:layout_alignParentBottom="true" android:layout_below="@id/subreddit_text_view_item_post_detail" android:layout_toEndOf="@id/icon_gif_image_view_item_post_detail" - android:textColor="@color/textColorPrimaryDark" /> + android:textColor="@color/colorPrimaryDarkDayNightTheme" /> </RelativeLayout> @@ -161,7 +161,7 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> @@ -176,7 +176,7 @@ android:padding="4dp" android:visibility="gone" app:lib_setRadius="3dp" - app:lib_setRoundedBorderColor="@color/textColorPrimaryDark" + app:lib_setRoundedBorderColor="@color/colorPrimaryDarkDayNightTheme" app:lib_setRoundedView="true" app:lib_setShape="rectangle" /> diff --git a/app/src/main/res/layout/item_subreddit_listing.xml b/app/src/main/res/layout/item_subreddit_listing.xml index 52409bfb..369f34fb 100644 --- a/app/src/main/res/layout/item_subreddit_listing.xml +++ b/app/src/main/res/layout/item_subreddit_listing.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/baseline_add_white_24" - android:tint="@color/textColorPrimaryDark" + android:tint="@color/colorPrimaryDarkDayNightTheme" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_user_listing.xml b/app/src/main/res/layout/item_user_listing.xml index 04b16bdc..bdf5436f 100644 --- a/app/src/main/res/layout/item_user_listing.xml +++ b/app/src/main/res/layout/item_user_listing.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:src="@drawable/baseline_add_white_24" - android:tint="@color/textColorPrimaryDark" + android:tint="@color/colorPrimaryDarkDayNightTheme" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/menu/edit_post_activity.xml b/app/src/main/res/menu/edit_post_activity.xml new file mode 100644 index 00000000..270d7664 --- /dev/null +++ b/app/src/main/res/menu/edit_post_activity.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_send_edit_post_activity" + android:orderInCategory="1" + android:title="@string/action_send" + android:icon="@drawable/ic_send_white_24dp" + app:showAsAction="ifRoom" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/view_post_detail_activity.xml b/app/src/main/res/menu/view_post_detail_activity.xml index f5b327d8..76e2db37 100644 --- a/app/src/main/res/menu/view_post_detail_activity.xml +++ b/app/src/main/res/menu/view_post_detail_activity.xml @@ -13,4 +13,18 @@ android:orderInCategory="2" android:title="@string/action_refresh" app:showAsAction="never" /> + + <item + android:id="@+id/action_edit_view_post_detail_activity" + android:orderInCategory="3" + android:title="@string/action_edit_post" + app:showAsAction="never" + android:visible="false" /> + + <item + android:id="@+id/action_delete_view_post_detail_activity" + android:orderInCategory="3" + android:title="@string/action_delete_post" + app:showAsAction="never" + android:visible="false" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 8d932a36..ddb63e21 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -12,7 +12,7 @@ <color name="primaryTextColor">#FFFFFF</color> - <color name="textColorPrimaryDark">#1E88E5</color> + <color name="colorPrimaryDarkDayNightTheme">#1E88E5</color> <color name="circularProgressBarBackground">#242424</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9d88ac4f..bf91858c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,7 +12,7 @@ <color name="primaryTextColor">#000000</color> - <color name="textColorPrimaryDark">@color/colorPrimaryDark</color> + <color name="colorPrimaryDarkDayNightTheme">@color/colorPrimaryDark</color> <color name="circularProgressBarBackground">#FFFFFF</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f76c1e66..392ffc9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -24,6 +24,8 @@ <string name="action_stop_lazy_mode">Stop Lazy Mode</string> <string name="action_send">Send</string> <string name="action_sort">Sort</string> + <string name="action_edit_post">Edit Post</string> + <string name="action_delete_post">Delete Post</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> @@ -178,4 +180,13 @@ <string name="log_out">Log out</string> <string name="press_here_to_login">Press here to login</string> <string name="login_first">Login first</string> + + <string name="delete_this_post">Delete This Post</string> + <string name="are_you_sure">Are you sure?</string> + <string name="delete">Delete</string> + <string name="cancel">Cancel</string> + <string name="delete_post_success">Delete successfully</string> + <string name="delete_post_failed">Delete failed</string> + + <string name="edit_success">Edit Successful</string> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 75f23b15..0b20ce0e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -46,5 +46,18 @@ <item name="tabBackground">?attr/selectableItemBackground</item> <item name="tabSelectedTextColor">@android:color/white</item> </style> + + <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog"> + <item name="buttonBarPositiveButtonStyle">@style/MaterialAlertDialogPositiveButtonStyle</item> + <item name="buttonBarNegativeButtonStyle">@style/MaterialAlertDialogNegativeButtonStyle</item> + </style> + + <style name="MaterialAlertDialogPositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog"> + <item name="android:textColor">@color/colorAccent</item> + </style> + + <style name="MaterialAlertDialogNegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog"> + <item name="android:textColor">@color/primaryTextColor</item> + </style> </resources> |