linux-rust: add battery to window and add option for text in tray

Author: kavishdevar

linux-rust/assets/font/sf_pro.otf

@@ -10,7 +10,6 @@ command: librepods
 finish-args:
   - --socket=wayland
   - --socket=fallback-x11
-  - --share=ipc
   - --socket=pulseaudio
   - --system-talk-name=org.bluez
   - --allow=bluetooth

linux-rust/flatpak/me.kavishdevar.librepods.yaml

@@ -1,6 +1,7 @@
 use std::fmt::Display;
-use iced::widget::{combo_box, ComboBox};
+use iced::widget::combo_box;
 use serde::{Deserialize, Serialize};
+use crate::bluetooth::aacp::BatteryInfo;
 use crate::devices::airpods::AirPodsInformation;
 use crate::devices::nothing::NothingInformation;
 
@@ -58,7 +59,8 @@ pub struct AirPodsState {
     pub noise_control_state: combo_box::State<AirPodsNoiseControlMode>,
     pub conversation_awareness_enabled: bool,
     pub personalized_volume_enabled: bool,
-    pub allow_off_mode: bool
+    pub allow_off_mode: bool,
+    pub battery: Vec<BatteryInfo>
 }
 
 #[derive(Clone, Debug)]

linux-rust/src/devices/enums.rs

@@ -28,19 +28,33 @@ use crate::utils::get_devices_path;
 
 #[derive(Parser)]
 struct Args {
-    #[arg(long)]
+    #[arg(long, short='d', help="Enable debug logging")]
     debug: bool,
-    #[arg(long)]
+    #[arg(long, help="Disable system tray, useful if your environment doesn't support AppIndicator or StatusNotifier")]
     no_tray: bool,
-    #[arg(long)]
+    #[arg(long, help="Start the application minimized to tray")]
     start_minimized: bool,
+    #[arg(long, help="Enable Bluetooth LE debug logging. Only use when absolutely necessary; this produces a lot of logs.")]
+    le_debug: bool,
+    #[arg(long, short='v', help="Show application version and exit")]
+    version: bool
 }
 
 fn main() -> iced::Result {
     let args = Args::parse();
+
+    if args.version {
+        println!("You are running LibrePods version {}", env!("CARGO_PKG_VERSION"));
+        return Ok(());
+    }
+
     let log_level = if args.debug { "debug" } else { "info" };
+    let wayland_display = env::var("WAYLAND_DISPLAY").is_ok();
     if env::var("RUST_LOG").is_err() {
-        unsafe { env::set_var("RUST_LOG", log_level.to_owned() + ",winit=warn,tracing=warn,,iced_wgpu=warn,wgpu_hal=warn,wgpu_core=warn,librepods_rust::bluetooth::le=warn,cosmic_text=warn,naga=warn,iced_winit=warn") };
+        if wayland_display {
+            unsafe { env::set_var("WGPU_BACKEND", "gl") };
+        }
+        unsafe { env::set_var("RUST_LOG", log_level.to_owned() + &format!(",winit=warn,tracing=warn,iced_wgpu=warn,wgpu_hal=warn,wgpu_core=warn,cosmic_text=warn,naga=warn,iced_winit=warn,librepods_rust::bluetooth::le={}", if args.le_debug { "debug" } else { "warn" })) };
     }
     env_logger::init();
 

linux-rust/src/main.rs

@@ -24,6 +24,7 @@ pub fn airpods_view<'a>(
 ) -> iced::widget::Container<'a, Message> {
     let mac = mac.to_string();
     // order: name, noise control, press and hold config, call controls (not sure if why it might be needed, adding it just in case), audio (personalized volume, conversational awareness, adaptive audio slider), connection settings, microphone, head gestures (not adding this), off listening mode, device information
