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 3f93ba656c86cdb4c547488e6521ad8cae29e90a..96dcaf117290df06ca403f41e9f852beae87149e 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 76b26ef39147ad68dad5fe4188ec9d778cf675f2..0b3960b5fcdd3435ed33481b58eb26daa473ff26 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 110be13fad96d765158ed9af584ef67e39b1d899..2e2f8f0b8ff3216995537d7d3f27225646e99390 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 54760d457955a6afc32f76d7a26a10f4077374b5..c8996f61d3d97680949ee7ba98a8ec23f10eb7fb 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 6b3ee67268f3ec6d668f8fa839502edfd8c87ef5..76774127bba77a8a05a921d79e683c5e8f6f8d45 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 b6814f6cf7d9e3427815846c0cea7029867b6572..4c46449feed2878003ab7bd8fb22e3d19b8fd145 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 0c594057b6ad34c6f301afe62fddad103306ee53..f85410c9d06b571c712a46df7b209362b1f1416d 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 c74985eb7f498f4711005210427ac07c3ee7b981..27adc2958f6c9b3a36a7625aeed9f02fb95c0305 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)