GODT-1329: Dark mode, with macOS autodetect.

This commit is contained in:
Jakub
2021-12-14 16:27:55 +01:00
committed by Jakub Cuth
parent 20a0404efb
commit 0332a3f873
12 changed files with 345 additions and 14 deletions

View File

@ -0,0 +1,34 @@
// Copyright (c) 2021 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
//go:build darwin
// +build darwin
package theme
import (
"os/exec"
"strings"
)
func detectSystemTheme() Theme {
out, err := exec.Command("defaults", "read", "-g", "AppleInterfaceStyle").Output() //nolint[gosec]
if err == nil && strings.TrimSpace(string(out)) == "Dark" {
return Dark
}
return Light
}

View File

@ -0,0 +1,25 @@
// Copyright (c) 2021 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
//go:build !windows && !darwin
// +build !windows,!darwin
package theme
func detectSystemTheme() Theme {
return Light
}

View File

@ -0,0 +1,53 @@
// Copyright (c) 2021 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
//go:build windows
// +build windows
package theme
import (
"github.com/sirupsen/logrus"
"golang.org/x/sys/windows/registry"
)
func detectSystemTheme() Theme {
log := logrus.WithField("pkg", "theme")
k, err := registry.OpenKey(
registry.CURRENT_USER,
`SOFTWARE\Microsoft\Windows\CurrentVersion\Themes\Personalize`,
registry.QUERY_VALUE,
)
if err != nil {
log.WithError(err).Error("Not able to open register")
return Light
}
defer k.Close()
i, _, err := k.GetIntegerValue("AppsUseLightTheme")
if err != nil {
log.WithError(err).Error("Cannot get value")
return Light
}
if i == 0 {
return Dark
}
return Light
}

View File

@ -0,0 +1,42 @@
// Copyright (c) 2021 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
package theme
import (
"runtime"
)
type Theme string
const (
Light = Theme("light")
Dark = Theme("dark")
)
func IsAvailable(have Theme) bool {
return have == Light || have == Dark
}
func DefaultTheme() Theme {
switch runtime.GOOS {
case "darwin", "windows":
return detectSystemTheme()
default:
return Light
}
}

View File

@ -0,0 +1,45 @@
// Copyright (c) 2021 Proton Technologies AG
//
// This file is part of ProtonMail Bridge.
//
// ProtonMail Bridge is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ProtonMail Bridge is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with ProtonMail Bridge. If not, see <https://www.gnu.org/licenses/>.
// Package settings provides access to persistent user settings.
package theme
import (
"testing"
"github.com/stretchr/testify/require"
)
func TestIsAvailable(t *testing.T) {
r := require.New(t)
want := "dark"
r.True(IsAvailable("dark"))
r.True(IsAvailable(Dark))
r.True(IsAvailable(Theme(want)))
want = "light"
r.True(IsAvailable("light"))
r.True(IsAvailable(Light))
r.True(IsAvailable(Theme(want)))
want = "molokai"
r.False(IsAvailable(""))
r.False(IsAvailable("molokai"))
r.False(IsAvailable(Theme(want)))
}