From 9cae00d2a5985b635169cd99370c7033c5eb1278 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 27 Jun 2025 19:37:15 +0200 Subject: [PATCH 01/16] refactor: first step to refactor the ui --- cmd/main.go | 75 ++++++++------ internal/ui/components/navbutton.go | 62 ++++++++++++ internal/ui/home.go | 71 ++++++++----- internal/ui/navbar.go | 45 +++++++++ internal/ui/theme/theme.go | 75 ++++++++++++++ internal/ui/training.go | 150 +++++++++------------------- internal/utils/utils.go | 10 ++ 7 files changed, 330 insertions(+), 158 deletions(-) create mode 100644 internal/ui/components/navbutton.go create mode 100644 internal/ui/navbar.go create mode 100644 internal/ui/theme/theme.go create mode 100644 internal/utils/utils.go diff --git a/cmd/main.go b/cmd/main.go index 7ca7e60..f0629fc 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,51 +4,70 @@ import ( "log" "path/filepath" - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/app" - "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/theme" - "git.patanix.de/git/kettlebell-app/internal/data" "git.patanix.de/git/kettlebell-app/internal/services" "git.patanix.de/git/kettlebell-app/internal/ui" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/app" + "fyne.io/fyne/v2/container" + + "git.patanix.de/git/kettlebell-app/internal/ui/theme" // <-- Neuer Theme-Import ) func main() { - myApp := app.NewWithID("com.example.kettlebell-tracker") - // myApp.Settings().SetTheme(theme.DarkTheme()) - mainWIndow := myApp.NewWindow("Kettlebell Programm Tracker") + // 1. App initialisieren und unser neues Theme setzen + myApp := app.NewWithID("com.patani.kettlebell-tracker") + myApp.Settings().SetTheme(&theme.KettlebellTheme{}) // <-- Setzt unser benutzerdefiniertes Theme + mainWindow := myApp.NewWindow("Kettlebell Tracker") + + // 2. Services initialisieren (wie zuvor) dbDir := myApp.Storage().RootURI().Path() - dbPath := filepath.Join(dbDir, "kb_training.db") - log.Println("Datenbankpfad:", dbPath) - + dbPath := filepath.Join(dbDir, "giant_training.db") dbService, err := data.NewDatabaseService(dbPath) if err != nil { log.Fatalf("Fehler bei der Initialisierung der Datenbank: %v", err) } - settingsService := services.NewSettingsService(myApp) apiService := services.NewApiService(myApp.UniqueID()) - trainingService := services.NewTrainingService(dbService, settingsService, apiService) - homeScreen := ui.MakeHomeScreen() - settingsScreen := ui.MakeSettingsScreen(settingsService, mainWIndow) - historyScreen := ui.MakeHistoryScreen(dbService, mainWIndow) - trainingScreen := ui.MakeTrainingScreen(trainingService, settingsService, mainWIndow) + // 3. UI-Bildschirme erstellen + // Wir erstellen einen Container, der die Bildschirme verwaltet (ähnlich einem Stack) + contentContainer := container.NewMax() - tabs := container.NewAppTabs( - container.NewTabItemWithIcon("Home", theme.HomeIcon(), homeScreen), - container.NewTabItemWithIcon("Training", theme.MediaPlayIcon(), trainingScreen), - container.NewTabItemWithIcon("Historie", theme.HistoryIcon(), historyScreen), - container.NewTabItemWithIcon("Einstellungen", theme.SettingsIcon(), settingsScreen), - ) + // Die Bildschirme erstellen und dem Container hinzufügen + homeScreen := ui.MakeHomeScreen(trainingService, contentContainer, mainWindow) + trainingScreen := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) + historyScreen := ui.MakeHistoryScreen(dbService, mainWindow) + settingsScreen := ui.MakeSettingsScreen(settingsService, mainWindow) - tabs.SetTabLocation(container.TabLocationBottom) + contentContainer.Add(homeScreen) + contentContainer.Add(trainingScreen) + contentContainer.Add(historyScreen) + contentContainer.Add(settingsScreen) - mainWIndow.Resize(fyne.NewSize(400, 600)) - mainWIndow.SetContent(tabs) - mainWIndow.SetMaster() - mainWIndow.ShowAndRun() + // Initial nur den Home-Bildschirm anzeigen + homeScreen.Show() + trainingScreen.Hide() + historyScreen.Hide() + settingsScreen.Hide() + + // 4. Benutzerdefinierte Navigationsleiste erstellen + navBar := ui.MakeNavBar(map[string]fyne.CanvasObject{ + "home": homeScreen, + "training": trainingScreen, + "history": historyScreen, + "settings": settingsScreen, + }, contentContainer) + + // 5. Hauptlayout mit Border-Layout erstellen + // Der Inhalt ist im Zentrum, die Navigationsleiste am unteren Rand. + mainLayout := container.NewBorder(nil, navBar, nil, nil, contentContainer) + + mainWindow.SetContent(mainLayout) + mainWindow.Resize(fyne.NewSize(360, 740)) // Mobile-freundliche Größe + mainWindow.SetMaster() + mainWindow.ShowAndRun() } diff --git a/internal/ui/components/navbutton.go b/internal/ui/components/navbutton.go new file mode 100644 index 0000000..1863d8d --- /dev/null +++ b/internal/ui/components/navbutton.go @@ -0,0 +1,62 @@ +package components + +import ( + "image/color" + + "git.patanix.de/git/kettlebell-app/internal/ui/theme" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/canvas" + "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/widget" +) + +// NavButton ist unser benutzerdefinierter Navigationsbutton +type NavButton struct { + widget.BaseWidget + icon *canvas.Image + label *canvas.Text + onTapped func() + isActive bool + container *fyne.Container +} + +func NewNavButton(label string, iconRes fyne.Resource, active bool, tapped func()) *NavButton { + icon := canvas.NewImageFromResource(iconRes) + icon.FillMode = canvas.ImageFillContain + icon.SetMinSize(fyne.NewSize(28, 28)) + + text := canvas.NewText(label, color.White) + text.TextSize = 12 + text.Alignment = fyne.TextAlignCenter + + button := &NavButton{ + icon: icon, + label: text, + onTapped: tapped, + } + button.ExtendBaseWidget(button) + button.container = container.NewVBox(icon, text) + button.SetActive(active) + return button +} + +func (b *NavButton) CreateRenderer() fyne.WidgetRenderer { + return widget.NewSimpleRenderer(b.container) +} + +func (b *NavButton) Tapped(*fyne.PointEvent) { + b.onTapped() +} + +func (b *NavButton) SetActive(active bool) { + b.isActive = active + if b.isActive { + // b.icon.Resource.Color = theme.ColorSky400 + b.label.Color = theme.ColorSky400 + } else { + // b.icon.Resource.Color = theme.ColorSlate400 + b.label.Color = theme.ColorSlate400 + } + b.Refresh() +} diff --git a/internal/ui/home.go b/internal/ui/home.go index 7b7592d..a9bddc2 100644 --- a/internal/ui/home.go +++ b/internal/ui/home.go @@ -1,36 +1,57 @@ package ui import ( + "fmt" + + "git.patanix.de/git/kettlebell-app/internal/services" + "fyne.io/fyne/v2" - "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" ) -// MakeHomeScreen erstellt den statischen Willkommensbildschirm. -func MakeHomeScreen() fyne.CanvasObject { - primaryColor := theme.PrimaryColor() - - title := canvas.NewText("Willkommen beim Giant Programm Tracker!", primaryColor) - title.TextStyle.Bold = true - title.Alignment = fyne.TextAlignCenter - title.TextSize = 24 - - subtitle := widget.NewLabel("Verwalte deine Kettlebell-Trainings effizient.") - subtitle.Alignment = fyne.TextAlignCenter - - icon := widget.NewIcon(theme.MediaPlayIcon()) - icon.Resize(fyne.NewSize(150, 150)) - - // Layout erstellen, das dem Flutter-Layout entspricht - content := container.NewVBox( - title, - widget.NewSeparator(), - subtitle, - container.NewPadded(icon), // Icon mit etwas Abstand +func MakeHomeScreen(ts *services.TrainingService, content *fyne.Container, parent fyne.Window) fyne.CanvasObject { + // Header + header := container.NewVBox( + widget.NewLabel("Hallo,"), + widget.NewLabelWithStyle("Patanix", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}), //, Size: 24}), ) - // Zentriert den Inhalt - return container.NewCenter(content) + // Nächstes Training CTA + state := ts.State + nextTrainingCard := widget.NewCard( + "Nächstes Training", + fmt.Sprintf("%s - Tag %d", state.CurrentProgram, state.CurrentBlockDay), + container.NewVBox( + widget.NewLabel(fmt.Sprintf("Ziel: %d Wiederholungen pro Satz", state.CurrentReps)), + widget.NewButton("Training starten", func() { + // Wechsle zum Trainingsbildschirm + for _, child := range content.Objects { + if _, ok := child.(*fyne.Container).Objects[0].(*widget.Card); ok { + // Heuristik, um den Trainings-Screen zu finden + child.Show() + } else { + child.Hide() + } + } + content.Refresh() + }), + ), + ) + + // Letzte Leistung + // HINWEIS: Diese Daten müssten aus dem dbService geladen werden. + // Hier verwenden wir vorerst Platzhalter. + statsCard := widget.NewCard("Letzte Leistung", "", container.NewGridWithColumns(3, + container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("8", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("18:45", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Gewicht"), widget.NewLabelWithStyle("16kg", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + )) + + return container.NewVBox( + header, + widget.NewSeparator(), + nextTrainingCard, + statsCard, + ) } diff --git a/internal/ui/navbar.go b/internal/ui/navbar.go new file mode 100644 index 0000000..a32cc42 --- /dev/null +++ b/internal/ui/navbar.go @@ -0,0 +1,45 @@ +package ui + +import ( + "git.patanix.de/git/kettlebell-app/internal/ui/components" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/theme" +) + +// MakeNavBar erstellt die benutzerdefinierte Navigationsleiste am unteren Rand. +func MakeNavBar(screens map[string]fyne.CanvasObject, content *fyne.Container) fyne.CanvasObject { + buttons := make(map[string]*components.NavButton) + + // Funktion zum Umschalten der Ansichten + navigateTo := func(name string) { + for key, screen := range screens { + if key == name { + screen.Show() + } else { + screen.Hide() + } + } + for key, button := range buttons { + if key == name { + button.SetActive(true) + } else { + button.SetActive(false) + } + } + content.Refresh() + } + + buttons["home"] = components.NewNavButton("Home", theme.HomeIcon(), true, func() { navigateTo("home") }) + buttons["training"] = components.NewNavButton("Training", theme.MediaPlayIcon(), false, func() { navigateTo("training") }) + buttons["history"] = components.NewNavButton("Historie", theme.ListIcon(), false, func() { navigateTo("history") }) + buttons["settings"] = components.NewNavButton("Einstellungen", theme.SettingsIcon(), false, func() { navigateTo("settings") }) + + return container.NewGridWithColumns(4, + buttons["home"], + buttons["training"], + buttons["history"], + buttons["settings"], + ) +} diff --git a/internal/ui/theme/theme.go b/internal/ui/theme/theme.go new file mode 100644 index 0000000..fa16797 --- /dev/null +++ b/internal/ui/theme/theme.go @@ -0,0 +1,75 @@ +package theme + +import ( + "image/color" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/theme" +) + +// Definiere unsere benutzerdefinierten Farben basierend auf dem Mock-up +var ( + ColorSlate900 = color.NRGBA{R: 0x0f, G: 0x17, B: 0x2a, A: 0xff} // bg-slate-900 + ColorSlate800 = color.NRGBA{R: 0x1e, G: 0x29, B: 0x3b, A: 0xff} // bg-slate-800 + ColorSlate400 = color.NRGBA{R: 0x94, G: 0xa3, B: 0xb8, A: 0xff} // text-slate-400 + ColorSlate200 = color.NRGBA{R: 0xe2, G: 0xe8, B: 0xf0, A: 0xff} // text-slate-200 + ColorSky500 = color.NRGBA{R: 0x0e, G: 0xa5, B: 0xe9, A: 0xff} // bg-sky-500 + ColorSky400 = color.NRGBA{R: 0x38, G: 0xbd, B: 0xf8, A: 0xff} // text-sky-400 + ColorRed500 = color.NRGBA{R: 0xef, G: 0x44, B: 0x44, A: 0xff} // red-500 +) + +// KettlebellTheme ist unsere benutzerdefinierte Theme-Implementierung +type KettlebellTheme struct{} + +func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { + switch name { + case theme.ColorNameBackground: + return ColorSlate900 + case theme.ColorNameButton: + return ColorSlate800 + case theme.ColorNameDisabledButton: + return ColorSlate800 + case theme.ColorNamePrimary: + return ColorSky500 + case theme.ColorNamePlaceHolder: + return ColorSlate400 + case theme.ColorNameHover: + return color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // Slate 700 + case theme.ColorNameForeground: + return ColorSlate200 + case theme.ColorNameDisabled: + return ColorSlate400 + case theme.ColorNameError: + return ColorRed500 + case theme.ColorNameInputBackground: + return ColorSlate800 + case theme.ColorNameSeparator: + return color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // Slate 700 + default: + return theme.DefaultTheme().Color(name, variant) + } +} + +func (t *KettlebellTheme) Icon(name fyne.ThemeIconName) fyne.Resource { + // Hier könnten wir benutzerdefinierte Icons laden, wenn nötig. + // Vorerst verwenden wir die Standard-Icons. + return theme.DefaultTheme().Icon(name) +} + +func (t *KettlebellTheme) Font(style fyne.TextStyle) fyne.Resource { + // Hier könnten wir eine benutzerdefinierte Schriftart wie 'Inter' laden. + return theme.DefaultTheme().Font(style) +} + +func (t *KettlebellTheme) Size(name fyne.ThemeSizeName) float32 { + switch name { + case theme.SizeNamePadding: + return 8 + case theme.SizeNameText: + return 16 + case theme.SizeNameHeadingText: + return 28 + default: + return theme.DefaultTheme().Size(name) + } +} diff --git a/internal/ui/training.go b/internal/ui/training.go index be6ed34..1e40724 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -2,7 +2,6 @@ package ui import ( "fmt" - "log" "time" "git.patanix.de/git/kettlebell-app/internal/data" @@ -10,69 +9,46 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" ) func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsService, parent fyne.Window) fyne.CanvasObject { - programLabel := widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) - blockDayLabel := widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{}) - repsLabel := widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + // UI-Elemente + timerLabel := widget.NewLabelWithStyle("20:00", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + // timerLabel.TextSize = 60 - timerLabel := widget.NewLabelWithStyle("00:00", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + setsLabel := widget.NewLabelWithStyle("0 / 8", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + // setsLabel.TextSize = 48 + // setsLabel.Color = theme.ColorSky400 - progressBar := widget.NewProgressBar() - progressLabel := widget.NewLabelWithStyle("Fortschritt: 0%", fyne.TextAlignCenter, fyne.TextStyle{}) + repsLabel := widget.NewLabelWithStyle("5 Wiederholungen", fyne.TextAlignCenter, fyne.TextStyle{}) + // repsLabel.TextSize = 20 - var startButton, setButton, finishButton *widget.Button - - setHistoryList := widget.NewList( - func() int { - return len(ts.State.SetTimes) - }, - func() fyne.CanvasObject { - return widget.NewLabel("") - }, - func(id widget.ListItemID, obj fyne.CanvasObject) { - t := ts.State.SetTimes[id] - obj.(*widget.Label).SetText(fmt.Sprintf("#%d um %s (%d Reps)", id+1, t.Format("15:04:05"), ts.State.CurrentReps)) - }, - ) - - var mainTimer, lastSetTimer *time.Ticker + var mainTimer *time.Ticker updateUI := func() { state := ts.State - programLabel.SetText(state.CurrentProgram) - blockDayLabel.SetText(fmt.Sprintf("Block Tag: %d", state.CurrentBlockDay)) - repsLabel.SetText(fmt.Sprintf("Reps pro Satz: %d", state.CurrentReps)) - timerLabel.SetText(formatDuration(int64(state.RemainingSeconds))) - progressBar.SetValue(state.Progress) - progressLabel.SetText(fmt.Sprintf("Fortschritt: %.0f%%", state.Progress*100)) - - if state.IsTrainingRunning { - startButton.Disable() - setButton.Enable() - finishButton.Enable() - } else { - startButton.Enable() - setButton.Disable() - finishButton.Disable() - } - setHistoryList.Refresh() + setsLabel.SetText(fmt.Sprintf("%d / %d", state.SetsDone, state.GoalSets)) + repsLabel.SetText(fmt.Sprintf("%d Wiederholungen", state.RepsPerSet)) } - stopTimers := func() { + finishAction := func() { if mainTimer != nil { mainTimer.Stop() - mainTimer = nil } - if lastSetTimer != nil { - lastSetTimer.Stop() - lastSetTimer = nil + // ... (Logik zum Speichern wie zuvor) ... + session := &data.TrainingSession{ + Date: time.Now(), + Sets: int64(ts.State.SetsDone), + WeightLeft: ss.LoadSettings().WeightLeft, + WeightRight: ss.LoadSettings().WeightRight, + RepsPerSet: int64(ts.State.RepsPerSet), + Duration: int64(ts.State.InitialDurationSeconds - ts.State.RemainingSeconds), } + ts.FinishTraining(session) + fyne.CurrentApp().SendNotification(&fyne.Notification{Title: "Training gespeichert!", Content: "Gut gemacht!"}) + updateUI() } startAction := func() { @@ -84,78 +60,42 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi go func() { for range mainTimer.C { if ts.State.RemainingSeconds <= 0 { - stopTimers() - fyne.CurrentApp().SendNotification(&fyne.Notification{ - Title: "Zeit abgelaufen!", - Content: "Training wird automatisch gespeichert.", - }) - finishButton.OnTapped() + finishAction() return } ts.Tick() updateUI() } }() - - lastSetTimer = time.NewTicker(time.Second) - go func() { - for range lastSetTimer.C { - ts.TickLastSetTimer() - } - }() } setAction := func() { ts.CompleteSet() - fyne.CurrentApp().SendNotification(&fyne.Notification{Title: "Satz gespeichert!", Content: ""}) updateUI() } - finishAction := func() { - stopTimers() - settings := ss.LoadSettings() - state := ts.State - - session := &data.TrainingSession{ - Date: time.Now(), - Sets: int64(state.SetsDone), - WeightLeft: settings.WeightLeft, - WeightRight: settings.WeightRight, - RepsPerSet: int64(state.RepsPerSet), - Duration: int64(state.InitialDurationSeconds - state.RemainingSeconds), - } - - if err := ts.FinishTraining(session); err != nil { - dialog.ShowError(err, parent) - log.Printf("Fehler beim Speichern des Trainings: %v", err) - } else { - fyne.CurrentApp().SendNotification(&fyne.Notification{Title: "Training gespeichert!", Content: "Gut gemacht!"}) - } - - updateUI() - } - - startButton = widget.NewButtonWithIcon("Start", theme.MediaPlayIcon(), startAction) - setButton = widget.NewButtonWithIcon("Satz", theme.ConfirmIcon(), setAction) - finishButton = widget.NewButtonWithIcon("Beenden", theme.MediaStopIcon(), finishAction) - - updateUI() - - headerCard := widget.NewCard("", "", container.NewVBox(programLabel, blockDayLabel, repsLabel)) - timerCard := widget.NewCard("", "", container.NewVBox( + // Layout im "Cockpit"-Stil + topPart := container.NewVBox( widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), timerLabel, - progressBar, - progressLabel, - )) - - actionButtons := container.NewGridWithColumns(3, startButton, setButton, finishButton) - historyCard := widget.NewCard("Satz-Historie", "", setHistoryList) - - return container.NewVBox( - headerCard, - timerCard, - actionButtons, - historyCard, ) + + middlePart := container.NewVBox( + widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{}), + setsLabel, + repsLabel, + ) + + finishButton := widget.NewButton("Training beenden", finishAction) + // Wir simulieren den roten Button durch die Error-Farbe des Themes + finishButton.Importance = widget.HighImportance + + bottomPart := container.NewVBox( + widget.NewButton("Satz abschließen", setAction), + finishButton, + ) + // HINWEIS: Start-Button fehlt hier, da der Flow vom Home-Screen ausgeht. + // Man könnte ihn bei Bedarf hinzufügen. + + return container.NewBorder(topPart, bottomPart, nil, nil, container.NewCenter(middlePart)) } diff --git a/internal/utils/utils.go b/internal/utils/utils.go new file mode 100644 index 0000000..7a3ccbe --- /dev/null +++ b/internal/utils/utils.go @@ -0,0 +1,10 @@ +package utils + +import "fmt" + +// Hilfsfunktion (kann in einer utils.go Datei platziert werden) +func formatDuration(totalSeconds int64) string { + mins := totalSeconds / 60 + secs := totalSeconds % 60 + return fmt.Sprintf("%02d:%02d", mins, secs) +} From 24430d0faea11b8d3c6b07ad644cf93f991fcd03 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 27 Jun 2025 19:55:34 +0200 Subject: [PATCH 02/16] refactor: ui refactor step 2 --- cmd/main.go | 34 ++++++++--------- internal/ui/history.go | 65 +++++++++++++++----------------- internal/ui/home.go | 31 +++++++-------- internal/ui/navbar.go | 16 ++++---- internal/ui/settings.go | 60 ++++++++++++++++++----------- internal/ui/theme/theme.go | 14 +++---- internal/ui/training.go | 55 +++++++++++++++++++-------- internal/ui/utils/format.go | 13 +++++++ internal/{ => ui}/utils/utils.go | 0 9 files changed, 167 insertions(+), 121 deletions(-) create mode 100644 internal/ui/utils/format.go rename internal/{ => ui}/utils/utils.go (100%) diff --git a/cmd/main.go b/cmd/main.go index f0629fc..f32cc2a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -34,36 +34,36 @@ func main() { trainingService := services.NewTrainingService(dbService, settingsService, apiService) // 3. UI-Bildschirme erstellen - // Wir erstellen einen Container, der die Bildschirme verwaltet (ähnlich einem Stack) contentContainer := container.NewMax() + // Navigationsfunktion definieren, die wir an die Screens weitergeben können + var navigateTo func(string) + // Die Bildschirme erstellen und dem Container hinzufügen - homeScreen := ui.MakeHomeScreen(trainingService, contentContainer, mainWindow) + homeScreen := ui.MakeHomeScreen(trainingService, func() { navigateTo("training") }) trainingScreen := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) historyScreen := ui.MakeHistoryScreen(dbService, mainWindow) settingsScreen := ui.MakeSettingsScreen(settingsService, mainWindow) - contentContainer.Add(homeScreen) - contentContainer.Add(trainingScreen) - contentContainer.Add(historyScreen) - contentContainer.Add(settingsScreen) - - // Initial nur den Home-Bildschirm anzeigen - homeScreen.Show() - trainingScreen.Hide() - historyScreen.Hide() - settingsScreen.Hide() - - // 4. Benutzerdefinierte Navigationsleiste erstellen - navBar := ui.MakeNavBar(map[string]fyne.CanvasObject{ + screens := map[string]fyne.CanvasObject{ "home": homeScreen, "training": trainingScreen, "history": historyScreen, "settings": settingsScreen, - }, contentContainer) + } + + for _, s := range screens { + contentContainer.Add(s) + } + + // 4. Benutzerdefinierte Navigationsleiste erstellen + navBar, navigateFunc := ui.MakeNavBar(screens, contentContainer) + navigateTo = navigateFunc // Weisen der Navigationsfunktion die Implementierung aus der Navbar zu + + // Initial den Home-Bildschirm anzeigen + navigateTo("home") // 5. Hauptlayout mit Border-Layout erstellen - // Der Inhalt ist im Zentrum, die Navigationsleiste am unteren Rand. mainLayout := container.NewBorder(nil, navBar, nil, nil, contentContainer) mainWindow.SetContent(mainLayout) diff --git a/internal/ui/history.go b/internal/ui/history.go index 6554d22..98c40f5 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -5,6 +5,7 @@ import ( "log" "git.patanix.de/git/kettlebell-app/internal/data" + "git.patanix.de/git/kettlebell-app/internal/ui/utils" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" @@ -13,55 +14,42 @@ import ( "fyne.io/fyne/v2/widget" ) -func formatDuration(totalSeconds int64) string { - mins := totalSeconds / 60 - secs := totalSeconds % 60 - return fmt.Sprintf("%02d:%02d", mins, secs) -} - -// MakeHistoryScreen erstellt den Bildschirm für die Trainingshistorie. func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.CanvasObject { var history []data.TrainingSession - // Platzhalter, wenn die Liste leer ist placeholder := widget.NewLabel("Noch keine Trainingsdaten vorhanden.") - placeholder.Alignment = fyne.TextAlignCenter - list := widget.NewList( func() int { return len(history) }, func() fyne.CanvasObject { - // Template für einen Listeneintrag return widget.NewCard("", "", container.NewVBox( - widget.NewLabel(""), // Datum + widget.NewLabel(""), widget.NewSeparator(), - widget.NewLabel(""), // Sätze - widget.NewLabel(""), // Gewicht - widget.NewLabel(""), // Reps - widget.NewLabel(""), // Dauer + container.NewGridWithColumns(3, + container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Reps/Satz"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + ), )) }, func(i widget.ListItemID, o fyne.CanvasObject) { - // Template mit Daten füllen session := history[i] card := o.(*widget.Card) - - // Datum als Titel der Karte card.SetTitle(session.Date.Format("02.01.2006 15:04")) - // Details im Inhalt der Karte - box := card.Content.(*fyne.Container) - labels := box.Objects - labels[0].(*widget.Label).SetText(fmt.Sprintf("Programm: %s - Tag %d", session.Program, session.BlockDay)) - labels[2].(*widget.Label).SetText(fmt.Sprintf("Sätze: %d", session.Sets)) - labels[3].(*widget.Label).SetText(fmt.Sprintf("Kettlebells: %.1fkg / %.1fkg", session.WeightLeft, session.WeightRight)) - labels[4].(*widget.Label).SetText(fmt.Sprintf("Reps pro Satz: %d", session.RepsPerSet)) - labels[5].(*widget.Label).SetText(fmt.Sprintf("Dauer: %s", formatDuration(session.Duration))) + content := card.Content.(*fyne.Container) + programLabel := content.Objects[0].(*widget.Label) + statsGrid := content.Objects[2].(*fyne.Container) + + programLabel.SetText(fmt.Sprintf("%s - Tag %d", session.Program, session.BlockDay)) + + statsGrid.Objects[0].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.Sets)) + statsGrid.Objects[1].(*fyne.Container).Objects[1].(*widget.Label).SetText(utils.FormatDuration(session.Duration)) + statsGrid.Objects[2].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.RepsPerSet)) }, ) - // Funktion zum Neuladen der Daten refreshData := func() { var err error history, err = db.GetHistory() @@ -69,24 +57,31 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas log.Printf("Fehler beim Laden der Historie: %v", err) dialog.ShowError(err, parent) } - if len(history) == 0 { - placeholder.Show() list.Hide() + placeholder.Show() } else { - placeholder.Hide() list.Show() + placeholder.Hide() } list.Refresh() } - // Initiales Laden - refreshData() + list.OnSelected = func(id widget.ListItemID) { + list.Unselect(id) + } - // Toolbar mit Refresh-Button toolbar := widget.NewToolbar( widget.NewToolbarAction(theme.ViewRefreshIcon(), refreshData), ) - return container.NewBorder(toolbar, nil, nil, nil, container.NewStack(list, placeholder)) + layout := container.NewBorder(toolbar, nil, nil, nil, container.NewStack(list, container.NewCenter(placeholder))) + + wrapper := container.NewMax(layout) + if wrapper.Visible() { + refreshData() + } + // wrapper.OnVisible = refreshData + + return wrapper } diff --git a/internal/ui/home.go b/internal/ui/home.go index a9bddc2..11e4fd3 100644 --- a/internal/ui/home.go +++ b/internal/ui/home.go @@ -4,54 +4,51 @@ import ( "fmt" "git.patanix.de/git/kettlebell-app/internal/services" + "git.patanix.de/git/kettlebell-app/internal/ui/theme" "fyne.io/fyne/v2" + "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/widget" ) -func MakeHomeScreen(ts *services.TrainingService, content *fyne.Container, parent fyne.Window) fyne.CanvasObject { +func MakeHomeScreen(ts *services.TrainingService, onStart func()) fyne.CanvasObject { // Header + headerTitle := canvas.NewText("Patanix", theme.ColorSlate200) + headerTitle.TextSize = 28 + headerTitle.TextStyle.Bold = true + header := container.NewVBox( widget.NewLabel("Hallo,"), - widget.NewLabelWithStyle("Patanix", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}), //, Size: 24}), + headerTitle, ) // Nächstes Training CTA state := ts.State + + // Verwende ein Card-Widget für das Styling nextTrainingCard := widget.NewCard( "Nächstes Training", fmt.Sprintf("%s - Tag %d", state.CurrentProgram, state.CurrentBlockDay), container.NewVBox( widget.NewLabel(fmt.Sprintf("Ziel: %d Wiederholungen pro Satz", state.CurrentReps)), - widget.NewButton("Training starten", func() { - // Wechsle zum Trainingsbildschirm - for _, child := range content.Objects { - if _, ok := child.(*fyne.Container).Objects[0].(*widget.Card); ok { - // Heuristik, um den Trainings-Screen zu finden - child.Show() - } else { - child.Hide() - } - } - content.Refresh() - }), + widget.NewButton("Training starten", onStart), ), ) // Letzte Leistung - // HINWEIS: Diese Daten müssten aus dem dbService geladen werden. - // Hier verwenden wir vorerst Platzhalter. statsCard := widget.NewCard("Letzte Leistung", "", container.NewGridWithColumns(3, container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("8", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("18:45", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), container.NewVBox(widget.NewLabel("Gewicht"), widget.NewLabelWithStyle("16kg", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), )) - return container.NewVBox( + layout := container.NewVBox( header, widget.NewSeparator(), nextTrainingCard, statsCard, ) + + return container.NewPadded(layout) } diff --git a/internal/ui/navbar.go b/internal/ui/navbar.go index a32cc42..d310001 100644 --- a/internal/ui/navbar.go +++ b/internal/ui/navbar.go @@ -8,38 +8,38 @@ import ( "fyne.io/fyne/v2/theme" ) -// MakeNavBar erstellt die benutzerdefinierte Navigationsleiste am unteren Rand. -func MakeNavBar(screens map[string]fyne.CanvasObject, content *fyne.Container) fyne.CanvasObject { +// MakeNavBar erstellt die benutzerdefinierte Navigationsleiste und gibt die Navigationsfunktion zurück. +func MakeNavBar(screens map[string]fyne.CanvasObject, content *fyne.Container) (fyne.CanvasObject, func(string)) { buttons := make(map[string]*components.NavButton) // Funktion zum Umschalten der Ansichten navigateTo := func(name string) { for key, screen := range screens { + screen.Hide() if key == name { screen.Show() - } else { - screen.Hide() } } for key, button := range buttons { + button.SetActive(false) if key == name { button.SetActive(true) - } else { - button.SetActive(false) } } content.Refresh() } - buttons["home"] = components.NewNavButton("Home", theme.HomeIcon(), true, func() { navigateTo("home") }) + buttons["home"] = components.NewNavButton("Home", theme.HomeIcon(), false, func() { navigateTo("home") }) buttons["training"] = components.NewNavButton("Training", theme.MediaPlayIcon(), false, func() { navigateTo("training") }) buttons["history"] = components.NewNavButton("Historie", theme.ListIcon(), false, func() { navigateTo("history") }) buttons["settings"] = components.NewNavButton("Einstellungen", theme.SettingsIcon(), false, func() { navigateTo("settings") }) - return container.NewGridWithColumns(4, + navContainer := container.NewGridWithColumns(4, buttons["home"], buttons["training"], buttons["history"], buttons["settings"], ) + + return navContainer, navigateTo } diff --git a/internal/ui/settings.go b/internal/ui/settings.go index ed20d57..81a60b2 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -8,48 +8,57 @@ import ( "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" - "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/widget" ) func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.Window) fyne.CanvasObject { currentSettings := settingsService.LoadSettings() - trainingTimeEntry := widget.NewEntry() - trainingTimeEntry.SetText(fmt.Sprintf("%d", currentSettings.TrainingTimeMinutes)) + timeEntry := widget.NewEntry() + timeEntry.SetText(fmt.Sprintf("%d", currentSettings.TrainingTimeMinutes)) + timeEntry.Validator = func(s string) error { + if _, err := strconv.Atoi(s); err != nil { + return fmt.Errorf("muss eine Zahl sein") + } + return nil + } + + setsEntry := widget.NewEntry() + setsEntry.SetText(fmt.Sprintf("%d", currentSettings.GoalSets)) + setsEntry.Validator = timeEntry.Validator // Gleicher Validator weightLeftEntry := widget.NewEntry() weightLeftEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightLeft)) + weightLeftEntry.Validator = func(s string) error { + if _, err := strconv.ParseFloat(s, 64); err != nil { + return fmt.Errorf("muss eine Zahl sein") + } + return nil + } weightRightEntry := widget.NewEntry() weightRightEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightRight)) - - goalSetsEntry := widget.NewEntry() - goalSetsEntry.SetText(fmt.Sprintf("%d", currentSettings.GoalSets)) + weightRightEntry.Validator = weightLeftEntry.Validator // Gleicher Validator form := &widget.Form{ Items: []*widget.FormItem{ - {Text: "Trainingszeit (Minuten)", Widget: trainingTimeEntry}, - {Text: "Linke Kettlebell (kg)", Widget: weightLeftEntry}, - {Text: "Rechte Kettlebell (kg)", Widget: weightRightEntry}, - {Text: "Ziel-Sätze", Widget: goalSetsEntry}, + {Text: "Trainingszeit (Minuten)", Widget: timeEntry}, + {Text: "Ziel-Sätze", Widget: setsEntry}, + {Text: "Links (kg)", Widget: weightLeftEntry}, + {Text: "Rechts (kg)", Widget: weightRightEntry}, }, OnSubmit: func() { - timeMin, err1 := strconv.Atoi(trainingTimeEntry.Text) - weightL, err2 := strconv.ParseFloat(weightLeftEntry.Text, 64) - weightR, err3 := strconv.ParseFloat(weightRightEntry.Text, 64) - goal, err4 := strconv.Atoi(goalSetsEntry.Text) - - if err1 != nil || err2 != nil || err3 != nil || err4 != nil { - dialog.ShowError(fmt.Errorf("Bitte gib gültige Zahlen ein"), parent) - return - } + timeMin, _ := strconv.Atoi(timeEntry.Text) + goal, _ := strconv.Atoi(setsEntry.Text) + weightL, _ := strconv.ParseFloat(weightLeftEntry.Text, 64) + weightR, _ := strconv.ParseFloat(weightRightEntry.Text, 64) newSettings := &services.Settings{ TrainingTimeMinutes: timeMin, + GoalSets: goal, WeightLeft: weightL, WeightRight: weightR, - GoalSets: goal, + InitialProgram: currentSettings.InitialProgram, // Beibehalten } settingsService.SaveSettings(newSettings) @@ -60,5 +69,14 @@ func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.W }, } - return container.NewPadded(form) + title := widget.NewLabelWithStyle("Einstellungen", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}) + title.TextStyle.Monospace = true // Workaround to force refresh on size change + + layout := container.NewVBox( + title, + widget.NewSeparator(), + form, + ) + + return container.NewPadded(layout) } diff --git a/internal/ui/theme/theme.go b/internal/ui/theme/theme.go index fa16797..e101b20 100644 --- a/internal/ui/theme/theme.go +++ b/internal/ui/theme/theme.go @@ -11,6 +11,7 @@ import ( var ( ColorSlate900 = color.NRGBA{R: 0x0f, G: 0x17, B: 0x2a, A: 0xff} // bg-slate-900 ColorSlate800 = color.NRGBA{R: 0x1e, G: 0x29, B: 0x3b, A: 0xff} // bg-slate-800 + ColorSlate700 = color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // bg-slate-700 ColorSlate400 = color.NRGBA{R: 0x94, G: 0xa3, B: 0xb8, A: 0xff} // text-slate-400 ColorSlate200 = color.NRGBA{R: 0xe2, G: 0xe8, B: 0xf0, A: 0xff} // text-slate-200 ColorSky500 = color.NRGBA{R: 0x0e, G: 0xa5, B: 0xe9, A: 0xff} // bg-sky-500 @@ -28,13 +29,13 @@ func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVari case theme.ColorNameButton: return ColorSlate800 case theme.ColorNameDisabledButton: - return ColorSlate800 + return ColorSlate700 case theme.ColorNamePrimary: return ColorSky500 case theme.ColorNamePlaceHolder: return ColorSlate400 case theme.ColorNameHover: - return color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // Slate 700 + return ColorSlate700 case theme.ColorNameForeground: return ColorSlate200 case theme.ColorNameDisabled: @@ -44,20 +45,17 @@ func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVari case theme.ColorNameInputBackground: return ColorSlate800 case theme.ColorNameSeparator: - return color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // Slate 700 + return ColorSlate700 default: return theme.DefaultTheme().Color(name, variant) } } func (t *KettlebellTheme) Icon(name fyne.ThemeIconName) fyne.Resource { - // Hier könnten wir benutzerdefinierte Icons laden, wenn nötig. - // Vorerst verwenden wir die Standard-Icons. return theme.DefaultTheme().Icon(name) } func (t *KettlebellTheme) Font(style fyne.TextStyle) fyne.Resource { - // Hier könnten wir eine benutzerdefinierte Schriftart wie 'Inter' laden. return theme.DefaultTheme().Font(style) } @@ -68,7 +66,9 @@ func (t *KettlebellTheme) Size(name fyne.ThemeSizeName) float32 { case theme.SizeNameText: return 16 case theme.SizeNameHeadingText: - return 28 + return 24 + case theme.SizeNameSubHeadingText: + return 20 default: return theme.DefaultTheme().Size(name) } diff --git a/internal/ui/training.go b/internal/ui/training.go index 1e40724..ce9b921 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -6,38 +6,56 @@ import ( "git.patanix.de/git/kettlebell-app/internal/data" "git.patanix.de/git/kettlebell-app/internal/services" + "git.patanix.de/git/kettlebell-app/internal/ui/theme" + "git.patanix.de/git/kettlebell-app/internal/ui/utils" "fyne.io/fyne/v2" + "fyne.io/fyne/v2/canvas" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/widget" ) func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsService, parent fyne.Window) fyne.CanvasObject { - // UI-Elemente - timerLabel := widget.NewLabelWithStyle("20:00", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) - // timerLabel.TextSize = 60 + // UI-Elemente mit canvas.Text für die Größensteuerung + timerLabel := canvas.NewText("20:00", theme.ColorSlate200) + timerLabel.TextSize = 60 + timerLabel.TextStyle.Bold = true + timerLabel.Alignment = fyne.TextAlignCenter - setsLabel := widget.NewLabelWithStyle("0 / 8", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) - // setsLabel.TextSize = 48 - // setsLabel.Color = theme.ColorSky400 + setsLabel := canvas.NewText("0 / 8", theme.ColorSky400) + setsLabel.TextSize = 48 + setsLabel.TextStyle.Bold = true + setsLabel.Alignment = fyne.TextAlignCenter - repsLabel := widget.NewLabelWithStyle("5 Wiederholungen", fyne.TextAlignCenter, fyne.TextStyle{}) - // repsLabel.TextSize = 20 + repsLabel := canvas.NewText("5 Wiederholungen", theme.ColorSlate200) + repsLabel.TextSize = 20 + repsLabel.Alignment = fyne.TextAlignCenter var mainTimer *time.Ticker + var startButton *widget.Button // Start-Button deklarieren updateUI := func() { state := ts.State - timerLabel.SetText(formatDuration(int64(state.RemainingSeconds))) - setsLabel.SetText(fmt.Sprintf("%d / %d", state.SetsDone, state.GoalSets)) - repsLabel.SetText(fmt.Sprintf("%d Wiederholungen", state.RepsPerSet)) + timerLabel.Text = utils.FormatDuration(int64(state.RemainingSeconds)) + setsLabel.Text = fmt.Sprintf("%d / %d", state.SetsDone, state.GoalSets) + repsLabel.Text = fmt.Sprintf("%d Wiederholungen", state.RepsPerSet) + + timerLabel.Refresh() + setsLabel.Refresh() + repsLabel.Refresh() + + if state.IsTrainingRunning { + startButton.Disable() + } else { + startButton.Enable() + } } finishAction := func() { if mainTimer != nil { mainTimer.Stop() + mainTimer = nil } - // ... (Logik zum Speichern wie zuvor) ... session := &data.TrainingSession{ Date: time.Now(), Sets: int64(ts.State.SetsDone), @@ -58,7 +76,8 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi mainTimer = time.NewTicker(time.Second) go func() { - for range mainTimer.C { + for mainTimer != nil { + <-mainTimer.C if ts.State.RemainingSeconds <= 0 { finishAction() return @@ -70,10 +89,16 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi } setAction := func() { + if !ts.State.IsTrainingRunning { + // Starte das Training, wenn es noch nicht läuft + startAction() + } ts.CompleteSet() updateUI() } + startButton = widget.NewButton("Training beginnen", startAction) + // Layout im "Cockpit"-Stil topPart := container.NewVBox( widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), @@ -87,15 +112,13 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi ) finishButton := widget.NewButton("Training beenden", finishAction) - // Wir simulieren den roten Button durch die Error-Farbe des Themes finishButton.Importance = widget.HighImportance bottomPart := container.NewVBox( + startButton, // Start-Button hinzugefügt widget.NewButton("Satz abschließen", setAction), finishButton, ) - // HINWEIS: Start-Button fehlt hier, da der Flow vom Home-Screen ausgeht. - // Man könnte ihn bei Bedarf hinzufügen. return container.NewBorder(topPart, bottomPart, nil, nil, container.NewCenter(middlePart)) } diff --git a/internal/ui/utils/format.go b/internal/ui/utils/format.go new file mode 100644 index 0000000..63f54a9 --- /dev/null +++ b/internal/ui/utils/format.go @@ -0,0 +1,13 @@ +package utils + +import "fmt" + +// FormatDuration wandelt Sekunden in einen MM:SS String um. +func FormatDuration(totalSeconds int64) string { + if totalSeconds < 0 { + totalSeconds = 0 + } + mins := totalSeconds / 60 + secs := totalSeconds % 60 + return fmt.Sprintf("%02d:%02d", mins, secs) +} diff --git a/internal/utils/utils.go b/internal/ui/utils/utils.go similarity index 100% rename from internal/utils/utils.go rename to internal/ui/utils/utils.go From c15cdea57d996e7641c225ced9714dccb684f314 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 27 Jun 2025 20:18:32 +0200 Subject: [PATCH 03/16] refactor: new ui step3 --- cmd/main.go | 34 ++++++++------- internal/data/database.go | 91 ++++++++++++++++++++++----------------- internal/ui/history.go | 50 ++++++++------------- internal/ui/home.go | 40 ++++++++++++++--- internal/ui/settings.go | 44 +++++++++---------- internal/ui/training.go | 66 +++++++++++++--------------- 6 files changed, 172 insertions(+), 153 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index f32cc2a..fd17b7b 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -4,25 +4,23 @@ import ( "log" "path/filepath" - "git.patanix.de/git/kettlebell-app/internal/data" - "git.patanix.de/git/kettlebell-app/internal/services" - "git.patanix.de/git/kettlebell-app/internal/ui" - "fyne.io/fyne/v2" "fyne.io/fyne/v2/app" "fyne.io/fyne/v2/container" - - "git.patanix.de/git/kettlebell-app/internal/ui/theme" // <-- Neuer Theme-Import + "git.patanix.de/git/kettlebell-app/internal/data" + "git.patanix.de/git/kettlebell-app/internal/services" + "git.patanix.de/git/kettlebell-app/internal/ui" + "git.patanix.de/git/kettlebell-app/internal/ui/theme" ) func main() { // 1. App initialisieren und unser neues Theme setzen myApp := app.NewWithID("com.patani.kettlebell-tracker") - myApp.Settings().SetTheme(&theme.KettlebellTheme{}) // <-- Setzt unser benutzerdefiniertes Theme + myApp.Settings().SetTheme(&theme.KettlebellTheme{}) mainWindow := myApp.NewWindow("Kettlebell Tracker") - // 2. Services initialisieren (wie zuvor) + // 2. Services initialisieren dbDir := myApp.Storage().RootURI().Path() dbPath := filepath.Join(dbDir, "giant_training.db") dbService, err := data.NewDatabaseService(dbPath) @@ -33,15 +31,19 @@ func main() { apiService := services.NewApiService(myApp.UniqueID()) trainingService := services.NewTrainingService(dbService, settingsService, apiService) - // 3. UI-Bildschirme erstellen + // 3. UI-Bildschirme und Aktionen erstellen contentContainer := container.NewMax() - - // Navigationsfunktion definieren, die wir an die Screens weitergeben können var navigateTo func(string) - // Die Bildschirme erstellen und dem Container hinzufügen - homeScreen := ui.MakeHomeScreen(trainingService, func() { navigateTo("training") }) - trainingScreen := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) + // Erstelle den Trainings-Screen und hole seine Start-Aktion + trainingScreen, startTrainingAction := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) + + // Erstelle den Home-Screen und übergebe ihm die Start-Aktion und die Navigationsfunktion + homeScreen := ui.MakeHomeScreen(trainingService, dbService, func() { + startTrainingAction() + navigateTo("training") + }) + historyScreen := ui.MakeHistoryScreen(dbService, mainWindow) settingsScreen := ui.MakeSettingsScreen(settingsService, mainWindow) @@ -58,7 +60,7 @@ func main() { // 4. Benutzerdefinierte Navigationsleiste erstellen navBar, navigateFunc := ui.MakeNavBar(screens, contentContainer) - navigateTo = navigateFunc // Weisen der Navigationsfunktion die Implementierung aus der Navbar zu + navigateTo = navigateFunc // Initial den Home-Bildschirm anzeigen navigateTo("home") @@ -67,7 +69,7 @@ func main() { mainLayout := container.NewBorder(nil, navBar, nil, nil, contentContainer) mainWindow.SetContent(mainLayout) - mainWindow.Resize(fyne.NewSize(360, 740)) // Mobile-freundliche Größe + mainWindow.Resize(fyne.NewSize(360, 740)) mainWindow.SetMaster() mainWindow.ShowAndRun() } diff --git a/internal/data/database.go b/internal/data/database.go index 4989cc9..b56f1f6 100644 --- a/internal/data/database.go +++ b/internal/data/database.go @@ -5,9 +5,10 @@ import ( "log" "time" - _ "modernc.org/sqlite" // Importiert den SQLite-Treiber + _ "modernc.org/sqlite" ) +// ... (DatabaseService struct und NewDatabaseService bleiben gleich) ... type DatabaseService struct { DB *sql.DB } @@ -17,11 +18,9 @@ func NewDatabaseService(dbPath string) (*DatabaseService, error) { if err != nil { return nil, err } - if err = db.Ping(); err != nil { return nil, err } - createTableSQL := ` CREATE TABLE IF NOT EXISTS training ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -34,23 +33,18 @@ func NewDatabaseService(dbPath string) (*DatabaseService, error) { program TEXT, blockDay INTEGER );` - _, err = db.Exec(createTableSQL) if err != nil { log.Printf("Fehler beim Erstellen der Tabelle: %v", err) return nil, err } - - // Hier könnten wir auch komplexere Migrationen wie dein _onUpgrade handle, - // aber für den Anfang reicht das Erstellen der Tabelle. - log.Println("Datenbank erfolgreich initialisiert.") return &DatabaseService{DB: db}, nil } +// ... (SaveTraining und GetHistory bleiben gleich) ... func (s *DatabaseService) SaveTraining(session *TrainingSession) error { dateStr := session.Date.Format(time.RFC3339) - query := ` INSERT INTO training (id, date, sets, weightLeft, weightRight, repsPerSet, duration, program, blockDay) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) @@ -68,11 +62,58 @@ func (s *DatabaseService) SaveTraining(session *TrainingSession) error { if session.ID != 0 { id = session.ID } - _, err := s.DB.Exec(query, id, dateStr, session.Sets, session.WeightLeft, session.WeightRight, session.RepsPerSet, session.Duration, session.Program, session.BlockDay) return err } +func (s *DatabaseService) GetHistory() ([]TrainingSession, error) { + query := `SELECT id, date, sets, weightLeft, weightRight, repsPerSet, duration, program, blockDay FROM training ORDER BY date DESC LIMIT 20;` + rows, err := s.DB.Query(query) + if err != nil { + return nil, err + } + defer rows.Close() + var sessions []TrainingSession + for rows.Next() { + var sess TrainingSession + var dateStr string + err := rows.Scan(&sess.ID, &dateStr, &sess.Sets, &sess.WeightLeft, &sess.WeightRight, &sess.RepsPerSet, &sess.Duration, &sess.Program, &sess.BlockDay) + if err != nil { + return nil, err + } + sess.Date, err = time.Parse(time.RFC3339, dateStr) + if err != nil { + return nil, err + } + sessions = append(sessions, sess) + } + return sessions, nil +} + +// GetLastTraining ruft die letzte einzelne Trainingseinheit ab. +func (s *DatabaseService) GetLastTraining() (*TrainingSession, error) { + query := `SELECT id, date, sets, weightLeft, weightRight, repsPerSet, duration, program, blockDay FROM training ORDER BY date DESC LIMIT 1;` + row := s.DB.QueryRow(query) + + var session TrainingSession + var dateStr string + err := row.Scan(&session.ID, &dateStr, &session.Sets, &session.WeightLeft, &session.WeightRight, &session.RepsPerSet, &session.Duration, &session.Program, &session.BlockDay) + if err != nil { + if err == sql.ErrNoRows { + return nil, nil // Kein Fehler, nur keine Einträge + } + return nil, err + } + + session.Date, err = time.Parse(time.RFC3339, dateStr) + if err != nil { + return nil, err + } + + return &session, nil +} + +// GetTrainingCount zählt alle Trainingseinheiten. func (s *DatabaseService) GetTrainingCount() (int, error) { var count int query := "SELECT COUNT(*) FROM training;" @@ -85,33 +126,3 @@ func (s *DatabaseService) GetTrainingCount() (int, error) { } return count, nil } - -func (s *DatabaseService) GetHistory() ([]TrainingSession, error) { - query := `SELECT id, date, sets, weightLeft, weightRight, repsPerSet, duration, program, blockDay FROM training ORDER BY date DESC LIMIT 20;` - - rows, err := s.DB.Query(query) - if err != nil { - return nil, err - } - defer rows.Close() - - var sessions []TrainingSession - for rows.Next() { - var s TrainingSession - var dateStr string - - err := rows.Scan(&s.ID, &dateStr, &s.Sets, &s.WeightLeft, &s.WeightRight, &s.RepsPerSet, &s.Duration, &s.Program, &s.BlockDay) - if err != nil { - return nil, err - } - - s.Date, err = time.Parse(time.RFC3339, dateStr) - if err != nil { - return nil, err - } - - sessions = append(sessions, s) - } - - return sessions, nil -} diff --git a/internal/ui/history.go b/internal/ui/history.go index 98c40f5..71bb629 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -4,14 +4,13 @@ import ( "fmt" "log" - "git.patanix.de/git/kettlebell-app/internal/data" - "git.patanix.de/git/kettlebell-app/internal/ui/utils" - "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/theme" "fyne.io/fyne/v2/widget" + "git.patanix.de/git/kettlebell-app/internal/data" + "git.patanix.de/git/kettlebell-app/internal/ui/utils" ) func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.CanvasObject { @@ -19,19 +18,14 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas placeholder := widget.NewLabel("Noch keine Trainingsdaten vorhanden.") list := widget.NewList( - func() int { - return len(history) - }, + func() int { return len(history) }, func() fyne.CanvasObject { - return widget.NewCard("", "", container.NewVBox( - widget.NewLabel(""), - widget.NewSeparator(), - container.NewGridWithColumns(3, - container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Reps/Satz"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - ), - )) + stats := container.NewGridWithColumns(3, + container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Reps/Satz"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + ) + return widget.NewCard("", "", container.NewVBox(widget.NewLabel(""), widget.NewSeparator(), stats)) }, func(i widget.ListItemID, o fyne.CanvasObject) { session := history[i] @@ -43,7 +37,6 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas statsGrid := content.Objects[2].(*fyne.Container) programLabel.SetText(fmt.Sprintf("%s - Tag %d", session.Program, session.BlockDay)) - statsGrid.Objects[0].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.Sets)) statsGrid.Objects[1].(*fyne.Container).Objects[1].(*widget.Label).SetText(utils.FormatDuration(session.Duration)) statsGrid.Objects[2].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.RepsPerSet)) @@ -56,32 +49,25 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas if err != nil { log.Printf("Fehler beim Laden der Historie: %v", err) dialog.ShowError(err, parent) + return } if len(history) == 0 { - list.Hide() placeholder.Show() + list.Hide() } else { - list.Show() placeholder.Hide() + list.Show() } list.Refresh() } - list.OnSelected = func(id widget.ListItemID) { - list.Unselect(id) - } + toolbar := widget.NewToolbar(widget.NewToolbarAction(theme.ViewRefreshIcon(), refreshData)) + content := container.NewStack(list, container.NewCenter(placeholder)) + layout := container.NewBorder(toolbar, nil, nil, nil, content) - toolbar := widget.NewToolbar( - widget.NewToolbarAction(theme.ViewRefreshIcon(), refreshData), - ) - - layout := container.NewBorder(toolbar, nil, nil, nil, container.NewStack(list, container.NewCenter(placeholder))) - - wrapper := container.NewMax(layout) - if wrapper.Visible() { + // Daten laden, wenn der Container sichtbar wird + if layout.Visible() { refreshData() } - // wrapper.OnVisible = refreshData - - return wrapper + return layout } diff --git a/internal/ui/home.go b/internal/ui/home.go index 11e4fd3..d1c95e5 100644 --- a/internal/ui/home.go +++ b/internal/ui/home.go @@ -2,9 +2,12 @@ package ui import ( "fmt" + "log" + "git.patanix.de/git/kettlebell-app/internal/data" "git.patanix.de/git/kettlebell-app/internal/services" "git.patanix.de/git/kettlebell-app/internal/ui/theme" + "git.patanix.de/git/kettlebell-app/internal/ui/utils" "fyne.io/fyne/v2" "fyne.io/fyne/v2/canvas" @@ -12,7 +15,7 @@ import ( "fyne.io/fyne/v2/widget" ) -func MakeHomeScreen(ts *services.TrainingService, onStart func()) fyne.CanvasObject { +func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onStart func()) fyne.CanvasObject { // Header headerTitle := canvas.NewText("Patanix", theme.ColorSlate200) headerTitle.TextSize = 28 @@ -25,8 +28,6 @@ func MakeHomeScreen(ts *services.TrainingService, onStart func()) fyne.CanvasObj // Nächstes Training CTA state := ts.State - - // Verwende ein Card-Widget für das Styling nextTrainingCard := widget.NewCard( "Nächstes Training", fmt.Sprintf("%s - Tag %d", state.CurrentProgram, state.CurrentBlockDay), @@ -37,12 +38,30 @@ func MakeHomeScreen(ts *services.TrainingService, onStart func()) fyne.CanvasObj ) // Letzte Leistung + setsValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + durationValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + weightValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) + statsCard := widget.NewCard("Letzte Leistung", "", container.NewGridWithColumns(3, - container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("8", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("18:45", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Gewicht"), widget.NewLabelWithStyle("16kg", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + container.NewVBox(widget.NewLabel("Sätze"), setsValue), + container.NewVBox(widget.NewLabel("Dauer"), durationValue), + container.NewVBox(widget.NewLabel("Gewicht"), weightValue), )) + // Funktion zum Laden der letzten Leistung + loadLastPerformance := func() { + lastSession, err := db.GetLastTraining() + if err != nil { + log.Printf("Fehler beim Laden der letzten Session: %v", err) + return + } + if lastSession != nil { + setsValue.SetText(fmt.Sprintf("%d", lastSession.Sets)) + durationValue.SetText(utils.FormatDuration(lastSession.Duration)) + weightValue.SetText(fmt.Sprintf("%.1fkg", lastSession.WeightLeft)) // Annahme: linkes Gewicht ist repräsentativ + } + } + layout := container.NewVBox( header, widget.NewSeparator(), @@ -50,5 +69,12 @@ func MakeHomeScreen(ts *services.TrainingService, onStart func()) fyne.CanvasObj statsCard, ) - return container.NewPadded(layout) + paddedLayout := container.NewPadded(layout) + // Daten laden, wenn der Bildschirm sichtbar wird + if paddedLayout.Visible() { + loadLastPerformance() + } + // paddedLayout.OnVisible = loadLastPerformance + + return paddedLayout } diff --git a/internal/ui/settings.go b/internal/ui/settings.go index 81a60b2..61f765d 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -12,10 +12,17 @@ import ( ) func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.Window) fyne.CanvasObject { - currentSettings := settingsService.LoadSettings() + var timeEntry, setsEntry, weightLeftEntry, weightRightEntry *widget.Entry - timeEntry := widget.NewEntry() - timeEntry.SetText(fmt.Sprintf("%d", currentSettings.TrainingTimeMinutes)) + loadData := func() { + currentSettings := settingsService.LoadSettings() + timeEntry.SetText(fmt.Sprintf("%d", currentSettings.TrainingTimeMinutes)) + setsEntry.SetText(fmt.Sprintf("%d", currentSettings.GoalSets)) + weightLeftEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightLeft)) + weightRightEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightRight)) + } + + timeEntry = widget.NewEntry() timeEntry.Validator = func(s string) error { if _, err := strconv.Atoi(s); err != nil { return fmt.Errorf("muss eine Zahl sein") @@ -23,22 +30,18 @@ func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.W return nil } - setsEntry := widget.NewEntry() - setsEntry.SetText(fmt.Sprintf("%d", currentSettings.GoalSets)) - setsEntry.Validator = timeEntry.Validator // Gleicher Validator + setsEntry = widget.NewEntry() + setsEntry.Validator = timeEntry.Validator - weightLeftEntry := widget.NewEntry() - weightLeftEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightLeft)) + weightLeftEntry = widget.NewEntry() weightLeftEntry.Validator = func(s string) error { if _, err := strconv.ParseFloat(s, 64); err != nil { return fmt.Errorf("muss eine Zahl sein") } return nil } - - weightRightEntry := widget.NewEntry() - weightRightEntry.SetText(fmt.Sprintf("%.1f", currentSettings.WeightRight)) - weightRightEntry.Validator = weightLeftEntry.Validator // Gleicher Validator + weightRightEntry = widget.NewEntry() + weightRightEntry.Validator = weightLeftEntry.Validator form := &widget.Form{ Items: []*widget.FormItem{ @@ -58,10 +61,9 @@ func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.W GoalSets: goal, WeightLeft: weightL, WeightRight: weightR, - InitialProgram: currentSettings.InitialProgram, // Beibehalten + InitialProgram: settingsService.LoadSettings().InitialProgram, } settingsService.SaveSettings(newSettings) - fyne.CurrentApp().SendNotification(&fyne.Notification{ Title: "Gespeichert", Content: "Die Einstellungen wurden erfolgreich aktualisiert.", @@ -70,13 +72,11 @@ func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.W } title := widget.NewLabelWithStyle("Einstellungen", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}) - title.TextStyle.Monospace = true // Workaround to force refresh on size change + layout := container.NewVBox(title, widget.NewSeparator(), form) + paddedLayout := container.NewPadded(layout) + if paddedLayout.Visible() { + loadData() + } // Daten laden, wenn sichtbar - layout := container.NewVBox( - title, - widget.NewSeparator(), - form, - ) - - return container.NewPadded(layout) + return paddedLayout } diff --git a/internal/ui/training.go b/internal/ui/training.go index ce9b921..6490db5 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -15,24 +15,23 @@ import ( "fyne.io/fyne/v2/widget" ) -func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsService, parent fyne.Window) fyne.CanvasObject { - // UI-Elemente mit canvas.Text für die Größensteuerung - timerLabel := canvas.NewText("20:00", theme.ColorSlate200) +// MakeTrainingScreen gibt jetzt das CanvasObject und die Start-Funktion zurück +func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsService, parent fyne.Window) (fyne.CanvasObject, func()) { + timerLabel := canvas.NewText("00:00", theme.ColorSlate200) timerLabel.TextSize = 60 timerLabel.TextStyle.Bold = true timerLabel.Alignment = fyne.TextAlignCenter - setsLabel := canvas.NewText("0 / 8", theme.ColorSky400) + setsLabel := canvas.NewText("0 / 0", theme.ColorSky400) setsLabel.TextSize = 48 setsLabel.TextStyle.Bold = true setsLabel.Alignment = fyne.TextAlignCenter - repsLabel := canvas.NewText("5 Wiederholungen", theme.ColorSlate200) + repsLabel := canvas.NewText("0 Wiederholungen", theme.ColorSlate200) repsLabel.TextSize = 20 repsLabel.Alignment = fyne.TextAlignCenter var mainTimer *time.Ticker - var startButton *widget.Button // Start-Button deklarieren updateUI := func() { state := ts.State @@ -43,12 +42,6 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi timerLabel.Refresh() setsLabel.Refresh() repsLabel.Refresh() - - if state.IsTrainingRunning { - startButton.Disable() - } else { - startButton.Enable() - } } finishAction := func() { @@ -56,6 +49,9 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi mainTimer.Stop() mainTimer = nil } + if !ts.State.IsTrainingRunning { + return // Nichts tun, wenn kein Training läuft + } session := &data.TrainingSession{ Date: time.Now(), Sets: int64(ts.State.SetsDone), @@ -70,6 +66,9 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi } startAction := func() { + if ts.State.IsTrainingRunning { + return // Verhindere Neustart + } settings := ss.LoadSettings() ts.StartTraining(settings.TrainingTimeMinutes, settings.GoalSets) updateUI() @@ -77,48 +76,43 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi mainTimer = time.NewTicker(time.Second) go func() { for mainTimer != nil { - <-mainTimer.C - if ts.State.RemainingSeconds <= 0 { - finishAction() - return + select { + case <-mainTimer.C: + if ts.State.RemainingSeconds <= 0 { + finishAction() + return + } + ts.Tick() + updateUI() } - ts.Tick() - updateUI() } }() } setAction := func() { if !ts.State.IsTrainingRunning { - // Starte das Training, wenn es noch nicht läuft - startAction() + return // Kein Satz ohne laufendes Training } ts.CompleteSet() updateUI() } - startButton = widget.NewButton("Training beginnen", startAction) - - // Layout im "Cockpit"-Stil - topPart := container.NewVBox( - widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), - timerLabel, - ) - - middlePart := container.NewVBox( - widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{}), - setsLabel, - repsLabel, - ) - + topPart := container.NewVBox(widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), timerLabel) + middlePart := container.NewVBox(widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{}), setsLabel, repsLabel) finishButton := widget.NewButton("Training beenden", finishAction) finishButton.Importance = widget.HighImportance bottomPart := container.NewVBox( - startButton, // Start-Button hinzugefügt widget.NewButton("Satz abschließen", setAction), finishButton, ) - return container.NewBorder(topPart, bottomPart, nil, nil, container.NewCenter(middlePart)) + layout := container.NewBorder(topPart, bottomPart, nil, nil, container.NewCenter(middlePart)) + // UI aktualisieren, wenn der Bildschirm sichtbar wird + if layout.Visible() { + updateUI() + } + // layout.OnVisible = updateUI + + return layout, startAction } From a7e427ca146c1338d05281d46dc9475d14382fb1 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Sat, 28 Jun 2025 14:13:14 +0200 Subject: [PATCH 04/16] refactor: perform clean up --- cmd/main.go | 10 +- internal/data/database.go | 6 +- internal/data/models.go | 4 +- internal/services/api.go | 12 --- internal/ui/components/navbutton.go | 7 +- internal/ui/history.go | 1 - internal/ui/home.go | 14 +-- internal/ui/navbar.go | 2 - internal/ui/settings.go | 2 +- internal/ui/theme/theme.go | 141 +++++++++++++++++++++++----- internal/ui/training.go | 17 ++-- internal/ui/utils/format.go | 1 - internal/ui/utils/utils.go | 1 - 13 files changed, 133 insertions(+), 85 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index fd17b7b..b88d9a7 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -14,13 +14,11 @@ import ( ) func main() { - // 1. App initialisieren und unser neues Theme setzen myApp := app.NewWithID("com.patani.kettlebell-tracker") - myApp.Settings().SetTheme(&theme.KettlebellTheme{}) + myApp.Settings().SetTheme(&theme.KettlebellThemeOneDark{}) mainWindow := myApp.NewWindow("Kettlebell Tracker") - // 2. Services initialisieren dbDir := myApp.Storage().RootURI().Path() dbPath := filepath.Join(dbDir, "giant_training.db") dbService, err := data.NewDatabaseService(dbPath) @@ -31,14 +29,11 @@ func main() { apiService := services.NewApiService(myApp.UniqueID()) trainingService := services.NewTrainingService(dbService, settingsService, apiService) - // 3. UI-Bildschirme und Aktionen erstellen contentContainer := container.NewMax() var navigateTo func(string) - // Erstelle den Trainings-Screen und hole seine Start-Aktion trainingScreen, startTrainingAction := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) - // Erstelle den Home-Screen und übergebe ihm die Start-Aktion und die Navigationsfunktion homeScreen := ui.MakeHomeScreen(trainingService, dbService, func() { startTrainingAction() navigateTo("training") @@ -58,14 +53,11 @@ func main() { contentContainer.Add(s) } - // 4. Benutzerdefinierte Navigationsleiste erstellen navBar, navigateFunc := ui.MakeNavBar(screens, contentContainer) navigateTo = navigateFunc - // Initial den Home-Bildschirm anzeigen navigateTo("home") - // 5. Hauptlayout mit Border-Layout erstellen mainLayout := container.NewBorder(nil, navBar, nil, nil, contentContainer) mainWindow.SetContent(mainLayout) diff --git a/internal/data/database.go b/internal/data/database.go index b56f1f6..4bf797d 100644 --- a/internal/data/database.go +++ b/internal/data/database.go @@ -8,7 +8,6 @@ import ( _ "modernc.org/sqlite" ) -// ... (DatabaseService struct und NewDatabaseService bleiben gleich) ... type DatabaseService struct { DB *sql.DB } @@ -42,7 +41,6 @@ func NewDatabaseService(dbPath string) (*DatabaseService, error) { return &DatabaseService{DB: db}, nil } -// ... (SaveTraining und GetHistory bleiben gleich) ... func (s *DatabaseService) SaveTraining(session *TrainingSession) error { dateStr := session.Date.Format(time.RFC3339) query := ` @@ -90,7 +88,6 @@ func (s *DatabaseService) GetHistory() ([]TrainingSession, error) { return sessions, nil } -// GetLastTraining ruft die letzte einzelne Trainingseinheit ab. func (s *DatabaseService) GetLastTraining() (*TrainingSession, error) { query := `SELECT id, date, sets, weightLeft, weightRight, repsPerSet, duration, program, blockDay FROM training ORDER BY date DESC LIMIT 1;` row := s.DB.QueryRow(query) @@ -100,7 +97,7 @@ func (s *DatabaseService) GetLastTraining() (*TrainingSession, error) { err := row.Scan(&session.ID, &dateStr, &session.Sets, &session.WeightLeft, &session.WeightRight, &session.RepsPerSet, &session.Duration, &session.Program, &session.BlockDay) if err != nil { if err == sql.ErrNoRows { - return nil, nil // Kein Fehler, nur keine Einträge + return nil, nil } return nil, err } @@ -113,7 +110,6 @@ func (s *DatabaseService) GetLastTraining() (*TrainingSession, error) { return &session, nil } -// GetTrainingCount zählt alle Trainingseinheiten. func (s *DatabaseService) GetTrainingCount() (int, error) { var count int query := "SELECT COUNT(*) FROM training;" diff --git a/internal/data/models.go b/internal/data/models.go index 8129f3c..17baa75 100644 --- a/internal/data/models.go +++ b/internal/data/models.go @@ -2,8 +2,6 @@ package data import "time" -// TrainingSession repräsentiert eine einzelne Trainingseinheit. -// Die `db`-Tags werden verwendet, um die Struct-Felder den Datenbankspalten zuzuordnen. type TrainingSession struct { ID int64 `db:"id"` Date time.Time `db:"date"` @@ -11,7 +9,7 @@ type TrainingSession struct { WeightLeft float64 `db:"weightLeft"` WeightRight float64 `db:"weightRight"` RepsPerSet int64 `db:"repsPerSet"` - Duration int64 `db:"duration"` // in Sekunden + Duration int64 `db:"duration"` Program string `db:"program"` BlockDay int64 `db:"blockDay"` } diff --git a/internal/services/api.go b/internal/services/api.go index 8a3b782..9c7afad 100644 --- a/internal/services/api.go +++ b/internal/services/api.go @@ -10,8 +10,6 @@ import ( "git.patanix.de/git/kettlebell-app/internal/data" ) -// TrainingPayload ist die JSON-Struktur, die an das Backend gesendet wird. -// Die `json:"..."`-Tags stellen sicher, dass die Feldnamen im JSON korrekt sind. type TrainingPayload struct { Reps int `json:"reps"` Rest float64 `json:"rest"` @@ -19,17 +17,14 @@ type TrainingPayload struct { UUID string `json:"uuid"` } -// ApiService kümmert sich um die Kommunikation mit dem Backend. type ApiService struct { client *http.Client endpoint string uuid string } -// NewApiService erstellt einen neuen Service für die API-Kommunikation. func NewApiService(appUUID string) *ApiService { return &ApiService{ - // Erstellt einen HTTP-Client mit einem 5-Sekunden-Timeout, genau wie in deiner Flutter-App. client: &http.Client{ Timeout: 5 * time.Second, }, @@ -38,15 +33,12 @@ func NewApiService(appUUID string) *ApiService { } } -// SendTrainingData sendet eine abgeschlossene Trainingseinheit an das Backend. func (s *ApiService) SendTrainingData(session *data.TrainingSession) { - // Berechnung für 'rest' durchführen. var rest float64 if session.Sets > 0 { rest = float64(session.Duration) / float64(session.Sets) } - // Die zu sendenden Daten vorbereiten. payload := TrainingPayload{ Reps: int(session.RepsPerSet), Rest: rest, @@ -54,14 +46,12 @@ func (s *ApiService) SendTrainingData(session *data.TrainingSession) { UUID: s.uuid, } - // Daten in JSON umwandeln. jsonData, err := json.Marshal(payload) if err != nil { log.Printf("API Fehler: Konnte Payload nicht in JSON umwandeln: %v", err) return } - // Den HTTP-Request erstellen. req, err := http.NewRequest("POST", s.endpoint, bytes.NewBuffer(jsonData)) if err != nil { log.Printf("API Fehler: Konnte Request nicht erstellen: %v", err) @@ -69,7 +59,6 @@ func (s *ApiService) SendTrainingData(session *data.TrainingSession) { } req.Header.Set("Content-Type", "application/json") - // Request senden. log.Printf("Sende Training an Backend: %s", string(jsonData)) resp, err := s.client.Do(req) if err != nil { @@ -78,7 +67,6 @@ func (s *ApiService) SendTrainingData(session *data.TrainingSession) { } defer resp.Body.Close() - // Antwort des Servers prüfen. if resp.StatusCode == http.StatusOK || resp.StatusCode == http.StatusCreated { log.Println("Training erfolgreich an Backend gesendet.") } else { diff --git a/internal/ui/components/navbutton.go b/internal/ui/components/navbutton.go index 1863d8d..7e03c81 100644 --- a/internal/ui/components/navbutton.go +++ b/internal/ui/components/navbutton.go @@ -11,7 +11,6 @@ import ( "fyne.io/fyne/v2/widget" ) -// NavButton ist unser benutzerdefinierter Navigationsbutton type NavButton struct { widget.BaseWidget icon *canvas.Image @@ -52,11 +51,9 @@ func (b *NavButton) Tapped(*fyne.PointEvent) { func (b *NavButton) SetActive(active bool) { b.isActive = active if b.isActive { - // b.icon.Resource.Color = theme.ColorSky400 - b.label.Color = theme.ColorSky400 + b.label.Color = theme.OneDarkGreen } else { - // b.icon.Resource.Color = theme.ColorSlate400 - b.label.Color = theme.ColorSlate400 + b.label.Color = theme.OneDarkText } b.Refresh() } diff --git a/internal/ui/history.go b/internal/ui/history.go index 71bb629..da42543 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -65,7 +65,6 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas content := container.NewStack(list, container.NewCenter(placeholder)) layout := container.NewBorder(toolbar, nil, nil, nil, content) - // Daten laden, wenn der Container sichtbar wird if layout.Visible() { refreshData() } diff --git a/internal/ui/home.go b/internal/ui/home.go index d1c95e5..998db37 100644 --- a/internal/ui/home.go +++ b/internal/ui/home.go @@ -6,6 +6,7 @@ import ( "git.patanix.de/git/kettlebell-app/internal/data" "git.patanix.de/git/kettlebell-app/internal/services" + "git.patanix.de/git/kettlebell-app/internal/ui/theme" "git.patanix.de/git/kettlebell-app/internal/ui/utils" @@ -16,17 +17,14 @@ import ( ) func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onStart func()) fyne.CanvasObject { - // Header - headerTitle := canvas.NewText("Patanix", theme.ColorSlate200) + headerTitle := canvas.NewText("Kettlebell Workout Tracker", theme.OneDarkText) headerTitle.TextSize = 28 headerTitle.TextStyle.Bold = true - header := container.NewVBox( - widget.NewLabel("Hallo,"), + header := container.NewCenter( headerTitle, ) - // Nächstes Training CTA state := ts.State nextTrainingCard := widget.NewCard( "Nächstes Training", @@ -37,7 +35,6 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt ), ) - // Letzte Leistung setsValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) durationValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) weightValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) @@ -48,7 +45,6 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt container.NewVBox(widget.NewLabel("Gewicht"), weightValue), )) - // Funktion zum Laden der letzten Leistung loadLastPerformance := func() { lastSession, err := db.GetLastTraining() if err != nil { @@ -58,7 +54,7 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt if lastSession != nil { setsValue.SetText(fmt.Sprintf("%d", lastSession.Sets)) durationValue.SetText(utils.FormatDuration(lastSession.Duration)) - weightValue.SetText(fmt.Sprintf("%.1fkg", lastSession.WeightLeft)) // Annahme: linkes Gewicht ist repräsentativ + weightValue.SetText(fmt.Sprintf("%.1fkg", lastSession.WeightLeft)) } } @@ -70,11 +66,9 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt ) paddedLayout := container.NewPadded(layout) - // Daten laden, wenn der Bildschirm sichtbar wird if paddedLayout.Visible() { loadLastPerformance() } - // paddedLayout.OnVisible = loadLastPerformance return paddedLayout } diff --git a/internal/ui/navbar.go b/internal/ui/navbar.go index d310001..c367107 100644 --- a/internal/ui/navbar.go +++ b/internal/ui/navbar.go @@ -8,11 +8,9 @@ import ( "fyne.io/fyne/v2/theme" ) -// MakeNavBar erstellt die benutzerdefinierte Navigationsleiste und gibt die Navigationsfunktion zurück. func MakeNavBar(screens map[string]fyne.CanvasObject, content *fyne.Container) (fyne.CanvasObject, func(string)) { buttons := make(map[string]*components.NavButton) - // Funktion zum Umschalten der Ansichten navigateTo := func(name string) { for key, screen := range screens { screen.Hide() diff --git a/internal/ui/settings.go b/internal/ui/settings.go index 61f765d..9f240d8 100644 --- a/internal/ui/settings.go +++ b/internal/ui/settings.go @@ -76,7 +76,7 @@ func MakeSettingsScreen(settingsService *services.SettingsService, parent fyne.W paddedLayout := container.NewPadded(layout) if paddedLayout.Visible() { loadData() - } // Daten laden, wenn sichtbar + } return paddedLayout } diff --git a/internal/ui/theme/theme.go b/internal/ui/theme/theme.go index e101b20..5142b98 100644 --- a/internal/ui/theme/theme.go +++ b/internal/ui/theme/theme.go @@ -1,3 +1,82 @@ +// package theme +// +// import ( +// +// "image/color" +// +// "fyne.io/fyne/v2" +// "fyne.io/fyne/v2/theme" +// +// ) +// +// // Definiere unsere benutzerdefinierten Farben basierend auf dem Mock-up +// var ( +// +// ColorSlate900 = color.NRGBA{R: 0x0f, G: 0x17, B: 0x2a, A: 0xff} // bg-slate-900 +// ColorSlate800 = color.NRGBA{R: 0x1e, G: 0x29, B: 0x3b, A: 0xff} // bg-slate-800 +// ColorSlate700 = color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // bg-slate-700 +// ColorSlate400 = color.NRGBA{R: 0x94, G: 0xa3, B: 0xb8, A: 0xff} // text-slate-400 +// ColorSlate200 = color.NRGBA{R: 0xe2, G: 0xe8, B: 0xf0, A: 0xff} // text-slate-200 +// ColorSky500 = color.NRGBA{R: 0x0e, G: 0xa5, B: 0xe9, A: 0xff} // bg-sky-500 +// ColorSky400 = color.NRGBA{R: 0x38, G: 0xbd, B: 0xf8, A: 0xff} // text-sky-400 +// ColorRed500 = color.NRGBA{R: 0xef, G: 0x44, B: 0x44, A: 0xff} // red-500 +// +// ) +// +// // KettlebellTheme ist unsere benutzerdefinierte Theme-Implementierung +// type KettlebellTheme struct{} +// +// func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { +// switch name { +// case theme.ColorNameBackground: +// return ColorSlate900 +// case theme.ColorNameButton: +// return ColorSlate800 +// case theme.ColorNameDisabledButton: +// return ColorSlate700 +// case theme.ColorNamePrimary: +// return ColorSky500 +// case theme.ColorNamePlaceHolder: +// return ColorSlate400 +// case theme.ColorNameHover: +// return ColorSlate700 +// case theme.ColorNameForeground: +// return ColorSlate200 +// case theme.ColorNameDisabled: +// return ColorSlate400 +// case theme.ColorNameError: +// return ColorRed500 +// case theme.ColorNameInputBackground: +// return ColorSlate800 +// case theme.ColorNameSeparator: +// return ColorSlate700 +// default: +// return theme.DefaultTheme().Color(name, variant) +// } +// } +// +// func (t *KettlebellTheme) Icon(name fyne.ThemeIconName) fyne.Resource { +// return theme.DefaultTheme().Icon(name) +// } +// +// func (t *KettlebellTheme) Font(style fyne.TextStyle) fyne.Resource { +// return theme.DefaultTheme().Font(style) +// } +// +// func (t *KettlebellTheme) Size(name fyne.ThemeSizeName) float32 { +// switch name { +// case theme.SizeNamePadding: +// return 8 +// case theme.SizeNameText: +// return 16 +// case theme.SizeNameHeadingText: +// return 24 +// case theme.SizeNameSubHeadingText: +// return 20 +// default: +// return theme.DefaultTheme().Size(name) +// } +// } package theme import ( @@ -7,59 +86,69 @@ import ( "fyne.io/fyne/v2/theme" ) -// Definiere unsere benutzerdefinierten Farben basierend auf dem Mock-up +// One Dark Farben (angepasst für Fyne) var ( - ColorSlate900 = color.NRGBA{R: 0x0f, G: 0x17, B: 0x2a, A: 0xff} // bg-slate-900 - ColorSlate800 = color.NRGBA{R: 0x1e, G: 0x29, B: 0x3b, A: 0xff} // bg-slate-800 - ColorSlate700 = color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // bg-slate-700 - ColorSlate400 = color.NRGBA{R: 0x94, G: 0xa3, B: 0xb8, A: 0xff} // text-slate-400 - ColorSlate200 = color.NRGBA{R: 0xe2, G: 0xe8, B: 0xf0, A: 0xff} // text-slate-200 - ColorSky500 = color.NRGBA{R: 0x0e, G: 0xa5, B: 0xe9, A: 0xff} // bg-sky-500 - ColorSky400 = color.NRGBA{R: 0x38, G: 0xbd, B: 0xf8, A: 0xff} // text-sky-400 - ColorRed500 = color.NRGBA{R: 0xef, G: 0x44, B: 0x44, A: 0xff} // red-500 + // Basisfarben + OneDarkBackground = color.NRGBA{R: 40, G: 44, B: 52, A: 0xff} // #282c34 (helleres Grau) + OneDarkCardBackground = color.NRGBA{R: 30, G: 32, B: 40, A: 0xff} // #1e2028 (dunkler für Cards) + OneDarkText = color.NRGBA{R: 171, G: 178, B: 191, A: 0xff} // #abb2bf (Standard-Text) + OneDarkSubtleText = color.NRGBA{R: 110, G: 115, B: 141, A: 0xff} // #6e738d (deaktiviert, Placeholder) + + // Akzentfarben (One Dark) + OneDarkGreen = color.NRGBA{R: 152, G: 195, B: 121, A: 0xff} // #98c379 + OneDarkRed = color.NRGBA{R: 224, G: 108, B: 117, A: 0xff} // #e06c75 + OneDarkYellow = color.NRGBA{R: 229, G: 192, B: 123, A: 0xff} // #e5c07b ) -// KettlebellTheme ist unsere benutzerdefinierte Theme-Implementierung -type KettlebellTheme struct{} +// KettlebellThemeOneDark ist das angepasste Theme +type KettlebellThemeOneDark struct{} -func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { +func (t *KettlebellThemeOneDark) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { switch name { case theme.ColorNameBackground: - return ColorSlate900 + return OneDarkBackground case theme.ColorNameButton: - return ColorSlate800 + return OneDarkGreen case theme.ColorNameDisabledButton: - return ColorSlate700 + return OneDarkSubtleText case theme.ColorNamePrimary: - return ColorSky500 + return OneDarkGreen case theme.ColorNamePlaceHolder: - return ColorSlate400 + return OneDarkSubtleText case theme.ColorNameHover: - return ColorSlate700 + return OneDarkYellow case theme.ColorNameForeground: - return ColorSlate200 + return OneDarkText case theme.ColorNameDisabled: - return ColorSlate400 + return OneDarkSubtleText case theme.ColorNameError: - return ColorRed500 + return OneDarkRed case theme.ColorNameInputBackground: - return ColorSlate800 + return OneDarkCardBackground case theme.ColorNameSeparator: - return ColorSlate700 + return OneDarkSubtleText + case theme.ColorNameSelection: + return OneDarkYellow + case theme.ColorNameShadow: + return OneDarkCardBackground + case theme.ColorNameFocus: + return OneDarkYellow + // case theme.ColorNameCardBackground: + // return OneDarkCardBackground default: return theme.DefaultTheme().Color(name, variant) } } -func (t *KettlebellTheme) Icon(name fyne.ThemeIconName) fyne.Resource { +func (t *KettlebellThemeOneDark) Icon(name fyne.ThemeIconName) fyne.Resource { return theme.DefaultTheme().Icon(name) } -func (t *KettlebellTheme) Font(style fyne.TextStyle) fyne.Resource { +func (t *KettlebellThemeOneDark) Font(style fyne.TextStyle) fyne.Resource { return theme.DefaultTheme().Font(style) } -func (t *KettlebellTheme) Size(name fyne.ThemeSizeName) float32 { +func (t *KettlebellThemeOneDark) Size(name fyne.ThemeSizeName) float32 { switch name { case theme.SizeNamePadding: return 8 diff --git a/internal/ui/training.go b/internal/ui/training.go index 6490db5..7050f69 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -15,19 +15,18 @@ import ( "fyne.io/fyne/v2/widget" ) -// MakeTrainingScreen gibt jetzt das CanvasObject und die Start-Funktion zurück func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsService, parent fyne.Window) (fyne.CanvasObject, func()) { - timerLabel := canvas.NewText("00:00", theme.ColorSlate200) + timerLabel := canvas.NewText("00:00", theme.OneDarkText) timerLabel.TextSize = 60 timerLabel.TextStyle.Bold = true timerLabel.Alignment = fyne.TextAlignCenter - setsLabel := canvas.NewText("0 / 0", theme.ColorSky400) + setsLabel := canvas.NewText("0 / 0", theme.OneDarkGreen) setsLabel.TextSize = 48 setsLabel.TextStyle.Bold = true setsLabel.Alignment = fyne.TextAlignCenter - repsLabel := canvas.NewText("0 Wiederholungen", theme.ColorSlate200) + repsLabel := canvas.NewText("0 Wiederholungen", theme.OneDarkSubtleText) repsLabel.TextSize = 20 repsLabel.Alignment = fyne.TextAlignCenter @@ -91,7 +90,7 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi setAction := func() { if !ts.State.IsTrainingRunning { - return // Kein Satz ohne laufendes Training + return } ts.CompleteSet() updateUI() @@ -100,19 +99,19 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi topPart := container.NewVBox(widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), timerLabel) middlePart := container.NewVBox(widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{}), setsLabel, repsLabel) finishButton := widget.NewButton("Training beenden", finishAction) - finishButton.Importance = widget.HighImportance + setButton := widget.NewButton("Satz abschließen", setAction) + setButton.Importance = widget.HighImportance + setButton.Resize(fyne.NewSize(120, 60)) bottomPart := container.NewVBox( - widget.NewButton("Satz abschließen", setAction), + setButton, finishButton, ) layout := container.NewBorder(topPart, bottomPart, nil, nil, container.NewCenter(middlePart)) - // UI aktualisieren, wenn der Bildschirm sichtbar wird if layout.Visible() { updateUI() } - // layout.OnVisible = updateUI return layout, startAction } diff --git a/internal/ui/utils/format.go b/internal/ui/utils/format.go index 63f54a9..1a03138 100644 --- a/internal/ui/utils/format.go +++ b/internal/ui/utils/format.go @@ -2,7 +2,6 @@ package utils import "fmt" -// FormatDuration wandelt Sekunden in einen MM:SS String um. func FormatDuration(totalSeconds int64) string { if totalSeconds < 0 { totalSeconds = 0 diff --git a/internal/ui/utils/utils.go b/internal/ui/utils/utils.go index 7a3ccbe..5373c71 100644 --- a/internal/ui/utils/utils.go +++ b/internal/ui/utils/utils.go @@ -2,7 +2,6 @@ package utils import "fmt" -// Hilfsfunktion (kann in einer utils.go Datei platziert werden) func formatDuration(totalSeconds int64) string { mins := totalSeconds / 60 secs := totalSeconds % 60 From 16b2409ae81e01a5a63eb0b5297a736155b14523 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 10:57:09 +0200 Subject: [PATCH 05/16] refactor: update coding style --- cmd/main.go | 2 +- internal/ui/training.go | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index b88d9a7..2fffb8f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -29,7 +29,7 @@ func main() { apiService := services.NewApiService(myApp.UniqueID()) trainingService := services.NewTrainingService(dbService, settingsService, apiService) - contentContainer := container.NewMax() + contentContainer := container.NewStack() var navigateTo func(string) trainingScreen, startTrainingAction := ui.MakeTrainingScreen(trainingService, settingsService, mainWindow) diff --git a/internal/ui/training.go b/internal/ui/training.go index 7050f69..5480a4d 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -75,15 +75,13 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi mainTimer = time.NewTicker(time.Second) go func() { for mainTimer != nil { - select { - case <-mainTimer.C: - if ts.State.RemainingSeconds <= 0 { - finishAction() - return - } - ts.Tick() - updateUI() + <-mainTimer.C + if ts.State.RemainingSeconds <= 0 { + finishAction() + return } + ts.Tick() + updateUI() } }() } From 059db8f2fb1bf77d906b3017e6b7faebe8965b9a Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 12:56:02 +0200 Subject: [PATCH 06/16] refactor: show finish Button only if time elapsed and center training card on home screen --- internal/services/training.go | 17 ++++++++--------- internal/ui/home.go | 28 +++++++++++++++++++++++----- internal/ui/training.go | 20 +++++++++++++++++--- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/internal/services/training.go b/internal/services/training.go index 9a0c11d..db5ad67 100644 --- a/internal/services/training.go +++ b/internal/services/training.go @@ -221,26 +221,26 @@ type TrainingState struct { } func calculateStateByDayCount(totalDays int) (program string, blockDay, reps int) { - program = "giant_1.0" + program = "clean_1.0" blockDay = 1 reps = 5 if totalDays > 0 { cycleIndex := (totalDays / 12) % 6 - programs := []string{"giant_1.0", "ksk_1.0", "giant_1.1", "ksk_1.1", "giant_1.2", "ksk_1.2"} + programs := []string{"clean_1.0", "snatch_1.0", "clean_1.1", "snatch_1.1", "clean_1.2", "snatch_1.2"} program = programs[cycleIndex] blockDay = (totalDays % 3) + 1 } repsMap := map[string][]int{ - "giant_1.0": {5, 6, 4}, - "giant_1.1": {6, 8, 7}, - "giant_1.2": {7, 9, 8}, - "ksk_1.0": {5, 6, 4}, - "ksk_1.1": {6, 8, 7}, - "ksk_1.2": {7, 9, 8}, + "clean_1.0": {5, 6, 4}, + "clean_1.1": {6, 8, 7}, + "clean_1.2": {7, 9, 8}, + "snatch_1.0": {5, 6, 4}, + "snatch_1.1": {6, 8, 7}, + "snatch_1.2": {7, 9, 8}, } if r, ok := repsMap[program]; ok && len(r) >= blockDay { @@ -339,7 +339,6 @@ func (s *TrainingService) FinishTraining(session *data.TrainingSession) error { return err } - // s.sendToBackend(session) go s.apiService.SendTrainingData(session) s.ResetTraining() diff --git a/internal/ui/home.go b/internal/ui/home.go index 998db37..19dedf8 100644 --- a/internal/ui/home.go +++ b/internal/ui/home.go @@ -3,6 +3,7 @@ package ui import ( "fmt" "log" + "time" "git.patanix.de/git/kettlebell-app/internal/data" "git.patanix.de/git/kettlebell-app/internal/services" @@ -22,18 +23,23 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt headerTitle.TextStyle.Bold = true header := container.NewCenter( + widget.NewSeparator(), headerTitle, ) state := ts.State + startButton := widget.NewButton("Training starten", onStart) + startButton.Importance = widget.HighImportance + nextTrainingCard := widget.NewCard( "Nächstes Training", fmt.Sprintf("%s - Tag %d", state.CurrentProgram, state.CurrentBlockDay), container.NewVBox( widget.NewLabel(fmt.Sprintf("Ziel: %d Wiederholungen pro Satz", state.CurrentReps)), - widget.NewButton("Training starten", onStart), + startButton, ), ) + centerContent := container.NewCenter(nextTrainingCard) setsValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) durationValue := widget.NewLabelWithStyle("–", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}) @@ -55,20 +61,32 @@ func MakeHomeScreen(ts *services.TrainingService, db *data.DatabaseService, onSt setsValue.SetText(fmt.Sprintf("%d", lastSession.Sets)) durationValue.SetText(utils.FormatDuration(lastSession.Duration)) weightValue.SetText(fmt.Sprintf("%.1fkg", lastSession.WeightLeft)) + trainedToday := false + trainedToday = EqualDate(lastSession.Date, time.Now()) + if trainedToday { + startButton.Disabled() + } } } - layout := container.NewVBox( + borderLayout := container.NewBorder( header, - widget.NewSeparator(), - nextTrainingCard, statsCard, + nil, + nil, + centerContent, ) - paddedLayout := container.NewPadded(layout) + paddedLayout := container.NewPadded(borderLayout) if paddedLayout.Visible() { loadLastPerformance() } return paddedLayout } + +func EqualDate(date1, date2 time.Time) bool { + y1, m1, d1 := date1.Date() + y2, m2, d2 := date2.Date() + return y1 == y2 && m1 == m2 && d1 == d2 +} diff --git a/internal/ui/training.go b/internal/ui/training.go index 5480a4d..49bd708 100644 --- a/internal/ui/training.go +++ b/internal/ui/training.go @@ -30,6 +30,8 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi repsLabel.TextSize = 20 repsLabel.Alignment = fyne.TextAlignCenter + var finishButton *widget.Button + var mainTimer *time.Ticker updateUI := func() { @@ -38,18 +40,29 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi setsLabel.Text = fmt.Sprintf("%d / %d", state.SetsDone, state.GoalSets) repsLabel.Text = fmt.Sprintf("%d Wiederholungen", state.RepsPerSet) + if finishButton != nil { + if state.RemainingSeconds <= 0 && state.IsTrainingRunning { + finishButton.Show() + } else { + finishButton.Hide() + } + } + timerLabel.Refresh() setsLabel.Refresh() repsLabel.Refresh() } finishAction := func() { + if ts.State.RemainingSeconds > 0 { + return + } if mainTimer != nil { mainTimer.Stop() mainTimer = nil } if !ts.State.IsTrainingRunning { - return // Nichts tun, wenn kein Training läuft + return } session := &data.TrainingSession{ Date: time.Now(), @@ -66,7 +79,7 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi startAction := func() { if ts.State.IsTrainingRunning { - return // Verhindere Neustart + return } settings := ss.LoadSettings() ts.StartTraining(settings.TrainingTimeMinutes, settings.GoalSets) @@ -96,7 +109,8 @@ func MakeTrainingScreen(ts *services.TrainingService, ss *services.SettingsServi topPart := container.NewVBox(widget.NewLabelWithStyle("Verbleibende Zeit", fyne.TextAlignCenter, fyne.TextStyle{}), timerLabel) middlePart := container.NewVBox(widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{}), setsLabel, repsLabel) - finishButton := widget.NewButton("Training beenden", finishAction) + finishButton = widget.NewButton("Training beenden", finishAction) + finishButton.Hide() // oder: finishButton.Hide() // finishButton.Disable() setButton := widget.NewButton("Satz abschließen", setAction) setButton.Importance = widget.HighImportance setButton.Resize(fyne.NewSize(120, 60)) From 084ea252a25c362eee353ea2fa7ef26fd292fad6 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 17:12:28 +0200 Subject: [PATCH 07/16] refactor: change history screen to use a list instead of cards --- internal/data/database.go | 17 +++++ internal/ui/history.go | 148 ++++++++++++++++++++++++++++++++----- internal/ui/theme/theme.go | 85 --------------------- 3 files changed, 147 insertions(+), 103 deletions(-) diff --git a/internal/data/database.go b/internal/data/database.go index 4bf797d..d0781b3 100644 --- a/internal/data/database.go +++ b/internal/data/database.go @@ -122,3 +122,20 @@ func (s *DatabaseService) GetTrainingCount() (int, error) { } return count, nil } + +func (s *DatabaseService) DeleteTraining(id int64) error { + query := "DELETE FROM training WHERE id = ?;" + _, err := s.DB.Exec(query, id) + return err +} + +func (s *DatabaseService) UpdateTraining(session *TrainingSession) error { + dateStr := session.Date.Format(time.RFC3339) + query := ` + UPDATE training + SET date = ?, sets = ?, weightLeft = ?, weightRight = ?, repsPerSet = ?, duration = ?, program = ?, blockDay = ? + WHERE id = ?; + ` + _, err := s.DB.Exec(query, dateStr, session.Sets, session.WeightLeft, session.WeightRight, session.RepsPerSet, session.Duration, session.Program, session.BlockDay, session.ID) + return err +} diff --git a/internal/ui/history.go b/internal/ui/history.go index da42543..45f3bc1 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -3,6 +3,7 @@ package ui import ( "fmt" "log" + "strconv" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" @@ -17,33 +18,137 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas var history []data.TrainingSession placeholder := widget.NewLabel("Noch keine Trainingsdaten vorhanden.") + + var showDetailDialog func(session data.TrainingSession, id int) + var refreshData func() + list := widget.NewList( func() int { return len(history) }, func() fyne.CanvasObject { - stats := container.NewGridWithColumns(3, - container.NewVBox(widget.NewLabel("Sätze"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Dauer"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), - container.NewVBox(widget.NewLabel("Reps/Satz"), widget.NewLabelWithStyle("", fyne.TextAlignCenter, fyne.TextStyle{Bold: true})), + return container.NewGridWithColumns(4, + widget.NewLabel(""), + widget.NewLabel(""), + widget.NewLabel(""), + widget.NewLabel(""), ) - return widget.NewCard("", "", container.NewVBox(widget.NewLabel(""), widget.NewSeparator(), stats)) }, func(i widget.ListItemID, o fyne.CanvasObject) { session := history[i] - card := o.(*widget.Card) - card.SetTitle(session.Date.Format("02.01.2006 15:04")) - - content := card.Content.(*fyne.Container) - programLabel := content.Objects[0].(*widget.Label) - statsGrid := content.Objects[2].(*fyne.Container) - - programLabel.SetText(fmt.Sprintf("%s - Tag %d", session.Program, session.BlockDay)) - statsGrid.Objects[0].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.Sets)) - statsGrid.Objects[1].(*fyne.Container).Objects[1].(*widget.Label).SetText(utils.FormatDuration(session.Duration)) - statsGrid.Objects[2].(*fyne.Container).Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.RepsPerSet)) + row := o.(*fyne.Container) + row.Objects[0].(*widget.Label).SetText(session.Date.Format("02.01.2006 15:04")) + row.Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.Sets)) + row.Objects[2].(*widget.Label).SetText(utils.FormatDuration(session.Duration)) + row.Objects[3].(*widget.Label).SetText(fmt.Sprintf("%d", session.RepsPerSet)) }, ) - refreshData := func() { + list.OnSelected = func(id widget.ListItemID) { + session := history[id] + showDetailDialog(session, id) + list.Unselect(id) + } + + showDetailDialog = func(session data.TrainingSession, id int) { + details := container.NewVBox( + widget.NewLabel(fmt.Sprintf("Datum: %s", session.Date.Format("02.01.2006 15:04"))), + widget.NewLabel(fmt.Sprintf("Programm: %s", session.Program)), + widget.NewLabel(fmt.Sprintf("Block-Tag: %d", session.BlockDay)), + widget.NewLabel(fmt.Sprintf("Sätze: %d", session.Sets)), + widget.NewLabel(fmt.Sprintf("Dauer: %s", utils.FormatDuration(session.Duration))), + widget.NewLabel(fmt.Sprintf("Reps/Satz: %d", session.RepsPerSet)), + widget.NewLabel(fmt.Sprintf("Gewicht links: %.1f kg", session.WeightLeft)), + widget.NewLabel(fmt.Sprintf("Gewicht rechts: %.1f kg", session.WeightRight)), + ) + + deleteBtn := widget.NewButtonWithIcon("Löschen", theme.DeleteIcon(), func() { + dialog.ShowConfirm("Eintrag löschen", "Möchtest du diesen Eintrag wirklich löschen?", func(ok bool) { + if ok { + err := db.DeleteTraining(session.ID) + if err != nil { + dialog.ShowError(err, parent) + return + } + refreshData() + } + }, parent) + }) + + editBtn := widget.NewButtonWithIcon("Bearbeiten", theme.DocumentCreateIcon(), func() { + setsEntry := widget.NewEntry() + setsEntry.SetText(fmt.Sprintf("%d", session.Sets)) + + durationEntry := widget.NewEntry() + durationEntry.SetText(fmt.Sprintf("%d", session.Duration)) // Dauer in Sekunden + + repsEntry := widget.NewEntry() + repsEntry.SetText(fmt.Sprintf("%d", session.RepsPerSet)) + + weightLeftEntry := widget.NewEntry() + weightLeftEntry.SetText(fmt.Sprintf("%.1f", session.WeightLeft)) + + weightRightEntry := widget.NewEntry() + weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) + + form := &widget.Form{ + Items: []*widget.FormItem{ + {Text: "Sätze", Widget: setsEntry}, + {Text: "Dauer (Sekunden)", Widget: durationEntry}, + {Text: "Reps/Satz", Widget: repsEntry}, + {Text: "Gewicht links (kg)", Widget: weightLeftEntry}, + {Text: "Gewicht rechts (kg)", Widget: weightRightEntry}, + }, + OnSubmit: func() { + var ( + sets, reps, duration int + weightLeft, weightRight float64 + err error + ) + if sets, err = strconv.Atoi(setsEntry.Text); err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Sätze-Zahl"), parent) + return + } + if duration, err = strconv.Atoi(durationEntry.Text); err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Dauer"), parent) + return + } + if reps, err = strconv.Atoi(repsEntry.Text); err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Wiederholungszahl"), parent) + return + } + if weightLeft, err = strconv.ParseFloat(weightLeftEntry.Text, 64); err != nil { + dialog.ShowError(fmt.Errorf("Ungültiges Gewicht links"), parent) + return + } + if weightRight, err = strconv.ParseFloat(weightRightEntry.Text, 64); err != nil { + dialog.ShowError(fmt.Errorf("Ungültiges Gewicht rechts"), parent) + return + } + + session.Sets = int64(sets) + session.Duration = int64(duration) + session.RepsPerSet = int64(reps) + session.WeightLeft = weightLeft + session.WeightRight = weightRight + + if err := db.UpdateTraining(&session); err != nil { + dialog.ShowError(err, parent) + return + } + dialog.ShowInformation("Erfolg", "Trainingseintrag aktualisiert.", parent) + refreshData() + }, + } + + dialog.ShowForm("Training bearbeiten", "Speichern", "Abbrechen", form.Items, func(ok bool) { + }, parent) + }) + + btns := container.NewHBox(editBtn, deleteBtn) + + dialog.ShowCustom("Training Details", "Schließen", container.NewVBox(details, btns), parent) + } + + refreshData = func() { var err error history, err = db.GetHistory() if err != nil { @@ -61,8 +166,15 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas list.Refresh() } + header := container.NewGridWithColumns(4, + widget.NewLabelWithStyle("Datum", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}), + widget.NewLabelWithStyle("Sätze", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}), + widget.NewLabelWithStyle("Dauer", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}), + widget.NewLabelWithStyle("Reps/Satz", fyne.TextAlignCenter, fyne.TextStyle{Bold: true}), + ) + toolbar := widget.NewToolbar(widget.NewToolbarAction(theme.ViewRefreshIcon(), refreshData)) - content := container.NewStack(list, container.NewCenter(placeholder)) + content := container.NewVBox(header, container.NewStack(list, container.NewCenter(placeholder))) layout := container.NewBorder(toolbar, nil, nil, nil, content) if layout.Visible() { diff --git a/internal/ui/theme/theme.go b/internal/ui/theme/theme.go index 5142b98..daf6492 100644 --- a/internal/ui/theme/theme.go +++ b/internal/ui/theme/theme.go @@ -1,82 +1,3 @@ -// package theme -// -// import ( -// -// "image/color" -// -// "fyne.io/fyne/v2" -// "fyne.io/fyne/v2/theme" -// -// ) -// -// // Definiere unsere benutzerdefinierten Farben basierend auf dem Mock-up -// var ( -// -// ColorSlate900 = color.NRGBA{R: 0x0f, G: 0x17, B: 0x2a, A: 0xff} // bg-slate-900 -// ColorSlate800 = color.NRGBA{R: 0x1e, G: 0x29, B: 0x3b, A: 0xff} // bg-slate-800 -// ColorSlate700 = color.NRGBA{R: 0x33, G: 0x41, B: 0x55, A: 0xff} // bg-slate-700 -// ColorSlate400 = color.NRGBA{R: 0x94, G: 0xa3, B: 0xb8, A: 0xff} // text-slate-400 -// ColorSlate200 = color.NRGBA{R: 0xe2, G: 0xe8, B: 0xf0, A: 0xff} // text-slate-200 -// ColorSky500 = color.NRGBA{R: 0x0e, G: 0xa5, B: 0xe9, A: 0xff} // bg-sky-500 -// ColorSky400 = color.NRGBA{R: 0x38, G: 0xbd, B: 0xf8, A: 0xff} // text-sky-400 -// ColorRed500 = color.NRGBA{R: 0xef, G: 0x44, B: 0x44, A: 0xff} // red-500 -// -// ) -// -// // KettlebellTheme ist unsere benutzerdefinierte Theme-Implementierung -// type KettlebellTheme struct{} -// -// func (t *KettlebellTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { -// switch name { -// case theme.ColorNameBackground: -// return ColorSlate900 -// case theme.ColorNameButton: -// return ColorSlate800 -// case theme.ColorNameDisabledButton: -// return ColorSlate700 -// case theme.ColorNamePrimary: -// return ColorSky500 -// case theme.ColorNamePlaceHolder: -// return ColorSlate400 -// case theme.ColorNameHover: -// return ColorSlate700 -// case theme.ColorNameForeground: -// return ColorSlate200 -// case theme.ColorNameDisabled: -// return ColorSlate400 -// case theme.ColorNameError: -// return ColorRed500 -// case theme.ColorNameInputBackground: -// return ColorSlate800 -// case theme.ColorNameSeparator: -// return ColorSlate700 -// default: -// return theme.DefaultTheme().Color(name, variant) -// } -// } -// -// func (t *KettlebellTheme) Icon(name fyne.ThemeIconName) fyne.Resource { -// return theme.DefaultTheme().Icon(name) -// } -// -// func (t *KettlebellTheme) Font(style fyne.TextStyle) fyne.Resource { -// return theme.DefaultTheme().Font(style) -// } -// -// func (t *KettlebellTheme) Size(name fyne.ThemeSizeName) float32 { -// switch name { -// case theme.SizeNamePadding: -// return 8 -// case theme.SizeNameText: -// return 16 -// case theme.SizeNameHeadingText: -// return 24 -// case theme.SizeNameSubHeadingText: -// return 20 -// default: -// return theme.DefaultTheme().Size(name) -// } -// } package theme import ( @@ -86,21 +7,17 @@ import ( "fyne.io/fyne/v2/theme" ) -// One Dark Farben (angepasst für Fyne) var ( - // Basisfarben OneDarkBackground = color.NRGBA{R: 40, G: 44, B: 52, A: 0xff} // #282c34 (helleres Grau) OneDarkCardBackground = color.NRGBA{R: 30, G: 32, B: 40, A: 0xff} // #1e2028 (dunkler für Cards) OneDarkText = color.NRGBA{R: 171, G: 178, B: 191, A: 0xff} // #abb2bf (Standard-Text) OneDarkSubtleText = color.NRGBA{R: 110, G: 115, B: 141, A: 0xff} // #6e738d (deaktiviert, Placeholder) - // Akzentfarben (One Dark) OneDarkGreen = color.NRGBA{R: 152, G: 195, B: 121, A: 0xff} // #98c379 OneDarkRed = color.NRGBA{R: 224, G: 108, B: 117, A: 0xff} // #e06c75 OneDarkYellow = color.NRGBA{R: 229, G: 192, B: 123, A: 0xff} // #e5c07b ) -// KettlebellThemeOneDark ist das angepasste Theme type KettlebellThemeOneDark struct{} func (t *KettlebellThemeOneDark) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color { @@ -133,8 +50,6 @@ func (t *KettlebellThemeOneDark) Color(name fyne.ThemeColorName, variant fyne.Th return OneDarkCardBackground case theme.ColorNameFocus: return OneDarkYellow - // case theme.ColorNameCardBackground: - // return OneDarkCardBackground default: return theme.DefaultTheme().Color(name, variant) } From 4f8e353d48dd4902986c50fcd52f4f4064eef4ce Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 17:40:51 +0200 Subject: [PATCH 08/16] refactor: update wrong list behaviour in history screen --- cmd/build.sh | 0 internal/ui/history.go | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) mode change 100644 => 100755 cmd/build.sh diff --git a/cmd/build.sh b/cmd/build.sh old mode 100644 new mode 100755 diff --git a/internal/ui/history.go b/internal/ui/history.go index 45f3bc1..1da74ea 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -174,9 +174,24 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas ) toolbar := widget.NewToolbar(widget.NewToolbarAction(theme.ViewRefreshIcon(), refreshData)) - content := container.NewVBox(header, container.NewStack(list, container.NewCenter(placeholder))) - layout := container.NewBorder(toolbar, nil, nil, nil, content) + // content := container.NewVBox(header, container.NewStack(list, container.NewCenter(placeholder))) + // layout := container.NewBorder(toolbar, nil, nil, nil, content) + content := container.NewBorder( + header, + nil, + nil, + nil, + container.NewVScroll(list), + ) + + layout := container.NewBorder( + toolbar, + nil, + nil, + nil, + content, + ) if layout.Visible() { refreshData() } From 519daeec40b150b326191e755e42a4da4bb16fc2 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 18:40:47 +0200 Subject: [PATCH 09/16] refactor: update edit functionality to be less confusing --- cmd/FyneApp.toml | 2 +- cmd/build.sh | 3 +- internal/data/database.go | 27 +++- internal/ui/history.go | 279 +++++++++++++++++++++++++++----------- 4 files changed, 224 insertions(+), 87 deletions(-) diff --git a/cmd/FyneApp.toml b/cmd/FyneApp.toml index d8806a7..160f95e 100644 --- a/cmd/FyneApp.toml +++ b/cmd/FyneApp.toml @@ -5,4 +5,4 @@ Website = "https://patanix.de" Name = "kettlebell_tracker" ID = "de.patanix.kettlebell_tracker" Version = "1.0.0" - Build = 5 + Build = 9 diff --git a/cmd/build.sh b/cmd/build.sh index 7f29a05..a9b4b72 100755 --- a/cmd/build.sh +++ b/cmd/build.sh @@ -1 +1,2 @@ -fyne package -os android -release --tags -ldflags="-s -w" +# fyne package -os android -release --tags -ldflags="-s -w" +fyne package -os android/arm64 -release --tags -ldflags="-s -w" -certificate my-release-key.keystore diff --git a/internal/data/database.go b/internal/data/database.go index d0781b3..d4ad757 100644 --- a/internal/data/database.go +++ b/internal/data/database.go @@ -2,6 +2,7 @@ package data import ( "database/sql" + "fmt" "log" "time" @@ -132,10 +133,24 @@ func (s *DatabaseService) DeleteTraining(id int64) error { func (s *DatabaseService) UpdateTraining(session *TrainingSession) error { dateStr := session.Date.Format(time.RFC3339) query := ` - UPDATE training - SET date = ?, sets = ?, weightLeft = ?, weightRight = ?, repsPerSet = ?, duration = ?, program = ?, blockDay = ? - WHERE id = ?; - ` - _, err := s.DB.Exec(query, dateStr, session.Sets, session.WeightLeft, session.WeightRight, session.RepsPerSet, session.Duration, session.Program, session.BlockDay, session.ID) - return err + UPDATE training + SET date = ?, sets = ?, weightLeft = ?, weightRight = ?, repsPerSet = ?, duration = ?, program = ?, blockDay = ? + WHERE id = ?; + ` + res, err := s.DB.Exec(query, dateStr, session.Sets, session.WeightLeft, session.WeightRight, session.RepsPerSet, session.Duration, session.Program, session.BlockDay, session.ID) + if err != nil { + log.Printf("UpdateTraining Fehler: %v", err) + return err + } + rowsAffected, err := res.RowsAffected() + if err != nil { + log.Printf("UpdateTraining RowsAffected Fehler: %v", err) + return err + } + if rowsAffected == 0 { + log.Printf("UpdateTraining: Kein Datensatz mit ID %d gefunden", session.ID) + return fmt.Errorf("kein Datensatz mit ID %d gefunden", session.ID) + } + log.Printf("UpdateTraining erfolgreich für ID %d", session.ID) + return nil } diff --git a/internal/ui/history.go b/internal/ui/history.go index 1da74ea..6706efe 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -19,7 +19,7 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas placeholder := widget.NewLabel("Noch keine Trainingsdaten vorhanden.") - var showDetailDialog func(session data.TrainingSession, id int) + var showDetailDialog func(session *data.TrainingSession, id int) var refreshData func() list := widget.NewList( @@ -43,23 +43,87 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas ) list.OnSelected = func(id widget.ListItemID) { - session := history[id] + session := &history[id] showDetailDialog(session, id) list.Unselect(id) } - showDetailDialog = func(session data.TrainingSession, id int) { - details := container.NewVBox( + showDetailDialog = func(session *data.TrainingSession, id int) { + setsEntry := widget.NewEntry() + setsEntry.SetText(fmt.Sprintf("%d", session.Sets)) + + durationEntry := widget.NewEntry() + durationEntry.SetText(fmt.Sprintf("%d", session.Duration)) + + repsEntry := widget.NewEntry() + repsEntry.SetText(fmt.Sprintf("%d", session.RepsPerSet)) + + weightLeftEntry := widget.NewEntry() + weightLeftEntry.SetText(fmt.Sprintf("%.1f", session.WeightLeft)) + + weightRightEntry := widget.NewEntry() + weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) + + // Info-Header + info := container.NewVBox( widget.NewLabel(fmt.Sprintf("Datum: %s", session.Date.Format("02.01.2006 15:04"))), widget.NewLabel(fmt.Sprintf("Programm: %s", session.Program)), widget.NewLabel(fmt.Sprintf("Block-Tag: %d", session.BlockDay)), - widget.NewLabel(fmt.Sprintf("Sätze: %d", session.Sets)), - widget.NewLabel(fmt.Sprintf("Dauer: %s", utils.FormatDuration(session.Duration))), - widget.NewLabel(fmt.Sprintf("Reps/Satz: %d", session.RepsPerSet)), - widget.NewLabel(fmt.Sprintf("Gewicht links: %.1f kg", session.WeightLeft)), - widget.NewLabel(fmt.Sprintf("Gewicht rechts: %.1f kg", session.WeightRight)), ) + form := widget.NewForm( + &widget.FormItem{Text: "Sätze", Widget: setsEntry}, + &widget.FormItem{Text: "Dauer (Sekunden)", Widget: durationEntry}, + &widget.FormItem{Text: "Reps/Satz", Widget: repsEntry}, + &widget.FormItem{Text: "Gewicht links (kg)", Widget: weightLeftEntry}, + &widget.FormItem{Text: "Gewicht rechts (kg)", Widget: weightRightEntry}, + ) + + // Lokale Dialog-Referenz deklarieren + var detailDialog dialog.Dialog + + saveBtn := widget.NewButtonWithIcon("Speichern", theme.ConfirmIcon(), func() { + sets, err := strconv.Atoi(setsEntry.Text) + if err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Sätze-Zahl"), parent) + return + } + duration, err := strconv.Atoi(durationEntry.Text) + if err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Dauer"), parent) + return + } + reps, err := strconv.Atoi(repsEntry.Text) + if err != nil { + dialog.ShowError(fmt.Errorf("Ungültige Wiederholungszahl"), parent) + return + } + weightLeft, err := strconv.ParseFloat(weightLeftEntry.Text, 64) + if err != nil { + dialog.ShowError(fmt.Errorf("Ungültiges Gewicht links"), parent) + return + } + weightRight, err := strconv.ParseFloat(weightRightEntry.Text, 64) + if err != nil { + dialog.ShowError(fmt.Errorf("Ungültiges Gewicht rechts"), parent) + return + } + + session.Sets = int64(sets) + session.Duration = int64(duration) + session.RepsPerSet = int64(reps) + session.WeightLeft = weightLeft + session.WeightRight = weightRight + + if err := db.UpdateTraining(session); err != nil { + dialog.ShowError(err, parent) + return + } + dialog.ShowInformation("Erfolg", "Trainingseintrag aktualisiert.", parent) + refreshData() + detailDialog.Hide() + }) + deleteBtn := widget.NewButtonWithIcon("Löschen", theme.DeleteIcon(), func() { dialog.ShowConfirm("Eintrag löschen", "Möchtest du diesen Eintrag wirklich löschen?", func(ok bool) { if ok { @@ -69,85 +133,142 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas return } refreshData() + detailDialog.Hide() } }, parent) }) - editBtn := widget.NewButtonWithIcon("Bearbeiten", theme.DocumentCreateIcon(), func() { - setsEntry := widget.NewEntry() - setsEntry.SetText(fmt.Sprintf("%d", session.Sets)) - - durationEntry := widget.NewEntry() - durationEntry.SetText(fmt.Sprintf("%d", session.Duration)) // Dauer in Sekunden - - repsEntry := widget.NewEntry() - repsEntry.SetText(fmt.Sprintf("%d", session.RepsPerSet)) - - weightLeftEntry := widget.NewEntry() - weightLeftEntry.SetText(fmt.Sprintf("%.1f", session.WeightLeft)) - - weightRightEntry := widget.NewEntry() - weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) - - form := &widget.Form{ - Items: []*widget.FormItem{ - {Text: "Sätze", Widget: setsEntry}, - {Text: "Dauer (Sekunden)", Widget: durationEntry}, - {Text: "Reps/Satz", Widget: repsEntry}, - {Text: "Gewicht links (kg)", Widget: weightLeftEntry}, - {Text: "Gewicht rechts (kg)", Widget: weightRightEntry}, - }, - OnSubmit: func() { - var ( - sets, reps, duration int - weightLeft, weightRight float64 - err error - ) - if sets, err = strconv.Atoi(setsEntry.Text); err != nil { - dialog.ShowError(fmt.Errorf("Ungültige Sätze-Zahl"), parent) - return - } - if duration, err = strconv.Atoi(durationEntry.Text); err != nil { - dialog.ShowError(fmt.Errorf("Ungültige Dauer"), parent) - return - } - if reps, err = strconv.Atoi(repsEntry.Text); err != nil { - dialog.ShowError(fmt.Errorf("Ungültige Wiederholungszahl"), parent) - return - } - if weightLeft, err = strconv.ParseFloat(weightLeftEntry.Text, 64); err != nil { - dialog.ShowError(fmt.Errorf("Ungültiges Gewicht links"), parent) - return - } - if weightRight, err = strconv.ParseFloat(weightRightEntry.Text, 64); err != nil { - dialog.ShowError(fmt.Errorf("Ungültiges Gewicht rechts"), parent) - return - } - - session.Sets = int64(sets) - session.Duration = int64(duration) - session.RepsPerSet = int64(reps) - session.WeightLeft = weightLeft - session.WeightRight = weightRight - - if err := db.UpdateTraining(&session); err != nil { - dialog.ShowError(err, parent) - return - } - dialog.ShowInformation("Erfolg", "Trainingseintrag aktualisiert.", parent) - refreshData() - }, - } - - dialog.ShowForm("Training bearbeiten", "Speichern", "Abbrechen", form.Items, func(ok bool) { - }, parent) + cancelBtn := widget.NewButton("Abbrechen", func() { + detailDialog.Hide() }) - btns := container.NewHBox(editBtn, deleteBtn) + btns := container.NewHBox(saveBtn, deleteBtn, cancelBtn) - dialog.ShowCustom("Training Details", "Schließen", container.NewVBox(details, btns), parent) + content := container.NewVBox( + info, + form, + btns, + ) + + // Hier wird der Dialog erzeugt und die lokale Variable gesetzt + detailDialog = dialog.NewCustom("Training bearbeiten/löschen", "Schließen", content, parent) + detailDialog.Show() } + // showDetailDialog = func(session *data.TrainingSession, id int) { + // details := container.NewVBox( + // widget.NewLabel(fmt.Sprintf("Datum: %s", session.Date.Format("02.01.2006 15:04"))), + // widget.NewLabel(fmt.Sprintf("Programm: %s", session.Program)), + // widget.NewLabel(fmt.Sprintf("Block-Tag: %d", session.BlockDay)), + // widget.NewLabel(fmt.Sprintf("Sätze: %d", session.Sets)), + // widget.NewLabel(fmt.Sprintf("Dauer: %s", utils.FormatDuration(session.Duration))), + // widget.NewLabel(fmt.Sprintf("Reps/Satz: %d", session.RepsPerSet)), + // widget.NewLabel(fmt.Sprintf("Gewicht links: %.1f kg", session.WeightLeft)), + // widget.NewLabel(fmt.Sprintf("Gewicht rechts: %.1f kg", session.WeightRight)), + // ) + + // deleteBtn := widget.NewButtonWithIcon("Löschen", theme.DeleteIcon(), func() { + // dialog.ShowConfirm("Eintrag löschen", "Möchtest du diesen Eintrag wirklich löschen?", func(ok bool) { + // if ok { + // err := db.DeleteTraining(session.ID) + // if err != nil { + // dialog.ShowError(err, parent) + // return + // } + // refreshData() + // } + // }, parent) + // }) + + // editBtn := widget.NewButtonWithIcon("Bearbeiten", theme.DocumentCreateIcon(), func() { + // setsEntry := widget.NewEntry() + // setsEntry.SetText(fmt.Sprintf("%d", session.Sets)) + + // durationEntry := widget.NewEntry() + // durationEntry.SetText(fmt.Sprintf("%d", session.Duration)) + + // repsEntry := widget.NewEntry() + // repsEntry.SetText(fmt.Sprintf("%d", session.RepsPerSet)) + + // weightLeftEntry := widget.NewEntry() + // weightLeftEntry.SetText(fmt.Sprintf("%.1f", session.WeightLeft)) + + // weightRightEntry := widget.NewEntry() + // weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) + + // items := []*widget.FormItem{ + // {Text: "Sätze", Widget: setsEntry}, + // {Text: "Dauer (Sekunden)", Widget: durationEntry}, + // {Text: "Reps/Satz", Widget: repsEntry}, + // {Text: "Gewicht links (kg)", Widget: weightLeftEntry}, + // {Text: "Gewicht rechts (kg)", Widget: weightRightEntry}, + // } + + // var editDialog dialog.Dialog + // editDialog = dialog.NewForm( + // "Training bearbeiten", + // "Speichern", + // "Abbrechen", + // items, + // func(ok bool) { + // if !ok { + // log.Printf("Bearbeiten abgebrochen für Session-ID %d", session.ID) + // return + // } + // // AB HIER: Das ist der Submit-Handler! + // log.Printf("Bearbeiten gespeichert für Session-ID %d", session.ID) + + // sets, err := strconv.Atoi(setsEntry.Text) + // if err != nil { + // dialog.ShowError(fmt.Errorf("Ungültige Sätze-Zahl"), parent) + // return + // } + // duration, err := strconv.Atoi(durationEntry.Text) + // if err != nil { + // dialog.ShowError(fmt.Errorf("Ungültige Dauer"), parent) + // return + // } + // reps, err := strconv.Atoi(repsEntry.Text) + // if err != nil { + // dialog.ShowError(fmt.Errorf("Ungültige Wiederholungszahl"), parent) + // return + // } + // weightLeft, err := strconv.ParseFloat(weightLeftEntry.Text, 64) + // if err != nil { + // dialog.ShowError(fmt.Errorf("Ungültiges Gewicht links"), parent) + // return + // } + // weightRight, err := strconv.ParseFloat(weightRightEntry.Text, 64) + // if err != nil { + // dialog.ShowError(fmt.Errorf("Ungültiges Gewicht rechts"), parent) + // return + // } + + // session.Sets = int64(sets) + // session.Duration = int64(duration) + // session.RepsPerSet = int64(reps) + // session.WeightLeft = weightLeft + // session.WeightRight = weightRight + + // log.Printf("UpdateTraining wird aufgerufen für Session-ID %d", session.ID) + // if err := db.UpdateTraining(session); err != nil { + // dialog.ShowError(err, parent) + // return + // } + // log.Printf("UpdateTraining erfolgreich für Session-ID %d", session.ID) + // dialog.ShowInformation("Erfolg", "Trainingseintrag aktualisiert.", parent) + // refreshData() + // }, + // parent, + // ) + // editDialog.Show() + // }) + + // btns := container.NewHBox(editBtn, deleteBtn) + + // dialog.ShowCustom("Training Details", "Schließen", container.NewVBox(details, btns), parent) + // } + refreshData = func() { var err error history, err = db.GetHistory() From e3eb2c9aa4f15350068e2b0a4255ff27ce275680 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 4 Jul 2025 18:49:05 +0200 Subject: [PATCH 10/16] refactor: finish refactor by cleaning up codebase --- internal/ui/history.go | 118 +---------------------------------------- 1 file changed, 1 insertion(+), 117 deletions(-) diff --git a/internal/ui/history.go b/internal/ui/history.go index 6706efe..3c25520 100644 --- a/internal/ui/history.go +++ b/internal/ui/history.go @@ -35,7 +35,7 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas func(i widget.ListItemID, o fyne.CanvasObject) { session := history[i] row := o.(*fyne.Container) - row.Objects[0].(*widget.Label).SetText(session.Date.Format("02.01.2006 15:04")) + row.Objects[0].(*widget.Label).SetText(session.Date.Format("02.01.2006")) row.Objects[1].(*widget.Label).SetText(fmt.Sprintf("%d", session.Sets)) row.Objects[2].(*widget.Label).SetText(utils.FormatDuration(session.Duration)) row.Objects[3].(*widget.Label).SetText(fmt.Sprintf("%d", session.RepsPerSet)) @@ -64,7 +64,6 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas weightRightEntry := widget.NewEntry() weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) - // Info-Header info := container.NewVBox( widget.NewLabel(fmt.Sprintf("Datum: %s", session.Date.Format("02.01.2006 15:04"))), widget.NewLabel(fmt.Sprintf("Programm: %s", session.Program)), @@ -150,125 +149,10 @@ func MakeHistoryScreen(db *data.DatabaseService, parent fyne.Window) fyne.Canvas btns, ) - // Hier wird der Dialog erzeugt und die lokale Variable gesetzt detailDialog = dialog.NewCustom("Training bearbeiten/löschen", "Schließen", content, parent) detailDialog.Show() } - // showDetailDialog = func(session *data.TrainingSession, id int) { - // details := container.NewVBox( - // widget.NewLabel(fmt.Sprintf("Datum: %s", session.Date.Format("02.01.2006 15:04"))), - // widget.NewLabel(fmt.Sprintf("Programm: %s", session.Program)), - // widget.NewLabel(fmt.Sprintf("Block-Tag: %d", session.BlockDay)), - // widget.NewLabel(fmt.Sprintf("Sätze: %d", session.Sets)), - // widget.NewLabel(fmt.Sprintf("Dauer: %s", utils.FormatDuration(session.Duration))), - // widget.NewLabel(fmt.Sprintf("Reps/Satz: %d", session.RepsPerSet)), - // widget.NewLabel(fmt.Sprintf("Gewicht links: %.1f kg", session.WeightLeft)), - // widget.NewLabel(fmt.Sprintf("Gewicht rechts: %.1f kg", session.WeightRight)), - // ) - - // deleteBtn := widget.NewButtonWithIcon("Löschen", theme.DeleteIcon(), func() { - // dialog.ShowConfirm("Eintrag löschen", "Möchtest du diesen Eintrag wirklich löschen?", func(ok bool) { - // if ok { - // err := db.DeleteTraining(session.ID) - // if err != nil { - // dialog.ShowError(err, parent) - // return - // } - // refreshData() - // } - // }, parent) - // }) - - // editBtn := widget.NewButtonWithIcon("Bearbeiten", theme.DocumentCreateIcon(), func() { - // setsEntry := widget.NewEntry() - // setsEntry.SetText(fmt.Sprintf("%d", session.Sets)) - - // durationEntry := widget.NewEntry() - // durationEntry.SetText(fmt.Sprintf("%d", session.Duration)) - - // repsEntry := widget.NewEntry() - // repsEntry.SetText(fmt.Sprintf("%d", session.RepsPerSet)) - - // weightLeftEntry := widget.NewEntry() - // weightLeftEntry.SetText(fmt.Sprintf("%.1f", session.WeightLeft)) - - // weightRightEntry := widget.NewEntry() - // weightRightEntry.SetText(fmt.Sprintf("%.1f", session.WeightRight)) - - // items := []*widget.FormItem{ - // {Text: "Sätze", Widget: setsEntry}, - // {Text: "Dauer (Sekunden)", Widget: durationEntry}, - // {Text: "Reps/Satz", Widget: repsEntry}, - // {Text: "Gewicht links (kg)", Widget: weightLeftEntry}, - // {Text: "Gewicht rechts (kg)", Widget: weightRightEntry}, - // } - - // var editDialog dialog.Dialog - // editDialog = dialog.NewForm( - // "Training bearbeiten", - // "Speichern", - // "Abbrechen", - // items, - // func(ok bool) { - // if !ok { - // log.Printf("Bearbeiten abgebrochen für Session-ID %d", session.ID) - // return - // } - // // AB HIER: Das ist der Submit-Handler! - // log.Printf("Bearbeiten gespeichert für Session-ID %d", session.ID) - - // sets, err := strconv.Atoi(setsEntry.Text) - // if err != nil { - // dialog.ShowError(fmt.Errorf("Ungültige Sätze-Zahl"), parent) - // return - // } - // duration, err := strconv.Atoi(durationEntry.Text) - // if err != nil { - // dialog.ShowError(fmt.Errorf("Ungültige Dauer"), parent) - // return - // } - // reps, err := strconv.Atoi(repsEntry.Text) - // if err != nil { - // dialog.ShowError(fmt.Errorf("Ungültige Wiederholungszahl"), parent) - // return - // } - // weightLeft, err := strconv.ParseFloat(weightLeftEntry.Text, 64) - // if err != nil { - // dialog.ShowError(fmt.Errorf("Ungültiges Gewicht links"), parent) - // return - // } - // weightRight, err := strconv.ParseFloat(weightRightEntry.Text, 64) - // if err != nil { - // dialog.ShowError(fmt.Errorf("Ungültiges Gewicht rechts"), parent) - // return - // } - - // session.Sets = int64(sets) - // session.Duration = int64(duration) - // session.RepsPerSet = int64(reps) - // session.WeightLeft = weightLeft - // session.WeightRight = weightRight - - // log.Printf("UpdateTraining wird aufgerufen für Session-ID %d", session.ID) - // if err := db.UpdateTraining(session); err != nil { - // dialog.ShowError(err, parent) - // return - // } - // log.Printf("UpdateTraining erfolgreich für Session-ID %d", session.ID) - // dialog.ShowInformation("Erfolg", "Trainingseintrag aktualisiert.", parent) - // refreshData() - // }, - // parent, - // ) - // editDialog.Show() - // }) - - // btns := container.NewHBox(editBtn, deleteBtn) - - // dialog.ShowCustom("Training Details", "Schließen", container.NewVBox(details, btns), parent) - // } - refreshData = func() { var err error history, err = db.GetHistory() From e6dc77116b6fd9c2b59de0bcfc1c23b241effc62 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Wed, 30 Jul 2025 22:29:10 +0200 Subject: [PATCH 11/16] change from golang fyne to kotlin and Jetpack Compose --- .gitignore | 15 + app/.gitignore | 1 + app/build.gradle.kts | 205 +++++++++++ app/src/main/AndroidManifest.xml | 27 ++ .../patani/kettlebelltracker/MainActivity.kt | 159 +++++++++ .../data/datastore/SettingsDataStore.kt | 54 +++ .../data/local/AppDatabase.kt | 11 + .../data/local/Converters.kt | 16 + .../data/local/TrainingSession.kt | 19 ++ .../data/local/TrainingSessionDao.kt | 36 ++ .../data/remote/ApiService.kt | 10 + .../data/remote/TrainingPayload.kt | 8 + .../repositories/ApiRepository.kt | 32 ++ .../kettlebelltracker/ui/navigation/Screen.kt | 15 + .../ui/screens/HistoryScreen.kt | 322 ++++++++++++++++++ .../ui/screens/HomeScreen.kt | 85 +++++ .../ui/screens/SettingsScreen.kt | 84 +++++ .../ui/screens/TrainingScreen.kt | 74 ++++ .../kettlebelltracker/ui/theme/Color.kt | 11 + .../kettlebelltracker/ui/theme/Theme.kt | 38 +++ .../patani/kettlebelltracker/ui/theme/Type.kt | 34 ++ .../kettlebelltracker/util/formatDuration.kt | 17 + .../viewmodels/HistoryViewModel.kt | 24 ++ .../viewmodels/HomeViewModel.kt | 33 ++ .../viewmodels/SettingsViewModel.kt | 31 ++ .../viewmodels/TrainingViewModel.kt | 169 +++++++++ .../res/drawable/ic_launcher_background.xml | 170 +++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/strings.xml | 3 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 ++ build.gradle.kts | 6 + gradle.properties | 23 ++ settings.gradle.kts | 24 ++ 48 files changed, 1845 insertions(+) create mode 100644 .gitignore create mode 100644 app/.gitignore create mode 100644 app/build.gradle.kts create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/datastore/SettingsDataStore.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/local/AppDatabase.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/local/Converters.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSession.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSessionDao.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/data/remote/TrainingPayload.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/navigation/Screen.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/screens/HistoryScreen.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/screens/HomeScreen.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/screens/SettingsScreen.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/screens/TrainingScreen.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/theme/Color.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/theme/Theme.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/ui/theme/Type.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/util/formatDuration.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/viewmodels/HistoryViewModel.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/viewmodels/HomeViewModel.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/viewmodels/SettingsViewModel.kt create mode 100644 app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..ac4f03b --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,205 @@ +//plugins { +// id("com.android.application") +// id("org.jetbrains.kotlin.android") +// id("org.jetbrains.kotlin.plugin.compose") +// id("kotlin-kapt") +//} +// +//android { +// namespace = "de.patani.kettlebelltracker" +// compileSdk = 34 +// +// defaultConfig { +// applicationId = "de.patani.kettlebelltracker" +// minSdk = 26 +// targetSdk = 34 +// versionCode = 1 +// versionName = "1.0" +// +// testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" +// vectorDrawables { +// useSupportLibrary = true +// } +// } +// +// buildTypes { +// release { +// isMinifyEnabled = false +// proguardFiles( +// getDefaultProguardFile("proguard-android-optimize.txt"), +// "proguard-rules.pro" +// ) +// } +// } +// compileOptions { +// sourceCompatibility = JavaVersion.VERSION_1_8 +// targetCompatibility = JavaVersion.VERSION_1_8 +// } +// kotlinOptions { +// jvmTarget = "1.8" +// } +// buildFeatures { +// compose = true +// } +// composeOptions { +// kotlinCompilerExtensionVersion = "1.5.1" +// } +// packaging { +// resources { +// excludes += "/META-INF/{AL2.0,LGPL2.1}" +// excludes += "org/intellij/lang/annotations/**" +// } +// } +//} +// +//configurations { +// all { +// exclude(group = "com.intellij", module = "annotations") +// } +//} +// +//dependencies { +// // Core +// implementation("androidx.core:core-ktx:1.12.0") +// implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") +// implementation("androidx.activity:activity-compose:1.8.2") +// +// // Compose +// implementation(platform("androidx.compose:compose-bom:2023.08.00")) +// implementation("androidx.compose.ui:ui") +// implementation("androidx.compose.ui:ui-graphics") +// implementation("androidx.compose.ui:ui-tooling-preview") +// implementation("androidx.compose.material3:material3") +// implementation("androidx.compose.material:material-icons-extended") +// +// +// // Navigation +// implementation("androidx.navigation:navigation-compose:2.7.6") +// +// // ViewModel +// implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") +// +// // Room (Database) +// implementation("androidx.room:room-runtime:2.6.1") +// implementation("androidx.room:room-ktx:2.6.1") +// implementation(libs.androidx.room.common.jvm) +// implementation(libs.androidx.room.compiler) +// kapt("androidx.room:room-compiler:2.6.1") +// +// // DataStore (Settings) +// implementation("androidx.datastore:datastore-preferences:1.0.0") +// +// // Retrofit (API) +// implementation("com.squareup.retrofit2:retrofit:2.9.0") +// implementation("com.squareup.retrofit2:converter-gson:2.9.0") +// +// // Hilt (Dependency Injection - Optional, but recommended) +// // implementation("com.google.dagger:hilt-android:2.48") +// // kapt("com.google.dagger:hilt-compiler:2.48") +// // implementation("androidx.hilt:hilt-navigation-compose:1.1.0") +//} +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.compose") + id("org.jetbrains.kotlin.kapt") // Wichtig: Hier auf 'org.jetbrains.kotlin.kapt' geändert +} + +android { + namespace = "de.patani.kettlebelltracker" + compileSdk = 34 + + defaultConfig { + applicationId = "de.patani.kettlebelltracker" + minSdk = 26 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + excludes += "org/intellij/lang/annotations/**" + } + } +} + +// Den 'configurations' Block entfernen, es sei denn, du benötigst ihn explizit für einen spezifischen Ausschluss. +// Wenn du ihn absichtlich hinzugefügt hast, um ein bekanntes Problem zu lösen, kannst du ihn behalten. +// Ansonsten kommentiere ihn aus oder entferne ihn: +/* +configurations { + all { + exclude(group = "com.intellij", module = "annotations") + } +} +*/ + +dependencies { + // Core + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.activity:activity-compose:1.8.2") + + // Compose + implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material:material-icons-extended") + + // Navigation + implementation("androidx.navigation:navigation-compose:2.7.6") + + // ViewModel + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") + + // Room (Database) + implementation("androidx.room:room-runtime:2.6.1") + implementation("androidx.room:room-ktx:2.6.1") + // Wichtig: Die folgenden Zeilen für den Room Compiler wurden entfernt/korrigiert! + // KEIN implementation("libs.androidx.room.common.jvm") + // KEIN implementation("libs.androidx.room.compiler") + kapt("androidx.room:room-compiler:2.6.1") // NUR diese Zeile für den Compiler! + + // DataStore (Settings) + implementation("androidx.datastore:datastore-preferences:1.0.0") + + // Retrofit (API) + implementation("com.squareup.retrofit2:retrofit:2.9.0") + implementation("com.squareup.retrofit2:converter-gson:2.9.0") + + // Hilt (Dependency Injection - Optional, but recommended) + // implementation("com.google.dagger:hilt-android:2.48") + // kapt("com.google.dagger:hilt-compiler:2.48") + // implementation("androidx.hilt:hilt-navigation-compose:1.1.0") +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..88e6e44 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt b/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt new file mode 100644 index 0000000..f25377e --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/MainActivity.kt @@ -0,0 +1,159 @@ +package de.patani.kettlebelltracker + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.compose.* +import androidx.room.Room +import de.patani.kettlebelltracker.data.datastore.SettingsDataStore +import de.patani.kettlebelltracker.data.local.AppDatabase +import de.patani.kettlebelltracker.repositories.ApiRepository +import de.patani.kettlebelltracker.ui.navigation.Screen +import de.patani.kettlebelltracker.ui.screens.* +import de.patani.kettlebelltracker.ui.theme.KettlebellTrackerTheme +import de.patani.kettlebelltracker.viewmodels.* +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import java.util.UUID + +class MainActivity : ComponentActivity() { + + private val db by lazy { + Room.databaseBuilder(applicationContext, AppDatabase::class.java, "kettlebell_tracker.db").build() + } + private val settingsDataStore by lazy { SettingsDataStore(applicationContext) } + + private val apiService by lazy { + Retrofit.Builder() + .baseUrl("http://192.168.178.43:8080/") // WICHTIG: Deine lokale IP + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(de.patani.kettlebelltracker.data.remote.ApiService::class.java) + } + + private val apiRepository by lazy { ApiRepository(apiService) } + + private val appUUID by lazy { + val prefs = getSharedPreferences("app_prefs", MODE_PRIVATE) + var uuid = prefs.getString("app_uuid", null) + if (uuid == null) { + uuid = UUID.randomUUID().toString() + prefs.edit().putString("app_uuid", uuid).apply() + } + uuid + } + + private val trainingViewModel by lazy { + ViewModelProvider(this, createViewModelFactory(TrainingViewModel::class.java)).get(TrainingViewModel::class.java) + } + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + KettlebellTrackerTheme { + App(createViewModelFactory = { modelClass -> createViewModelFactory(modelClass) }) + } + } + } + + @Suppress("UNCHECKED_CAST") + private fun createViewModelFactory(modelClass: Class): ViewModelProvider.Factory { + return object : ViewModelProvider.Factory { + override fun create(modelClass: Class): T { + return when { + modelClass.isAssignableFrom(TrainingViewModel::class.java) -> + appUUID?.let { + TrainingViewModel(db.trainingSessionDao(), settingsDataStore, apiRepository, + it + ) + } as T + modelClass.isAssignableFrom(HomeViewModel::class.java) -> + HomeViewModel(db.trainingSessionDao(), trainingViewModel) as T + modelClass.isAssignableFrom(HistoryViewModel::class.java) -> + HistoryViewModel(db.trainingSessionDao()) as T + modelClass.isAssignableFrom(SettingsViewModel::class.java) -> + SettingsViewModel(settingsDataStore) as T + else -> throw IllegalArgumentException("Unknown ViewModel class") + } + } + } + } +} + +@Composable +fun App(createViewModelFactory: (Class) -> ViewModelProvider.Factory) { + val navController = rememberNavController() + val screens = listOf( + Screen.Home, + Screen.Training, + Screen.History, + Screen.Settings + ) + + val sharedTrainingViewModel: TrainingViewModel = + androidx.lifecycle.viewmodel.compose.viewModel(factory = createViewModelFactory(TrainingViewModel::class.java)) + + + Scaffold( + bottomBar = { + NavigationBar { + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + screens.forEach { screen -> + NavigationBarItem( + icon = { Icon(screen.icon, contentDescription = null) }, + label = { Text(screen.title) }, + selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true, + onClick = { + navController.navigate(screen.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + } + ) + } + } + } + ) { innerPadding -> + NavHost( + navController, + startDestination = Screen.Home.route, + Modifier.padding(innerPadding) + ) { + composable(Screen.Home.route) { + val homeViewModel: HomeViewModel = androidx.lifecycle.viewmodel.compose.viewModel(factory = createViewModelFactory(HomeViewModel::class.java)) + HomeScreen( + viewModel = homeViewModel, + onStartTrainingClicked = { + sharedTrainingViewModel.startTraining() + navController.navigate(Screen.Training.route) + } + ) + } + composable(Screen.Training.route) { + TrainingScreen(viewModel = sharedTrainingViewModel) + } + composable(Screen.History.route) { + val historyViewModel: HistoryViewModel = androidx.lifecycle.viewmodel.compose.viewModel(factory = createViewModelFactory(HistoryViewModel::class.java)) + HistoryScreen(viewModel = historyViewModel) + } + composable(Screen.Settings.route) { + val settingsViewModel: SettingsViewModel = androidx.lifecycle.viewmodel.compose.viewModel(factory = createViewModelFactory(SettingsViewModel::class.java)) + SettingsScreen(viewModel = settingsViewModel) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/datastore/SettingsDataStore.kt b/app/src/main/java/de/patani/kettlebelltracker/data/datastore/SettingsDataStore.kt new file mode 100644 index 0000000..b6222ed --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/datastore/SettingsDataStore.kt @@ -0,0 +1,54 @@ +package de.patani.kettlebelltracker.data.datastore + +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.doublePreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.intPreferencesKey +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map + +val Context.dataStore: DataStore by preferencesDataStore(name = "settings") + +class SettingsDataStore(context: Context) { + private val dataStore = context.dataStore + + companion object { + val TRAINING_TIME_MINUTES = intPreferencesKey("trainingTimeMinutes") + val WEIGHT_LEFT = doublePreferencesKey("weightLeft") + val WEIGHT_RIGHT = doublePreferencesKey("weightRight") + val GOAL_SETS = intPreferencesKey("goalSets") + val INITIAL_PROGRAM = stringPreferencesKey("initialProgram") + } + + val settingsFlow: Flow = dataStore.data.map { preferences -> + Settings( + trainingTimeMinutes = preferences[TRAINING_TIME_MINUTES] ?: 20, + weightLeft = preferences[WEIGHT_LEFT] ?: 16.0, + weightRight = preferences[WEIGHT_RIGHT] ?: 16.0, + goalSets = preferences[GOAL_SETS] ?: 5, + initialProgram = preferences[INITIAL_PROGRAM] ?: "giant_1.0" + ) + } + + suspend fun saveSettings(settings: Settings) { + dataStore.edit { preferences -> + preferences[TRAINING_TIME_MINUTES] = settings.trainingTimeMinutes + preferences[WEIGHT_LEFT] = settings.weightLeft + preferences[WEIGHT_RIGHT] = settings.weightRight + preferences[GOAL_SETS] = settings.goalSets + preferences[INITIAL_PROGRAM] = settings.initialProgram + } + } +} + +data class Settings( + val trainingTimeMinutes: Int, + val weightLeft: Double, + val weightRight: Double, + val goalSets: Int, + val initialProgram: String +) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/local/AppDatabase.kt b/app/src/main/java/de/patani/kettlebelltracker/data/local/AppDatabase.kt new file mode 100644 index 0000000..087f901 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/local/AppDatabase.kt @@ -0,0 +1,11 @@ +package de.patani.kettlebelltracker.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase +import androidx.room.TypeConverters + +@Database(entities = [TrainingSession::class], version = 1, exportSchema = false) +@TypeConverters(Converters::class) +abstract class AppDatabase : RoomDatabase() { + abstract fun trainingSessionDao(): TrainingSessionDao +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/local/Converters.kt b/app/src/main/java/de/patani/kettlebelltracker/data/local/Converters.kt new file mode 100644 index 0000000..213a881 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/local/Converters.kt @@ -0,0 +1,16 @@ +package de.patani.kettlebelltracker.data.local + +import androidx.room.TypeConverter +import java.util.Date + +class Converters { + @TypeConverter + fun fromTimestamp(value: Long?): Date? { + return value?.let { Date(it) } + } + + @TypeConverter + fun dateToTimestamp(date: Date?): Long? { + return date?.time + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSession.kt b/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSession.kt new file mode 100644 index 0000000..ec91096 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSession.kt @@ -0,0 +1,19 @@ +package de.patani.kettlebelltracker.data.local + +import androidx.room.Entity +import androidx.room.PrimaryKey +import java.util.Date + +@Entity(tableName = "training_session") +data class TrainingSession( + @PrimaryKey(autoGenerate = true) + val id: Long = 0, + val date: Date, + val sets: Int, + val weightLeft: Double, + val weightRight: Double, + val repsPerSet: Int, + val duration: Long, // in seconds + val program: String, + val blockDay: Int +) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSessionDao.kt b/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSessionDao.kt new file mode 100644 index 0000000..1772939 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/local/TrainingSessionDao.kt @@ -0,0 +1,36 @@ +package de.patani.kettlebelltracker.data.local + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.OnConflictStrategy +import androidx.room.Query +import androidx.room.Update +import kotlinx.coroutines.flow.Flow + +@Dao +interface TrainingSessionDao { + @Query("SELECT * FROM training_session ORDER BY date DESC") + fun getAllSessions(): Flow> + + @Query("SELECT * FROM training_session ORDER BY date DESC LIMIT 20") + fun getHistory(): Flow> + + @Query("SELECT * FROM training_session ORDER BY date DESC LIMIT 1") + fun getLastSession(): Flow + + @Query("SELECT COUNT(*) FROM training_session") + fun getTrainingCount(): Flow + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insert(session: TrainingSession) + + @Update + suspend fun update(session: TrainingSession) + + @Delete + suspend fun delete(session: TrainingSession) + + @Query("DELETE FROM training_session WHERE id = :sessionId") + suspend fun deleteById(sessionId: Long) +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt b/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt new file mode 100644 index 0000000..482dd4a --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/remote/ApiService.kt @@ -0,0 +1,10 @@ +package de.patani.kettlebelltracker.data.remote + +import retrofit2.http.Body +import retrofit2.http.POST +import retrofit2.Response + +interface ApiService { + @POST("trainings/") + suspend fun sendTrainingData(@Body payload: TrainingPayload): Response +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/data/remote/TrainingPayload.kt b/app/src/main/java/de/patani/kettlebelltracker/data/remote/TrainingPayload.kt new file mode 100644 index 0000000..01ad4a1 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/data/remote/TrainingPayload.kt @@ -0,0 +1,8 @@ +package de.patani.kettlebelltracker.data.remote + +data class TrainingPayload( + val reps: Int, + val rest: Double, + val sets: Int, + val uuid: String +) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt b/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt new file mode 100644 index 0000000..53f3020 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/repositories/ApiRepository.kt @@ -0,0 +1,32 @@ +package de.patani.kettlebelltracker.repositories + +import android.util.Log +import de.patani.kettlebelltracker.data.remote.TrainingPayload +import de.patani.kettlebelltracker.data.remote.ApiService + +class ApiRepository(private val apiService: ApiService) { + suspend fun sendTrainingData(session: de.patani.kettlebelltracker.data.local.TrainingSession, uuid: String) { + try { + val rest = if (session.sets > 0) { + session.duration.toDouble() / session.sets.toDouble() + } else { + 0.0 + } + + val payload = TrainingPayload( + reps = session.repsPerSet, + rest = rest, + sets = session.sets, + uuid = uuid + ) + val response = apiService.sendTrainingData(payload) + if (response.isSuccessful) { + Log.d("ApiRepository", "Training successfully sent to backend.") + } else { + Log.e("ApiRepository", "API Error: Unexpected status code: ${response.code()}") + } + } catch (e: Exception) { + Log.e("ApiRepository", "API Error: Failed to send training data", e) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/navigation/Screen.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/navigation/Screen.kt new file mode 100644 index 0000000..b79bd02 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/navigation/Screen.kt @@ -0,0 +1,15 @@ +package de.patani.kettlebelltracker.ui.navigation + +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.DateRange +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material.icons.filled.Settings +import androidx.compose.ui.graphics.vector.ImageVector + +sealed class Screen(val route: String, val title: String, val icon: ImageVector) { + object Home : Screen("home", "Home", Icons.Default.Home) + object Training : Screen("training", "Training", Icons.Default.PlayArrow) + object History : Screen("history", "Historie", Icons.Default.DateRange) + object Settings : Screen("settings", "Einstellungen", Icons.Default.Settings) +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HistoryScreen.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HistoryScreen.kt new file mode 100644 index 0000000..106b281 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HistoryScreen.kt @@ -0,0 +1,322 @@ +// +//import androidx.compose.foundation.layout.* +//import androidx.compose.foundation.lazy.LazyColumn +//import androidx.compose.foundation.lazy.items +//import androidx.compose.material3.* +//import androidx.compose.runtime.* +//import androidx.compose.ui.Modifier +//import androidx.compose.ui.unit.dp +//import de.patani.kettlebelltracker.viewmodels.HistoryViewModel +//import de.patani.kettlebelltracker.util.formatDate +//import de.patani.kettlebelltracker.util.formatDuration +//import de.patani.kettlebelltracker.data.local.TrainingSession +// +//@Composable +//fun HistoryScreen(viewModel: HistoryViewModel) { +// val history by viewModel.history.collectAsState() +// +// if (history.isEmpty()) { +// Box(modifier = Modifier.fillMaxSize(), contentAlignment = androidx.compose.ui.Alignment.Center) { +// Text("Noch keine Trainingsdaten vorhanden.") +// } +// } else { +// LazyColumn( +// modifier = Modifier.fillMaxSize(), +// contentPadding = PaddingValues(16.dp), +// verticalArrangement = Arrangement.spacedBy(8.dp) +// ) { +// item { +// Row(Modifier.fillMaxWidth()) { +// Text("Datum", modifier = Modifier.weight(1f)) +// Text("Sätze", modifier = Modifier.weight(0.5f)) +// Text("Dauer", modifier = Modifier.weight(0.7f)) +// Text("Reps", modifier = Modifier.weight(0.5f)) +// } +// Divider(modifier = Modifier.padding(vertical = 8.dp)) +// } +// items(history) { session -> +// HistoryItem(session = session, onUpdate = viewModel::updateSession, onDelete = viewModel::deleteSession) +// } +// } +// } +//} +// +//@OptIn(ExperimentalMaterial3Api::class) +//@Composable +//fun HistoryItem(session: TrainingSession, onUpdate: (TrainingSession) -> Unit, onDelete: (TrainingSession) -> Unit) { +// var showDialog by remember { mutableStateOf(false) } +// +// Card(onClick = { showDialog = true }, modifier = Modifier.fillMaxWidth()) { +// Row(modifier = Modifier.padding(16.dp)) { +// Text(text = session.date.formatDate(), modifier = Modifier.weight(1f)) +// Text(text = session.sets.toString(), modifier = Modifier.weight(0.5f)) +// Text(text = formatDuration(session.duration), modifier = Modifier.weight(0.7f)) +// Text(text = session.repsPerSet.toString(), modifier = Modifier.weight(0.5f)) +// } +// } +// +// if (showDialog) { +// EditHistoryDialog( +// session = session, +// onDismiss = { showDialog = false }, +// onSave = { updatedSession -> +// onUpdate(updatedSession) +// showDialog = false +// }, +// onDelete = { +// onDelete(session) +// showDialog = false +// } +// ) +// } +//} +// +//@Composable +//fun EditHistoryDialog(session: TrainingSession, onDismiss: () -> Unit, onSave: (TrainingSession) -> Unit, onDelete: () -> Unit) { +// // Implement a detailed dialog for editing if needed, similar to the Go app's dialog. +// // For brevity, this example uses a simpler confirmation. +// AlertDialog( +// onDismissRequest = onDismiss, +// title = { Text("Eintrag verwalten") }, +// text = { Text("Möchtest du diesen Eintrag löschen? Das Bearbeiten kann in einer zukünftigen Version implementiert werden.") }, +// confirmButton = { +// Button(onClick = onDelete) { +// Text("Löschen") +// } +// }, +// dismissButton = { +// Button(onClick = onDismiss) { +// Text("Abbrechen") +// } +// } +// ) +//} +package de.patani.kettlebelltracker.ui.screens + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import de.patani.kettlebelltracker.viewmodels.HistoryViewModel +import de.patani.kettlebelltracker.util.formatDate +import de.patani.kettlebelltracker.util.formatDuration +import de.patani.kettlebelltracker.data.local.TrainingSession +import androidx.compose.ui.Alignment + +@Composable +fun HistoryScreen(viewModel: HistoryViewModel) { + val history by viewModel.history.collectAsState() + + if (history.isEmpty()) { + Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { + Text("Noch keine Trainingsdaten vorhanden.") + } + } else { + LazyColumn( + modifier = Modifier.fillMaxSize(), + contentPadding = PaddingValues(16.dp), + verticalArrangement = Arrangement.spacedBy(8.dp) + ) { + item { + Row(Modifier.fillMaxWidth()) { + Text("Datum", modifier = Modifier.weight(1f)) + Text("Sätze", modifier = Modifier.weight(0.5f)) + Text("Dauer", modifier = Modifier.weight(0.7f)) + Text("Reps", modifier = Modifier.weight(0.5f)) + } + Divider(modifier = Modifier.padding(vertical = 8.dp)) + } + items(history) { session -> + HistoryItem( + session = session, + onUpdate = viewModel::updateSession, + onDelete = viewModel::deleteSession + ) + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HistoryItem(session: TrainingSession, onUpdate: (TrainingSession) -> Unit, onDelete: (TrainingSession) -> Unit) { + var showDialog by remember { mutableStateOf(false) } + + Card(onClick = { showDialog = true }, modifier = Modifier.fillMaxWidth()) { + Row(modifier = Modifier.padding(16.dp)) { + Text(text = session.date.formatDate(), modifier = Modifier.weight(1f)) + Text(text = session.sets.toString(), modifier = Modifier.weight(0.5f)) + Text(text = formatDuration(session.duration), modifier = Modifier.weight(0.7f)) + Text(text = session.repsPerSet.toString(), modifier = Modifier.weight(0.5f)) + } + } + + if (showDialog) { + EditHistoryDialog( + session = session, + onDismiss = { showDialog = false }, + onSave = { updatedSession -> + onUpdate(updatedSession) + showDialog = false + }, + onDelete = { + onDelete(session) + showDialog = false + } + ) + } +} + +@Composable +fun EditHistoryDialog(session: TrainingSession, onDismiss: () -> Unit, onSave: (TrainingSession) -> Unit, onDelete: () -> Unit) { + var editedSets by remember { mutableStateOf(session.sets.toString()) } + var editedRepsPerSet by remember { mutableStateOf(session.repsPerSet.toString()) } + var editedWeightLeft by remember { mutableStateOf(session.weightLeft.toString()) } + var editedWeightRight by remember { mutableStateOf(session.weightRight.toString()) } + var editedDurationMinutes by remember { mutableStateOf((session.duration / 60).toString()) } + var editedDurationSeconds by remember { mutableStateOf((session.duration % 60).toString()) } + + AlertDialog( + onDismissRequest = onDismiss, + title = { Text("Eintrag bearbeiten") }, + text = { + Column { + Text("Datum: ${session.date.formatDate()}", style = MaterialTheme.typography.bodyMedium) + Spacer(modifier = Modifier.height(8.dp)) + + OutlinedTextField( + value = editedSets, + onValueChange = { newValue -> + if (newValue.all { it.isDigit() } || newValue.isEmpty()) { + editedSets = newValue + } + }, + label = { Text("Sätze") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp), + singleLine = true + ) + + OutlinedTextField( + value = editedRepsPerSet, + onValueChange = { newValue -> + if (newValue.all { it.isDigit() } || newValue.isEmpty()) { + editedRepsPerSet = newValue + } + }, + label = { Text("Wiederholungen pro Satz") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp), + singleLine = true + ) + + OutlinedTextField( + value = editedWeightLeft, + onValueChange = { newValue -> + if (newValue.matches(Regex("^\\d*\\.?\\d*\$"))) { + editedWeightLeft = newValue + } + }, + label = { Text("Gewicht Links (kg)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp), + singleLine = true + ) + + OutlinedTextField( + value = editedWeightRight, + onValueChange = { newValue -> + if (newValue.matches(Regex("^\\d*\\.?\\d*\$"))) { + editedWeightRight = newValue + } + }, + label = { Text("Gewicht Rechts (kg)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp), + singleLine = true + ) + + Row(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp), horizontalArrangement = Arrangement.SpaceBetween) { + OutlinedTextField( + value = editedDurationMinutes, + onValueChange = { newValue -> + if (newValue.all { it.isDigit() } || newValue.isEmpty()) { + editedDurationMinutes = newValue + } + }, + label = { Text("Dauer (Min)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.weight(1f).padding(end = 4.dp), + singleLine = true + ) + OutlinedTextField( + value = editedDurationSeconds, + onValueChange = { newValue -> + if (newValue.all { it.isDigit() } || newValue.isEmpty()) { + editedDurationSeconds = newValue + } + }, + label = { Text("Dauer (Sek)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.weight(1f).padding(start = 4.dp), + singleLine = true + ) + } + Text("Programm: ${session.program}", style = MaterialTheme.typography.bodySmall) + Text("Block Tag: ${session.blockDay}", style = MaterialTheme.typography.bodySmall) + } + }, + confirmButton = { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Button( + onClick = onDelete, + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), + modifier = Modifier.weight(1f).padding(end = 4.dp) + ) { + Icon(Icons.Default.Delete, contentDescription = "Löschen") + Spacer(Modifier.width(4.dp)) + Text("Löschen") + } + Button( + onClick = { + val newSets = editedSets.toIntOrNull() ?: session.sets + val newRepsPerSet = editedRepsPerSet.toIntOrNull() ?: session.repsPerSet + val newWeightLeft = editedWeightLeft.toDoubleOrNull() ?: session.weightLeft + val newWeightRight = editedWeightRight.toDoubleOrNull() ?: session.weightRight + val newDurationMinutes = editedDurationMinutes.toLongOrNull() ?: 0L + val newDurationSeconds = editedDurationSeconds.toLongOrNull() ?: 0L + val newDuration = newDurationMinutes * 60 + newDurationSeconds + + val updatedSession = session.copy( + sets = newSets, + repsPerSet = newRepsPerSet, + weightLeft = newWeightLeft, + weightRight = newWeightRight, + duration = newDuration + ) + onSave(updatedSession) + }, + modifier = Modifier.weight(1f).padding(start = 4.dp) + ) { + Text("Speichern") + } + } + }, + dismissButton = { + Button(onClick = onDismiss) { + Text("Abbrechen") + } + } + ) +} diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HomeScreen.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HomeScreen.kt new file mode 100644 index 0000000..56f6c3a --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/HomeScreen.kt @@ -0,0 +1,85 @@ +package de.patani.kettlebelltracker.ui.screens + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import de.patani.kettlebelltracker.viewmodels.HomeViewModel +import de.patani.kettlebelltracker.util.formatDate +import de.patani.kettlebelltracker.util.formatDuration +import java.util.Calendar + +@Composable +fun HomeScreen( + viewModel: HomeViewModel, + onStartTrainingClicked: () -> Unit +) { + val state by viewModel.homeScreenState.collectAsState() + + val isTrainedToday = remember(state.lastTrainingSession) { + val lastDate = state.lastTrainingSession?.date + if (lastDate == null) false + else { + val cal1 = Calendar.getInstance().apply { time = lastDate } + val cal2 = Calendar.getInstance() + cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && + cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) + } + } + + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.SpaceAround + ) { + Text( + text = "Kettlebell Workout Tracker", + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center + ) + + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.fillMaxWidth().padding(16.dp), horizontalAlignment = Alignment.CenterHorizontally) { + Text("Nächstes Training", style = MaterialTheme.typography.titleLarge) + Spacer(modifier = Modifier.height(8.dp)) + Text("${state.nextTrainingProgram} - Tag ${state.nextTrainingBlockDay}") + Spacer(modifier = Modifier.height(8.dp)) + Text("Ziel: ${state.nextTrainingReps} Wiederholungen pro Satz") + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = onStartTrainingClicked, enabled = !isTrainedToday) { + Text(if (isTrainedToday) "Heute bereits trainiert" else "Training starten") + } + } + } + + Card(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.fillMaxWidth().padding(16.dp)) { + Text("Letzte Leistung", style = MaterialTheme.typography.titleLarge, modifier = Modifier.align(Alignment.CenterHorizontally)) + Spacer(modifier = Modifier.height(16.dp)) + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceAround + ) { + StatItem("Datum", state.lastTrainingSession?.date?.formatDate() ?: "–") + StatItem("Sätze", state.lastTrainingSession?.sets?.toString() ?: "–") + StatItem("Dauer", formatDuration(state.lastTrainingSession?.duration ?: 0)) + StatItem("Gewicht", "${state.lastTrainingSession?.weightLeft ?: "–"}kg") + } + } + } + } +} + +@Composable +fun StatItem(label: String, value: String) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text(text = label, style = MaterialTheme.typography.labelMedium) + Text(text = value, style = MaterialTheme.typography.bodyLarge, fontSize = 18.sp) + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/screens/SettingsScreen.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/SettingsScreen.kt new file mode 100644 index 0000000..d85f717 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/SettingsScreen.kt @@ -0,0 +1,84 @@ +package de.patani.kettlebelltracker.ui.screens + +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import de.patani.kettlebelltracker.viewmodels.SettingsViewModel +import kotlinx.coroutines.launch + +@Composable +fun SettingsScreen(viewModel: SettingsViewModel) { + val settings by viewModel.settings.collectAsState() + val snackbarHostState = remember { SnackbarHostState() } + val scope = rememberCoroutineScope() + + var time by remember(settings.trainingTimeMinutes) { mutableStateOf(settings.trainingTimeMinutes.toString()) } + var sets by remember(settings.goalSets) { mutableStateOf(settings.goalSets.toString()) } + var weightLeft by remember(settings.weightLeft) { mutableStateOf(settings.weightLeft.toString()) } + var weightRight by remember(settings.weightRight) { mutableStateOf(settings.weightRight.toString()) } + + Scaffold( + snackbarHost = { SnackbarHost(snackbarHostState) } + ) { padding -> + Column( + modifier = Modifier + .fillMaxSize() + .padding(padding) + .padding(16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Text("Einstellungen", style = MaterialTheme.typography.headlineSmall) + + OutlinedTextField( + value = time, + onValueChange = { time = it }, + label = { Text("Trainingszeit (Minuten)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = sets, + onValueChange = { sets = it }, + label = { Text("Ziel-Sätze") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = weightLeft, + onValueChange = { weightLeft = it }, + label = { Text("Gewicht Links (kg)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + modifier = Modifier.fillMaxWidth() + ) + OutlinedTextField( + value = weightRight, + onValueChange = { weightRight = it }, + label = { Text("Gewicht Rechts (kg)") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Decimal), + modifier = Modifier.fillMaxWidth() + ) + + Button( + onClick = { + val timeInt = time.toIntOrNull() ?: settings.trainingTimeMinutes + val setsInt = sets.toIntOrNull() ?: settings.goalSets + val weightL = weightLeft.toDoubleOrNull() ?: settings.weightLeft + val weightR = weightRight.toDoubleOrNull() ?: settings.weightRight + + viewModel.saveSettings(timeInt, setsInt, weightL, weightR) + + scope.launch { + snackbarHostState.showSnackbar("Einstellungen gespeichert!") + } + }, + modifier = Modifier.fillMaxWidth() + ) { + Text("Speichern") + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/screens/TrainingScreen.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/TrainingScreen.kt new file mode 100644 index 0000000..518c6bb --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/screens/TrainingScreen.kt @@ -0,0 +1,74 @@ +package de.patani.kettlebelltracker.ui.screens + +import androidx.compose.foundation.layout.* +import androidx.compose.material3.* +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import de.patani.kettlebelltracker.viewmodels.TrainingViewModel +import de.patani.kettlebelltracker.util.formatDuration + +@Composable +fun TrainingScreen(viewModel: TrainingViewModel) { + val state by viewModel.trainingState.collectAsState() + val showFinishButton = state.remainingSeconds <= 0 && state.isTrainingRunning + + Column( + modifier = Modifier + .fillMaxSize() + .padding(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.SpaceEvenly + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Verbleibende Zeit", style = MaterialTheme.typography.titleLarge) + Text( + text = formatDuration(state.remainingSeconds.toLong()), + fontSize = 72.sp, + fontWeight = FontWeight.Bold + ) + } + + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text("Sätze", style = MaterialTheme.typography.titleLarge) + Text( + text = "${state.setsDone} / ${state.goalSets}", + fontSize = 60.sp, + fontWeight = FontWeight.Bold, + color = MaterialTheme.colorScheme.tertiary + ) + Text( + text = "${state.repsPerSet} Wiederholungen", + fontSize = 24.sp, + color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.7f) + ) + } + + Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(12.dp)) { + Button( + onClick = viewModel::completeSet, + enabled = state.isTrainingRunning, + modifier = Modifier + .fillMaxWidth() + .height(60.dp) + ) { + Text("Satz abschließen", fontSize = 18.sp) + } + if (showFinishButton) { + Button( + onClick = viewModel::finishTraining, + colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error), + modifier = Modifier + .fillMaxWidth() + .height(50.dp) + ) { + Text("Training beenden & Speichern", fontSize = 16.sp) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Color.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Color.kt new file mode 100644 index 0000000..dba3d63 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package de.patani.kettlebelltracker.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Theme.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Theme.kt new file mode 100644 index 0000000..f105e9d --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Theme.kt @@ -0,0 +1,38 @@ +package de.patani.kettlebelltracker.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +import androidx.compose.material3.darkColorScheme +import androidx.compose.ui.graphics.Color + +private val DarkColorScheme = darkColorScheme( + primary = Color(0xFF61AFEF), // Blue + secondary = Color(0xFFC678DD), // Purple + tertiary = Color(0xFF98C379), // Green + background = Color(0xFF282C34), + surface = Color(0xFF2C313A), + onPrimary = Color.Black, + onSecondary = Color.Black, + onTertiary = Color.Black, + onBackground = Color(0xFFABB2BF), + onSurface = Color(0xFFABB2BF), + error = Color(0xFFE06C75), // Red +) + +@Composable +fun KettlebellTrackerTheme(content: @Composable () -> Unit) { + MaterialTheme( + colorScheme = DarkColorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Type.kt b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Type.kt new file mode 100644 index 0000000..06a5fb5 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package de.patani.kettlebelltracker.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/util/formatDuration.kt b/app/src/main/java/de/patani/kettlebelltracker/util/formatDuration.kt new file mode 100644 index 0000000..77c4782 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/util/formatDuration.kt @@ -0,0 +1,17 @@ +package de.patani.kettlebelltracker.util + +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +fun Date.formatDate(): String { + val formatter = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault()) + return formatter.format(this) +} + +fun formatDuration(totalSeconds: Long): String { + if (totalSeconds < 0) return "00:00" + val minutes = totalSeconds / 60 + val seconds = totalSeconds % 60 + return String.format("%02d:%02d", minutes, seconds) +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HistoryViewModel.kt b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HistoryViewModel.kt new file mode 100644 index 0000000..1827055 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HistoryViewModel.kt @@ -0,0 +1,24 @@ +package de.patani.kettlebelltracker.viewmodels + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.patani.kettlebelltracker.data.datastore.SettingsDataStore +import de.patani.kettlebelltracker.data.local.TrainingSessionDao +import de.patani.kettlebelltracker.data.local.TrainingSession +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch +import java.util.Date + +class HistoryViewModel(private val dao: TrainingSessionDao) : ViewModel() { + val history = dao.getHistory() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), emptyList()) + + fun updateSession(session: TrainingSession) = viewModelScope.launch { + dao.update(session) + } + + fun deleteSession(session: TrainingSession) = viewModelScope.launch { + dao.delete(session) + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HomeViewModel.kt b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HomeViewModel.kt new file mode 100644 index 0000000..c662d01 --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/HomeViewModel.kt @@ -0,0 +1,33 @@ +package de.patani.kettlebelltracker.viewmodels + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.patani.kettlebelltracker.data.local.TrainingSessionDao +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.stateIn + +class HomeViewModel( + dao: TrainingSessionDao, + trainingViewModel: TrainingViewModel +) : ViewModel() { + + val lastSession = dao.getLastSession() + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null) + + val homeScreenState = combine(lastSession, trainingViewModel.trainingState) { last, trainingState -> + HomeScreenState( + lastTrainingSession = last, + nextTrainingProgram = trainingState.currentProgram, + nextTrainingBlockDay = trainingState.currentBlockDay, + nextTrainingReps = trainingState.currentReps + ) + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), HomeScreenState()) +} + +data class HomeScreenState( + val lastTrainingSession: de.patani.kettlebelltracker.data.local.TrainingSession? = null, + val nextTrainingProgram: String = "", + val nextTrainingBlockDay: Int = 0, + val nextTrainingReps: Int = 0 +) \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/SettingsViewModel.kt b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/SettingsViewModel.kt new file mode 100644 index 0000000..0c61f5c --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/SettingsViewModel.kt @@ -0,0 +1,31 @@ +package de.patani.kettlebelltracker.viewmodels + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.patani.kettlebelltracker.data.datastore.Settings +import de.patani.kettlebelltracker.data.datastore.SettingsDataStore +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.launch + +class SettingsViewModel(private val settingsDataStore: SettingsDataStore) : ViewModel() { + val settings = settingsDataStore.settingsFlow + .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), Settings(0,0.0,0.0,0,"")) + + fun saveSettings( + time: Int, + sets: Int, + weightLeft: Double, + weightRight: Double + ) = viewModelScope.launch { + val currentSettings = settings.value + settingsDataStore.saveSettings( + currentSettings.copy( + trainingTimeMinutes = time, + goalSets = sets, + weightLeft = weightLeft, + weightRight = weightRight + ) + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt new file mode 100644 index 0000000..83c8f1f --- /dev/null +++ b/app/src/main/java/de/patani/kettlebelltracker/viewmodels/TrainingViewModel.kt @@ -0,0 +1,169 @@ +package de.patani.kettlebelltracker.viewmodels + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import de.patani.kettlebelltracker.data.local.TrainingSessionDao +import de.patani.kettlebelltracker.data.datastore.SettingsDataStore +import de.patani.kettlebelltracker.repositories.ApiRepository +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import java.util.Date +import kotlin.math.min + +data class TrainingState( + val isTrainingRunning: Boolean = false, + val remainingSeconds: Int = 0, + val initialDurationSeconds: Int = 0, + val setsDone: Int = 0, + val goalSets: Int = 5, + val repsPerSet: Int = 5, + val progress: Float = 0.0f, + val currentProgram: String = "clean_1.0", + val currentBlockDay: Int = 1, + val currentReps: Int = 5, + val totalTrainingDays: Int = 0 +) + +class TrainingViewModel( + private val dao: TrainingSessionDao, + private val settingsDataStore: SettingsDataStore, + private val apiRepository: ApiRepository, + private val appUUID: String +) : ViewModel() { + + private val _trainingState = MutableStateFlow(TrainingState()) + val trainingState = _trainingState.asStateFlow() + + private var timerJob: Job? = null + + init { + // Load initial state based on past trainings + viewModelScope.launch { + val trainingCount = dao.getTrainingCount().first() + val initialState = calculateStateByDayCount(trainingCount) + _trainingState.update { + it.copy( + totalTrainingDays = trainingCount, + currentProgram = initialState.program, + currentBlockDay = initialState.blockDay, + currentReps = initialState.reps, + repsPerSet = initialState.reps + ) + } + } + } + + fun startTraining() { + if (_trainingState.value.isTrainingRunning) return + + viewModelScope.launch { + val settings = settingsDataStore.settingsFlow.first() + val durationSeconds = settings.trainingTimeMinutes * 60 + + _trainingState.update { + it.copy( + isTrainingRunning = true, + initialDurationSeconds = durationSeconds, + remainingSeconds = durationSeconds, + goalSets = settings.goalSets, + setsDone = 0, + progress = 0.0f + ) + } + startTimer() + } + } + + private fun startTimer() { + timerJob?.cancel() + timerJob = viewModelScope.launch { + while (_trainingState.value.remainingSeconds > 0 && _trainingState.value.isTrainingRunning) { + delay(1000) + _trainingState.update { it.copy(remainingSeconds = it.remainingSeconds - 1) } + } + if (_trainingState.value.isTrainingRunning) { + finishTraining() + } + } + } + + fun completeSet() { + if (!_trainingState.value.isTrainingRunning) return + + _trainingState.update { + val newSetsDone = it.setsDone + 1 + val newProgress = if (it.goalSets > 0) { + min(newSetsDone.toFloat() / it.goalSets.toFloat(), 1.0f) + } else 0.0f + it.copy(setsDone = newSetsDone, progress = newProgress) + } + } + + fun finishTraining() { + timerJob?.cancel() + if (!_trainingState.value.isTrainingRunning) return + + viewModelScope.launch { + val state = _trainingState.value + val settings = settingsDataStore.settingsFlow.first() + + val session = de.patani.kettlebelltracker.data.local.TrainingSession( + date = Date(), + sets = state.setsDone, + weightLeft = settings.weightLeft, + weightRight = settings.weightRight, + repsPerSet = state.repsPerSet, + duration = (state.initialDurationSeconds - state.remainingSeconds).toLong(), + program = state.currentProgram, + blockDay = state.currentBlockDay + ) + + dao.insert(session) + apiRepository.sendTrainingData(session, appUUID) + resetTraining() + } + } + + private suspend fun resetTraining() { + val trainingCount = dao.getTrainingCount().first() + val nextState = calculateStateByDayCount(trainingCount) + _trainingState.value = TrainingState( + totalTrainingDays = trainingCount, + currentProgram = nextState.program, + currentBlockDay = nextState.blockDay, + currentReps = nextState.reps, + repsPerSet = nextState.reps + ) + } + + private fun calculateStateByDayCount(totalDays: Int): ProgramState { + if (totalDays <= 0) { + return ProgramState("clean_1.0", 1, 5) + } + + val cycleIndex = (totalDays / 12) % 6 + val programs = listOf("clean_1.0", "snatch_1.0", "clean_1.1", "snatch_1.1", "clean_1.2", "snatch_1.2") + val program = programs[cycleIndex] + val blockDay = (totalDays % 3) + 1 + + val repsMap = mapOf( + "clean_1.0" to listOf(5, 6, 4), + "clean_1.1" to listOf(6, 8, 7), + "clean_1.2" to listOf(7, 9, 8), + "snatch_1.0" to listOf(5, 6, 4), + "snatch_1.1" to listOf(6, 8, 7), + "snatch_1.2" to listOf(7, 9, 8) + ) + + val reps = repsMap[program]?.getOrNull(blockDay - 1) ?: 5 + return ProgramState(program, blockDay, reps) + } + + data class ProgramState(val program: String, val blockDay: Int, val reps: Int) +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} zs4%E?srLW`CJh0GCIK@hTkrW7A15Iu%N&?Q^$0+!{Tv&|t^Y@u%!L zglTg&?Q5q#ijZ;&HBQ?FNPp;k3J5!&{^+SGq?AX~SiOM9jJMRpyP?RCr@z38AQyy&WRMaC;n4una$~nJKSp?q|s8F00c9?Q! zY_ovvjTFm+DeQM^LXJ#v0}6HRt3R1%5PT*}W!k8BEM;Jrj8dIceFo2fhzTqaB3KKk zGlCLI)gU25(#u6ch6GeB1k@eHq7l{EHXv0n6xE#ws#ri}08kkCf8hUt{|Ejb`2YW* zvg}0nSSX1m=76s?sZhRY$K=3dpJ+y*eDULGnL2}4>4nvW^7_<~wIM_5fjvwt4h1|g z)g0Z6ZFq9j<~9~b8((~TN{Z?ZQfw|is&Xp~AC61sj;xItKyCHdI|tCMC_LbXF>~vR z=w6V3^H=W4CbAgR4#xw}ETTwu2guW~=Crl@SMXv85jQ=%y!s^?m4PI0My7MWICO;- z175jm%&PcPWh8QdOU(#8bp4!N7ET-+)N}N2zk2)8ch|4Q&lPFNQgT-thu053`r*h3 z_8dI@G;`zn;lH$zX3RzIk`E8~`J=BBdR}qD%n@vVG1834)!pS1Y?zVkJGtsa(sB~y zNfMYKsOJb%5J(0ivK8d+l2D2y&5X!cg3BG!AJ}910|_${nF}sC1QF^nLIhzXk-Y#x z0)&1iK!O;Og0Ky!;`b~v%b$`S4E&fB)1NB4v@8wr( z&+NX4e^&o)ecb=)dd~C!{(1e6t?&9j{l8%U*k4)?`(L3;Qjw z#w7FS+U(94MaJKS!J9O8^$)36_J8;thW#2$y9i{bB{?M{QS_inZIJ!jwqAbfXYVd$ zQ5fC$6Nc9hFi8m^;oI-%C#BS|c8vy+@{jx6hFcf^_;2VRgkoN(0h!_VSGmgNPRsxI z8$rTo0LaYq-H5i&gtj81=&xU?H-Y2==G@uQV7E`@+2E9XQW@{&j`?EOktk|Ho{HU>ZqDzvgjwBmdex z&uZNd2C1h{{}2k6Ys9$*nFP3;K%u!MhW`uZy7Sn`1M1zs@Es&;z*Z>Gsh@-3Fe6pE zQD2@cqF((NrRevgvLsvM_8;;iNyJ5nyPyy?e!kvKjGj`6diRFBEe49Oa7wwkJFV7Z z$YT&DWloYu-H?3<0BKn9L&JYDT-SK~*6c5pi18P26$JESKRYj{T7Zk6KiRJcbvOO*{P56Q6s8msbeI3>|j>K9}Q9UBeq*inXKemCm`-<5|-$ZyN4u$(3 z&HcvqehFD%5Yrmykg-^d`=BSa8(i=>ZoC77^mWY{evp(km@aHqhUECBz76YiR+VYK zY_avFC~V3$=`6C4JhfHAQ@DZtUOwH`L;oYX6zK0-uI^?hS$ALfq}A7evR;ohJHij} zHSZdW?EKv9U1s4oD*<(0oQ*;MaQ6@cvGL zuHCPgm_NhVsgp^sfr*ia^Db}swo1?O(_Q2)y+S$CBm+g=9wCOUPbz(x)_GbaKa@A7 zuI&!ynLiZRT#V%_y_-D`0Z5lT*auoe{(U5NylTzFSJW()W-#F6*&A`LNO1bV#Y;QJ zSbLBnp|B^dtK|KIWC|No>JjWBWE@n7O)x{&^E(WMeMvp57#qA8m* zeTow*U@_86B#Fm*rxyYu5PRWaWHx8y> z*qmHEp(AMDl0v)ij(AY8fnH=~ZwwjVAbu*m5;xPfidh@ov6d8g zfJsi&!QyK53Es%sC39ts;54V68koALD4b|%tNHW0bIkZAJKa=W&FomJSEDT>W1xIX z1x%Z>AvNIsSPLcn3RTcHXb@KB?cuM)=x6fcIx>&(GxqZ8w3p#jJ(GVgc*`c0HG}dv zIop&Qim!K1NFwic%07KcjWgHBPUkq7f~lj;TPqVGTiT#cUeim>;nY`>h@a*S{qQex zQ`z62WK|Mj)Y{tfF{;T4P;c8$Q|KU?Joh zIkA^z%X7z|r>4aTh@|StTi!-r1D!g=zb#3d#{{&K3CqE$Iz-UH<%37c zRfkO`&uM%#AD3PHv`g5t0e^O%nVL0d{Xlx^EjEC3#skF@`zl-7PF^0oxW)1!C!JxR zWvuAHH?)61FKA1QeT*_sY7;_Id#!GmV4n`MO{~sv}VLSK` zXRw=Y=Clz*00B(5y^K;gCZMAzjT5+c3IC=)l(9VIDdatpxj3y89WwI|bH&$!ZEvp` zPR!T@#!(|KfI-w?!&+7$N3F6>tD{YO4Qg$d_`nNEdfVCha9vaPn0jI0`)`@*72hq! zpU5ND^P*RoEkbD5o#az(-g=Y)L>HH>Oc%}$ zT3Rs_ih0;4+Lv4Y;@Iv(;fUbQ=i-G(#>vghec~*j(I#r|5mqFiJBpzi&hzEcD{u$< zRsm0BVYn=pT;0>R(itW|*D&;O%bOc7et9ACaH#J>z3A1A~6fdP>pmbM%xzm4>|;c_?B+%sl;Qs2{t!60$^u zH1t@9^6>;?!FuusnISi$f5CL&;z?EqJN$FBuWDA#D5`cy_UvCFIVvf{c?4N0teh;d zET$7aVbj08KTQS!x?Nd1Is8q8qFzs}a=!@nJ;7FSfCY^T@D-gpw`w<6e#X3+;O}1h z$%I!M)0bg|EKUA04Qjn@+x{Rj8vt6Wn!R|3A92z}^$KfF5(#CWr4y#~re1CN4i4w0 z#GsypBR{xA3Er7sgAi(|}1-W?s~n$7?K|9WL8kpVfw-;#b9 z+mn;=ep!162U5R>_t}fOt~tE?s#m( zO-S$7>Ay6*hHdZ)7_oU915WYYCIX;hFI-U2EWYX!pllONr@Q--2o~`!isi6vTPLJ4@(|o=%NHYjo0_S&q*UQIROw@*N-By@PaQ&;YxFZ0aR zX&}LeOEz);#m~Hwm^VAY8DK}b$F4bo{jMN?d!lxKPhNklzr^Cd`0f4oJr^z=I|l`* zm8AHm*fPV`0=lF3Pnnp}&J0N1X@}-D94YvmUabFrLGSnTz7Mu^21F#O5tN#CuY9Vh zUZBH=ez%h*wkf0hBtXJh1SN3d+IF{gzT7lp)j}n?03lt;XSQRAh7qd&v;RwTYDuQ# zbI2*r<>?x-G0@hM{;%{VBD7nLKt~D`T~-HAt5;h%i0_=Ifs=yHma5dhJ+QMG?Ux(a z|E?1CMy1!~oA`FP!k~iG=t&5#>bVdz=peT8HMB6Y)#7PpETtNryT^+Rv3vpJaF^zP z{H}0-LyV9Fu21ID%wO9f1IKlFr1p4c{o-?03vyB-tr5duk^&L$;m_|f$vs`^Sl{j2 z95}oY{LlY+=ZS%J+tZoXCd0*sSU7w^gjovXn+g7uyra5{cU49@yHf#Z^Jl-$9cIfo z+AJuxH$VLb=#+uBbVmUjnx zxb1pZ@-O9=AIk4@S)m6fJ2?{HrNYwwnL3a45muuNjr;6$O`bGEM0T4A2_S$t=86*- zcO+0mywg*j#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N6H$Y}~MJ{rYuf zz^KljIWvFi-?#?V@LPR&c6Nn{!=XM z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;) z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^ z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9 zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99& z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ< zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8 zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L;C941IK`ISfdE$4S zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#RzrTrCn7L2H{9Amq|qNg@#eZY=|P zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHbz_&4W@QCr$z3~w=8Ua- z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)% z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^? z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9# zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax` z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH z?|ago!o;WC^h=|T7PVBg(DAB}72cyUS zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1pjgyk zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG! zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4SONxP35106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0 zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1? z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_jGOc zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73 zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz zsSnlq&pG;z0OUN%$~$3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{ zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk zKp3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~ zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}+%fOKU|(9?V1 zHE8&@4z)Kx!RAvAs z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?& z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMXgA5-p&kS202!l?!fT3t|HG*rIP~mS* z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1| zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H? zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap zJU4U*R+(2Dd!G+lh8!V{pT_UJn+^1Qg6$` zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE z?N|wSzLjMUK8E)a2tI}Lf;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2 zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)Op<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o` zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#( zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`) zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY* z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1 znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@# z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_ zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2 ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0 zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R! zmn7AZtY6ST%ixgU5)%$%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB%;;?=F>B7ms9QSxv#@+69;@>QaR?REYX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#wi{CMuz5x6BKlA-qy++cM01D3b7`uD z#l6M4pI;JCypO8JZ6?U&wNxR!{4oB_ zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g z4}JGo(sGZ1O~to-}le

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..d1aa070 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + kettlebelltracker + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..9a13f97 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +