Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Various improvements and fixes #128

Merged
merged 8 commits into from
Dec 19, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ package network.bisq.mobile.presentation.ui.helpers
import java.text.DecimalFormat

actual val numberFormatter: NumberFormatter = object : NumberFormatter {
private val formatter = DecimalFormat("#.########")
private val formatter = DecimalFormat("0.00000000")
override fun satsFormat(value: Double): String = formatter.format(value)
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package network.bisq.mobile.i18n
data class CommonStrings(
val buttons_back: String,
val buttons_next: String,
val buttons_save: String,
val buttons_submit: String,
val buttons_cancel: String,

Expand All @@ -14,4 +15,6 @@ data class CommonStrings(

val take_offer: String,
val currency: String,

val delete_account: String,
)
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
package network.bisq.mobile.i18n

import cafe.adriel.lyricist.LyricistStrings

// @LyricistStrings(languageTag = Locales.EN, default = true)
val EnCommonStrings = CommonStrings(
buttons_back = "Back",
buttons_next = "Next",
buttons_save = "Save",
buttons_submit = "Submit",
buttons_cancel = "Cancel",

Expand All @@ -18,4 +16,5 @@ val EnCommonStrings = CommonStrings(
take_offer = "Take offer",
currency = "Currency",

delete_account = "Delete account",
)
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package network.bisq.mobile.i18n

import cafe.adriel.lyricist.LyricistStrings

//@LyricistStrings(languageTag = Locales.FR)
val FrCommonStrings = CommonStrings(

buttons_back = "[FR] Back",
buttons_next = "[FR] Next",
buttons_save = "[FR] Save",
buttons_submit = "[FR] Submit",
buttons_cancel = "[FR] Cancel",

Expand All @@ -17,5 +15,7 @@ val FrCommonStrings = CommonStrings(
offers_list_sell_to = "[FR] Sell to",

take_offer = "[FR] Take offer",
currency = "[FR] Currency"
currency = "[FR] Currency",

delete_account = "[FR] Delete account",
)
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ data class AppStrings(
val bisqEasy: BisqEasyStrings,
val bisqEasyTradeState: BisqEasyTradeStateStrings,
val bisqEasyTradeWizard: BisqEasyTradeWizardStrings,
val user: UserStrings,
val common: CommonStrings
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ val EnAppStrings = AppStrings(
bisqEasy = EnBisqEasyStrings,
bisqEasyTradeWizard = EnBisqEasyTradeWizardStrings,
bisqEasyTradeState = EnBisqEasyTradeStateStrings,
user = EnUserStrings,
common = EnCommonStrings
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ val FrAppStrings = AppStrings(
bisqEasy = FrBisqEasyStrings,
bisqEasyTradeWizard = FrBisqEasyTradeWizardStrings,
bisqEasyTradeState = FrBisqEasyTradeStateStrings,
user = FrUserStrings,
common = FrCommonStrings
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
package network.bisq.mobile.i18n

data class UserStrings(
val user_userProfile_tooltip: String,
val user_userProfile_tooltip_banned: String,
val user_userProfile_userName_banned: String,
val user_userProfile_livenessState: String,
val user_userProfile_livenessState_ageDisplay: String,
val user_userProfile_version: String,
val user_userProfile_addressByTransport_CLEAR: String,
val user_userProfile_addressByTransport_TOR: String,
val user_userProfile_addressByTransport_I2P: String,
val user_userProfile: String,
val user_password: String,
val user_paymentAccounts: String,
val user_bondedRoles_userProfile_select: String,
val user_bondedRoles_userProfile_select_invalid: String,
val user_userProfile_comboBox_description: String,
val user_userProfile_nymId: String,
val user_userProfile_nymId_tooltip: String,
val user_userProfile_profileId: String,
val user_userProfile_profileId_tooltip: String,
val user_userProfile_profileAge: String,
val user_userProfile_profileAge_tooltip: String,
val user_userProfile_livenessState_description: String,
val user_userProfile_livenessState_tooltip: String,
val user_userProfile_reputation: String,
val user_userProfile_statement: String,
val user_userProfile_statement_prompt: String,
val user_userProfile_statement_tooLong: String,
val user_userProfile_terms: String,
val user_userProfile_terms_prompt: String,
val user_userProfile_terms_tooLong: String,
val user_userProfile_createNewProfile: String,
val user_userProfile_learnMore: String,
val user_userProfile_deleteProfile: String,
val user_userProfile_deleteProfile_popup_warning: String,
val user_userProfile_deleteProfile_popup_warning_yes: String,
val user_userProfile_deleteProfile_cannotDelete: String,
val user_userProfile_popup_noSelectedProfile: String,
val user_userProfile_save_popup_noChangesToBeSaved: String,
val user_userProfile_new_step2_headline: String,
val user_userProfile_new_step2_subTitle: String,
val user_userProfile_new_statement: String,
val user_userProfile_new_statement_prompt: String,
val user_userProfile_new_terms: String,
val user_userProfile_new_terms_prompt: String,
val user_password_headline_setPassword: String,
val user_password_headline_removePassword: String,
val user_password_button_savePassword: String,
val user_password_button_removePassword: String,
val user_password_enterPassword: String,
val user_password_confirmPassword: String,
val user_password_savePassword_success: String,
val user_password_removePassword_success: String,
val user_password_removePassword_failed: String,
val user_paymentAccounts_headline: String,
val user_paymentAccounts_noAccounts_headline: String,
val user_paymentAccounts_noAccounts_info: String,
val user_paymentAccounts_noAccounts_whySetup: String,
val user_paymentAccounts_noAccounts_whySetup_info: String,
val user_paymentAccounts_noAccounts_whySetup_note: String,
val user_paymentAccounts_accountData: String,
val user_paymentAccounts_selectAccount: String,
val user_paymentAccounts_createAccount: String,
val user_paymentAccounts_deleteAccount: String,
val user_paymentAccounts_createAccount_headline: String,
val user_paymentAccounts_createAccount_subtitle: String,
val user_paymentAccounts_createAccount_accountName: String,
val user_paymentAccounts_createAccount_accountName_prompt: String,
val user_paymentAccounts_createAccount_accountData_prompt: String,
val user_paymentAccounts_createAccount_sameName: String,
val user_profileCard_userNickname_banned: String,
val user_profileCard_reputation_totalReputationScore: String,
val user_profileCard_reputation_ranking: String,
val user_profileCard_userActions_sendPrivateMessage: String,
val user_profileCard_userActions_ignore: String,
val user_profileCard_userActions_undoIgnore: String,
val user_profileCard_userActions_report: String,
val user_profileCard_tab_overview: String,
val user_profileCard_tab_details: String,
val user_profileCard_tab_offers: String,
val user_profileCard_tab_reputation: String,
val user_profileCard_overview_statement: String,
val user_profileCard_overview_tradeTerms: String,
val user_profileCard_details_botId: String,
val user_profileCard_details_userId: String,
val user_profileCard_details_transportAddress: String,
val user_profileCard_details_totalReputationScore: String,
val user_profileCard_details_profileAge: String,
val user_profileCard_details_lastUserActivity: String,
val user_profileCard_details_version: String,
val user_profileCard_offers_table_columns_market: String,
val user_profileCard_offers_table_columns_offer: String,
val user_profileCard_offers_table_columns_amount: String,
val user_profileCard_offers_table_columns_price: String,
val user_profileCard_offers_table_columns_paymentMethods: String,
val user_profileCard_offers_table_columns_offerAge: String,
val user_profileCard_offers_table_columns_offerAge_tooltip: String,
val user_profileCard_offers_table_columns_goToOffer_button: String,
val user_profileCard_offers_table_placeholderText: String,

// Mobile app specific
val user_userProfile_payment_account: String,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package network.bisq.mobile.i18n

import cafe.adriel.lyricist.LyricistStrings

val EnUserStrings = UserStrings(
user_userProfile_tooltip = "Nickname: {0}\nBot ID: {1}\nProfile ID: {2}\n{3}",
user_userProfile_tooltip_banned = "This profile is banned!",
user_userProfile_userName_banned = "[Banned] {0}",
user_userProfile_livenessState = "Last user activity: {0} ago",
user_userProfile_livenessState_ageDisplay = "{0} ago",
user_userProfile_version = "Version: {0}",
user_userProfile_addressByTransport_CLEAR = "Clear net address: {0}",
user_userProfile_addressByTransport_TOR = "Tor address: {0}",
user_userProfile_addressByTransport_I2P = "I2P address: {0}",
user_userProfile = "User profile",
user_password = "Password",
user_paymentAccounts = "Payment accounts",
user_bondedRoles_userProfile_select = "Select user profile",
user_bondedRoles_userProfile_select_invalid = "Please pick a user profile from the list",
user_userProfile_comboBox_description = "User profile",
user_userProfile_nymId = "Bot ID",
user_userProfile_nymId_tooltip = " The 'Bot ID' is generated from the hash of the public key of that\n user profiles identity.\n It is appended to the nickname in case there are multiple user profiles in\n the network with the same nickname to distinct clearly between those profiles.",
user_userProfile_profileId = "Profile ID",
user_userProfile_profileId_tooltip = " The 'Profile ID' is the hash of the public key of that user profiles identity\n encoded as hexadecimal string.",
user_userProfile_profileAge = "Profile age",
user_userProfile_profileAge_tooltip = "The 'Profile age' is the age in days of that user profile.",
user_userProfile_livenessState_description = "Last user activity",
user_userProfile_livenessState_tooltip = "The time passed since the user profile has been republished to the network triggered by user activity like mouse movements.",
user_userProfile_reputation = "Reputation",
user_userProfile_statement = "Statement",
user_userProfile_statement_prompt = "Enter optional statement",
user_userProfile_statement_tooLong = "Statement must not be longer than {0} characters",
user_userProfile_terms = "Trade terms",
user_userProfile_terms_prompt = "Enter optional trade terms",
user_userProfile_terms_tooLong = "Trade terms must not be longer than {0} characters",
user_userProfile_createNewProfile = "Create new profile",
user_userProfile_learnMore = "Why create a new profile?",
user_userProfile_deleteProfile = "Delete profile",
user_userProfile_deleteProfile_popup_warning = "Do you really want to delete {0}? You cannot un-do this operation.",
user_userProfile_deleteProfile_popup_warning_yes = "Yes, delete profile",
user_userProfile_deleteProfile_cannotDelete = "Deleting user profile is not permitted\n\n To delete this profile, first:\n - Delete all messages posted with this profile\n - Close all private channels for this profile\n - Make sure to have at least one more profile",
user_userProfile_popup_noSelectedProfile = "Please pick a user profile from the list",
user_userProfile_save_popup_noChangesToBeSaved = "There are no new changes to be saved",
user_userProfile_new_step2_headline = "Complete your profile",
user_userProfile_new_step2_subTitle = "You can optionally add a personalized statement to your profile and set your trade terms.",
user_userProfile_new_statement = "Statement",
user_userProfile_new_statement_prompt = "Optional add statement",
user_userProfile_new_terms = "Your trade terms",
user_userProfile_new_terms_prompt = "Optional set trade terms",
user_password_headline_setPassword = "Set password protection",
user_password_headline_removePassword = "Remove password protection",
user_password_button_savePassword = "Save password",
user_password_button_removePassword = "Remove password",
user_password_enterPassword = "Enter password (min. 8 characters)",
user_password_confirmPassword = "Confirm password",
user_password_savePassword_success = "Password protection enabled.",
user_password_removePassword_success = "Password protection removed.",
user_password_removePassword_failed = "Invalid password.",
user_paymentAccounts_headline = "Your payment accounts",
user_paymentAccounts_noAccounts_headline = "Your payment accounts",
user_paymentAccounts_noAccounts_info = "You haven't set up any accounts yet.",
user_paymentAccounts_noAccounts_whySetup = "Why is setting up an account useful?",
user_paymentAccounts_noAccounts_whySetup_info = "When you're selling Bitcoin, you need to provide your payment account details to the buyer for receiving the fiat payment. Setting up accounts in advance allows for quick and convenient access to this information during the trade.",
user_paymentAccounts_noAccounts_whySetup_note = "Background information:\n Your account data is exclusively stored locally on your computer and is shared with your trade partner only when you decide to share it.",
user_paymentAccounts_accountData = "Payment account info",
user_paymentAccounts_selectAccount = "Select payment account",
user_paymentAccounts_createAccount = "Create new payment account",
user_paymentAccounts_deleteAccount = "Delete payment account",
user_paymentAccounts_createAccount_headline = "Add new payment account",
user_paymentAccounts_createAccount_subtitle = "The payment account is stored only locally on your computer and only sent to your trade peer if you decide to do so.",
user_paymentAccounts_createAccount_accountName = "Payment account name",
user_paymentAccounts_createAccount_accountName_prompt = "Set a unique name for your payment account",
user_paymentAccounts_createAccount_accountData_prompt = "Enter the payment account info (e.g. bank account data) you want to share with a potential Bitcoin buyer so that they can transfer you the national currency amount.",
user_paymentAccounts_createAccount_sameName = "This account name is already used. Please use a different name.",
user_profileCard_userNickname_banned = "[Banned] {0}",
user_profileCard_reputation_totalReputationScore = "Total Reputation Score",
user_profileCard_reputation_ranking = "Ranking",
user_profileCard_userActions_sendPrivateMessage = "Send private message",
user_profileCard_userActions_ignore = "Ignore",
user_profileCard_userActions_undoIgnore = "Undo ignore",
user_profileCard_userActions_report = "Report to moderator",
user_profileCard_tab_overview = "Overview",
user_profileCard_tab_details = "Details",
user_profileCard_tab_offers = "Offers ({0})",
user_profileCard_tab_reputation = "Reputation",
user_profileCard_overview_statement = "Statement",
user_profileCard_overview_tradeTerms = "Trade terms",
user_profileCard_details_botId = "Bot ID",
user_profileCard_details_userId = "User ID",
user_profileCard_details_transportAddress = "Transport address",
user_profileCard_details_totalReputationScore = "Total reputation score",
user_profileCard_details_profileAge = "Profile age",
user_profileCard_details_lastUserActivity = "Last user activity",
user_profileCard_details_version = "Software version",
user_profileCard_offers_table_columns_market = "Market",
user_profileCard_offers_table_columns_offer = "Offer",
user_profileCard_offers_table_columns_amount = "Amount",
user_profileCard_offers_table_columns_price = "Price",
user_profileCard_offers_table_columns_paymentMethods = "Payment methods",
user_profileCard_offers_table_columns_offerAge = "Age",
user_profileCard_offers_table_columns_offerAge_tooltip = "Creation date:\n{0}",
user_profileCard_offers_table_columns_goToOffer_button = "Go to offer",
user_profileCard_offers_table_placeholderText = "No offers",

user_userProfile_payment_account = "Payment account",
)

Loading
Loading