From bed3f5d9787eacfda3daf979bfa086d3c3261778 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 15 Jan 2020 15:00:05 +0100 Subject: [PATCH] added Timetable and Moodle shortcut, cleaned up activity init --- README.md | 2 +- .../mosad/seil0/projectlaogai/MainActivity.kt | 29 +++++++++---------- .../controller/CacheController.kt | 2 +- .../projectlaogai/controller/NFCMensaCard.kt | 2 +- .../controller/PreferencesController.kt | 2 +- .../controller/TCoRAPIController.kt | 2 +- .../projectlaogai/fragments/HomeFragment.kt | 2 +- .../projectlaogai/fragments/MensaFragment.kt | 2 +- .../projectlaogai/fragments/MoodleFragment.kt | 2 +- .../fragments/SettingsFragment.kt | 2 +- .../fragments/TimeTableFragment.kt | 2 +- .../projectlaogai/hsoparser/DataTypes.kt | 2 +- .../projectlaogai/uicomponents/DayCardView.kt | 2 +- .../uicomponents/LessonLinearLayout.kt | 2 +- .../uicomponents/MealLinearLayout.kt | 2 +- .../res/layouts/activities/xml/shortcuts.xml | 28 ++++++++++++++++++ app/src/main/res/values-de-rDE/strings.xml | 14 +++++++-- app/src/main/res/values/strings.xml | 10 ++++++- 18 files changed, 76 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index d7da456..42ede7b 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ ProjectLaogai is a app to access the timetable and the mensa menu of Hochschule [](https://www.mosad.xyz/images/Project_Laogai/ProjectLaogai_Settings.png) [](https://www.mosad.xyz/images/Project_Laogai/ProjectLaogai_Mensa_dark.png) -ProjectLaogai © 2019 [@Seil0](https://git.mosad.xyz/Seil0), a [mosad](http://www.mosad.xyz) Project +ProjectLaogai © 2019-2020 [@Seil0](https://git.mosad.xyz/Seil0), a [mosad](http://www.mosad.xyz) Project diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt index ae7cb6f..1093bf2 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/MainActivity.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -62,6 +62,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte private var useNFC = false override fun onCreate(savedInstanceState: Bundle?) { + val fragmentTransaction: FragmentTransaction = supportFragmentManager.beginTransaction() + Aesthetic.attach(this) super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) @@ -72,11 +74,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte initAesthetic() initForegroundDispatch() - //init home fragment - val fragmentTransaction: FragmentTransaction = supportFragmentManager.beginTransaction() - fragmentTransaction.replace(R.id.fragment_container, activeFragment) - fragmentTransaction.commit() - val toggle = ActionBarDrawerToggle( this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close ) @@ -85,17 +82,17 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte nav_view.setNavigationItemSelectedListener(this) - // TODO use a switch expression - // if we get an NFC read intent while the app is closed call readBalance - if (NfcAdapter.ACTION_TECH_DISCOVERED == intent.action) - NFCMensaCard.readBalance(intent, this) - if ("org.mosad.seil0.projectlaogai.fragments.MensaFragment" == intent.action) { - println("starting mensa screen") - // TODO find a way to use only one FragmentTransaction - val fragmentTransaction2: FragmentTransaction = supportFragmentManager.beginTransaction() - fragmentTransaction2.replace(R.id.fragment_container, MensaFragment()) - fragmentTransaction2.commit() + // based on the inent we get, call readBalance or open a Fragment + when (intent.action) { + NfcAdapter.ACTION_TECH_DISCOVERED -> NFCMensaCard.readBalance(intent, this) + "org.mosad.seil0.projectlaogai.fragments.MensaFragment" -> activeFragment = MensaFragment() + "org.mosad.seil0.projectlaogai.fragments.TimeTableFragment" -> activeFragment = TimeTableFragment() + "org.mosad.seil0.projectlaogai.fragments.MoodleFragment" -> activeFragment = MoodleFragment() } + + // open the activeFragment, default is the HomeFragment + fragmentTransaction.replace(R.id.fragment_container, activeFragment) + fragmentTransaction.commit() } override fun onNewIntent(intent: Intent) { diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt index c88c1a5..c3f291c 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/CacheController.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt index e3fbb77..73935d9 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/NFCMensaCard.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt index f3e0094..24c48ab 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/PreferencesController.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt index 6f7c00d..5a41c5d 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/controller/TCoRAPIController.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt index 3973212..40f4b5a 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/HomeFragment.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt index 771637e..25a9680 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MensaFragment.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt index 920c3a1..7cbde41 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/MoodleFragment.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt index c69d79f..96f160a 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/SettingsFragment.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt index d4a2dc5..be3d017 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/fragments/TimeTableFragment.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt index f3936f3..f1c23f5 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/hsoparser/DataTypes.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt index b1e9a95..f1c23c8 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/DayCardView.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt index dd47460..fbb92ba 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/LessonLinearLayout.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt index 233b9fe..3fea220 100644 --- a/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt +++ b/app/src/main/java/org/mosad/seil0/projectlaogai/uicomponents/MealLinearLayout.kt @@ -1,7 +1,7 @@ /** * ProjectLaogai * - * Copyright 2019 + * Copyright 2019-2020 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/app/src/main/res/layouts/activities/xml/shortcuts.xml b/app/src/main/res/layouts/activities/xml/shortcuts.xml index beb28c2..93efa2c 100644 --- a/app/src/main/res/layouts/activities/xml/shortcuts.xml +++ b/app/src/main/res/layouts/activities/xml/shortcuts.xml @@ -12,4 +12,32 @@ android:targetClass="org.mosad.seil0.projectlaogai.MainActivity" /> + + + + + + + + + + diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 692dc9b..0abcc1d 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -46,8 +46,18 @@ Fehler Stundenplan konnte nicht geladen werden! - Mensa deaktiviert - Mensa + + Mensa + Mensa + Mensa deaktiviert + + Stundenplan + Stundenplan + Stundenplan deaktiviert + + Moodle + Moodle + Moodle deaktiviert diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6261791..25f25ef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ User Tap to change course About - "This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018-2019 seil0@mosad.xyz " + "This software is made by @Seil0 and is published under the terms and conditions of GPL 3. For further information visit \ngit.mosad.xyz/Seil0/ProjectLaogai \n\n© 2018-2020 seil0@mosad.xyz " hso App by @Seil0 Version %1$s (%2$s) Licenses @@ -64,6 +64,14 @@ Mensa Mensa disabled + Timetable + Timetable + Timetable disabled + + Moodle + Moodle + Moodle disabled + org.mosad.seil0.projectlaogai_preferences org.mosad.seil0.projectlaogai.course