From 2c49d80fb7a908903ce2306f9ef2d1aa719f496f Mon Sep 17 00:00:00 2001
From: Zarazric623 <zara.zaric@smail.th-koeln.de>
Date: Sat, 14 Sep 2024 15:50:23 +0200
Subject: [PATCH] bugfix
---
.../myapplication/Room/AppViewModel.kt | 2 +-
.../example/myapplication/Room/Entities.kt | 8 +++---
.../UI_Components/Dialogs/TaskDialog.kt | 2 +-
.../UI_Components/Dialogs/TaskInfo.kt | 4 +--
.../UI_Components/Home/HomeScreen.kt | 4 +--
.../UI_Components/Settings/Settings.kt | 26 +++++++++----------
.../Settings/SettingsDropdown.kt | 4 +--
.../UI_Components/Timer/TimerScreen.kt | 4 +--
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/example/myapplication/Room/AppViewModel.kt b/app/src/main/java/com/example/myapplication/Room/AppViewModel.kt
index 3f93ba6..96dcaf1 100644
--- a/app/src/main/java/com/example/myapplication/Room/AppViewModel.kt
+++ b/app/src/main/java/com/example/myapplication/Room/AppViewModel.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.ViewModel
import com.example.myapplication.R
import com.example.myapplication.Types.NavigationType
-class AppViewModel: ViewModel() {
+class 2AppViewModel: ViewModel() {
var isRunning = MutableLiveData(false)
var isInPause = MutableLiveData(false)
var selectedNavigation = MutableLiveData(NavigationType.Home)
diff --git a/app/src/main/java/com/example/myapplication/Room/Entities.kt b/app/src/main/java/com/example/myapplication/Room/Entities.kt
index 76b26ef..0b3960b 100644
--- a/app/src/main/java/com/example/myapplication/Room/Entities.kt
+++ b/app/src/main/java/com/example/myapplication/Room/Entities.kt
@@ -15,9 +15,9 @@ data class Task(
@Entity(tableName = "TimerSetting")
data class SettingsTimer(
@PrimaryKey val id: Int = 1,
- var dauer: Int = 25,
- var kurzePause: Int = 15,
- var langePause: Int = 25,
- var langePauseNachEinheiten: Int = 4,
+ var duration: Int = 25,
+ var shortBreak: Int = 15,
+ var longBreak: Int = 25,
+ var longBreakAfterSessions: Int = 4,
var musik: String = "day"
)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskDialog.kt b/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskDialog.kt
index 110be13..2e2f8f0 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskDialog.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskDialog.kt
@@ -67,7 +67,7 @@ fun TaskDialog(currentTaskId: Int, currentTaskDate: String, currentTaskName: Str
Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
Text(text = "Status:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
- Text(text = "nicht erledigt", fontSize = 15.sp, modifier = Modifier.width(200.dp), textAlign = TextAlign.Start)
+ Text(text = "Not done", fontSize = 15.sp, modifier = Modifier.width(200.dp), textAlign = TextAlign.Start)
}
}
},
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskInfo.kt b/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskInfo.kt
index 54760d4..c8996f6 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskInfo.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Dialogs/TaskInfo.kt
@@ -35,7 +35,7 @@ fun TaskInfoDialog(currentTaskDate: String, currentTaskName: String,showDialogDi
.height(10.dp))
Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
- Text(text = "Datum:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
+ Text(text = "Date:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
Text(text = currentTaskDate, fontSize = 15.sp,modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
}
@@ -45,7 +45,7 @@ fun TaskInfoDialog(currentTaskDate: String, currentTaskName: String,showDialogDi
Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
Text(text = "Status:", fontSize = 15.sp, modifier = Modifier.width(50.dp), textAlign = TextAlign.Start)
- Text(text = "erledigt", fontSize = 15.sp, modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
+ Text(text = "Done", fontSize = 15.sp, modifier = Modifier.width(180.dp), textAlign = TextAlign.Start)
}
}
},
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Home/HomeScreen.kt b/app/src/main/java/com/example/myapplication/UI_Components/Home/HomeScreen.kt
index 6b3ee67..7677412 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Home/HomeScreen.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Home/HomeScreen.kt
@@ -58,7 +58,7 @@ fun HomeScreen(currentOpenTask: List<Task>, currentCompletedTask: List<Task>, on
.fillMaxSize()
.padding(16.dp)
) {
- Title(titel = "Offene Aufgaen", showButton = true, onClickShowButton = {
+ Title(titel = "Open tasks", showButton = true, onClickShowButton = {
currentTask.id = 0
currentTask.date = Date().time
currentTask.name = ""
@@ -87,7 +87,7 @@ fun HomeScreen(currentOpenTask: List<Task>, currentCompletedTask: List<Task>, on
Spacer(modifier = Modifier.height(16.dp))
- Title(titel = "Erledigte Aufgaben")
+ Title(titel = "Completed Task")
TaskList(tasks = completedTask,
onTaskCompleted = {
completedTask = completedTask.toMutableList().apply {
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Settings/Settings.kt b/app/src/main/java/com/example/myapplication/UI_Components/Settings/Settings.kt
index b6814f6..4c46449 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Settings/Settings.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Settings/Settings.kt
@@ -33,39 +33,39 @@ fun Settings(appSettings: SettingsTimer) {
Column(Modifier.padding(15.dp, 10.dp)) {
Title(titel = "Promodoro-Timer")
SettingsDropdown(
- titel = "Dauer der Promodoro-Einheit",
- content = newSettingsTimerState.dauer,
+ titel = "Duration of the Promodoro-Unit",
+ content = newSettingsTimerState.duration,
listOfDropdownItem = listOf(25, 15, 10, 5)
) {
- newSettingsTimerState = newSettingsTimerState.copy(dauer = it)
+ newSettingsTimerState = newSettingsTimerState.copy(duration = it)
changesEnabled = true
}
SettingsDropdown(
- titel = "kurze Pause",
- content = newSettingsTimerState.kurzePause,
+ titel = "Short break",
+ content = newSettingsTimerState.shortBreak,
listOfDropdownItem = listOf(15, 10, 5)
) {
- newSettingsTimerState = newSettingsTimerState.copy(kurzePause = it)
+ newSettingsTimerState = newSettingsTimerState.copy(shortBreak = it)
changesEnabled = true
}
SettingsDropdown(
- titel = "lange Pause",
- content = newSettingsTimerState.langePause,
+ titel = "Longe break",
+ content = newSettingsTimerState.longBreak,
listOfDropdownItem = listOf(25, 20, 15, 10)
) {
- newSettingsTimerState = newSettingsTimerState.copy(langePause = it)
+ newSettingsTimerState = newSettingsTimerState.copy(longBreak = it)
changesEnabled = true
}
SettingsDropdown(
- titel = "lange Pause nach",
- content = newSettingsTimerState.langePauseNachEinheiten,
+ titel = "Longe pause after",
+ content = newSettingsTimerState.longBreakAfterSessions,
listOfDropdownItem = listOf(2, 4, 6, 8),
SettingsDropdownType.Einheiten
) {
- newSettingsTimerState = newSettingsTimerState.copy(langePauseNachEinheiten = it)
+ newSettingsTimerState = newSettingsTimerState.copy(longBreakAfterSessions = it)
changesEnabled = true
}
@@ -88,7 +88,7 @@ fun Settings(appSettings: SettingsTimer) {
.fillMaxWidth()
.height(50.dp))
- Title(titel = "Über")
+ Title(titel = "Above")
SettingsInfo(titel = "Developed by", content = "Emirhan, Kaan, Zara")
SettingsInfo(titel = "Download in", content = "Android")
SettingsInfo(titel = "Support", content = "email@support-timer.com", color = color_0066FF)
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Settings/SettingsDropdown.kt b/app/src/main/java/com/example/myapplication/UI_Components/Settings/SettingsDropdown.kt
index 0c59405..f85410c 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Settings/SettingsDropdown.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Settings/SettingsDropdown.kt
@@ -69,8 +69,8 @@ fun <T> SettingsDropdown(titel: String, content: T, listOfDropdownItem: List<T>,
fun <T> contentName(content:T, dropdownType:SettingsDropdownType): String {
return when(dropdownType) {
- SettingsDropdownType.Minuten -> "$content Minuten"
- SettingsDropdownType.Einheiten -> "$content Einheiten"
+ SettingsDropdownType.Minuten -> "$content Minutes"
+ SettingsDropdownType.Einheiten -> "$content Units"
SettingsDropdownType.Musik -> "$content"
}
}
diff --git a/app/src/main/java/com/example/myapplication/UI_Components/Timer/TimerScreen.kt b/app/src/main/java/com/example/myapplication/UI_Components/Timer/TimerScreen.kt
index c74985e..27adc29 100644
--- a/app/src/main/java/com/example/myapplication/UI_Components/Timer/TimerScreen.kt
+++ b/app/src/main/java/com/example/myapplication/UI_Components/Timer/TimerScreen.kt
@@ -95,13 +95,13 @@ fun TimerScreen(todayTasks: List<Task>, settingsTimer: SettingsTimer, notificati
.padding(vertical = 16.dp),
contentAlignment = Alignment.Center
) {
- val text = if(isInPause) "Pause" else "$round.Arbeitsphase"
+ val text = if(isInPause) "Pause" else "$round.Working phase"
TimerDisplay(text ,timeLeft = timeLeft)
}
Spacer(modifier = Modifier.height(16.dp))
- Title(titel = "Heutige Aufgaben")
+ Title(titel = "Today´s Task")
// Liste der Aufgaben
TaskList(tasks = tasks)
--
GitLab