Skip to content

Wpf UI#316

Merged
Alex4SSB merged 129 commits into
masterfrom
WpfUi
May 20, 2026
Merged

Wpf UI#316
Alex4SSB merged 129 commits into
masterfrom
WpfUi

Conversation

@Alex4SSB

Copy link
Copy Markdown
Owner

No description provided.

Alex4SSB and others added 30 commits November 15, 2025 18:04
• Fixed language setting combobox causing crash when trying to filter settings
• Prepared the settings page display-wise, apart from the about section
• Unified theme handling
• Removed code related to settings separator
• Removed code related to settings group level commands
• Ungrouped settings are now hidden in default view
• Enabled theme-dependent colors
• Fixed base style for hyperlinkbutton
• Added support for content dialog
• Added the settings about section
• UI culture is now set properly for the settings page
• Copied and adapted compound icons
• Adapted ContentDialog and DialogService
• Adapted Menu
• Copied SimpleStackPanel
• Page header is now set manually by MainWindow
• Settings page header is now a user control and displayed separately to prevent scrolling it
• Action menu tooltip change is now properly triggered
• Copied radio button style template from WPF UI to fix flow direction and horizontal content alignment issue
• The whole main window, settings page, settings list and contents now have thier flow direction dependent on the UI culture
• Disabled context menu for combobox
• Added sorted settings list
• Settings about expander now expands with everyone else
• Added settings group icon
• Implemented settings search functionality
• Fixed group hint arrow in settings search mode for RTL (← vs →)
• Navigation view item text now has smaller font and text trimming
• Sorted settings checkbox content no longer moves on mouse over to accomodate layout change
• Fixed settings about version display in RTL
• Fixed language country display for non-RTL languages when current one is RTL
• Fixed settings about expander not following expand/collapse all groups button
• Added devices page header as mDNS expander and devices title
• mDNS setting is now applied on launch
• ADB path is now updated on launch
• Fixed ADB version display in RTL
• Device list is now displayed in the style of the drive view
• mDNS control and QR are now part of the devices list
• Migrated device and battery VMs
• Page view model is now assigned to the page header as well when navigating
• Page headers are now instantiated once
• Devices filtering is now MVVM
• The mDNS device is now hidden when disabled in the settings
• Settings filtering is now MVVM
• Sorted settings groups are no longer displayed as expanders to prevent expanding each time the filtering changes
• Fixed leftmost pixel row being cut
• CheckGlyph color is now inverted when not checked
• Fixed flow direction of hyperlinks in the settings about section
• Fixed reset settings button margin
Updated instructions for Store version and clarified file transfer details.
• All settings are now separated into categories and displayed in cards
• Moved all settings to the header to prevent page scrolling
• Started incorporating the about section into the settings model
• Added icon to each setting
• All radio button settings have moved into other groups and are now displayed as comboboxes
• Re-enabled long gone feature that disabled double click to pull to default folder when default folder is not set
• Settings about section is now fully incorporated into the settings model
• Added GitHub and Weblate logos
• Refactored themed colors
• Sorted settings are now displayed in the settings header
• App display name card is now always first in the sorted view
• Fixed some settings having less than 70px height
• Devices are now displayed in a masonry panel
• Implemented device polling service as a background service
• App launch now navigates to devices page
• Page headers are now constructed once
• Sorted settings view is now activated through local MVVM instead of FileActions
• Devices are now separated into two columns
• Fixed ID displayed instead of name for device connected by both USB & mDNS
• Redesigned device container
• Fixed device reboot options not being translated
• Device list is now updated when changing mDNS in the settings
• QR is now part of mDNS class and instance
• mDNS class is no longer destroyed when device list is refreshed
• Implemented basic drive view
• Implemented basic folder view
• Implemented basic folder view context menu
• Connected device & drive browsing to UI
• Opening device for browsing now navigates to the explorer page
• Implemented some of the events
• Modified styles to make row selection work
• Disabled mouse navigation for the navigation view control
• Synced translations
• Added toolbars, menus, navigation box, and search box controls
• Added explorer canvas
• File name and file type flow direction are now content-dependent
• Navigation controls are now on the first explorer row instead of the main action menu
• Flipped back and forward icons for RTL
• Fixed breadcrumb arrow icon for RTL
• Fixed push and pull icons for RTL
• Fixed missing icons for file actions
• Implemented navigation box breacrumbs and path
• Fixed explorer context menu not being re-filtered
• Fixed menu sub-items having incorrect style target
• Detailed battery percentage is now also part of the tooltip target
• Fixed detailed battery percentage display in RTL
Alex4SSB added 21 commits May 7, 2026 23:53
• Details pane is now also updated when changing location
• Switching between details and preview modes in the side pane has moved from the settings page to the thumbs size selector, as in Windows Explorer
• Details controls now updates its icon and label for each of the side pane modes
• Added file types and icons for multiple files and for a drive
• Fixed thumbnails not shown for service devices
• Small file icons in the details pane are now rendered as 32px instead of 16
• Thumbnail info now also includes: f-stop, ISO, & exposure for images; bitrate for videos
• Thumbnail info is now available even if the thumbnail itself isn't
• File details in the side pane now include: type, location, size, date modified, link target, and all available thumbnail info
• Details pane now handles the special cases of: no file selected when in drive root, no file selected when in a folder with a special icon, & multiple files selected
• File operations page title in the navigation view has been shortened to just operations
• Fixed date modified not visible on broken links that have it
• Replaced PDFToImage library with built in Windows PDF
• Disabled preview for images
• Fixed another source of explorer catching key strokes from the details pane
• Increased max preview file size cap to 100MB
• Fixed min width of content dialog buttons
• Menu item for "New" now has an accented icon
• Added chevron to menu items that have children
• Fixed date being displayed using invariant culture when app language is system default
• Fixed lag when opening package install location from app drive
• Added read of package dumpsys when selected to display version name and last update
• Fixed APK files to use the new icon for drag image
• Directory listing now saves the permissions info from ADB
• User and group are added to file details on the go
• Added creation time and last access time to file details in the side pane
• File dates in the details pane now display time zone when it differs from the current one
• Side pane is now forced to details mode when the location does not support preview, without affecting the saved preference
• Selecting a logical drive now displays info acquired from `adb shell mount`
• Synced translations from master
• Fixed rename and create new item not working
• Added the rename tooltip from the base project
• Rename tooltip placement is now smarter
• Rename tooltip is now also available in icon view
• Rename tooltip is now animated
• Added the paste & pull tooltip from the base project
• Paste & pull tooltip is now an actual tooltip of a warning icon in the bottom toolbar
• Details pane hide / show is now animated
• Fixed details pane forcing read of thumbnail data when thumbnails are disabled
• App title is now bigger and uses the Nunito font
• Title bar buttons now occupy the whole title bar height
• When ADB is missing, only the Settings page is visible, and working directories section is selected
• Added 5 reasons for "missing" ADB
• Fixed trying to store operations page columns configurations on app closing, when the page hasn't been loaded in the first place
• Fixed checking ADB version from previous commit
• Fixed explorer view not sorting after link listing is finished
@Alex4SSB Alex4SSB linked an issue May 20, 2026 that may be closed by this pull request
@Alex4SSB

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	ADB Explorer/MainWindow.xaml
#	ADB Explorer/PortableLauncher.bat
#	ADB Explorer/Services/ADB/ADBDevice.cs
#	ADB Explorer/Styles/Controls/ComboBox.xaml
#	ADB Explorer/Styles/FileOp.xaml
#	ADB Explorer/Styles/Settings.xaml

Co-authored-by: Alex4SSB <68120101+Alex4SSB@users.noreply.github.com>

Copilot AI commented May 20, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Done in commit 3d32d21b. Merged master into WpfUi with WpfUi treated as superior — all 6 modify/delete conflicts were resolved by keeping the WpfUi deletions (MainWindow.xaml, PortableLauncher.bat, Services/ADB/ADBDevice.cs, Styles/Controls/ComboBox.xaml, Styles/FileOp.xaml, Styles/Settings.xaml). Non-conflicting additions from master (e.g. SECURITY.md, OFFICIAL_ADB_VERSIONS.md, the ADB version check workflow) were brought in automatically.

@Alex4SSB Alex4SSB merged commit 7adb95f into master May 20, 2026
@Alex4SSB Alex4SSB deleted the WpfUi branch May 21, 2026 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

⚡Abandon ModernWpf in favor of WPF UI

2 participants