diff --git a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java index 51e63ec2..ac8b1181 100644 --- a/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java +++ b/app/src/main/java/io/lbry/browser/dialog/CreateSupportDialogFragment.java @@ -225,9 +225,10 @@ public class CreateSupportDialogFragment extends BottomSheetDialogFragment imple if (!isTip) { sendButton.setText(R.string.send_revocable_support); } else { - String amountString = Helper.getValue(inputAmount.getText()); + String amountString = Helper.getValue(inputAmount.getText(), "0"); double parsedAmount = Helper.parseDouble(amountString, 0); - sendButton.setText(parsedAmount == 0 ? getString(R.string.send_a_tip) : getString(R.string.send_lbc_tip, amountString)); + String text = getResources().getQuantityString(R.plurals.send_lbc_tip, parsedAmount == 1.0 ? 1 : 2, amountString); + sendButton.setText(text); } } diff --git a/app/src/main/java/io/lbry/browser/utils/Helper.java b/app/src/main/java/io/lbry/browser/utils/Helper.java index e5ac6410..6d6a3862 100644 --- a/app/src/main/java/io/lbry/browser/utils/Helper.java +++ b/app/src/main/java/io/lbry/browser/utils/Helper.java @@ -348,6 +348,10 @@ public final class Helper { return cs != null ? cs.toString().trim() : ""; } + public static String getValue(CharSequence cs, String defaultValue) { + return cs != null && !Helper.isNullOrEmpty(cs.toString()) ? cs.toString().trim() : defaultValue; + } + public static List buildContentSortOrder(int sortBy) { List sortOrder = new ArrayList<>(); switch (sortBy) { diff --git a/app/src/main/res/drawable-hdpi/ic_credits.png b/app/src/main/res/drawable-hdpi/ic_credits.png new file mode 100644 index 00000000..dbf9c788 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_credits.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_credits.png b/app/src/main/res/drawable-mdpi/ic_credits.png new file mode 100644 index 00000000..dbf9c788 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_credits.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_credits.png b/app/src/main/res/drawable-xhdpi/ic_credits.png new file mode 100644 index 00000000..dbf9c788 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_credits.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_credits.png b/app/src/main/res/drawable-xxhdpi/ic_credits.png new file mode 100644 index 00000000..dbf9c788 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_credits.png differ diff --git a/app/src/main/res/layout/card_wallet_send_credits.xml b/app/src/main/res/layout/card_wallet_send_credits.xml index 5a39b4d2..9cbd3f5d 100644 --- a/app/src/main/res/layout/card_wallet_send_credits.xml +++ b/app/src/main/res/layout/card_wallet_send_credits.xml @@ -72,10 +72,11 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:visibility="invisible"> - + - + - + diff --git a/app/src/main/res/layout/dialog_repost_claim.xml b/app/src/main/res/layout/dialog_repost_claim.xml index ada26944..8c9cbad2 100644 --- a/app/src/main/res/layout/dialog_repost_claim.xml +++ b/app/src/main/res/layout/dialog_repost_claim.xml @@ -127,10 +127,11 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:visibility="invisible"> - + - + android:src="@drawable/ic_credits" /> - + - + android:src="@drawable/ic_credits" /> - + - + android:src="@drawable/ic_credits" /> - + android:src="@drawable/ic_credits" /> - + android:src="@drawable/ic_credits" /> Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International - LBC + LBRY Credits USD @@ -227,7 +227,7 @@ Oops! Something went wrong. Loaded Installation ID. Loaded local known and followed tags. - Loaded LBC/USD exchange rate. + Loaded LBRY Credits/USD exchange rate. User authenticated. Installation registered. Loaded subscriptions. @@ -314,7 +314,7 @@ <a href="https://lbry.com/faq/how-to-backup-wallet#android">Manual backup</a> <a href="https://lbry.com/faq/how-to-backup-wallet#sync">Sync FAQ</a> 0 - LBC + Credits Account Recommended A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync. @@ -338,7 +338,7 @@ Are you sure you want to unlock all your tips? Please enter an amount more than 0.0001 credits. - Buy LBC + Buy LBRY Credits Your device does not support the minimum requirements for securing your purchase request. You do not have a wallet address set. Please generate a new address and try again. @@ -382,7 +382,10 @@ Channel to show support as Make this a tip Send Revocable Support - Send a %1$s LBC Tip + + Tip %1$s Credit + Tip %1$s Credits + This will appear as a tip for %1$s, which will boost its ability to be discovered while active. <a href="https://lbry.com/faq/tipping">Learn more</a>. This will appear as a tip for %1$s, which will boost the channel\'s ability to be discovered while active. <a href="https://lbry.com/faq/tipping">Learn more</a>. Cancel @@ -477,7 +480,7 @@ Title \@ Deposit - This LBC remains yours. It is a deposit to reserve the name and can be undone at any time. + The credits remains yours. It is a deposit to reserve the name and can be undone at any time. LBRY requires access to download content to your device. LBRY requires access to load images from your device storage. Select thumbnail @@ -511,7 +514,7 @@ - LBRY credits allow you to publish or purchase content. + LBRY Credits allow you to publish or purchase content. You can obtain free credits worth $%1$s after you provide an email address. <a href="https://lbry.com/faq/earn-credits">Learn more</a>. Get started