From ffeb72a3830fa2ed93276a5e720b86e4bb1a688f Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Fri, 16 Oct 2020 06:53:08 +0100 Subject: [PATCH] Publish mature tags. String resource updates. --- .../ui/publish/PublishFormFragment.java | 2 +- .../io/lbry/browser/utils/Predefined.java | 7 ++++++ .../main/res/layout/fragment_publish_form.xml | 2 +- app/src/main/res/values/strings.xml | 23 ++++++++++--------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java index 7d9a4072..5e6b0dcc 100644 --- a/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/publish/PublishFormFragment.java @@ -257,7 +257,7 @@ public class PublishFormFragment extends BaseFragment implements suggestedTagsAdapter.setClickListener(this); suggestedTagsList.setAdapter(suggestedTagsAdapter); - matureTagsAdapter = new TagListAdapter(Helper.getTagObjectsForTags(Predefined.MATURE_TAGS), context); + matureTagsAdapter = new TagListAdapter(Helper.getTagObjectsForTags(Predefined.PUBLISH_MATURE_TAGS), context); matureTagsAdapter.setCustomizeMode(TagListAdapter.CUSTOMIZE_MODE_ADD); matureTagsAdapter.setClickListener(this); matureTagsList.setAdapter(matureTagsAdapter); diff --git a/app/src/main/java/io/lbry/browser/utils/Predefined.java b/app/src/main/java/io/lbry/browser/utils/Predefined.java index 167c36b2..aacc42fc 100644 --- a/app/src/main/java/io/lbry/browser/utils/Predefined.java +++ b/app/src/main/java/io/lbry/browser/utils/Predefined.java @@ -515,6 +515,13 @@ public final class Predefined { "fuck", "hentai" ); + // Subset of mature tags to be displayed on the publish page + public static final List PUBLISH_MATURE_TAGS = Arrays.asList( + "porn", + "nsfw", + "mature", + "xxx" + ); public static final List ADJECTIVES = Arrays.asList( "aback", "abaft", diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml index 14898fa9..6d7eed34 100644 --- a/app/src/main/res/layout/fragment_publish_form.xml +++ b/app/src/main/res/layout/fragment_publish_form.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:fontFamily="@font/inter" - android:text="@string/uploading" + android:text="@string/uploading_thumbnail" android:textColor="@color/white" android:textFontWeight="300" android:textSize="12sp" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24cc0aca..65537a8a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,7 +28,7 @@ Welcome to LBRY. LBRY is a community-controlled content platform where you can find and publish videos, music, books, and more. By continuing, I agree to the <a href="https://lbry.com/termsofservice">Terms of Service</a> and confirm I am over the age of 13. - Please wait while we get some things ready... + Please wait while we get some things ready… Use LBRY » @@ -40,7 +40,7 @@ Discover LBRY works better if you follow at least 5 creators you like. Sign in to show creators you follow if you already have an account. Please select up to 5 creators to continue. - %1$d remaining... + %1$d remaining… Done All Discover new channels @@ -58,7 +58,7 @@ Download Open Report - Loading decentralized data... + Loading decentralized data… Related Content Comments No comments to display at this time. @@ -130,7 +130,7 @@ Take a Photo Upload a file We could not find any videos on your device. Take a photo or record a video to get started. - Please wait while we load your videos... + Please wait while we load your videos… LBRY requires access to be able to display and publish your videos, images and other files from your device. LBRY requires access to your camera to record videos. LBRY requires access to your camera to take photos. @@ -275,7 +275,7 @@ in your publishes in your supports Earn more tips by uploading cool videos - The background service is initializing... + The background service is initializing… The background service is still initializing. You can explore and watch content in the mean time. You cannot do this right now because the background service is still initializing. @@ -329,7 +329,7 @@ Insufficient balance Please enter a valid amount Your credits could not be sent at this time. Please try again later. - Loading transactions... + Loading transactions… There are no recent transactions to display. There are no transactions to display at this time. fee %1$s @@ -420,8 +420,8 @@ Please enter a valid email address Please follow the instructions in the email sent to your address to continue. You have successfully signed in to lbry.tv - Retrieving account information... - Applying wallet data... + Retrieving account information… + Applying wallet data… Please enter the password you used to secure your wallet. Please enter a password to secure your wallet. Note: for wallet security purposes, LBRY is unable to reset your password. @@ -466,7 +466,7 @@ You have not created a channel.\nStart now by creating a new channel! Create a channel - Create a channel... + Create a channel… Edit channel Delete selection? Delete channel? @@ -492,7 +492,8 @@ The file path could not be determined for the selected image. Please select an image in a different location. Please wait for the current upload to finish. The image upload request failed. Please try again. - Uploading... + Uploading… + Uploading thumbnail… Please enter a channel name. Your channel name contains invalid characters. You have already created a channel with the same name. @@ -607,7 +608,7 @@ Get Social You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit. App info - Loading... + Loading… <a href="https://lbry.com/faq/what-is-lbry">What is LBRY?</a> <a href="https://lbry.com/faq/android-basics">Android Basics</a> <a href="https://lbry.com/faq">FAQ</a>