+
     let aacp_manager_for_rename = aacp_manager.clone();
     let rename_input = container(
         row![
@@ -221,14 +222,13 @@ pub fn airpods_view<'a>(
                         column![
                             text("Personalized Volume").size(16),
                             text("Adjusts the volume in response to your environment.").size(12).style(
-                            |theme: &Theme| {
-                                let mut style = text::Style::default();
-                                style.color = Some(theme.palette().text.scale_alpha(0.7));
-                                style
-                            }
-                        )
-                        ],
-                        Space::with_width(Length::Fill),
+                                |theme: &Theme| {
+                                    let mut style = text::Style::default();
+                                    style.color = Some(theme.palette().text.scale_alpha(0.7));
+                                    style
+                                }
+                            ).width(Length::Fill),
+                        ].width(Length::Fill),
                         toggler(state.personalized_volume_enabled)
                             .on_toggle(
                             {
@@ -255,6 +255,7 @@ pub fn airpods_view<'a>(
                         .size(20)
                     ]
                     .align_y(Center)
+                    .spacing(8)
                 },
                 Rule::horizontal(8).style(
                     |theme: &Theme| {
@@ -272,14 +273,13 @@ pub fn airpods_view<'a>(
                         column![
                             text("Conversation Awareness").size(16),
                             text("Lowers the volume of your audio when it detects that you are speaking.").size(12).style(
-                            |theme: &Theme| {
-                                let mut style = text::Style::default();
-                                style.color = Some(theme.palette().text.scale_alpha(0.7));
-                                style
-                            }
-                        )
-                        ],
-                        Space::with_width(Length::Fill),
+                                |theme: &Theme| {
+                                    let mut style = text::Style::default();
+                                    style.color = Some(theme.palette().text.scale_alpha(0.7));
+                                    style
+                                }
+                            ).width(Length::Fill),
+                        ].width(Length::Fill),
                         toggler(state.conversation_awareness_enabled)
                             .on_toggle(move |is_enabled| {
                                 let aacp_manager = aacp_manager_conv_detect.clone();
@@ -299,6 +299,7 @@ pub fn airpods_view<'a>(
                         .size(20)
                     ]
                     .align_y(Center)
+                    .spacing(8)
                 }
             ]
                 .spacing(4)
@@ -328,15 +329,14 @@ pub fn airpods_view<'a>(
         container(row![
             column![
                 text("Off Listening Mode").size(16),
-                text("When this is on, AIrPods listening modes will include an Off option. Loud sound levels are not reduced when listening mode is set to Off.").size(12).style(
+                text("When this is on, AirPods listening modes will include an Off option. Loud sound levels are not reduced when listening mode is set to Off.").size(12).style(
                     |theme: &Theme| {
                         let mut style = text::Style::default();
                         style.color = Some(theme.palette().text.scale_alpha(0.7));
                         style
                     }
-                )
-            ],
-            Space::with_width(Length::Fill),
+                ).width(Length::Fill)
+            ].width(Length::Fill),
             toggler(state.allow_off_mode)
                 .on_toggle(move |is_enabled| {
                     let aacp_manager = aacp_manager_olm.clone();
@@ -356,6 +356,7 @@ pub fn airpods_view<'a>(
             .size(20)
         ]
             .align_y(Center)
+            .spacing(8)
         )
             .padding(Padding{
                 top: 5.0,

linux-rust/src/ui/airpods.rs

@@ -6,6 +6,7 @@ use tokio::sync::mpsc::UnboundedSender;
 
 use crate::bluetooth::aacp::ControlCommandIdentifiers;
 use crate::ui::messages::BluetoothUIMessage;
+use crate::utils::get_app_settings_path;
 
 #[derive(Debug)]
 pub(crate) struct MyTray {
@@ -57,7 +58,15 @@ impl ksni::Tray for MyTray {
         };
         let any_bud_charging = matches!(self.battery_l_status, Some(crate::bluetooth::aacp::BatteryStatus::Charging))
             || matches!(self.battery_r_status, Some(crate::bluetooth::aacp::BatteryStatus::Charging));
-        let icon = generate_icon(&text, false, any_bud_charging);
+        let app_settings_path = get_app_settings_path();
+        let settings = std::fs::read_to_string(&app_settings_path)
+            .ok()
+            .and_then(|s| serde_json::from_str::<serde_json::Value>(&s).ok());
+        let text_mode = settings.clone()
+            .and_then(|v| v.get("tray_text_mode").cloned())
+            .and_then(|ttm| serde_json::from_value(ttm).ok())
+            .unwrap_or(false);
+        let icon = generate_icon(&text, text_mode, any_bud_charging);
         vec![icon]
     }
     fn tool_tip(&self) -> ToolTip {