Move app UI package under internal/appui

This commit is contained in:
Joe Julian
2026-04-09 06:35:59 -07:00
parent 07a071503a
commit 7751b5472a
24 changed files with 25 additions and 25 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ APP_ID ?= org.julianfamily.keepassgo
APK_OUT ?= build/keepassgo.apk APK_OUT ?= build/keepassgo.apk
APK_VERSION ?= 0.1.0.1 APK_VERSION ?= 0.1.0.1
APP_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev) APP_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo.appVersion=$(APP_VERSION) GO_LDFLAGS ?= -X git.julianfamily.org/keepassgo/internal/appui.appVersion=$(APP_VERSION)
ANDROID_MIN_SDK ?= 28 ANDROID_MIN_SDK ?= 28
ANDROID_TARGET_SDK ?= 35 ANDROID_TARGET_SDK ?= 35
SIGNKEY ?= SIGNKEY ?=
+1 -1
View File
@@ -45,7 +45,7 @@ By default, build outputs stamp the app version from `git describe --tags --alwa
You can override the version shown in KeePassGO with: You can override the version shown in KeePassGO with:
```bash ```bash
go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=v0.0.1" ./cmd/keepassgo go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=v0.0.1" ./cmd/keepassgo
``` ```
## Arch Linux Package ## Arch Linux Package
+1 -1
View File
@@ -13,7 +13,7 @@ const (
DefaultAppID = "org.julianfamily.keepassgo" DefaultAppID = "org.julianfamily.keepassgo"
DefaultAPKOut = "build/keepassgo.apk" DefaultAPKOut = "build/keepassgo.apk"
DefaultVersion = "0.1.0.1" DefaultVersion = "0.1.0.1"
DefaultLdflags = "-X git.julianfamily.org/keepassgo.appVersion=dev" DefaultLdflags = "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=dev"
DefaultMinSDK = "28" DefaultMinSDK = "28"
DefaultTargetSDK = "35" DefaultTargetSDK = "35"
DefaultIconPath = "assets/keepassgo-icon.png" DefaultIconPath = "assets/keepassgo-icon.png"
+2 -2
View File
@@ -1,7 +1,7 @@
package main package main
import keepassgo "git.julianfamily.org/keepassgo" import "git.julianfamily.org/keepassgo/internal/appui"
func main() { func main() {
keepassgo.Main() appui.Main()
} }
@@ -1,6 +1,6 @@
//go:build android //go:build android
package keepassgo package appui
/* /*
#cgo CFLAGS: -Werror #cgo CFLAGS: -Werror
@@ -1,6 +1,6 @@
//go:build !android //go:build !android
package keepassgo package appui
func newPlatformVaultSharer(goos string) vaultSharer { func newPlatformVaultSharer(goos string) vaultSharer {
return nil return nil
+1 -1
View File
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"crypto/sha256" "crypto/sha256"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"io" "io"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"slices" "slices"
+1 -1
View File
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"bytes" "bytes"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"fmt" "fmt"
+1 -1
View File
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"fmt" "fmt"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"image" "image"
+1 -1
View File
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"fmt" "fmt"
+1 -1
View File
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"fmt" "fmt"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"image" "image"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"fmt" "fmt"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"image" "image"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"gioui.org/layout" "gioui.org/layout"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"encoding/json" "encoding/json"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"strings" "strings"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"image/color" "image/color"
@@ -1,4 +1,4 @@
package keepassgo package appui
import ( import (
"runtime" "runtime"
@@ -41,7 +41,7 @@ build() {
export GOFLAGS="-trimpath" export GOFLAGS="-trimpath"
local app_version local app_version
app_version="$(git describe --tags --always --dirty)" app_version="$(git describe --tags --always --dirty)"
go build -ldflags "-X git.julianfamily.org/keepassgo.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo go build -ldflags "-X git.julianfamily.org/keepassgo/internal/appui.appVersion=${app_version}" -o keepassgo ./cmd/keepassgo
} }
package() { package() {