From ccfa6941809380f4cb1d83b53efffc3dbe321cb6 Mon Sep 17 00:00:00 2001 From: r0r-5chach Date: Fri, 14 Jun 2024 21:36:23 +0100 Subject: [PATCH] updates --- .idea/deploymentTargetSelector.xml | 8 + .idea/gradle.xml | 1 + .idea/misc.xml | 1 - .idea/vcs.xml | 6 + app/build.gradle.kts | 15 +- app/src/main/AndroidManifest.xml | 6 + .../r0r5chach/dermy_app/AccountPreference.kt | 188 +++++++++++++ .../xyz/r0r5chach/dermy_app/LinksAdapter.kt | 67 +++++ .../xyz/r0r5chach/dermy_app/MainActivity.kt | 1 + .../xyz/r0r5chach/dermy_app/api/DermyApi.kt | 17 ++ .../dermy_app/api/DermyApiService.kt | 34 +++ .../db/locations/LocationCategory.java | 8 + .../dermy_app/fragments/AccountFragment.java | 5 - .../dermy_app/fragments/CameraFragment.kt | 2 +- .../dermy_app/fragments/HomeFragment.kt | 21 +- .../dermy_app/fragments/LinksFragment.java | 7 - .../dermy_app/fragments/LinksFragment.kt | 26 ++ .../dermy_app/fragments/MapFragment.java | 8 - .../dermy_app/fragments/MapFragment.kt | 35 +++ .../dermy_app/fragments/MapPageFragment.kt | 33 +++ .../dermy_app/fragments/SettingsFragment.kt | 25 +- app/src/main/res/drawable-night/back_body.png | Bin 0 -> 13429 bytes .../main/res/drawable-night/front_body.png | Bin 0 -> 12280 bytes app/src/main/res/drawable-night/side_body.png | Bin 0 -> 10326 bytes app/src/main/res/drawable/add_icon.xml | 9 + app/src/main/res/drawable/back_body.png | Bin 0 -> 41688 bytes app/src/main/res/drawable/circle_button.xml | 8 + app/src/main/res/drawable/cog_icon.xml | 9 + app/src/main/res/drawable/flag_icon.xml | 10 + app/src/main/res/drawable/front_body.png | Bin 0 -> 39551 bytes app/src/main/res/drawable/links_icon.xml | 9 + app/src/main/res/drawable/map_icon.xml | 9 + app/src/main/res/drawable/server_icon.xml | 9 + app/src/main/res/drawable/side_body.png | Bin 0 -> 28210 bytes app/src/main/res/drawable/user_icon.xml | 9 + app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/fragment_account.xml | 124 ++++++++- app/src/main/res/layout/fragment_home.xml | 28 +- app/src/main/res/layout/fragment_links.xml | 14 + app/src/main/res/layout/fragment_map.xml | 7 + app/src/main/res/layout/fragment_map_page.xml | 254 ++++++++++++++++++ .../main/res/layout/front_body_buttons.xml | 6 + app/src/main/res/layout/links_row_item.xml | 21 ++ app/src/main/res/values-night/themes.xml | 1 + app/src/main/res/values/strings.xml | 31 ++- app/src/main/res/values/themes.xml | 1 + app/src/main/res/xml/preferences.xml | 33 ++- gradle/libs.versions.toml | 12 + 48 files changed, 1071 insertions(+), 51 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/AccountPreference.kt create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/LinksAdapter.kt create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/api/DermyApi.kt create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/api/DermyApiService.kt create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/db/locations/LocationCategory.java delete mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/AccountFragment.java delete mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/LinksFragment.java create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/LinksFragment.kt delete mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/MapFragment.java create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/MapFragment.kt create mode 100644 app/src/main/java/xyz/r0r5chach/dermy_app/fragments/MapPageFragment.kt create mode 100644 app/src/main/res/drawable-night/back_body.png create mode 100644 app/src/main/res/drawable-night/front_body.png create mode 100644 app/src/main/res/drawable-night/side_body.png create mode 100644 app/src/main/res/drawable/add_icon.xml create mode 100644 app/src/main/res/drawable/back_body.png create mode 100644 app/src/main/res/drawable/circle_button.xml create mode 100644 app/src/main/res/drawable/cog_icon.xml create mode 100644 app/src/main/res/drawable/flag_icon.xml create mode 100644 app/src/main/res/drawable/front_body.png create mode 100644 app/src/main/res/drawable/links_icon.xml create mode 100644 app/src/main/res/drawable/map_icon.xml create mode 100644 app/src/main/res/drawable/server_icon.xml create mode 100644 app/src/main/res/drawable/side_body.png create mode 100644 app/src/main/res/drawable/user_icon.xml create mode 100644 app/src/main/res/layout/fragment_map_page.xml create mode 100644 app/src/main/res/layout/front_body_buttons.xml create mode 100644 app/src/main/res/layout/links_row_item.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..09d66a2 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 32522c1..0897082 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,5 +1,6 @@ +