ceos/universal-android-debloater-next-generation
1
0
Fork 0
mirror of https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation.git synced 2026-08-27 15:51:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update dependencies + compatibility with iced latest commit

Browse source
This commit is contained in:
w1nst0n 2021-09-22 17:19:30 +02:00
commit 4bf2bcef87
No known key found for this signature in database
GPG key ID: 34D27465928A0A1D
5 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Cargo.lock generated
View file

@ -143,9 +143,9 @@ checksum = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
[[package]]
name = "bumpalo"
version = "3.7.0"
version = "3.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538"
[[package]]
name = "bytemuck"
@ -1079,7 +1079,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.3.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"iced_core",
"iced_futures",
@ -1092,7 +1092,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.4.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"bitflags",
]
@ -1100,7 +1100,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.3.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"futures",
"log",
@ -1110,7 +1110,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.2.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"bytemuck",
"font-kit",
@ -1124,7 +1124,7 @@ dependencies = [
[[package]]
name = "iced_native"
version = "0.4.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"iced_core",
"iced_futures",
@ -1136,7 +1136,7 @@ dependencies = [
[[package]]
name = "iced_style"
version = "0.3.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"iced_core",
]
@ -1144,7 +1144,7 @@ dependencies = [
[[package]]
name = "iced_web"
version = "0.4.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"base64",
"dodrio",
@ -1161,7 +1161,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.4.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"bytemuck",
"futures",
@ -1180,7 +1180,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.3.0"
source = "git+https://github.com/hecrj/iced.git#099981cfc2f61a1f37e84100592d65babb94fb82"
source = "git+https://github.com/hecrj/iced.git#35c4ad6dd950fa91d181f4d3253fcb486bcf1b11"
dependencies = [
"iced_futures",
"iced_graphics",
@ -2512,9 +2512,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
[[package]]
name = "unicode-width"
version = "0.1.8"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
[[package]]
name = "unicode-xid"
@ -2609,7 +2609,7 @@ version = "0.2.78"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
dependencies = [
"bumpalo 3.7.0",
"bumpalo 3.7.1",
"lazy_static",
"log",
"proc-macro2",
@ -2764,9 +2764,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.10.2"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "425b975c319d311e051bf3afb54120a34b187f9d889edc68e347567e512774c8"
checksum = "5f1b4d918c970526cbc83b72ccb72dbefd38aec45f07b2310de4ffcd7f4bd8c5"
dependencies = [
"arrayvec 0.7.1",
"bitflags",
@ -2945,9 +2945,9 @@ dependencies = [
[[package]]
name = "x11-dl"
version = "2.18.5"
version = "2.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf981e3a5b3301209754218f962052d4d9ee97e478f4d26d4a6eced34c1fef8"
checksum = "7eab1e810da9042813865ebe3477261aa77d1f2241f6be747ef8c0e442bc1fa3"
dependencies = [
"lazy_static",
"libc",

6
src/gui/mod.rs
View file

@ -6,12 +6,12 @@ pub use views::about::About as AboutView;
pub use views::list::{List as AppsView, Message as AppsMessage};
pub use views::settings::{Settings as SettingsView, Message as SettingsMessage};
pub use crate::core::uad_lists::{ load_debloat_lists, Package };
pub use crate::core::sync::{ get_phone_brand };
pub use crate::core::sync::{ get_phone_brand};
use std::{collections::HashMap};
use static_init::{dynamic};
use iced::{
button, Align, Application, Button, Column, Command, Space,
button, Alignment, Application, Button, Column, Command, Space,
Container, Element, Length, Row, Settings, Text, window::Settings as Window, Svg,
};
@ -153,7 +153,7 @@ impl Application for UadGui {
let row = Row::new()
.width(Length::Fill)
.align_items(Align::Center)
.align_items(Alignment::Center)
.spacing(10)
.push(Text::new("Device: ".to_string() + &self.device_name))
.push(Space::new(Length::Fill, Length::Shrink))

4
src/gui/views/about.rs
View file

@ -1,6 +1,6 @@
use crate::gui::style;
use crate::gui::Message;
use iced::{Align, Column, Container, Element, Length, Text};
use iced::{Alignment, Column, Container, Element, Length, Text};
#[derive(Default, Debug, Clone)]
pub struct About {}
@ -14,7 +14,7 @@ impl About {
let content = Column::new()
.width(Length::Fill)
.spacing(10)
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(about_text);
Container::new(content)

25
src/gui/views/list.rs
View file

@ -6,9 +6,9 @@ use crate::gui::views::settings::Settings;
use crate::gui::widgets::package_row::{ PackageRow, Message as RowMessage };
use iced::{
scrollable, Align, Column, Container, Element, Space,
scrollable, Alignment, alignment, Column, Container, Element, Space,
Length, Row, Scrollable, Text, text_input, TextInput, Command,//Svg,
PickList, pick_list, Button, button, HorizontalAlignment, VerticalAlignment
PickList, pick_list, Button, button,
};
use crate::core::sync::{
@ -215,9 +215,8 @@ impl List {
Command::none()
},
}
}
pub fn view(&mut self) -> Element<Message> {
if self.ready {
let search_packages = TextInput::new(
@ -255,7 +254,7 @@ impl List {
let control_panel = Row::new()
.width(Length::Fill)
.align_items(Align::Center)
.align_items(Alignment::Center)
.spacing(10)
.push(search_packages)
.push(divider)
@ -282,14 +281,14 @@ impl List {
let packages_scrollable = Scrollable::new(&mut self.package_scrollable_state)
.push(packages)
.spacing(2)
.align_items(Align::Start)
.align_items(Alignment::Start)
.height(Length::FillPortion(6))
.style(style::Scrollable);
// let mut packages_v: Vec<&str> = self.packages.lines().collect();
let description_panel = Container::new(
Row::new()
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(Text::new(&self.description))
)
.style(style::Description)
@ -301,7 +300,7 @@ impl List {
let apply_selection_btn = Button::new(
&mut self.apply_selection_btn_state,
Row::new()
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(Text::new(format!("{}{}{}", "Debloat/Restore selection (", self.selected_packages.len(), ")")))
)
.on_press(Message::ApplyActionOnSelection)
@ -312,7 +311,7 @@ impl List {
let select_all_btn = Button::new(
&mut self.select_all_btn_state,
Row::new()
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(Text::new("Select all"))
)
.on_press(Message::SelectAllPressed)
@ -322,7 +321,7 @@ impl List {
let action_row = Row::new()
.width(Length::Fill)
.align_items(Align::Center)
.align_items(Alignment::Center)
.height(Length::FillPortion(1))
.push(select_all_btn)
.push(Space::new(Length::Fill, Length::Shrink))
@ -331,7 +330,7 @@ impl List {
let content = Column::new()
.width(Length::Fill)
.spacing(10)
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(control_panel)
.push(Space::new(Length::Fill, Length::Units(2)))
.push(packages_scrollable)
@ -373,8 +372,8 @@ impl List {
fn loading_data<'a>() -> Element<'a, Message> {
Container::new(
Text::new("Pulling packages from the phone. Please wait...")
.horizontal_alignment(HorizontalAlignment::Center)
.vertical_alignment(VerticalAlignment::Center)
.horizontal_alignment(alignment::Horizontal::Center)
.vertical_alignment(alignment::Vertical::Center)
.size(20),
)
.width(Length::Fill)

12
src/gui/widgets/package_row.rs
View file

@ -2,8 +2,8 @@ use crate::core::uad_lists::{ UadList, PackageState, Removal };
use crate::gui::style;
use iced::{
Align, Command, Element, Space, Length, Row, Text, Button,
button, HorizontalAlignment, Checkbox,
Alignment, alignment, Command, Element, Space, Length, Row, Text, Button,
button, Checkbox,
};
#[derive(Clone, Debug)]
@ -76,7 +76,7 @@ impl PackageRow {
action_btn = Button::new(
&mut self.action_btn_state,
Text::new(action_text).horizontal_alignment(HorizontalAlignment::Center),
Text::new(action_text).horizontal_alignment(alignment::Horizontal::Center),
)
.on_press(Message::ActionPressed);
@ -86,7 +86,7 @@ impl PackageRow {
action_btn = Button::new(
&mut self.action_btn_state,
Text::new(action_text).horizontal_alignment(HorizontalAlignment::Center),
Text::new(action_text).horizontal_alignment(alignment::Horizontal::Center),
);
}
@ -94,7 +94,7 @@ impl PackageRow {
.push(Button::new(
&mut self.package_btn_state,
Row::new()
.align_items(Align::Center)
.align_items(Alignment::Center)
.push(selection_checkbox)
.push(Text::new(&self.name).width(Length::FillPortion(8)))
.push(action_btn.width(Length::FillPortion(1))
@ -107,7 +107,7 @@ impl PackageRow {
)
.push(Space::with_width(Length::Units(15)))
.align_items(Align::Center)
.align_items(Alignment::Center)
.into()
}
}