Back button fix

Back button does not work on some android devices, let any device use the title as a back button
Strosel · Jun 20, 2023 · 9312130 · 9312130
1 parent 5f8e60c
commit 9312130
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -41,6 +41,8 @@
             vendorHash = "sha256-2LQCFYyEletx+FswLV1Ui506qG62yHUKGr5vP5Y/b/s=";
             doCheck = false;
           };
+
+          minsdk = "29";
         in
         {
           devShells.default = pkgs.mkShell
@@ -55,14 +57,14 @@
                   local V=$(gum input --prompt 'Version? ' --placeholder '7')
 
                   gum spin --spinner dot --title "Building..." -- \
-                  gogio -target android -icon assets/meta/icon.png -version $V -minsdk 29 .
+                  gogio -target android -icon assets/meta/icon.png -version $V -minsdk ${minsdk} .
 
                   apksigner sign --ks ~/.android/sign.keystore treman.apk
                 }
 
                 stream () {
                   gum spin --spinner dot --title "Building..." -- \
-                  gogio -target android -icon assets/meta/icon.png -minsdk 29 .
+                  gogio -target android -icon assets/meta/icon.png -minsdk ${minsdk} .
                   adb uninstall com.github.treman > /dev/null 2>&1
                   adb install treman.apk
                 }

diff --git a/main.go b/main.go
@@ -53,11 +53,10 @@ func loop(w *app.Window, th *material.Theme) error {
 		switch e := e.(type) {
 		case system.DestroyEvent:
 			return e.Err
-		case key.Event: //NOTE oklart om detta funkar
+		case key.Event:
 			if e.Name == key.NameBack {
 				screen = gameScreen(screen.Rules())
 			}
-			//HACK e.Cancel = true
 			w.Invalidate()
 		case system.FrameEvent:
 			gtx := layout.NewContext(&ops, e)

diff --git a/viewRules.go b/viewRules.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	"runtime"
-
 	"gioui.org/layout"
 	"gioui.org/unit"
 	"gioui.org/widget"
@@ -51,9 +49,7 @@ func (v *viewRules) Layout(gtx Ctx, th *material.Theme) (nextScreen Screen) {
 	layout.UniformInset(unit.Dp(8)).Layout(gtx, func(gtx Ctx) Dim {
 		return v.list.Layout(gtx, 4, func(gtx Ctx, i int) Dim {
 			return layout.UniformInset(unit.Dp(16)).Layout(gtx, func(gtx Ctx) Dim {
-				if i == 0 && runtime.GOOS == "android" {
-					return layout.Inset{Top: unit.Dp(16)}.Layout(gtx, material.H6(th, "Regler").Layout)
-				} else if i == 0 {
+				if i == 0 {
 					bttn := material.Button(th, v.cancelClick, "← Regler")
 					bttn.Color = BLACK
 					bttn.Background = WHITE