From a80118fea7b1dd629a27e2dcdd2ee87222737f94 Mon Sep 17 00:00:00 2001 From: Mitchel van Hamburg Date: Mon, 23 Jan 2023 10:09:41 +0100 Subject: [PATCH] Added app icon Started work on the freezer overview Updated dependencies Some project restructuring --- .idea/gradle.xml | 1 + app/build.gradle | 26 +-- app/src/debug/ic_launcher-playstore.png | Bin 0 -> 28441 bytes app/src/main/ic_launcher-playstore.png | Bin 0 -> 28441 bytes .../com/mitchelbv/thuis_c/MainActivity.kt | 23 +-- .../java/com/mitchelbv/thuis_c/Screens.kt | 17 ++ .../network/card/CardRetrofitHelper.kt | 16 -- .../thuis_c/network/card/CardService.kt | 13 -- .../responses/EventStartDateTimeFormatted.kt | 22 +-- .../responses/FeyenoordEventResponse.kt | 2 - .../network/feyenoord/responses/HeaderItem.kt | 110 +++++------ .../network/thuis/ThuisRetrofitHelper.kt | 16 ++ .../thuis_c/network/thuis/ThuisService.kt | 62 +++++++ .../network/{card => thuis}/responses/Card.kt | 2 +- .../{card => thuis}/responses/Cards.kt | 2 +- .../network/thuis/responses/Freezer.kt | 9 + .../network/thuis/responses/FreezerItem.kt | 14 ++ .../network/thuis/responses/FreezerItems.kt | 8 + .../thuis/responses/FreezerItemsInFreezer.kt | 13 ++ .../network/thuis/responses/Freezers.kt | 7 + .../thuis_c/ui/card/CardViewModel.kt | 30 +-- .../mitchelbv/thuis_c/ui/card/CardsView.kt | 3 +- .../thuis_c/ui/feyenoord/FeyenoordView.kt | 2 +- .../ui/feyenoord/FeyenoordViewModel.kt | 1 - .../thuis_c/ui/freezer/FreezerView.kt | 108 +++++++++++ .../thuis_c/ui/freezer/FreezerViewModel.kt | 39 ++++ .../freezer/detailed/FreezerDetailedView.kt | 10 + .../freezer/detailed/FreezerEditViewModel.kt | 30 +++ .../ui/freezer/edit/FreezerEditView.kt | 30 +++ .../com/mitchelbv/thuis_c/ui/home/Home.kt | 47 ++++- .../mitchelbv/thuis_c/ui/recipe/RecipeView.kt | 1 + .../drawable-v24/ic_launcher_foreground.xml | 30 --- app/src/main/res/drawable/arrow.xml | 14 ++ .../res/drawable/ic_launcher_background.xml | 174 +----------------- app/src/main/res/drawable/placeholder.png | Bin 0 -> 1441 bytes app/src/main/res/drawable/storefront.xml | 4 + .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2460 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 3429 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 4561 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1704 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 2176 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 2851 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 3485 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 4673 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 6498 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 5462 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 7436 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 10495 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 7540 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 10760 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 15093 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes app/src/main/res/values/strings.xml | 6 + build.gradle | 8 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 66 files changed, 554 insertions(+), 356 deletions(-) create mode 100644 app/src/debug/ic_launcher-playstore.png create mode 100644 app/src/main/ic_launcher-playstore.png create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/Screens.kt delete mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/card/CardRetrofitHelper.kt delete mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/card/CardService.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/ThuisRetrofitHelper.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/ThuisService.kt rename app/src/main/java/com/mitchelbv/thuis_c/network/{card => thuis}/responses/Card.kt (81%) rename app/src/main/java/com/mitchelbv/thuis_c/network/{card => thuis}/responses/Cards.kt (72%) create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/responses/Freezer.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/responses/FreezerItem.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/responses/FreezerItems.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/responses/FreezerItemsInFreezer.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/network/thuis/responses/Freezers.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/ui/freezer/FreezerView.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/ui/freezer/FreezerViewModel.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/ui/freezer/detailed/FreezerDetailedView.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/ui/freezer/detailed/FreezerEditViewModel.kt create mode 100644 app/src/main/java/com/mitchelbv/thuis_c/ui/freezer/edit/FreezerEditView.kt delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/arrow.xml create mode 100644 app/src/main/res/drawable/placeholder.png create mode 100644 app/src/main/res/drawable/storefront.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a2d7c21..a0de2a1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,6 +7,7 @@