mirror of
https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation.git
synced 2026-08-22 13:34:18 +02:00
Merge pull request #118 from Universal-Debloater-Alliance/feature/standardized-font-size-and-layout-fixes
Feature/standardized font size and layout fixes
This commit is contained in:
Adhiraj S. Chauhan
GitHub
commit
e049bc6ec5
4 changed files with 24 additions and 30 deletions
|
|
@ -372,7 +372,7 @@ impl UadGui {
|
|||
decorations: true,
|
||||
..iced::window::Settings::default()
|
||||
},
|
||||
default_text_size: 17.0,
|
||||
default_text_size: 16.0,
|
||||
..Settings::default()
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -309,6 +309,7 @@ impl List {
|
|||
}
|
||||
LoadingState::Ready(_) => {
|
||||
let search_packages = text_input("Search packages...", &self.input_value)
|
||||
.width(160)
|
||||
.on_input(Message::SearchInputChanged)
|
||||
.padding(5);
|
||||
|
||||
|
|
@ -410,7 +411,7 @@ impl List {
|
|||
|
||||
let unavailable = container(
|
||||
column![
|
||||
text("ADB is not authorized to access this user!").size(22)
|
||||
text("ADB is not authorized to access this user!").size(20)
|
||||
.style(style::Text::Danger),
|
||||
text("The most likely reason is that it is the user of your work profile (also called Secure Folder on Samsung devices). There's really no solution, other than completely disabling your work profile in your device settings.")
|
||||
.style(style::Text::Commentary)
|
||||
|
|
@ -488,13 +489,13 @@ impl List {
|
|||
self.selected_user,
|
||||
Message::ModalUserSelected,
|
||||
)
|
||||
.size(23),
|
||||
.size(24),
|
||||
)
|
||||
},
|
||||
);
|
||||
|
||||
let title_ctn =
|
||||
container(row![text("Review your selection").size(25)].align_items(Alignment::Center))
|
||||
container(row![text("Review your selection").size(24)].align_items(Alignment::Center))
|
||||
.width(Length::Fill)
|
||||
.style(style::Container::Frame)
|
||||
.padding([10, 0, 10, 0])
|
||||
|
|
@ -513,10 +514,9 @@ impl List {
|
|||
tooltip(
|
||||
text("\u{EA0C}")
|
||||
.font(ICONS)
|
||||
.width(17)
|
||||
.width(22)
|
||||
.horizontal_alignment(alignment::Horizontal::Center)
|
||||
.style(style::Text::Commentary)
|
||||
.size(17),
|
||||
.style(style::Text::Commentary),
|
||||
"Let's say you choose user 0. If a selected package on user 0\n\
|
||||
is set to be uninstalled and if this same package is disabled on user 10,\n\
|
||||
then the package on both users will be uninstalled.",
|
||||
|
|
@ -524,7 +524,6 @@ impl List {
|
|||
)
|
||||
.gap(20)
|
||||
.padding(10)
|
||||
.size(17)
|
||||
.style(style::Container::Tooltip)
|
||||
]
|
||||
.spacing(10),
|
||||
|
|
@ -572,12 +571,12 @@ impl List {
|
|||
self.phone_packages[selection.0][selection.1]
|
||||
.removal
|
||||
)]
|
||||
.width(100),
|
||||
.width(120),
|
||||
row![text(
|
||||
self.phone_packages[selection.0][selection.1]
|
||||
.uad_list
|
||||
)]
|
||||
.width(60),
|
||||
.width(70),
|
||||
row![text(
|
||||
self.phone_packages[selection.0][selection.1]
|
||||
.name
|
||||
|
|
@ -603,7 +602,7 @@ impl List {
|
|||
PackageState::All => text("Impossible")
|
||||
.style(style::Text::Danger),
|
||||
},]
|
||||
.width(60),
|
||||
.width(80),
|
||||
]
|
||||
.width(Length::Fill)
|
||||
.spacing(20),
|
||||
|
|
@ -802,7 +801,7 @@ fn recap<'a>(
|
|||
) -> Element<'a, Message, Renderer<Theme>> {
|
||||
container(
|
||||
row![
|
||||
text(removal).size(25).width(Length::FillPortion(1)),
|
||||
text(removal).size(24).width(Length::FillPortion(1)),
|
||||
vertical_rule(5),
|
||||
row![
|
||||
if settings.device.disable_mode {
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ impl Settings {
|
|||
Some(string_to_theme(&self.general.theme)),
|
||||
Message::ApplyTheme,
|
||||
)
|
||||
.size(23),
|
||||
.size(24),
|
||||
)
|
||||
});
|
||||
let theme_ctn = container(radio_btn_theme)
|
||||
|
|
@ -213,8 +213,7 @@ impl Settings {
|
|||
|
||||
let expert_mode_descr =
|
||||
text("Most of unsafe packages are known to bootloop the device if removed.")
|
||||
.style(style::Text::Commentary)
|
||||
.size(15);
|
||||
.style(style::Text::Commentary);
|
||||
|
||||
let general_ctn = container(column![expert_mode_checkbox, expert_mode_descr].spacing(10))
|
||||
.padding(10)
|
||||
|
|
@ -238,7 +237,6 @@ impl Settings {
|
|||
|
||||
let multi_user_mode_descr = row![
|
||||
text("This will not affect the following protected work profile users: ")
|
||||
.size(15)
|
||||
.style(style::Text::Commentary),
|
||||
text(
|
||||
phone
|
||||
|
|
@ -249,7 +247,6 @@ impl Settings {
|
|||
.collect::<Vec<String>>()
|
||||
.join(", ")
|
||||
)
|
||||
.size(15)
|
||||
.style(style::Text::Danger)
|
||||
];
|
||||
|
||||
|
|
@ -268,10 +265,9 @@ impl Settings {
|
|||
|
||||
let disable_mode_descr =
|
||||
text("In some cases, it can be better to disable a package instead of uninstalling it")
|
||||
.style(style::Text::Commentary)
|
||||
.size(15);
|
||||
.style(style::Text::Commentary);
|
||||
|
||||
let unavailable_btn = button(text("Unavailable").size(13))
|
||||
let unavailable_btn = button(text("Unavailable").size(14))
|
||||
.on_press(Message::UrlPressed(PathBuf::from(
|
||||
"https://github.com/Universal-Debloater-Alliance/universal-android-debloater/wiki/FAQ#\
|
||||
why-is-the-disable-mode-setting-not-available-for-my-device",
|
||||
|
|
@ -394,24 +390,24 @@ impl Settings {
|
|||
|
||||
let content = if phone.adb_id.clone().is_empty() {
|
||||
column![
|
||||
text("Theme").size(25),
|
||||
text("Theme").size(26),
|
||||
theme_ctn,
|
||||
text("General").size(25),
|
||||
text("General").size(26),
|
||||
general_ctn,
|
||||
text("Current device").size(25),
|
||||
text("Current device").size(26),
|
||||
no_device_ctn(),
|
||||
text("Backup / Restore").size(25),
|
||||
text("Backup / Restore").size(26),
|
||||
no_device_ctn(),
|
||||
]
|
||||
.width(Length::Fill)
|
||||
.spacing(20)
|
||||
} else {
|
||||
column![
|
||||
text("Theme").size(25),
|
||||
text("Theme").size(26),
|
||||
theme_ctn,
|
||||
text("General").size(25),
|
||||
text("General").size(26),
|
||||
general_ctn,
|
||||
text("Current device").size(25),
|
||||
text("Current device").size(26),
|
||||
warning_ctn,
|
||||
device_specific_ctn,
|
||||
backup_restore_ctn,
|
||||
|
|
|
|||
|
|
@ -22,9 +22,8 @@ pub fn nav_menu<'a>(
|
|||
let apps_refresh_btn = button(
|
||||
Text::new("\u{E900}")
|
||||
.font(ICONS)
|
||||
.width(17)
|
||||
.horizontal_alignment(alignment::Horizontal::Center)
|
||||
.size(17),
|
||||
.width(22)
|
||||
.horizontal_alignment(alignment::Horizontal::Center),
|
||||
)
|
||||
.on_press(Message::RefreshButtonPressed)
|
||||
.padding(5)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue