Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions MacUtilGUI.Tests/TweakTabTests.fs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
namespace MacUtilGUI.Tests

open System
open System.IO
open Xunit
open MacUtilGUI.Models
open MacUtilGUI.Services
Expand All @@ -24,6 +26,24 @@ module TweakTabTests =
for row in vm.CautionTweaks do
row.IsChecked <- false

let private repoRoot () =
let rec walk dir =
if String.IsNullOrEmpty dir then
None
elif File.Exists(Path.Combine(dir, "MacUtilGUI", "Views", "MainWindow.axaml")) then
Some dir
else
let parent = Directory.GetParent dir

if isNull parent then None else walk parent.FullName

match walk AppContext.BaseDirectory with
| Some dir -> dir
| None ->
match walk (Directory.GetCurrentDirectory()) with
| Some dir -> dir
| None -> failwith "repo root not found"

[<Fact>]
let TweakRowUncheckedWhenAbsent () =
let client = FakeDefaultsClient()
Expand Down Expand Up @@ -84,3 +104,78 @@ module TweakTabTests =
Assert.True(client.Read("com.apple.finder", "ShowPathbar").IsNone)
Assert.False(pathBar.IsChecked)
Assert.True(ActionEngine.detect client extensions.Tweak)

[<Fact>]
let TweakGroupsByCategory () =
let client = FakeDefaultsClient()
let vm = makeVm client

let safeNames =
vm.SafeTweakGroups |> Seq.map (fun group -> group.Name) |> Seq.toList

Assert.Equal<string list>([ "Finder"; "Dock"; "Keyboard"; "Screenshots"; "Privacy" ], safeNames)

let cautionNames =
vm.CautionTweakGroups |> Seq.map (fun group -> group.Name) |> Seq.toList

Assert.Equal<string list>([ "Keyboard"; "Screenshots"; "Privacy" ], cautionNames)

Assert.Equal(vm.SafeTweaks.Count, vm.SafeTweakGroups |> Seq.sumBy (fun group -> group.Tweaks.Count))
Assert.Equal(vm.CautionTweaks.Count, vm.CautionTweakGroups |> Seq.sumBy (fun group -> group.Tweaks.Count))

Assert.False(
vm.CautionTweakGroups
|> Seq.exists (fun group -> group.Name = "Finder" || group.Name = "Dock")
)

let groupedSafe =
vm.SafeTweakGroups |> Seq.collect (fun group -> group.Tweaks) |> Seq.toList

Assert.Equal(vm.SafeTweaks.Count, groupedSafe.Length)

for row in vm.SafeTweaks do
Assert.Contains(row, groupedSafe)

let finder = vm.SafeTweakGroups |> Seq.find (fun group -> group.Name = "Finder")
finder.AllSelected <- true
Assert.True(finder.Tweaks |> Seq.forall (fun row -> row.IsChecked))
Assert.True(finder.AllSelected)

for row in vm.CautionTweaks do
Assert.False(row.IsChecked)

finder.AllSelected <- false
Assert.True(finder.Tweaks |> Seq.forall (fun row -> not row.IsChecked))
Assert.False(finder.AllSelected)

vm.SelectStandard()
let standard = Set.ofList (catalog ()).Presets.["Standard"]

for row in vm.SafeTweaks do
Assert.Equal(standard.Contains row.Id, row.IsChecked)

if row.IsChecked then
Assert.True(row.Category = "Finder" || row.Category = "Dock")

for row in vm.CautionTweaks do
Assert.False(row.IsChecked)

uncheckAll vm
let writesBefore = client.WriteCount
vm.ApplySelected()
Assert.Equal(writesBefore, client.WriteCount)
Assert.Equal("Nothing is selected.", vm.StatusText)
Assert.Empty(vm.SelectedIds)

let axaml =
File.ReadAllText(Path.Combine(repoRoot (), "MacUtilGUI", "Views", "MainWindow.axaml"))

Assert.Contains("SafeTweakGroups", axaml)
Assert.Contains("CautionTweakGroups", axaml)
Assert.Contains("TweakGroupViewModel", axaml)
Assert.DoesNotContain("ItemsSource=\"{Binding SafeTweaks}\"", axaml)
Assert.DoesNotContain("ItemsSource=\"{Binding CautionTweaks}\"", axaml)
Assert.Contains("ItemsSource=\"{Binding AppGroups}\"", axaml)
Assert.Contains("Maintenance", axaml)
Assert.Contains("Updates", axaml)
Assert.Contains("#1C1C1E", axaml)
1 change: 1 addition & 0 deletions MacUtilGUI/MacUtilGUI.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<Compile Include="ViewModels\TweakRowViewModel.fs" />
<Compile Include="ViewModels\AppRowViewModel.fs" />
<Compile Include="ViewModels\AppGroupViewModel.fs" />
<Compile Include="ViewModels\TweakGroupViewModel.fs" />
<Compile Include="ViewModels\UpdateRowViewModel.fs" />
<Compile Include="ViewModels\MainWindowViewModel.fs" />
<Compile Include="Views\MainWindow.axaml.fs" />
Expand Down
15 changes: 15 additions & 0 deletions MacUtilGUI/ViewModels/MainWindowViewModel.fs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ type MainWindowViewModel
let mutable searchText: string = ""
let safeTweaks = ObservableCollection<TweakRowViewModel>()
let cautionTweaks = ObservableCollection<TweakRowViewModel>()
let safeTweakGroups = ObservableCollection<TweakGroupViewModel>()
let cautionTweakGroups = ObservableCollection<TweakGroupViewModel>()
let allApps = ResizeArray<AppRowViewModel>()
let apps = ObservableCollection<AppRowViewModel>()
let appGroups = ObservableCollection<AppGroupViewModel>()
Expand Down Expand Up @@ -232,6 +234,12 @@ type MainWindowViewModel
| "Privacy" -> 4
| _ -> 5

let fillTweakGroups (source: TweakRowViewModel seq) (target: ObservableCollection<TweakGroupViewModel>) =
source
|> Seq.groupBy (fun (row: TweakRowViewModel) -> row.Category)
|> Seq.sortBy (fun (category, _) -> categoryRank category, category)
|> Seq.iter (fun (category, rows) -> target.Add(TweakGroupViewModel(category, rows)))

do
catalog.Tweaks
|> Map.toSeq
Expand All @@ -244,6 +252,9 @@ type MainWindowViewModel
| Risk.Safe -> safeTweaks.Add(row)
| Risk.Caution -> cautionTweaks.Add(row))

fillTweakGroups safeTweaks safeTweakGroups
fillTweakGroups cautionTweaks cautionTweakGroups

catalog.Apps
|> Map.toSeq
|> Seq.map snd
Expand Down Expand Up @@ -277,6 +288,10 @@ type MainWindowViewModel

member _.CautionTweaks = cautionTweaks

member _.SafeTweakGroups = safeTweakGroups

member _.CautionTweakGroups = cautionTweakGroups

member _.Apps = apps

member _.AppGroups = appGroups
Expand Down
22 changes: 22 additions & 0 deletions MacUtilGUI/ViewModels/TweakGroupViewModel.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
namespace MacUtilGUI.ViewModels

open System.Collections.ObjectModel

type TweakGroupViewModel(name: string, rows: TweakRowViewModel seq) =
inherit ViewModelBase()

let tweaks = ObservableCollection<TweakRowViewModel>(rows)

member _.Name = name

member _.Tweaks = tweaks

member this.AllSelected
with get () =
tweaks.Count > 0
&& Seq.forall (fun (row: TweakRowViewModel) -> row.IsChecked) tweaks
and set v =
for row in tweaks do
row.IsChecked <- v

