StNicolay/pass_manager
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Added LocaleString type that can be converted to String to reduce the ammount of as_refs

Browse Source
This commit is contained in:
StNicolay
2024-04-22 15:17:51 +03:00
parent 86c7b4d0c4
commit 305b796d51
35 changed files with 202 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/markups.rs
View File

@@ -57,23 +57,23 @@ pub fn account_markup(name: &str, is_encrypted: bool, locale: LocaleRef) -> Inli
let hash = std::str::from_utf8(&hash).unwrap();
let encryption_button = if is_encrypted {
(locale.decrypt_button.as_ref(), "decrypt")
(&locale.decrypt_button, "decrypt")
} else {
(locale.hide_button.as_ref(), "get")
(&locale.hide_button, "get")
};
let main_buttons = [
(locale.change_name_button.as_ref(), "an"),
(locale.change_login_button.as_ref(), "al"),
(locale.change_password_button.as_ref(), "ap"),
(locale.delete_account_button.as_ref(), "delete0"),
(&locale.change_name_button, "an"),
(&locale.change_login_button, "al"),
(&locale.change_password_button, "ap"),
(&locale.delete_account_button, "delete0"),
encryption_button,
]
.into_iter()
.map(|(text, command)| make_button(text, command, hash))
.chunks(2);
let menu_button = InlineKeyboardButton::callback(locale.menu_button.as_ref(), "get_menu");
let menu_button = InlineKeyboardButton::callback(&locale.menu_button, "get_menu");
InlineKeyboardMarkup::new(&main_buttons).append_row([menu_button])
}
@@ -91,7 +91,6 @@ pub fn language_markup() -> InlineKeyboardMarkup {
/// This markup should be added for all messages that won't be deleted afterwards
#[inline]
pub fn deletion_markup(locale: LocaleRef) -> InlineKeyboardMarkup {
let button =
InlineKeyboardButton::callback(locale.delete_message_button.as_ref(), "delete_message");
let button = InlineKeyboardButton::callback(&locale.delete_message_button, "delete_message");
InlineKeyboardMarkup::new([[button]])
}