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<String> buildContentSortOrder(int sortBy) {
List<String> 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">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/wallet_inline_balance_value"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/container_inline_channel_form.xml b/app/src/main/res/layout/container_inline_channel_form.xml
index 76318b5a..38b11bf0 100644
--- a/app/src/main/res/layout/container_inline_channel_form.xml
+++ b/app/src/main/res/layout/container_inline_channel_form.xml
@@ -62,10 +62,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/inline_channel_form_inline_balance_value"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_create_support.xml b/app/src/main/res/layout/dialog_create_support.xml
index 23f04128..4e36db0f 100644
--- a/app/src/main/res/layout/dialog_create_support.xml
+++ b/app/src/main/res/layout/dialog_create_support.xml
@@ -103,10 +103,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/create_support_inline_balance_value"
android:layout_width="wrap_content"
@@ -158,7 +159,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
- android:text="@string/send_lbc_tip"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout>
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">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/repost_inline_balance_value"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/floating_wallet_balance.xml b/app/src/main/res/layout/floating_wallet_balance.xml
index c64c1788..b6a3dd5c 100644
--- a/app/src/main/res/layout/floating_wallet_balance.xml
+++ b/app/src/main/res/layout/floating_wallet_balance.xml
@@ -56,13 +56,11 @@
android:paddingBottom="8dp"
android:paddingStart="12dp"
android:paddingEnd="16dp">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="16dp"
- android:layout_height="16dp"
- android:textSize="10dp"
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
android:layout_gravity="center_vertical"
- android:textColor="@color/white"
- android:text="@string/fa_coins" />
+ android:src="@drawable/ic_credits" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index 6ba62998..5549368d 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -215,10 +215,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/channel_form_inline_balance_value"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_file_view.xml b/app/src/main/res/layout/fragment_file_view.xml
index 4bb99e37..97fa2df9 100644
--- a/app/src/main/res/layout/fragment_file_view.xml
+++ b/app/src/main/res/layout/fragment_file_view.xml
@@ -84,13 +84,11 @@
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
- <io.lbry.browser.ui.controls.SolidIconView
+ <ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
- android:textSize="8dp"
- android:text="@string/fa_coins"
- android:textColor="@android:color/black" />
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/file_view_fee"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index 48078daf..cff1ad36 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -436,10 +436,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:text="@string/fa_coins" />
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/publish_form_inline_balance_value"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_channel.xml b/app/src/main/res/layout/list_item_channel.xml
index 685370c2..81a9c997 100644
--- a/app/src/main/res/layout/list_item_channel.xml
+++ b/app/src/main/res/layout/list_item_channel.xml
@@ -91,12 +91,11 @@
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:visibility="gone">
- <io.lbry.browser.ui.controls.SolidIconView
- android:layout_width="16dp"
- android:layout_height="16dp"
+ <ImageView
+ android:layout_width="12dp"
+ android:layout_height="12dp"
android:layout_gravity="center_vertical"
- android:textSize="12dp"
- android:text="@string/fa_coins" />
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_featured_search_result.xml b/app/src/main/res/layout/list_item_featured_search_result.xml
index 5ba51b2b..afb084b6 100644
--- a/app/src/main/res/layout/list_item_featured_search_result.xml
+++ b/app/src/main/res/layout/list_item_featured_search_result.xml
@@ -101,13 +101,11 @@
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
- <io.lbry.browser.ui.controls.SolidIconView
+ <ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
- android:textSize="8dp"
- android:text="@string/fa_coins"
- android:textColor="@android:color/black"/>
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/list_item_stream.xml b/app/src/main/res/layout/list_item_stream.xml
index be24eeae..d0c96384 100644
--- a/app/src/main/res/layout/list_item_stream.xml
+++ b/app/src/main/res/layout/list_item_stream.xml
@@ -106,13 +106,11 @@
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
- <io.lbry.browser.ui.controls.SolidIconView
+ <ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
- android:textSize="8dp"
- android:text="@string/fa_coins"
- android:textColor="@android:color/black"/>
+ android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15d94339..09f80e66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -208,7 +208,7 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
- <item>LBC</item>
+ <item>LBRY Credits</item>
<item>USD</item>
</string-array>
@@ -227,7 +227,7 @@
<string name="oops_something_went_wrong">Oops! Something went wrong.</string>
<string name="installation_id_loaded">Loaded Installation ID.</string>
<string name="known_tags_loaded">Loaded local known and followed tags.</string>
- <string name="exchange_rate_loaded">Loaded LBC/USD exchange rate.</string>
+ <string name="exchange_rate_loaded">Loaded LBRY Credits/USD exchange rate.</string>
<string name="user_authenticated">User authenticated.</string>
<string name="installation_registered">Installation registered.</string>
<string name="subscriptions_loaded">Loaded subscriptions.</string>
@@ -314,7 +314,7 @@
<string name="manual_backup"><a href="https://lbry.com/faq/how-to-backup-wallet#android">Manual backup</a></string>
<string name="sync_faq"><a href="https://lbry.com/faq/how-to-backup-wallet#sync">Sync FAQ</a></string>
<string name="zero">0</string>
- <string name="lbc">LBC</string>
+ <string name="lbc" translatable="false">Credits</string>
<string name="account_recommended">Account Recommended</string>
<string name="wallet_account_desc">A lbry.tv account allows you to earn rewards, backup your wallet, and keep everything in sync.</string>
@@ -338,7 +338,7 @@
<string name="confirm_unlock_tips">Are you sure you want to unlock all your tips?</string>
<string name="min_spend_required">Please enter an amount more than 0.0001 credits.</string>
- <string name="buy_lbc">Buy LBC</string>
+ <string name="buy_lbc">Buy LBRY Credits</string>
<string name="hash_not_supported">Your device does not support the minimum requirements for securing your purchase request.</string>
<string name="receive_address_not_set">You do not have a wallet address set. Please generate a new address and try again.</string>
@@ -382,7 +382,10 @@
<string name="channel_to_show_support_as">Channel to show support as</string>
<string name="make_this_a_tip">Make this a tip</string>
<string name="send_revocable_support">Send Revocable Support</string>
- <string name="send_lbc_tip">Send a %1$s LBC Tip</string>
+ <plurals name="send_lbc_tip">
+ <item quantity="one">Tip %1$s Credit</item>
+ <item quantity="other">Tip %1$s Credits</item>
+ </plurals>
<string name="send_tip_info_content">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>.</string>
<string name="send_tip_info_channel">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>.</string>
<string name="cancel">Cancel</string>
@@ -477,7 +480,7 @@
<string name="title">Title</string>
<string name="at">\@</string>
<string name="deposit">Deposit</string>
- <string name="deposit_remains_yours">This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.</string>
+ <string name="deposit_remains_yours">The credits remains yours. It is a deposit to reserve the name and can be undone at any time.</string>
<string name="storage_permission_rationale_download">LBRY requires access to download content to your device.</string>
<string name="storage_permission_rationale_images">LBRY requires access to load images from your device storage.</string>
<string name="select_thumbnail">Select thumbnail</string>
@@ -511,7 +514,7 @@
</plurals>
<!-- Rewards -->
- <string name="lbry_credits_allow">LBRY credits allow you to publish or purchase content.</string>
+ <string name="lbry_credits_allow">LBRY Credits allow you to publish or purchase content.</string>
<string name="free_credits_worth">You can obtain free credits worth $%1$s after you provide an email address.</string>
<string name="rewards_learn_more"><a href="https://lbry.com/faq/earn-credits">Learn more</a>.</string>
<string name="get_started">Get started</string>