this.OnPropertyChanged("AllSelected")
1 change: 1 addition & 0 deletions MacUtilGUI/ViewModels/TweakRowViewModel.fs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type TweakRowViewModel(tweak: Tweak, isChecked: bool) =
member _.Id = tweak.Id
member _.Content = tweak.Content
member _.Description = tweak.Description
member _.Category = tweak.Category
member _.Tweak = tweak

member this.IsChecked
Expand Down
94 changes: 70 additions & 24 deletions MacUtilGUI/Views/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,41 +49,87 @@
Classes="macos-title"
FontSize="18"
Margin="0,0,0,12"/>
<ItemsControl ItemsSource="{Binding SafeTweaks}">
<ItemsControl ItemsSource="{Binding SafeTweakGroups}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:TweakRowViewModel">
<CheckBox Classes="macos-tweak"
IsChecked="{Binding IsChecked, Mode=TwoWay}"
<DataTemplate x:DataType="vm:TweakGroupViewModel">
<Expander IsExpanded="True"
HorizontalAlignment="Stretch"
Margin="0,0,0,8">
<StackPanel>
<TextBlock Text="{Binding Content}" Classes="macos-body"/>
<TextBlock Text="{Binding Description}"
Classes="macos-secondary"
FontSize="11"
TextWrapping="Wrap"/>
</StackPanel>
</CheckBox>
<Expander.Header>
<DockPanel>
<CheckBox DockPanel.Dock="Left"
Classes="macos-tweak"
IsChecked="{Binding AllSelected, Mode=TwoWay}"
VerticalAlignment="Center"/>
<TextBlock Text="{Binding Name}"
Classes="macos-title"
FontSize="16"
VerticalAlignment="Center"
Margin="8,0,0,0"/>
</DockPanel>
</Expander.Header>
<ItemsControl ItemsSource="{Binding Tweaks}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:TweakRowViewModel">
<CheckBox Classes="macos-tweak"
IsChecked="{Binding IsChecked, Mode=TwoWay}"
Margin="0,0,0,8">
<StackPanel>
<TextBlock Text="{Binding Content}" Classes="macos-body"/>
<TextBlock Text="{Binding Description}"
Classes="macos-secondary"
FontSize="11"
TextWrapping="Wrap"/>
</StackPanel>
</CheckBox>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Expander>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<TextBlock Text="Caution"
Classes="macos-caution"
FontSize="16"
Margin="0,20,0,12"/>
<ItemsControl ItemsSource="{Binding CautionTweaks}">
<ItemsControl ItemsSource="{Binding CautionTweakGroups}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:TweakRowViewModel">
<CheckBox Classes="macos-tweak"
IsChecked="{Binding IsChecked, Mode=TwoWay}"
<DataTemplate x:DataType="vm:TweakGroupViewModel">
<Expander IsExpanded="True"
HorizontalAlignment="Stretch"
Margin="0,0,0,8">
<StackPanel>
<TextBlock Text="{Binding Content}" Classes="macos-body"/>
<TextBlock Text="{Binding Description}"
Classes="macos-secondary"
FontSize="11"
TextWrapping="Wrap"/>
</StackPanel>
</CheckBox>
<Expander.Header>
<DockPanel>
<CheckBox DockPanel.Dock="Left"
Classes="macos-tweak"
IsChecked="{Binding AllSelected, Mode=TwoWay}"
VerticalAlignment="Center"/>
<TextBlock Text="{Binding Name}"
Classes="macos-title"
FontSize="16"
VerticalAlignment="Center"
Margin="8,0,0,0"/>
</DockPanel>
</Expander.Header>
<ItemsControl ItemsSource="{Binding Tweaks}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:TweakRowViewModel">
<CheckBox Classes="macos-tweak"
IsChecked="{Binding IsChecked, Mode=TwoWay}"
Margin="0,0,0,8">
<StackPanel>
<TextBlock Text="{Binding Content}" Classes="macos-body"/>
<TextBlock Text="{Binding Description}"
Classes="macos-secondary"
FontSize="11"
TextWrapping="Wrap"/>
</StackPanel>
</CheckBox>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Expander>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
Expand Down
Loading