From 2293d1f5cfc09681793cc92bf82bbcc29d3cf0ed Mon Sep 17 00:00:00 2001 From: Clogon Date: Fri, 14 Jul 2023 15:32:30 +0300 Subject: [PATCH] 123 --- .idea/codeStyles/Project.xml | 123 +++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 2 +- .idea/gradle.xml | 1 + .idea/misc.xml | 3 +- app/build.gradle | 5 + app/src/main/AndroidManifest.xml | 13 +- .../Admin/activityAdmin/FeedbackActivity.kt | 22 + .../Admin/activityAdmin/StatisticsActivity.kt | 21 + .../activityAdmin/UserSettingActivity.kt | 718 ++++++++++++++++++ .../Admin/fragmrntAdmin/FeedbackFragment.kt | 26 + .../fragmrntAdmin/MainSettingFragment.kt | 49 ++ .../Admin/fragmrntAdmin/StatisticsFragment.kt | 32 + .../fragmrntAdmin/UserSettingFragment.kt} | 13 +- .../example/rehabilitation/Baza/TaskItem.kt | 24 - .../rehabilitation/Baza/TaskItemAdapter.kt | 25 - .../Baza/TaskItemClickListener.kt | 7 - .../rehabilitation/Baza/TaskItemViewHolder.kt | 41 - .../rehabilitation/Baza/TaskViewModel.kt | 44 -- .../example/rehabilitation/MainActivity.kt | 15 +- .../example/rehabilitation/SettingActivity.kt | 31 + .../User/fragmentUser/CalendarFragment.kt | 132 ++++ .../fragmentUser}/HomeFragment.kt | 3 +- .../fragmentUser}/InformationFragment.kt | 3 +- .../fragmentUser}/ProgresFragment.kt | 3 +- .../User/fragmentUser/SceduleFragment.kt | 266 +++++++ .../java/com/example/rehabilitation/db/Dao.kt | 22 +- .../example/rehabilitation/db/DaoDaySport.kt | 26 + .../com/example/rehabilitation/db/DaoImage.kt | 26 + .../rehabilitation/db/DaoSportCategory.kt | 34 + .../com/example/rehabilitation/db/Item.kt | 13 +- .../example/rehabilitation/db/ItemDaySport.kt | 18 + .../example/rehabilitation/db/ItemImage.kt | 17 + .../rehabilitation/db/ItemSportCategory.kt | 23 + .../com/example/rehabilitation/db/MainDB.kt | 7 +- .../rehabilitation/dip/Day/DayAdapter.kt | 78 ++ .../rehabilitation/dip/Day/DayModel.kt | 14 + .../dip/Image/ImageSportAdapter.kt | 72 ++ .../dip/Image/ImageSportModel.kt | 8 + .../rehabilitation/dip/MainViewModel.kt | 25 + .../rehabilitation/dip/Month/MonthAdapter.kt | 77 ++ .../rehabilitation/dip/Month/MonthModel.kt | 9 + .../fragment/User/SceduleFragment.kt | 109 --- app/src/main/res/drawable/B1_1.png | Bin 0 -> 340811 bytes app/src/main/res/drawable/B1_2.png | Bin 0 -> 346871 bytes app/src/main/res/drawable/B2_1.png | Bin 0 -> 391567 bytes app/src/main/res/drawable/B2_2.png | Bin 0 -> 394628 bytes app/src/main/res/drawable/B3_1.png | Bin 0 -> 314920 bytes app/src/main/res/drawable/B3_2.png | Bin 0 -> 341617 bytes app/src/main/res/drawable/B3_3.png | Bin 0 -> 367690 bytes app/src/main/res/drawable/B4_1.png | Bin 0 -> 325662 bytes app/src/main/res/drawable/B4_2.png | Bin 0 -> 373633 bytes app/src/main/res/drawable/C10_1.png | Bin 0 -> 327154 bytes app/src/main/res/drawable/C10_2.png | Bin 0 -> 326176 bytes app/src/main/res/drawable/C10_3.png | Bin 0 -> 308189 bytes app/src/main/res/drawable/C11_1.png | Bin 0 -> 514501 bytes app/src/main/res/drawable/C12_1.png | Bin 0 -> 465614 bytes app/src/main/res/drawable/C12_2.png | Bin 0 -> 436409 bytes app/src/main/res/drawable/C13_1.png | Bin 0 -> 426962 bytes app/src/main/res/drawable/C13_2.png | Bin 0 -> 431874 bytes app/src/main/res/drawable/C14_1.png | Bin 0 -> 332149 bytes app/src/main/res/drawable/C14_2.png | Bin 0 -> 356264 bytes app/src/main/res/drawable/C15_1.png | Bin 0 -> 325472 bytes app/src/main/res/drawable/C15_2.png | Bin 0 -> 352001 bytes app/src/main/res/drawable/C16_1.png | Bin 0 -> 385214 bytes app/src/main/res/drawable/C16_2.png | Bin 0 -> 364648 bytes app/src/main/res/drawable/C17_1.png | Bin 0 -> 299783 bytes app/src/main/res/drawable/C17_2.png | Bin 0 -> 318207 bytes app/src/main/res/drawable/C18_1.png | Bin 0 -> 285347 bytes app/src/main/res/drawable/C18_2.png | Bin 0 -> 323306 bytes app/src/main/res/drawable/C18_3.png | Bin 0 -> 330014 bytes app/src/main/res/drawable/C1_1.png | Bin 0 -> 303287 bytes app/src/main/res/drawable/C1_2.png | Bin 0 -> 303703 bytes app/src/main/res/drawable/C2_1.png | Bin 0 -> 323290 bytes app/src/main/res/drawable/C2_2.png | Bin 0 -> 363925 bytes app/src/main/res/drawable/C3_1.png | Bin 0 -> 285025 bytes app/src/main/res/drawable/C3_2.png | Bin 0 -> 358907 bytes app/src/main/res/drawable/C4_1.png | Bin 0 -> 340588 bytes app/src/main/res/drawable/C4_2.png | Bin 0 -> 374028 bytes app/src/main/res/drawable/C5_1.png | Bin 0 -> 336614 bytes app/src/main/res/drawable/C5_2.png | Bin 0 -> 347689 bytes app/src/main/res/drawable/C6_1.png | Bin 0 -> 322580 bytes app/src/main/res/drawable/C6_2.png | Bin 0 -> 360939 bytes app/src/main/res/drawable/C6_3.png | Bin 0 -> 314057 bytes app/src/main/res/drawable/C7_1.png | Bin 0 -> 556129 bytes app/src/main/res/drawable/C8_1.png | Bin 0 -> 404499 bytes app/src/main/res/drawable/C8_2.png | Bin 0 -> 405180 bytes app/src/main/res/drawable/C9_1.png | Bin 0 -> 369521 bytes app/src/main/res/drawable/C9_2.png | Bin 0 -> 381491 bytes app/src/main/res/drawable/C9_3.png | Bin 0 -> 422352 bytes app/src/main/res/drawable/J10_1.png | Bin 0 -> 317305 bytes app/src/main/res/drawable/J10_2.png | Bin 0 -> 370447 bytes app/src/main/res/drawable/J10_3.png | Bin 0 -> 372796 bytes app/src/main/res/drawable/J11_1.png | Bin 0 -> 251664 bytes app/src/main/res/drawable/J11_2.png | Bin 0 -> 302468 bytes app/src/main/res/drawable/J11_3.png | Bin 0 -> 278992 bytes app/src/main/res/drawable/J11_4.png | Bin 0 -> 240380 bytes app/src/main/res/drawable/J12_1.png | Bin 0 -> 303720 bytes app/src/main/res/drawable/J12_2.png | Bin 0 -> 299755 bytes app/src/main/res/drawable/J1_1.png | Bin 0 -> 395480 bytes app/src/main/res/drawable/J1_2.png | Bin 0 -> 428151 bytes app/src/main/res/drawable/J2_1.png | Bin 0 -> 259085 bytes app/src/main/res/drawable/J2_2.png | Bin 0 -> 271807 bytes app/src/main/res/drawable/J3_1.png | Bin 0 -> 296345 bytes app/src/main/res/drawable/J3_2.png | Bin 0 -> 370772 bytes app/src/main/res/drawable/J4_1.png | Bin 0 -> 264282 bytes app/src/main/res/drawable/J4_2.png | Bin 0 -> 267023 bytes app/src/main/res/drawable/J4_3.png | Bin 0 -> 266426 bytes app/src/main/res/drawable/J5_1.png | Bin 0 -> 440987 bytes app/src/main/res/drawable/J6_1.png | Bin 0 -> 244305 bytes app/src/main/res/drawable/J6_2.png | Bin 0 -> 255550 bytes app/src/main/res/drawable/J6_3.png | Bin 0 -> 265461 bytes app/src/main/res/drawable/J6_4.png | Bin 0 -> 278426 bytes app/src/main/res/drawable/J7_1.png | Bin 0 -> 445114 bytes app/src/main/res/drawable/J7_2.png | Bin 0 -> 268280 bytes app/src/main/res/drawable/J7_3.png | Bin 0 -> 290632 bytes app/src/main/res/drawable/J7_4.png | Bin 0 -> 292939 bytes app/src/main/res/drawable/J7_5.png | Bin 0 -> 335310 bytes app/src/main/res/drawable/J7_6.png | Bin 0 -> 304043 bytes app/src/main/res/drawable/J7_7.png | Bin 0 -> 298234 bytes app/src/main/res/drawable/J8_1.png | Bin 0 -> 250883 bytes app/src/main/res/drawable/J8_2.png | Bin 0 -> 266377 bytes app/src/main/res/drawable/J8_3.png | Bin 0 -> 271770 bytes app/src/main/res/drawable/J9_1.png | Bin 0 -> 471650 bytes app/src/main/res/layout/activity_feedback.xml | 18 + app/src/main/res/layout/activity_setting.xml | 68 +- .../main/res/layout/activity_statistics.xml | 18 + .../main/res/layout/activity_user_setting.xml | 316 ++++++++ app/src/main/res/layout/fragment_calendar.xml | 23 +- app/src/main/res/layout/fragment_feedback.xml | 14 + app/src/main/res/layout/fragment_home.xml | 2 +- .../main/res/layout/fragment_information.xml | 2 +- .../main/res/layout/fragment_main_setting.xml | 170 +++++ app/src/main/res/layout/fragment_progres.xml | 2 +- app/src/main/res/layout/fragment_scedule.xml | 154 ++-- .../main/res/layout/fragment_statistics.xml | 14 + .../main/res/layout/fragment_user_setting.xml | 14 + app/src/main/res/layout/image_sport_cards.xml | 40 + app/src/main/res/layout/rc_item.xml | 82 +- app/src/main/res/layout/rc_item_day.xml | 74 ++ 140 files changed, 2802 insertions(+), 414 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/activityAdmin/FeedbackActivity.kt create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/activityAdmin/StatisticsActivity.kt create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/activityAdmin/UserSettingActivity.kt create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/FeedbackFragment.kt create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/MainSettingFragment.kt create mode 100644 app/src/main/java/com/example/rehabilitation/Admin/fragmrntAdmin/StatisticsFragment.kt rename app/src/main/java/com/example/rehabilitation/{fragment/User/CalendarFragment.kt => Admin/fragmrntAdmin/UserSettingFragment.kt} (51%) delete mode 100644 app/src/main/java/com/example/rehabilitation/Baza/TaskItem.kt delete mode 100644 app/src/main/java/com/example/rehabilitation/Baza/TaskItemAdapter.kt delete mode 100644 app/src/main/java/com/example/rehabilitation/Baza/TaskItemClickListener.kt delete mode 100644 app/src/main/java/com/example/rehabilitation/Baza/TaskItemViewHolder.kt delete mode 100644 app/src/main/java/com/example/rehabilitation/Baza/TaskViewModel.kt create mode 100644 app/src/main/java/com/example/rehabilitation/User/fragmentUser/CalendarFragment.kt rename app/src/main/java/com/example/rehabilitation/{fragment/User => User/fragmentUser}/HomeFragment.kt (88%) rename app/src/main/java/com/example/rehabilitation/{fragment/User => User/fragmentUser}/InformationFragment.kt (88%) rename app/src/main/java/com/example/rehabilitation/{fragment/User => User/fragmentUser}/ProgresFragment.kt (88%) create mode 100644 app/src/main/java/com/example/rehabilitation/User/fragmentUser/SceduleFragment.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/DaoDaySport.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/DaoImage.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/DaoSportCategory.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/ItemDaySport.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/ItemImage.kt create mode 100644 app/src/main/java/com/example/rehabilitation/db/ItemSportCategory.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Day/DayAdapter.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Day/DayModel.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Image/ImageSportAdapter.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Image/ImageSportModel.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/MainViewModel.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Month/MonthAdapter.kt create mode 100644 app/src/main/java/com/example/rehabilitation/dip/Month/MonthModel.kt delete mode 100644 app/src/main/java/com/example/rehabilitation/fragment/User/SceduleFragment.kt create mode 100644 app/src/main/res/drawable/B1_1.png create mode 100644 app/src/main/res/drawable/B1_2.png create mode 100644 app/src/main/res/drawable/B2_1.png create mode 100644 app/src/main/res/drawable/B2_2.png create mode 100644 app/src/main/res/drawable/B3_1.png create mode 100644 app/src/main/res/drawable/B3_2.png create mode 100644 app/src/main/res/drawable/B3_3.png create mode 100644 app/src/main/res/drawable/B4_1.png create mode 100644 app/src/main/res/drawable/B4_2.png create mode 100644 app/src/main/res/drawable/C10_1.png create mode 100644 app/src/main/res/drawable/C10_2.png create mode 100644 app/src/main/res/drawable/C10_3.png create mode 100644 app/src/main/res/drawable/C11_1.png create mode 100644 app/src/main/res/drawable/C12_1.png create mode 100644 app/src/main/res/drawable/C12_2.png create mode 100644 app/src/main/res/drawable/C13_1.png create mode 100644 app/src/main/res/drawable/C13_2.png create mode 100644 app/src/main/res/drawable/C14_1.png create mode 100644 app/src/main/res/drawable/C14_2.png create mode 100644 app/src/main/res/drawable/C15_1.png create mode 100644 app/src/main/res/drawable/C15_2.png create mode 100644 app/src/main/res/drawable/C16_1.png create mode 100644 app/src/main/res/drawable/C16_2.png create mode 100644 app/src/main/res/drawable/C17_1.png create mode 100644 app/src/main/res/drawable/C17_2.png create mode 100644 app/src/main/res/drawable/C18_1.png create mode 100644 app/src/main/res/drawable/C18_2.png create mode 100644 app/src/main/res/drawable/C18_3.png create mode 100644 app/src/main/res/drawable/C1_1.png create mode 100644 app/src/main/res/drawable/C1_2.png create mode 100644 app/src/main/res/drawable/C2_1.png create mode 100644 app/src/main/res/drawable/C2_2.png create mode 100644 app/src/main/res/drawable/C3_1.png create mode 100644 app/src/main/res/drawable/C3_2.png create mode 100644 app/src/main/res/drawable/C4_1.png create mode 100644 app/src/main/res/drawable/C4_2.png create mode 100644 app/src/main/res/drawable/C5_1.png create mode 100644 app/src/main/res/drawable/C5_2.png create mode 100644 app/src/main/res/drawable/C6_1.png create mode 100644 app/src/main/res/drawable/C6_2.png create mode 100644 app/src/main/res/drawable/C6_3.png create mode 100644 app/src/main/res/drawable/C7_1.png create mode 100644 app/src/main/res/drawable/C8_1.png create mode 100644 app/src/main/res/drawable/C8_2.png create mode 100644 app/src/main/res/drawable/C9_1.png create mode 100644 app/src/main/res/drawable/C9_2.png create mode 100644 app/src/main/res/drawable/C9_3.png create mode 100644 app/src/main/res/drawable/J10_1.png create mode 100644 app/src/main/res/drawable/J10_2.png create mode 100644 app/src/main/res/drawable/J10_3.png create mode 100644 app/src/main/res/drawable/J11_1.png create mode 100644 app/src/main/res/drawable/J11_2.png create mode 100644 app/src/main/res/drawable/J11_3.png create mode 100644 app/src/main/res/drawable/J11_4.png create mode 100644 app/src/main/res/drawable/J12_1.png create mode 100644 app/src/main/res/drawable/J12_2.png create mode 100644 app/src/main/res/drawable/J1_1.png create mode 100644 app/src/main/res/drawable/J1_2.png create mode 100644 app/src/main/res/drawable/J2_1.png create mode 100644 app/src/main/res/drawable/J2_2.png create mode 100644 app/src/main/res/drawable/J3_1.png create mode 100644 app/src/main/res/drawable/J3_2.png create mode 100644 app/src/main/res/drawable/J4_1.png create mode 100644 app/src/main/res/drawable/J4_2.png create mode 100644 app/src/main/res/drawable/J4_3.png create mode 100644 app/src/main/res/drawable/J5_1.png create mode 100644 app/src/main/res/drawable/J6_1.png create mode 100644 app/src/main/res/drawable/J6_2.png create mode 100644 app/src/main/res/drawable/J6_3.png create mode 100644 app/src/main/res/drawable/J6_4.png create mode 100644 app/src/main/res/drawable/J7_1.png create mode 100644 app/src/main/res/drawable/J7_2.png create mode 100644 app/src/main/res/drawable/J7_3.png create mode 100644 app/src/main/res/drawable/J7_4.png create mode 100644 app/src/main/res/drawable/J7_5.png create mode 100644 app/src/main/res/drawable/J7_6.png create mode 100644 app/src/main/res/drawable/J7_7.png create mode 100644 app/src/main/res/drawable/J8_1.png create mode 100644 app/src/main/res/drawable/J8_2.png create mode 100644 app/src/main/res/drawable/J8_3.png create mode 100644 app/src/main/res/drawable/J9_1.png create mode 100644 app/src/main/res/layout/activity_feedback.xml create mode 100644 app/src/main/res/layout/activity_statistics.xml create mode 100644 app/src/main/res/layout/activity_user_setting.xml create mode 100644 app/src/main/res/layout/fragment_feedback.xml create mode 100644 app/src/main/res/layout/fragment_main_setting.xml create mode 100644 app/src/main/res/layout/fragment_statistics.xml create mode 100644 app/src/main/res/layout/fragment_user_setting.xml create mode 100644 app/src/main/res/layout/image_sport_cards.xml create mode 100644 app/src/main/res/layout/rc_item_day.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..7643783 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,123 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 8f684dc..de2c1e8 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -17,5 +17,6 @@ +