From 9ae47a8e6156bf442c8e59dc9990b9371f5ce368 Mon Sep 17 00:00:00 2001 From: Kelvin Sande <98394184+sande11@users.noreply.github.com> Date: Wed, 27 Aug 2025 08:54:13 +0200 Subject: [PATCH 01/23] Updated UI to fit new figma design. This also contains the new search view for body fragment --- .idea/AndroidProjectSystem.xml | 6 + .idea/deploymentTargetSelector.xml | 4 +- .idea/deviceManager.xml | 13 + .idea/gradle.xml | 2 +- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 17 ++ .../ui/ActionBarController.kt | 8 + .../gatbreferenceguide/ui/BaseFragment.kt | 26 +- .../gatbreferenceguide/ui/MainActivity.kt | 248 ++++++++++++++++- .../ui/adapters/FAMainFirst6ChapterAdapter.kt | 9 + .../ui/adapters/FAMainFirst6ChartAdapter.kt | 8 +- .../ui/adapters/FANoteColorAdapter.kt | 16 +- .../ui/fragments/BodyFragment.kt | 240 ++++++++++++++-- .../ui/fragments/ChapterFragment.kt | 31 --- .../ui/fragments/MainFragment.kt | 16 +- .../ui/fragments/ShareTargetsAdapter.kt | 39 +++ .../ui/fragments/SubChapterFragment.kt | 26 +- .../ui/viewmodels/MainActivityViewModel.kt | 6 + .../res/drawable/action_row_background.xml | 13 + .../drawable/bookmark_cancel_button_bg.xml | 6 + .../drawable/bookmark_popup_background.xml | 13 + .../bookmark_popup_dismiss_button_bg.xml | 10 + .../bookmark_popup_visit_button_bg.xml | 10 + .../res/drawable/bookmark_save_button_bg.xml | 5 + .../main/res/drawable/cancel_button_bg.xml | 10 + .../color_picker_container_background.xml | 13 + app/src/main/res/drawable/frame_16.xml | 19 ++ app/src/main/res/drawable/frame_46.xml | 15 + .../main/res/drawable/ic_baseline_lung.xml | 55 ++++ .../ic_shape_bg_chapter_see_all_chapter.xml | 13 + .../res/drawable/input_field_background.xml | 6 + app/src/main/res/drawable/logo_container.xml | 9 + .../note_deletion_popup_background.xml | 13 + .../res/drawable/note_dialog_background.xml | 13 + .../drawable/note_edit_field_background.xml | 13 + app/src/main/res/drawable/rectangle_2.xml | 14 + app/src/main/res/drawable/save_button_bg.xml | 10 + .../res/drawable/search_bar_background.xml | 7 + .../res/drawable/search_view_background.xml | 13 + .../drawable/selected_tag_circle_border.xml | 8 + .../res/drawable/share_sheet_background.xml | 13 + .../res/drawable/unselected_tag_circle.xml | 8 + .../res/layout/custom_action_bar_title.xml | 44 +++ app/src/main/res/layout/dialog_bookmark.xml | 172 ++++++------ .../res/layout/dialog_bookmark_success.xml | 48 ++++ app/src/main/res/layout/dialog_note.xml | 217 +++++++-------- .../res/layout/dialog_note_color_item.xml | 41 ++- .../dialog_note_deletion_confirmation.xml | 49 ++++ .../main/res/layout/dialog_share_sheet.xml | 259 ++++++++++++++++++ app/src/main/res/layout/fragment_body.xml | 35 ++- app/src/main/res/layout/fragment_main.xml | 7 +- .../fragment_main_first_6_chapter_item.xml | 7 +- .../fragment_main_first_6_chart_item.xml | 5 +- app/src/main/res/layout/item_share_target.xml | 27 ++ app/src/main/res/layout/search_view.xml | 33 +++ app/src/main/res/values/attr.xml | 3 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 5 + app/src/main/res/values/themes.xml | 30 +- gradlew | 0 60 files changed, 1663 insertions(+), 347 deletions(-) create mode 100644 .idea/AndroidProjectSystem.xml create mode 100644 .idea/deviceManager.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 app/src/main/java/org/apphatchery/gatbreferenceguide/ui/ActionBarController.kt create mode 100644 app/src/main/java/org/apphatchery/gatbreferenceguide/ui/fragments/ShareTargetsAdapter.kt create mode 100644 app/src/main/res/drawable/action_row_background.xml create mode 100644 app/src/main/res/drawable/bookmark_cancel_button_bg.xml create mode 100644 app/src/main/res/drawable/bookmark_popup_background.xml create mode 100644 app/src/main/res/drawable/bookmark_popup_dismiss_button_bg.xml create mode 100644 app/src/main/res/drawable/bookmark_popup_visit_button_bg.xml create mode 100644 app/src/main/res/drawable/bookmark_save_button_bg.xml create mode 100644 app/src/main/res/drawable/cancel_button_bg.xml create mode 100644 app/src/main/res/drawable/color_picker_container_background.xml create mode 100644 app/src/main/res/drawable/frame_16.xml create mode 100644 app/src/main/res/drawable/frame_46.xml create mode 100644 app/src/main/res/drawable/ic_baseline_lung.xml create mode 100644 app/src/main/res/drawable/ic_shape_bg_chapter_see_all_chapter.xml create mode 100644 app/src/main/res/drawable/input_field_background.xml create mode 100644 app/src/main/res/drawable/logo_container.xml create mode 100644 app/src/main/res/drawable/note_deletion_popup_background.xml create mode 100644 app/src/main/res/drawable/note_dialog_background.xml create mode 100644 app/src/main/res/drawable/note_edit_field_background.xml create mode 100644 app/src/main/res/drawable/rectangle_2.xml create mode 100644 app/src/main/res/drawable/save_button_bg.xml create mode 100644 app/src/main/res/drawable/search_bar_background.xml create mode 100644 app/src/main/res/drawable/search_view_background.xml create mode 100644 app/src/main/res/drawable/selected_tag_circle_border.xml create mode 100644 app/src/main/res/drawable/share_sheet_background.xml create mode 100644 app/src/main/res/drawable/unselected_tag_circle.xml create mode 100644 app/src/main/res/layout/custom_action_bar_title.xml create mode 100644 app/src/main/res/layout/dialog_bookmark_success.xml create mode 100644 app/src/main/res/layout/dialog_note_deletion_confirmation.xml create mode 100644 app/src/main/res/layout/dialog_share_sheet.xml create mode 100644 app/src/main/res/layout/item_share_target.xml create mode 100644 app/src/main/res/layout/search_view.xml mode change 100644 => 100755 gradlew diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 8372623..018e211 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@