aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-08-28 08:41:36 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-08-28 08:41:36 +0000
commitcc0d78aeddb90346c136fc4eafe03d80b95e93fa (patch)
treeb871b8fb573886c876bc0197a3c46e2bcfd72553 /app/src/main/res
parent30d2abe9c691bf1603495bd7ae1abebbc447e0a8 (diff)
downloadinfinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar.gz
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar.bz2
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar.lz
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar.xz
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.tar.zst
infinity-for-reddit-cc0d78aeddb90346c136fc4eafe03d80b95e93fa.zip
Receiving images, videos and texts to directly submitting different kinds of posts. Fixed video was not shown after selected from picker in PostVideoActivity. Handle some cases that the posts cannot be submitted. Minor bugs fixed.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_post_video.xml9
-rw-r--r--app/src/main/res/values/strings.xml14
2 files changed, 15 insertions, 8 deletions
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index 3e87bd88..2ba2d8eb 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -184,11 +184,12 @@
android:textColor="@color/colorAccent"
android:visibility="gone" />
- <VideoView
- android:id="@+id/video_view_post_video_activity"
+ <com.google.android.exoplayer2.ui.PlayerView
+ android:id="@+id/player_view_post_video_activity"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone"/>
+ android:layout_height="400dp"
+ android:visibility="gone"
+ app:controller_layout_id="@layout/exo_playback_control_view" />
</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85a70bbb..1cde4e7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -118,7 +118,8 @@
<string name="select_an_image">Please select an image first</string>
<string name="posting">Posting</string>
<string name="post_failed">Could not post it</string>
- <string name="error_processing_video">Error processing this video</string>
+ <string name="error_processing_image">Error processing image</string>
+ <string name="error_processing_video">Error processing video</string>
<string name="download_completed">Download completed</string>
<string name="download_failed">Download Failed</string>
@@ -197,8 +198,8 @@
<string name="best">Best</string>
<string name="search">Search</string>
- <string name="posting_video">Posting video</string>
- <string name="posting_image">Posting image</string>
+ <string name="posting_video">Posting Video</string>
+ <string name="posting_image">Posting Image</string>
<string name="please_wait">Please wait.</string>
<string name="add_account">Add account</string>
@@ -283,7 +284,12 @@
<string name="exit_when_submit_post">Leave?</string>
<string name="exit_when_submit_post_detail">The post will still be submitted even if you leave here.</string>
<string name="discard_post">Discard?</string>
- <string name="discard_post_detail">All the draft will not be saved.</string>
+ <string name="discard_post_detail">All the draft will NOT be saved.</string>
<string name="yes">Yes</string>
<string name="no">No</string>
+
+ <string name="no_data_received">No data received</string>
+ <string name="no_image_path_received">No image path received</string>
+ <string name="no_video_path_received">No video path received</string>
+ <string name="cannot_handle_intent">Could not handle the share request</string>
</resources>