From 6ad6501e00516d5e9a4a68cde57e7e03443d3592 Mon Sep 17 00:00:00 2001 From: Ferdy Rodriguez Date: Wed, 18 Dec 2024 16:33:13 +0100 Subject: [PATCH] chore: [ANDROAPP-6676] Updates compose, kotlin, gradle, and dependencies versions (#340) --- android/build.gradle.kts | 2 +- .../org/hisp/dhis/android/MainActivity.kt | 1 - build.gradle.kts | 10 ++- common/build.gradle.kts | 8 +- designsystem/build.gradle.kts | 12 +-- .../mobile/ui/designsystem/resource/Font.kt | 14 ---- .../mobile/ui/designsystem/resource/String.kt | 28 ------- .../ExpandableItemColumnSnapshotTest.kt | 16 ++++ .../ui/designsystem/InputAgeSnapshotTest.kt | 8 ++ .../designsystem/InputDropDownSnapshotTest.kt | 8 ++ .../InputSequentialSnapshotTest.kt | 8 ++ .../ListCardSelectableSnapshotTest.kt | 8 ++ .../LocationBarSearchSnapshotTest.kt | 8 ++ .../drawable/dhis2_2g_negative.xml | 0 .../drawable/dhis2_2g_outline.xml | 0 .../drawable/dhis2_2g_positive.xml | 0 .../drawable/dhis2_3g_negative.xml | 0 .../drawable/dhis2_3g_outline.xml | 0 .../drawable/dhis2_3g_positive.xml | 0 .../drawable/dhis2_4x4_negative.xml | 0 .../drawable/dhis2_4x4_outline.xml | 0 .../drawable/dhis2_4x4_positive.xml | 0 .../drawable/dhis2_agriculture_negative.xml | 0 .../drawable/dhis2_agriculture_outline.xml | 0 .../drawable/dhis2_agriculture_positive.xml | 0 .../dhis2_agriculture_worker_negative.xml | 0 .../dhis2_agriculture_worker_outline.xml | 0 .../dhis2_agriculture_worker_positive.xml | 0 .../drawable/dhis2_alert_circle_negative.xml | 0 .../drawable/dhis2_alert_circle_outline.xml | 0 .../drawable/dhis2_alert_circle_positive.xml | 0 .../drawable/dhis2_alert_negative.xml | 0 .../drawable/dhis2_alert_outline.xml | 0 .../drawable/dhis2_alert_positive.xml | 0 .../dhis2_alert_triangle_negative.xml | 0 .../drawable/dhis2_alert_triangle_outline.xml | 0 .../dhis2_alert_triangle_positive.xml | 0 .../drawable/dhis2_ambulance_negative.xml | 0 .../drawable/dhis2_ambulance_outline.xml | 0 .../drawable/dhis2_ambulance_positive.xml | 0 .../dhis2_ambulatory_clinic_negative.xml | 0 .../dhis2_ambulatory_clinic_outline.xml | 0 .../dhis2_ambulatory_clinic_positive.xml | 0 .../drawable/dhis2_ancv_negative.xml | 0 .../drawable/dhis2_ancv_outline.xml | 0 .../drawable/dhis2_ancv_positive.xml | 0 .../dhis2_baby_female_0203m_negative.xml | 0 .../dhis2_baby_female_0203m_outline.xml | 0 .../dhis2_baby_female_0203m_positive.xml | 0 .../dhis2_baby_female_0306m_negative.xml | 0 .../dhis2_baby_female_0306m_outline.xml | 0 .../dhis2_baby_female_0306m_positive.xml | 0 .../dhis2_baby_female_0609m_negative.xml | 0 .../dhis2_baby_female_0609m_outline.xml | 0 .../dhis2_baby_female_0609m_positive.xml | 0 .../dhis2_baby_male_0203m_negative.xml | 0 .../dhis2_baby_male_0203m_outline.xml | 0 .../dhis2_baby_male_0203m_positive.xml | 0 .../dhis2_baby_male_0306m_negative.xml | 0 .../dhis2_baby_male_0306m_outline.xml | 0 .../dhis2_baby_male_0306m_positive.xml | 0 .../dhis2_baby_male_0609m_negative.xml | 0 .../dhis2_baby_male_0609m_outline.xml | 0 .../dhis2_baby_male_0609m_positive.xml | 0 .../dhis2_basic_motorcycle_negative.xml | 0 .../dhis2_basic_motorcycle_outline.xml | 0 .../dhis2_basic_motorcycle_positive.xml | 0 .../drawable/dhis2_bike_negative.xml | 0 .../drawable/dhis2_bike_outline.xml | 0 .../drawable/dhis2_bike_positive.xml | 0 .../drawable/dhis2_bills_negative.xml | 0 .../drawable/dhis2_bills_outline.xml | 0 .../drawable/dhis2_bills_positive.xml | 0 .../dhis2_blister_pills_oval_x14_negative.xml | 0 .../dhis2_blister_pills_oval_x14_outline.xml | 0 .../dhis2_blister_pills_oval_x14_positive.xml | 0 .../dhis2_blister_pills_oval_x16_negative.xml | 0 .../dhis2_blister_pills_oval_x16_outline.xml | 0 .../dhis2_blister_pills_oval_x16_positive.xml | 0 .../dhis2_blister_pills_oval_x1_negative.xml | 0 .../dhis2_blister_pills_oval_x1_outline.xml | 0 .../dhis2_blister_pills_oval_x1_positive.xml | 0 .../dhis2_blister_pills_oval_x4_negative.xml | 0 .../dhis2_blister_pills_oval_x4_outline.xml | 0 .../dhis2_blister_pills_oval_x4_positive.xml | 0 ...dhis2_blister_pills_round_x14_negative.xml | 0 .../dhis2_blister_pills_round_x14_outline.xml | 0 ...dhis2_blister_pills_round_x14_positive.xml | 0 ...dhis2_blister_pills_round_x16_negative.xml | 0 .../dhis2_blister_pills_round_x16_outline.xml | 0 ...dhis2_blister_pills_round_x16_positive.xml | 0 .../dhis2_blister_pills_round_x1_negative.xml | 0 .../dhis2_blister_pills_round_x1_outline.xml | 0 .../dhis2_blister_pills_round_x1_positive.xml | 0 .../dhis2_blister_pills_round_x4_negative.xml | 0 .../dhis2_blister_pills_round_x4_outline.xml | 0 .../dhis2_blister_pills_round_x4_positive.xml | 0 .../drawable/dhis2_blood_a_n_negative.xml | 0 .../drawable/dhis2_blood_a_n_outline.xml | 0 .../drawable/dhis2_blood_a_n_positive.xml | 0 .../drawable/dhis2_blood_a_p_negative.xml | 0 .../drawable/dhis2_blood_a_p_outline.xml | 0 .../drawable/dhis2_blood_a_p_positive.xml | 0 .../drawable/dhis2_blood_ab_n_negative.xml | 0 .../drawable/dhis2_blood_ab_n_outline.xml | 0 .../drawable/dhis2_blood_ab_n_positive.xml | 0 .../drawable/dhis2_blood_ab_p_negative.xml | 0 .../drawable/dhis2_blood_ab_p_outline.xml | 0 .../drawable/dhis2_blood_ab_p_positive.xml | 0 .../drawable/dhis2_blood_b_n_negative.xml | 0 .../drawable/dhis2_blood_b_n_outline.xml | 0 .../drawable/dhis2_blood_b_n_positive.xml | 0 .../drawable/dhis2_blood_b_p_negative.xml | 0 .../drawable/dhis2_blood_b_p_outline.xml | 0 .../drawable/dhis2_blood_b_p_positive.xml | 0 .../drawable/dhis2_blood_o_n_negative.xml | 0 .../drawable/dhis2_blood_o_n_outline.xml | 0 .../drawable/dhis2_blood_o_n_positive.xml | 0 .../drawable/dhis2_blood_o_p_negative.xml | 0 .../drawable/dhis2_blood_o_p_outline.xml | 0 .../drawable/dhis2_blood_o_p_positive.xml | 0 .../dhis2_blood_pressure_2_negative.xml | 0 .../dhis2_blood_pressure_2_outline.xml | 0 .../dhis2_blood_pressure_2_positive.xml | 0 .../dhis2_blood_pressure_monitor_negative.xml | 0 .../dhis2_blood_pressure_monitor_outline.xml | 0 .../dhis2_blood_pressure_monitor_positive.xml | 0 .../dhis2_blood_pressure_negative.xml | 0 .../drawable/dhis2_blood_pressure_outline.xml | 0 .../dhis2_blood_pressure_positive.xml | 0 .../drawable/dhis2_blood_rh_n_negative.xml | 0 .../drawable/dhis2_blood_rh_n_outline.xml | 0 .../drawable/dhis2_blood_rh_n_positive.xml | 0 .../drawable/dhis2_blood_rh_p_negative.xml | 0 .../drawable/dhis2_blood_rh_p_outline.xml | 0 .../drawable/dhis2_blood_rh_p_positive.xml | 0 .../drawable/dhis2_boy_0105y_negative.xml | 0 .../drawable/dhis2_boy_0105y_outline.xml | 0 .../drawable/dhis2_boy_0105y_positive.xml | 0 .../drawable/dhis2_boy_1015y_negative.xml | 0 .../drawable/dhis2_boy_1015y_outline.xml | 0 .../drawable/dhis2_boy_1015y_positive.xml | 0 .../dhis2_breeding_sites_negative.xml | 0 .../drawable/dhis2_breeding_sites_outline.xml | 0 .../dhis2_breeding_sites_positive.xml | 0 .../drawable/dhis2_calendar_negative.xml | 0 .../drawable/dhis2_calendar_outline.xml | 0 .../drawable/dhis2_calendar_positive.xml | 0 .../drawable/dhis2_cardiogram_e_negative.xml | 0 .../drawable/dhis2_cardiogram_e_outline.xml | 0 .../drawable/dhis2_cardiogram_e_positive.xml | 0 .../drawable/dhis2_cardiogram_negative.xml | 0 .../drawable/dhis2_cardiogram_outline.xml | 0 .../drawable/dhis2_cardiogram_positive.xml | 0 .../dhis2_cervical_cancer_negative.xml | 0 .../dhis2_cervical_cancer_outline.xml | 0 .../dhis2_cervical_cancer_positive.xml | 0 .../drawable/dhis2_child_care_negative.xml | 0 .../drawable/dhis2_child_care_outline.xml | 0 .../drawable/dhis2_child_care_positive.xml | 0 .../drawable/dhis2_child_program_negative.xml | 0 .../drawable/dhis2_child_program_outline.xml | 0 .../drawable/dhis2_child_program_positive.xml | 0 .../drawable/dhis2_chills_negative.xml | 0 .../drawable/dhis2_chills_outline.xml | 0 .../drawable/dhis2_chills_positive.xml | 0 .../drawable/dhis2_cholera_negative.xml | 0 .../drawable/dhis2_cholera_outline.xml | 0 .../drawable/dhis2_cholera_positive.xml | 0 .../drawable/dhis2_church_negative.xml | 0 .../drawable/dhis2_church_outline.xml | 0 .../drawable/dhis2_church_positive.xml | 0 .../drawable/dhis2_circle_large_negative.xml | 0 .../drawable/dhis2_circle_large_outline.xml | 0 .../drawable/dhis2_circle_large_positive.xml | 0 .../drawable/dhis2_circle_medium_negative.xml | 0 .../drawable/dhis2_circle_medium_outline.xml | 0 .../drawable/dhis2_circle_medium_positive.xml | 0 .../drawable/dhis2_circle_small_negative.xml | 0 .../drawable/dhis2_circle_small_outline.xml | 0 .../drawable/dhis2_circle_small_positive.xml | 0 .../drawable/dhis2_city_negative.xml | 0 .../drawable/dhis2_city_outline.xml | 0 .../drawable/dhis2_city_positive.xml | 0 .../drawable/dhis2_city_worker_negative.xml | 0 .../drawable/dhis2_city_worker_outline.xml | 0 .../drawable/dhis2_city_worker_positive.xml | 0 .../drawable/dhis2_clean_hands_negative.xml | 0 .../drawable/dhis2_clean_hands_outline.xml | 0 .../drawable/dhis2_clean_hands_positive.xml | 0 .../drawable/dhis2_clinical_a_negative.xml | 0 .../drawable/dhis2_clinical_a_outline.xml | 0 .../drawable/dhis2_clinical_a_positive.xml | 0 .../drawable/dhis2_clinical_f_negative.xml | 0 .../drawable/dhis2_clinical_f_outline.xml | 0 .../drawable/dhis2_clinical_f_positive.xml | 0 .../drawable/dhis2_clinical_fe_negative.xml | 0 .../drawable/dhis2_clinical_fe_outline.xml | 0 .../drawable/dhis2_clinical_fe_positive.xml | 0 .../drawable/dhis2_coins_negative.xml | 0 .../drawable/dhis2_coins_outline.xml | 0 .../drawable/dhis2_coins_positive.xml | 0 .../drawable/dhis2_cold_chain_negative.xml | 0 .../drawable/dhis2_cold_chain_outline.xml | 0 .../drawable/dhis2_cold_chain_positive.xml | 0 .../drawable/dhis2_communication_negative.xml | 0 .../drawable/dhis2_communication_outline.xml | 0 .../drawable/dhis2_communication_positive.xml | 0 .../dhis2_cone_test_on_nets_negative.xml | 0 .../dhis2_cone_test_on_nets_outline.xml | 0 .../dhis2_cone_test_on_nets_positive.xml | 0 .../dhis2_cone_test_on_walls_negative.xml | 0 .../dhis2_cone_test_on_walls_outline.xml | 0 .../dhis2_cone_test_on_walls_positive.xml | 0 .../drawable/dhis2_construction_negative.xml | 0 .../drawable/dhis2_construction_outline.xml | 0 .../drawable/dhis2_construction_positive.xml | 0 .../dhis2_construction_worker_negative.xml | 0 .../dhis2_construction_worker_outline.xml | 0 .../dhis2_construction_worker_positive.xml | 0 .../dhis2_contact_support_negative.xml | 0 .../dhis2_contact_support_outline.xml | 0 .../dhis2_contact_support_positive.xml | 0 ...dhis2_contraceptive_diaphragm_negative.xml | 0 .../dhis2_contraceptive_diaphragm_outline.xml | 0 ...dhis2_contraceptive_diaphragm_positive.xml | 0 ...dhis2_contraceptive_injection_negative.xml | 0 .../dhis2_contraceptive_injection_outline.xml | 0 ...dhis2_contraceptive_injection_positive.xml | 0 .../dhis2_contraceptive_patch_negative.xml | 0 .../dhis2_contraceptive_patch_outline.xml | 0 .../dhis2_contraceptive_patch_positive.xml | 0 .../dhis2_contraceptive_voucher_negative.xml | 0 .../dhis2_contraceptive_voucher_outline.xml | 0 .../dhis2_contraceptive_voucher_positive.xml | 0 .../drawable/dhis2_copper_iud_negative.xml | 0 .../drawable/dhis2_copper_iud_outline.xml | 0 .../drawable/dhis2_copper_iud_positive.xml | 0 .../drawable/dhis2_coughing_negative.xml | 0 .../drawable/dhis2_coughing_outline.xml | 0 .../drawable/dhis2_coughing_positive.xml | 0 .../drawable/dhis2_credit_card_negative.xml | 0 .../drawable/dhis2_credit_card_outline.xml | 0 .../drawable/dhis2_credit_card_positive.xml | 0 ...his2_cross_country_motorcycle_negative.xml | 0 ...dhis2_cross_country_motorcycle_outline.xml | 0 ...his2_cross_country_motorcycle_positive.xml | 0 .../drawable/dhis2_default_negative.xml | 0 .../drawable/dhis2_default_outline.xml | 0 .../drawable/dhis2_default_positive.xml | 0 .../drawable/dhis2_dhis2_logo_negative.xml | 0 .../drawable/dhis2_dhis2_logo_outline.xml | 0 .../drawable/dhis2_dhis2_logo_positive.xml | 0 .../drawable/dhis2_diarrhea_negative.xml | 0 .../drawable/dhis2_diarrhea_outline.xml | 0 .../drawable/dhis2_diarrhea_positive.xml | 0 ...ating_concentration_bioassays_negative.xml | 0 ...nating_concentration_bioassays_outline.xml | 0 ...ating_concentration_bioassays_positive.xml | 0 .../drawable/dhis2_doctor_negative.xml | 0 .../drawable/dhis2_doctor_outline.xml | 0 .../drawable/dhis2_doctor_positive.xml | 0 .../dhis2_domestic_worker_negative.xml | 0 .../dhis2_domestic_worker_outline.xml | 0 .../dhis2_domestic_worker_positive.xml | 0 .../drawable/dhis2_donkey_negative.xml | 0 .../drawable/dhis2_donkey_outline.xml | 0 .../drawable/dhis2_donkey_positive.xml | 0 .../drawable/dhis2_drone_negative.xml | 0 .../drawable/dhis2_drone_outline.xml | 0 .../drawable/dhis2_drone_positive.xml | 0 .../drawable/dhis2_eco_care_negative.xml | 0 .../drawable/dhis2_eco_care_outline.xml | 0 .../drawable/dhis2_eco_care_positive.xml | 0 .../drawable/dhis2_elderly_negative.xml | 0 .../drawable/dhis2_elderly_outline.xml | 0 .../drawable/dhis2_elderly_positive.xml | 0 .../drawable/dhis2_electricity_negative.xml | 0 .../drawable/dhis2_electricity_outline.xml | 0 .../drawable/dhis2_electricity_positive.xml | 0 .../dhis2_emergency_post_negative.xml | 0 .../drawable/dhis2_emergency_post_outline.xml | 0 .../dhis2_emergency_post_positive.xml | 0 .../drawable/dhis2_expectorate_negative.xml | 0 .../drawable/dhis2_expectorate_outline.xml | 0 .../drawable/dhis2_expectorate_positive.xml | 0 .../dhis2_factory_worker_negative.xml | 0 .../drawable/dhis2_factory_worker_outline.xml | 0 .../dhis2_factory_worker_positive.xml | 0 .../dhis2_family_planning_negative.xml | 0 .../dhis2_family_planning_outline.xml | 0 .../dhis2_family_planning_positive.xml | 0 .../dhis2_female_and_male_negative.xml | 0 .../dhis2_female_and_male_outline.xml | 0 .../dhis2_female_and_male_positive.xml | 0 .../drawable/dhis2_female_condom_negative.xml | 0 .../drawable/dhis2_female_condom_outline.xml | 0 .../drawable/dhis2_female_condom_positive.xml | 0 .../dhis2_female_sex_worker_negative.xml | 0 .../dhis2_female_sex_worker_outline.xml | 0 .../dhis2_female_sex_worker_positive.xml | 0 .../drawable/dhis2_fetus_negative.xml | 0 .../drawable/dhis2_fetus_outline.xml | 0 .../drawable/dhis2_fetus_positive.xml | 0 .../drawable/dhis2_fever_2_negative.xml | 0 .../drawable/dhis2_fever_2_outline.xml | 0 .../drawable/dhis2_fever_2_positive.xml | 0 .../drawable/dhis2_fever_chills_negative.xml | 0 .../drawable/dhis2_fever_chills_outline.xml | 0 .../drawable/dhis2_fever_chills_positive.xml | 0 .../drawable/dhis2_fever_negative.xml | 0 .../drawable/dhis2_fever_outline.xml | 0 .../drawable/dhis2_fever_positive.xml | 0 .../drawable/dhis2_forest_negative.xml | 0 .../drawable/dhis2_forest_outline.xml | 0 .../dhis2_forest_persons_negative.xml | 0 .../drawable/dhis2_forest_persons_outline.xml | 0 .../dhis2_forest_persons_positive.xml | 0 .../drawable/dhis2_forest_positive.xml | 0 .../drawable/dhis2_forum_negative.xml | 0 .../drawable/dhis2_forum_outline.xml | 0 .../drawable/dhis2_forum_positive.xml | 0 .../drawable/dhis2_girl_0105y_negative.xml | 0 .../drawable/dhis2_girl_0105y_outline.xml | 0 .../drawable/dhis2_girl_0105y_positive.xml | 0 .../drawable/dhis2_girl_1015y_negative.xml | 0 .../drawable/dhis2_girl_1015y_outline.xml | 0 .../drawable/dhis2_girl_1015y_positive.xml | 0 ...his2_group_discussion_meeting_negative.xml | 0 ...dhis2_group_discussion_meeting_outline.xml | 0 ...his2_group_discussion_meeting_positive.xml | 0 ...s2_group_discussion_meetingx3_negative.xml | 0 ...is2_group_discussion_meetingx3_outline.xml | 0 ...s2_group_discussion_meetingx3_positive.xml | 0 .../drawable/dhis2_happy_negative.xml | 0 .../drawable/dhis2_happy_outline.xml | 0 .../drawable/dhis2_happy_positive.xml | 0 .../drawable/dhis2_hazardous_negative.xml | 0 .../drawable/dhis2_hazardous_outline.xml | 0 .../drawable/dhis2_hazardous_positive.xml | 0 .../drawable/dhis2_headache_negative.xml | 0 .../drawable/dhis2_headache_outline.xml | 0 .../drawable/dhis2_headache_positive.xml | 0 .../dhis2_health_worker_form_negative.xml | 0 .../dhis2_health_worker_form_outline.xml | 0 .../dhis2_health_worker_form_positive.xml | 0 .../drawable/dhis2_health_worker_negative.xml | 0 .../drawable/dhis2_health_worker_outline.xml | 0 .../drawable/dhis2_health_worker_positive.xml | 0 .../dhis2_heart_cardiogram_negative.xml | 0 .../dhis2_heart_cardiogram_outline.xml | 0 .../dhis2_heart_cardiogram_positive.xml | 0 .../drawable/dhis2_heart_negative.xml | 0 .../drawable/dhis2_heart_outline.xml | 0 .../drawable/dhis2_heart_positive.xml | 0 .../drawable/dhis2_helicopter_negative.xml | 0 .../drawable/dhis2_helicopter_outline.xml | 0 .../drawable/dhis2_helicopter_positive.xml | 0 .../drawable/dhis2_high_bars_negative.xml | 0 .../drawable/dhis2_high_bars_outline.xml | 0 .../drawable/dhis2_high_bars_positive.xml | 0 .../drawable/dhis2_high_level_negative.xml | 0 .../drawable/dhis2_high_level_outline.xml | 0 .../drawable/dhis2_high_level_positive.xml | 0 .../drawable/dhis2_hiv_ind_negative.xml | 0 .../drawable/dhis2_hiv_ind_outline.xml | 0 .../drawable/dhis2_hiv_ind_positive.xml | 0 .../drawable/dhis2_hiv_neg_negative.xml | 0 .../drawable/dhis2_hiv_neg_outline.xml | 0 .../drawable/dhis2_hiv_neg_positive.xml | 0 .../drawable/dhis2_hiv_pos_negative.xml | 0 .../drawable/dhis2_hiv_pos_outline.xml | 0 .../drawable/dhis2_hiv_pos_positive.xml | 0 .../drawable/dhis2_hiv_self_test_negative.xml | 0 .../drawable/dhis2_hiv_self_test_outline.xml | 0 .../drawable/dhis2_hiv_self_test_positive.xml | 0 .../drawable/dhis2_home_negative.xml | 0 .../drawable/dhis2_home_outline.xml | 0 .../drawable/dhis2_home_positive.xml | 0 .../drawable/dhis2_hormonal_ring_negative.xml | 0 .../drawable/dhis2_hormonal_ring_outline.xml | 0 .../drawable/dhis2_hormonal_ring_positive.xml | 0 .../drawable/dhis2_hospital_negative.xml | 0 .../drawable/dhis2_hospital_outline.xml | 0 .../drawable/dhis2_hospital_positive.xml | 0 .../drawable/dhis2_hospitalized_negative.xml | 0 .../drawable/dhis2_hospitalized_outline.xml | 0 .../drawable/dhis2_hospitalized_positive.xml | 0 .../drawable/dhis2_hot_meal_negative.xml | 0 .../drawable/dhis2_hot_meal_outline.xml | 0 .../drawable/dhis2_hot_meal_positive.xml | 0 .../drawable/dhis2_hpv_negative.xml | 0 .../drawable/dhis2_hpv_outline.xml | 0 .../drawable/dhis2_hpv_positive.xml | 0 .../dhis2_i_certificate_paper_negative.xml | 0 .../dhis2_i_certificate_paper_outline.xml | 0 .../dhis2_i_certificate_paper_positive.xml | 0 .../dhis2_i_documents_accepted_negative.xml | 0 .../dhis2_i_documents_accepted_outline.xml | 0 .../dhis2_i_documents_accepted_positive.xml | 0 .../dhis2_i_documents_denied_negative.xml | 0 .../dhis2_i_documents_denied_outline.xml | 0 .../dhis2_i_documents_denied_positive.xml | 0 .../dhis2_i_exam_multiple_choice_negative.xml | 0 .../dhis2_i_exam_multiple_choice_outline.xml | 0 .../dhis2_i_exam_multiple_choice_positive.xml | 0 .../dhis2_i_exam_qualification_negative.xml | 0 .../dhis2_i_exam_qualification_outline.xml | 0 .../dhis2_i_exam_qualification_positive.xml | 0 ...s2_i_groups_perspective_crowd_negative.xml | 0 ...is2_i_groups_perspective_crowd_outline.xml | 0 ...s2_i_groups_perspective_crowd_positive.xml | 0 .../drawable/dhis2_i_note_action_negative.xml | 0 .../drawable/dhis2_i_note_action_outline.xml | 0 .../drawable/dhis2_i_note_action_positive.xml | 0 ...2_i_schedule_school_date_time_negative.xml | 0 ...s2_i_schedule_school_date_time_outline.xml | 0 ...2_i_schedule_school_date_time_positive.xml | 0 .../dhis2_i_training_class_negative.xml | 0 .../dhis2_i_training_class_outline.xml | 0 .../dhis2_i_training_class_positive.xml | 0 .../drawable/dhis2_i_utensils_negative.xml | 0 .../drawable/dhis2_i_utensils_outline.xml | 0 .../drawable/dhis2_i_utensils_positive.xml | 0 .../drawable/dhis2_image_not_supported.xml | 0 .../drawable/dhis2_imm_negative.xml | 0 .../drawable/dhis2_imm_outline.xml | 0 .../drawable/dhis2_imm_positive.xml | 0 .../drawable/dhis2_implant_negative.xml | 0 .../drawable/dhis2_implant_outline.xml | 0 .../drawable/dhis2_implant_positive.xml | 0 .../drawable/dhis2_info_negative.xml | 0 .../drawable/dhis2_info_outline.xml | 0 .../drawable/dhis2_info_positive.xml | 0 .../dhis2_information_campaign_negative.xml | 0 .../dhis2_information_campaign_outline.xml | 0 .../dhis2_information_campaign_positive.xml | 0 .../drawable/dhis2_inpatient_negative.xml | 0 .../drawable/dhis2_inpatient_outline.xml | 0 .../drawable/dhis2_inpatient_positive.xml | 0 .../dhis2_insecticide_resistance_negative.xml | 0 .../dhis2_insecticide_resistance_outline.xml | 0 .../dhis2_insecticide_resistance_positive.xml | 0 ...nsity_concentration_bioassays_negative.xml | 0 ...ensity_concentration_bioassays_outline.xml | 0 ...nsity_concentration_bioassays_positive.xml | 0 .../drawable/dhis2_iud_negative.xml | 0 .../drawable/dhis2_iud_outline.xml | 0 .../drawable/dhis2_iud_positive.xml | 0 .../drawable/dhis2_justice_negative.xml | 0 .../drawable/dhis2_justice_outline.xml | 0 .../drawable/dhis2_justice_positive.xml | 0 .../drawable/dhis2_lactation_negative.xml | 0 .../drawable/dhis2_lactation_outline.xml | 0 .../drawable/dhis2_lactation_positive.xml | 0 .../drawable/dhis2_letrina_negative.xml | 0 .../drawable/dhis2_letrina_outline.xml | 0 .../drawable/dhis2_letrina_positive.xml | 0 .../drawable/dhis2_llin_negative.xml | 0 .../drawable/dhis2_llin_outline.xml | 0 .../drawable/dhis2_llin_positive.xml | 0 .../drawable/dhis2_low_bars_negative.xml | 0 .../drawable/dhis2_low_bars_outline.xml | 0 .../drawable/dhis2_low_bars_positive.xml | 0 .../drawable/dhis2_low_level_negative.xml | 0 .../drawable/dhis2_low_level_outline.xml | 0 .../drawable/dhis2_low_level_positive.xml | 0 .../drawable/dhis2_machinery_negative.xml | 0 .../drawable/dhis2_machinery_outline.xml | 0 .../drawable/dhis2_machinery_positive.xml | 0 .../dhis2_magnifying_glass_negative.xml | 0 .../dhis2_magnifying_glass_outline.xml | 0 .../dhis2_magnifying_glass_positive.xml | 0 ...his2_malaria_mixed_microscope_negative.xml | 0 ...dhis2_malaria_mixed_microscope_outline.xml | 0 ...his2_malaria_mixed_microscope_positive.xml | 0 ...2_malaria_negative_microscope_negative.xml | 0 ...s2_malaria_negative_microscope_outline.xml | 0 ...2_malaria_negative_microscope_positive.xml | 0 .../dhis2_malaria_outbreak_negative.xml | 0 .../dhis2_malaria_outbreak_outline.xml | 0 .../dhis2_malaria_outbreak_positive.xml | 0 .../dhis2_malaria_pf_microscope_negative.xml | 0 .../dhis2_malaria_pf_microscope_outline.xml | 0 .../dhis2_malaria_pf_microscope_positive.xml | 0 .../dhis2_malaria_pv_microscope_negative.xml | 0 .../dhis2_malaria_pv_microscope_outline.xml | 0 .../dhis2_malaria_pv_microscope_positive.xml | 0 .../dhis2_malaria_testing_negative.xml | 0 .../dhis2_malaria_testing_outline.xml | 0 .../dhis2_malaria_testing_positive.xml | 0 .../dhis2_male_and_female_negative.xml | 0 .../dhis2_male_and_female_outline.xml | 0 .../dhis2_male_and_female_positive.xml | 0 .../drawable/dhis2_male_condom_negative.xml | 0 .../drawable/dhis2_male_condom_outline.xml | 0 .../drawable/dhis2_male_condom_positive.xml | 0 .../dhis2_male_sex_worker_negative.xml | 0 .../dhis2_male_sex_worker_outline.xml | 0 .../dhis2_male_sex_worker_positive.xml | 0 .../drawable/dhis2_man_negative.xml | 0 .../drawable/dhis2_man_outline.xml | 0 .../drawable/dhis2_man_positive.xml | 0 .../drawable/dhis2_market_stall_negative.xml | 0 .../drawable/dhis2_market_stall_outline.xml | 0 .../drawable/dhis2_market_stall_positive.xml | 0 .../drawable/dhis2_mask_negative.xml | 0 .../drawable/dhis2_mask_outline.xml | 0 .../drawable/dhis2_mask_positive.xml | 0 .../drawable/dhis2_measles_negative.xml | 0 .../drawable/dhis2_measles_outline.xml | 0 .../drawable/dhis2_measles_positive.xml | 0 .../drawable/dhis2_medicines_negative.xml | 0 .../drawable/dhis2_medicines_outline.xml | 0 .../drawable/dhis2_medicines_positive.xml | 0 .../drawable/dhis2_medium_bars_negative.xml | 0 .../drawable/dhis2_medium_bars_outline.xml | 0 .../drawable/dhis2_medium_bars_positive.xml | 0 .../drawable/dhis2_medium_level_negative.xml | 0 .../drawable/dhis2_medium_level_outline.xml | 0 .../drawable/dhis2_medium_level_positive.xml | 0 .../drawable/dhis2_megaphone_negative.xml | 0 .../drawable/dhis2_megaphone_outline.xml | 0 .../drawable/dhis2_megaphone_positive.xml | 0 .../dhis2_mental_disorders_negative.xml | 0 .../dhis2_mental_disorders_outline.xml | 0 .../dhis2_mental_disorders_positive.xml | 0 .../drawable/dhis2_microscope_negative.xml | 0 .../drawable/dhis2_microscope_outline.xml | 0 .../drawable/dhis2_microscope_positive.xml | 0 .../dhis2_military_worker_negative.xml | 0 .../dhis2_military_worker_outline.xml | 0 .../dhis2_military_worker_positive.xml | 0 .../drawable/dhis2_miner_worker_negative.xml | 0 .../drawable/dhis2_miner_worker_outline.xml | 0 .../drawable/dhis2_miner_worker_positive.xml | 0 .../drawable/dhis2_mobile_clinic_negative.xml | 0 .../drawable/dhis2_mobile_clinic_outline.xml | 0 .../drawable/dhis2_mobile_clinic_positive.xml | 0 .../drawable/dhis2_money_bag_negative.xml | 0 .../drawable/dhis2_money_bag_outline.xml | 0 .../drawable/dhis2_money_bag_positive.xml | 0 .../dhis2_mosquito_collection_negative.xml | 0 .../dhis2_mosquito_collection_outline.xml | 0 .../dhis2_mosquito_collection_positive.xml | 0 .../drawable/dhis2_mosquito_negative.xml | 0 .../drawable/dhis2_mosquito_outline.xml | 0 .../drawable/dhis2_mosquito_positive.xml | 0 .../drawable/dhis2_msm_negative.xml | 0 .../drawable/dhis2_msm_outline.xml | 0 .../drawable/dhis2_msm_positive.xml | 0 .../drawable/dhis2_nausea_negative.xml | 0 .../drawable/dhis2_nausea_outline.xml | 0 .../drawable/dhis2_nausea_positive.xml | 0 .../drawable/dhis2_negative_negative.xml | 0 .../drawable/dhis2_negative_outline.xml | 0 .../drawable/dhis2_negative_positive.xml | 0 .../drawable/dhis2_network_4g_negative.xml | 0 .../drawable/dhis2_network_4g_outline.xml | 0 .../drawable/dhis2_network_4g_positive.xml | 0 .../drawable/dhis2_network_5g_negative.xml | 0 .../drawable/dhis2_network_5g_outline.xml | 0 .../drawable/dhis2_network_5g_positive.xml | 0 .../drawable/dhis2_neurology_negative.xml | 0 .../drawable/dhis2_neurology_outline.xml | 0 .../drawable/dhis2_neurology_positive.xml | 0 .../drawable/dhis2_neutral_negative.xml | 0 .../drawable/dhis2_neutral_outline.xml | 0 .../drawable/dhis2_neutral_positive.xml | 0 .../drawable/dhis2_no_negative.xml | 0 .../drawable/dhis2_no_outline.xml | 0 .../drawable/dhis2_no_positive.xml | 0 .../drawable/dhis2_not_ok_negative.xml | 0 .../drawable/dhis2_not_ok_outline.xml | 0 .../drawable/dhis2_not_ok_positive.xml | 0 .../drawable/dhis2_nurse_negative.xml | 0 .../drawable/dhis2_nurse_outline.xml | 0 .../drawable/dhis2_nurse_positive.xml | 0 .../drawable/dhis2_observation_negative.xml | 0 .../drawable/dhis2_observation_outline.xml | 0 .../drawable/dhis2_observation_positive.xml | 0 .../dhis2_odontology_implant_negative.xml | 0 .../dhis2_odontology_implant_outline.xml | 0 .../dhis2_odontology_implant_positive.xml | 0 .../drawable/dhis2_odontology_negative.xml | 0 .../drawable/dhis2_odontology_outline.xml | 0 .../drawable/dhis2_odontology_positive.xml | 0 .../drawable/dhis2_officer_negative.xml | 0 .../drawable/dhis2_officer_outline.xml | 0 .../drawable/dhis2_officer_positive.xml | 0 .../drawable/dhis2_ok_negative.xml | 0 .../drawable/dhis2_ok_outline.xml | 0 .../drawable/dhis2_ok_positive.xml | 0 .../drawable/dhis2_old_man_negative.xml | 0 .../drawable/dhis2_old_man_outline.xml | 0 .../drawable/dhis2_old_man_positive.xml | 0 .../drawable/dhis2_old_woman_negative.xml | 0 .../drawable/dhis2_old_woman_outline.xml | 0 .../drawable/dhis2_old_woman_positive.xml | 0 ...2_oral_contraception_pillsx21_negative.xml | 0 ...s2_oral_contraception_pillsx21_outline.xml | 0 ...2_oral_contraception_pillsx21_positive.xml | 0 ...2_oral_contraception_pillsx28_negative.xml | 0 ...s2_oral_contraception_pillsx28_outline.xml | 0 ...2_oral_contraception_pillsx28_positive.xml | 0 .../drawable/dhis2_outpatient_negative.xml | 0 .../drawable/dhis2_outpatient_outline.xml | 0 .../drawable/dhis2_outpatient_positive.xml | 0 .../drawable/dhis2_overweight_negative.xml | 0 .../drawable/dhis2_overweight_outline.xml | 0 .../drawable/dhis2_overweight_positive.xml | 0 .../dhis2_palm_branches_roof_negative.xml | 0 .../dhis2_palm_branches_roof_outline.xml | 0 .../dhis2_palm_branches_roof_positive.xml | 0 .../drawable/dhis2_pave_road_negative.xml | 0 .../drawable/dhis2_pave_road_outline.xml | 0 .../drawable/dhis2_pave_road_positive.xml | 0 .../drawable/dhis2_peace_negative.xml | 0 .../drawable/dhis2_peace_outline.xml | 0 .../drawable/dhis2_peace_positive.xml | 0 .../drawable/dhis2_people_negative.xml | 0 .../drawable/dhis2_people_outline.xml | 0 .../drawable/dhis2_people_positive.xml | 0 .../drawable/dhis2_person_negative.xml | 0 .../drawable/dhis2_person_outline.xml | 0 .../drawable/dhis2_person_positive.xml | 0 .../drawable/dhis2_phone_negative.xml | 0 .../drawable/dhis2_phone_outline.xml | 0 .../drawable/dhis2_phone_positive.xml | 0 .../drawable/dhis2_pill_1_negative.xml | 0 .../drawable/dhis2_pill_1_outline.xml | 0 .../drawable/dhis2_pill_1_positive.xml | 0 .../drawable/dhis2_pills_2_negative.xml | 0 .../drawable/dhis2_pills_2_outline.xml | 0 .../drawable/dhis2_pills_2_positive.xml | 0 .../drawable/dhis2_pills_3_negative.xml | 0 .../drawable/dhis2_pills_3_outline.xml | 0 .../drawable/dhis2_pills_3_positive.xml | 0 .../drawable/dhis2_pills_4_negative.xml | 0 .../drawable/dhis2_pills_4_outline.xml | 0 .../drawable/dhis2_pills_4_positive.xml | 0 .../dhis2_plantation_worker_negative.xml | 0 .../dhis2_plantation_worker_outline.xml | 0 .../dhis2_plantation_worker_positive.xml | 0 .../drawable/dhis2_polygon_negative.xml | 0 .../drawable/dhis2_polygon_outline.xml | 0 .../drawable/dhis2_polygon_positive.xml | 0 .../drawable/dhis2_positive_negative.xml | 0 .../drawable/dhis2_positive_outline.xml | 0 .../drawable/dhis2_positive_positive.xml | 0 .../dhis2_pregnant_0812w_negative.xml | 0 .../drawable/dhis2_pregnant_0812w_outline.xml | 0 .../dhis2_pregnant_0812w_positive.xml | 0 .../dhis2_pregnant_2426w_negative.xml | 0 .../drawable/dhis2_pregnant_2426w_outline.xml | 0 .../dhis2_pregnant_2426w_positive.xml | 0 .../drawable/dhis2_pregnant_32w_negative.xml | 0 .../drawable/dhis2_pregnant_32w_outline.xml | 0 .../drawable/dhis2_pregnant_32w_positive.xml | 0 .../dhis2_pregnant_3638w_negative.xml | 0 .../drawable/dhis2_pregnant_3638w_outline.xml | 0 .../dhis2_pregnant_3638w_positive.xml | 0 .../drawable/dhis2_pregnant_negative.xml | 0 .../drawable/dhis2_pregnant_outline.xml | 0 .../drawable/dhis2_pregnant_positive.xml | 0 .../drawable/dhis2_prisoner_negative.xml | 0 .../drawable/dhis2_prisoner_outline.xml | 0 .../drawable/dhis2_prisoner_positive.xml | 0 .../drawable/dhis2_proper_roof_negative.xml | 0 .../drawable/dhis2_proper_roof_outline.xml | 0 .../drawable/dhis2_proper_roof_positive.xml | 0 .../drawable/dhis2_provider_fst_negative.xml | 0 .../drawable/dhis2_provider_fst_outline.xml | 0 .../drawable/dhis2_provider_fst_positive.xml | 0 .../drawable/dhis2_pwid_negative.xml | 0 .../drawable/dhis2_pwid_outline.xml | 0 .../drawable/dhis2_pwid_positive.xml | 0 .../dhis2_question_circle_negative.xml | 0 .../dhis2_question_circle_outline.xml | 0 .../dhis2_question_circle_positive.xml | 0 .../drawable/dhis2_question_negative.xml | 0 .../drawable/dhis2_question_outline.xml | 0 .../drawable/dhis2_question_positive.xml | 0 .../dhis2_question_triangle_negative.xml | 0 .../dhis2_question_triangle_outline.xml | 0 .../dhis2_question_triangle_positive.xml | 0 .../dhis2_rdt_result_invalid_negative.xml | 0 .../dhis2_rdt_result_invalid_outline.xml | 0 .../dhis2_rdt_result_invalid_positive.xml | 0 ...his2_rdt_result_mixed_invalid_negative.xml | 0 ...dhis2_rdt_result_mixed_invalid_outline.xml | 0 ...his2_rdt_result_mixed_invalid_positive.xml | 0 ...ult_mixed_invalid_rectangular_negative.xml | 0 ...sult_mixed_invalid_rectangular_outline.xml | 0 ...ult_mixed_invalid_rectangular_positive.xml | 0 .../dhis2_rdt_result_mixed_negative.xml | 0 .../dhis2_rdt_result_mixed_outline.xml | 0 .../dhis2_rdt_result_mixed_positive.xml | 0 ..._rdt_result_mixed_rectangular_negative.xml | 0 ...2_rdt_result_mixed_rectangular_outline.xml | 0 ..._rdt_result_mixed_rectangular_positive.xml | 0 .../dhis2_rdt_result_neg_invalid_negative.xml | 0 .../dhis2_rdt_result_neg_invalid_outline.xml | 0 .../dhis2_rdt_result_neg_invalid_positive.xml | 0 ...esult_neg_invalid_rectangular_negative.xml | 0 ...result_neg_invalid_rectangular_outline.xml | 0 ...esult_neg_invalid_rectangular_positive.xml | 0 .../dhis2_rdt_result_neg_negative.xml | 0 .../drawable/dhis2_rdt_result_neg_outline.xml | 0 .../dhis2_rdt_result_neg_positive.xml | 0 ...s2_rdt_result_neg_rectangular_negative.xml | 0 ...is2_rdt_result_neg_rectangular_outline.xml | 0 ...s2_rdt_result_neg_rectangular_positive.xml | 0 .../dhis2_rdt_result_negative_negative.xml | 0 .../dhis2_rdt_result_negative_outline.xml | 0 .../dhis2_rdt_result_negative_positive.xml | 0 .../dhis2_rdt_result_no_test_negative.xml | 0 .../dhis2_rdt_result_no_test_outline.xml | 0 .../dhis2_rdt_result_no_test_positive.xml | 0 .../dhis2_rdt_result_out_stock_negative.xml | 0 .../dhis2_rdt_result_out_stock_outline.xml | 0 .../dhis2_rdt_result_out_stock_positive.xml | 0 .../dhis2_rdt_result_pf_invalid_negative.xml | 0 .../dhis2_rdt_result_pf_invalid_outline.xml | 0 .../dhis2_rdt_result_pf_invalid_positive.xml | 0 ...result_pf_invalid_rectangular_negative.xml | 0 ..._result_pf_invalid_rectangular_outline.xml | 0 ...result_pf_invalid_rectangular_positive.xml | 0 .../drawable/dhis2_rdt_result_pf_negative.xml | 0 .../drawable/dhis2_rdt_result_pf_outline.xml | 0 .../drawable/dhis2_rdt_result_pf_positive.xml | 0 ...is2_rdt_result_pf_rectangular_negative.xml | 0 ...his2_rdt_result_pf_rectangular_outline.xml | 0 ...is2_rdt_result_pf_rectangular_positive.xml | 0 .../dhis2_rdt_result_positive_negative.xml | 0 .../dhis2_rdt_result_positive_outline.xml | 0 .../dhis2_rdt_result_positive_positive.xml | 0 .../dhis2_rdt_result_pv_invalid_negative.xml | 0 .../dhis2_rdt_result_pv_invalid_outline.xml | 0 .../dhis2_rdt_result_pv_invalid_positive.xml | 0 ...result_pv_invalid_rectangular_negative.xml | 0 ..._result_pv_invalid_rectangular_outline.xml | 0 ...result_pv_invalid_rectangular_positive.xml | 0 .../drawable/dhis2_rdt_result_pv_negative.xml | 0 .../drawable/dhis2_rdt_result_pv_outline.xml | 0 .../drawable/dhis2_rdt_result_pv_positive.xml | 0 ...is2_rdt_result_pv_rectangular_negative.xml | 0 ...his2_rdt_result_pv_rectangular_outline.xml | 0 ...is2_rdt_result_pv_rectangular_positive.xml | 0 .../drawable/dhis2_referral_negative.xml | 0 .../drawable/dhis2_referral_outline.xml | 0 .../drawable/dhis2_referral_positive.xml | 0 .../drawable/dhis2_refused_negative.xml | 0 .../drawable/dhis2_refused_outline.xml | 0 .../drawable/dhis2_refused_positive.xml | 0 .../drawable/dhis2_ribbon_negative.xml | 0 .../drawable/dhis2_ribbon_outline.xml | 0 .../drawable/dhis2_ribbon_positive.xml | 0 .../drawable/dhis2_rmnh_negative.xml | 0 .../drawable/dhis2_rmnh_outline.xml | 0 .../drawable/dhis2_rmnh_positive.xml | 0 .../drawable/dhis2_running_water_negative.xml | 0 .../drawable/dhis2_running_water_outline.xml | 0 .../drawable/dhis2_running_water_positive.xml | 0 .../drawable/dhis2_rural_post_negative.xml | 0 .../drawable/dhis2_rural_post_outline.xml | 0 .../drawable/dhis2_rural_post_positive.xml | 0 .../drawable/dhis2_sad_negative.xml | 0 .../drawable/dhis2_sad_outline.xml | 0 .../drawable/dhis2_sad_positive.xml | 0 .../drawable/dhis2_sanitizer_negative.xml | 0 .../drawable/dhis2_sanitizer_outline.xml | 0 .../drawable/dhis2_sanitizer_positive.xml | 0 .../drawable/dhis2_sayana_press_negative.xml | 0 .../drawable/dhis2_sayana_press_outline.xml | 0 .../drawable/dhis2_sayana_press_positive.xml | 0 .../dhis2_security_worker_negative.xml | 0 .../dhis2_security_worker_outline.xml | 0 .../dhis2_security_worker_positive.xml | 0 ...s2_sexual_reproductive_health_negative.xml | 0 ...is2_sexual_reproductive_health_outline.xml | 0 ...s2_sexual_reproductive_health_positive.xml | 0 .../drawable/dhis2_small_plane_negative.xml | 0 .../drawable/dhis2_small_plane_outline.xml | 0 .../drawable/dhis2_small_plane_positive.xml | 0 .../dhis2_social_distancing_negative.xml | 0 .../dhis2_social_distancing_outline.xml | 0 .../dhis2_social_distancing_positive.xml | 0 .../drawable/dhis2_spraying_negative.xml | 0 .../drawable/dhis2_spraying_outline.xml | 0 .../drawable/dhis2_spraying_positive.xml | 0 .../drawable/dhis2_square_large_negative.xml | 0 .../drawable/dhis2_square_large_outline.xml | 0 .../drawable/dhis2_square_large_positive.xml | 0 .../drawable/dhis2_square_medium_negative.xml | 0 .../drawable/dhis2_square_medium_outline.xml | 0 .../drawable/dhis2_square_medium_positive.xml | 0 .../drawable/dhis2_square_small_negative.xml | 0 .../drawable/dhis2_square_small_outline.xml | 0 .../drawable/dhis2_square_small_positive.xml | 0 .../drawable/dhis2_star_large_negative.xml | 0 .../drawable/dhis2_star_large_outline.xml | 0 .../drawable/dhis2_star_large_positive.xml | 0 .../drawable/dhis2_star_medium_negative.xml | 0 .../drawable/dhis2_star_medium_outline.xml | 0 .../drawable/dhis2_star_medium_positive.xml | 0 .../drawable/dhis2_star_small_negative.xml | 0 .../drawable/dhis2_star_small_outline.xml | 0 .../drawable/dhis2_star_small_positive.xml | 0 .../drawable/dhis2_stethoscope_negative.xml | 0 .../drawable/dhis2_stethoscope_outline.xml | 0 .../drawable/dhis2_stethoscope_positive.xml | 0 .../drawable/dhis2_sti_negative.xml | 0 .../drawable/dhis2_sti_outline.xml | 0 .../drawable/dhis2_sti_positive.xml | 0 .../drawable/dhis2_stock_out_negative.xml | 0 .../drawable/dhis2_stock_out_outline.xml | 0 .../drawable/dhis2_stock_out_positive.xml | 0 .../drawable/dhis2_stop_negative.xml | 0 .../drawable/dhis2_stop_outline.xml | 0 .../drawable/dhis2_stop_positive.xml | 0 .../dhis2_surgical_sterilization_negative.xml | 0 .../dhis2_surgical_sterilization_outline.xml | 0 .../dhis2_surgical_sterilization_positive.xml | 0 .../drawable/dhis2_sweating_negative.xml | 0 .../drawable/dhis2_sweating_outline.xml | 0 .../drawable/dhis2_sweating_positive.xml | 0 .../drawable/dhis2_symptom_negative.xml | 0 .../drawable/dhis2_symptom_outline.xml | 0 .../drawable/dhis2_symptom_positive.xml | 0 ...nergist_insecticide_bioassays_negative.xml | 0 ...ynergist_insecticide_bioassays_outline.xml | 0 ...nergist_insecticide_bioassays_positive.xml | 0 .../drawable/dhis2_syringe_negative.xml | 0 .../drawable/dhis2_syringe_outline.xml | 0 .../drawable/dhis2_syringe_positive.xml | 0 .../drawable/dhis2_tac_negative.xml | 0 .../drawable/dhis2_tac_outline.xml | 0 .../drawable/dhis2_tac_positive.xml | 0 .../drawable/dhis2_tb_negative.xml | 0 .../drawable/dhis2_tb_outline.xml | 0 .../drawable/dhis2_tb_positive.xml | 0 .../drawable/dhis2_transgender_negative.xml | 0 .../drawable/dhis2_transgender_outline.xml | 0 .../drawable/dhis2_transgender_positive.xml | 0 .../drawable/dhis2_traumatism_negative.xml | 0 .../drawable/dhis2_traumatism_outline.xml | 0 .../drawable/dhis2_traumatism_positive.xml | 0 .../drawable/dhis2_travel_negative.xml | 0 .../drawable/dhis2_travel_outline.xml | 0 .../drawable/dhis2_travel_positive.xml | 0 .../drawable/dhis2_treated_water_negative.xml | 0 .../drawable/dhis2_treated_water_outline.xml | 0 .../drawable/dhis2_treated_water_positive.xml | 0 .../dhis2_triangle_large_negative.xml | 0 .../drawable/dhis2_triangle_large_outline.xml | 0 .../dhis2_triangle_large_positive.xml | 0 .../dhis2_triangle_medium_negative.xml | 0 .../dhis2_triangle_medium_outline.xml | 0 .../dhis2_triangle_medium_positive.xml | 0 .../dhis2_triangle_small_negative.xml | 0 .../drawable/dhis2_triangle_small_outline.xml | 0 .../dhis2_triangle_small_positive.xml | 0 .../drawable/dhis2_truck_driver_negative.xml | 0 .../drawable/dhis2_truck_driver_outline.xml | 0 .../drawable/dhis2_truck_driver_positive.xml | 0 .../drawable/dhis2_un_pave_road_negative.xml | 0 .../drawable/dhis2_un_pave_road_outline.xml | 0 .../drawable/dhis2_un_pave_road_positive.xml | 0 .../drawable/dhis2_underweight_negative.xml | 0 .../drawable/dhis2_underweight_outline.xml | 0 .../drawable/dhis2_underweight_positive.xml | 0 .../dhis2_vespa_motorcycle_negative.xml | 0 .../dhis2_vespa_motorcycle_outline.xml | 0 .../dhis2_vespa_motorcycle_positive.xml | 0 .../drawable/dhis2_vih_aids_negative.xml | 0 .../drawable/dhis2_vih_aids_outline.xml | 0 .../drawable/dhis2_vih_aids_positive.xml | 0 .../drawable/dhis2_virus_negative.xml | 0 .../drawable/dhis2_virus_outline.xml | 0 .../drawable/dhis2_virus_positive.xml | 0 .../drawable/dhis2_vomiting_negative.xml | 0 .../drawable/dhis2_vomiting_outline.xml | 0 .../drawable/dhis2_vomiting_positive.xml | 0 .../drawable/dhis2_war_negative.xml | 0 .../drawable/dhis2_war_outline.xml | 0 .../drawable/dhis2_war_positive.xml | 0 .../drawable/dhis2_wash_hands_negative.xml | 0 .../drawable/dhis2_wash_hands_outline.xml | 0 .../drawable/dhis2_wash_hands_positive.xml | 0 .../dhis2_water_sanitation_negative.xml | 0 .../dhis2_water_sanitation_outline.xml | 0 .../dhis2_water_sanitation_positive.xml | 0 .../dhis2_water_treatment_negative.xml | 0 .../dhis2_water_treatment_outline.xml | 0 .../dhis2_water_treatment_positive.xml | 0 .../drawable/dhis2_weight_negative.xml | 0 .../drawable/dhis2_weight_outline.xml | 0 .../drawable/dhis2_weight_positive.xml | 0 .../drawable/dhis2_wold_care_negative.xml | 0 .../drawable/dhis2_wold_care_outline.xml | 0 .../drawable/dhis2_wold_care_positive.xml | 0 .../drawable/dhis2_woman_negative.xml | 0 .../drawable/dhis2_woman_outline.xml | 0 .../drawable/dhis2_woman_positive.xml | 0 .../drawable/dhis2_yes_negative.xml | 0 .../drawable/dhis2_yes_outline.xml | 0 .../drawable/dhis2_yes_positive.xml | 0 .../drawable/dhis2_young_people_negative.xml | 0 .../drawable/dhis2_young_people_outline.xml | 0 .../drawable/dhis2_young_people_positive.xml | 0 .../drawable/material_barcode.xml | 0 .../drawable/material_barcode_scanner.xml | 0 .../drawable/material_circle_outline.xml | 0 .../drawable/org_unit.xml | 0 .../font/roboto_black.ttf | Bin .../font/roboto_black_italic.ttf | Bin .../font/roboto_bold.ttf | Bin .../font/roboto_bold_italic.ttf | Bin .../font/roboto_italic.ttf | Bin .../font/roboto_light.ttf | Bin .../font/roboto_light_italic.ttf | Bin .../font/roboto_medium.ttf | Bin .../font/roboto_medium_italic.ttf | Bin .../font/roboto_regular.ttf | Bin .../font/roboto_thin.ttf | Bin .../font/roboto_thin_italic.ttf | Bin .../values-es/strings.xml | 8 +- .../values/strings.xml | 8 +- .../ui/designsystem/component/AssistChip.kt | 9 ++- .../ui/designsystem/component/BaseCard.kt | 6 +- .../designsystem/component/BasicTextInput.kt | 3 +- .../ui/designsystem/component/Button.kt | 28 +++---- .../designsystem/component/ButtonCarousel.kt | 12 +-- .../ui/designsystem/component/CheckBox.kt | 8 +- .../ui/designsystem/component/FilterChip.kt | 8 +- .../ui/designsystem/component/IconButton.kt | 14 ++-- .../ui/designsystem/component/InfoBar.kt | 8 +- .../ui/designsystem/component/InputChip.kt | 8 +- .../designsystem/component/InputDropDown.kt | 3 +- .../ui/designsystem/component/Legend.kt | 4 +- .../ui/designsystem/component/ListCard.kt | 6 +- .../designsystem/component/OrgBottomSheet.kt | 4 +- .../component/ProgressIndicator.kt | 5 +- .../ui/designsystem/component/RadioButton.kt | 8 +- .../ui/designsystem/component/SearchBar.kt | 4 +- .../ui/designsystem/component/Sections.kt | 4 +- .../designsystem/component/SupportingText.kt | 60 +++++++++------ .../ui/designsystem/component/Switch.kt | 8 +- .../internal/modifiers/ClickableWithRipple.kt | 4 +- .../component/navigationBar/NavigationBar.kt | 7 +- .../component/parameter/ParameterSelector.kt | 4 +- .../mobile/ui/designsystem/resource/Font.kt | 7 -- .../mobile/ui/designsystem/resource/Image.kt | 38 ++------- .../mobile/ui/designsystem/resource/String.kt | 40 +++++++++- .../mobile/ui/designsystem/theme/Ripple.kt | 36 ++++----- .../mobile/ui/designsystem/theme/Theme.kt | 30 ++++---- .../src/commonMain/resources/drawable/dog.jpg | Bin 94347 -> 0 bytes .../mobile/ui/designsystem/resource/Font.kt | 12 --- .../mobile/ui/designsystem/resource/String.kt | 72 ------------------ ...ogressIndicatorSnapshotTest_launchChip.png | 4 +- ...system_TopBarSnapshotTest_launchTopBar.png | 4 +- gradle.properties | 10 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 964 files changed, 302 insertions(+), 325 deletions(-) delete mode 100644 designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt delete mode 100644 designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_2g_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_2g_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_2g_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_3g_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_3g_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_3g_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_4x4_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_4x4_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_4x4_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_agriculture_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_circle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_circle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_circle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_triangle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_triangle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_alert_triangle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulance_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulance_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulance_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulatory_clinic_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulatory_clinic_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ambulatory_clinic_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ancv_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ancv_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ancv_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0203m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0203m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0203m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0306m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0306m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0306m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0609m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0609m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_female_0609m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0203m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0203m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0203m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0306m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0306m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0306m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0609m_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0609m_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_baby_male_0609m_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_basic_motorcycle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_basic_motorcycle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_basic_motorcycle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bike_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bike_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bike_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bills_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bills_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_bills_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x14_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x14_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x14_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x16_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x16_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x16_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x1_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x1_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x1_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x4_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x4_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_oval_x4_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x14_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x14_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x14_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x16_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x16_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x16_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x1_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x1_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x1_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x4_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x4_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blister_pills_round_x4_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_n_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_n_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_n_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_p_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_p_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_a_p_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_n_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_n_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_n_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_p_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_p_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_ab_p_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_n_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_n_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_n_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_p_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_p_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_b_p_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_n_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_n_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_n_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_p_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_p_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_o_p_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_2_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_2_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_2_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_monitor_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_monitor_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_monitor_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_pressure_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_n_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_n_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_n_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_p_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_p_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_blood_rh_p_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_0105y_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_0105y_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_0105y_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_1015y_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_1015y_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_boy_1015y_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_breeding_sites_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_breeding_sites_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_breeding_sites_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_calendar_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_calendar_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_calendar_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_e_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_e_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_e_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cardiogram_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cervical_cancer_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cervical_cancer_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cervical_cancer_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_care_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_care_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_care_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_program_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_program_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_child_program_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_chills_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_chills_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_chills_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cholera_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cholera_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cholera_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_church_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_church_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_church_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_large_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_large_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_large_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_medium_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_medium_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_medium_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_small_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_small_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_circle_small_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_city_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clean_hands_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clean_hands_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clean_hands_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_a_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_a_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_a_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_f_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_f_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_f_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_fe_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_fe_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_clinical_fe_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coins_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coins_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coins_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cold_chain_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cold_chain_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cold_chain_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_communication_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_communication_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_communication_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_nets_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_nets_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_nets_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_walls_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_walls_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cone_test_on_walls_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_construction_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contact_support_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contact_support_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contact_support_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_diaphragm_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_diaphragm_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_diaphragm_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_injection_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_injection_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_injection_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_patch_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_patch_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_patch_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_voucher_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_voucher_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_contraceptive_voucher_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_copper_iud_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_copper_iud_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_copper_iud_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coughing_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coughing_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_coughing_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_credit_card_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_credit_card_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_credit_card_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cross_country_motorcycle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cross_country_motorcycle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_cross_country_motorcycle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_default_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_default_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_default_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_dhis2_logo_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_dhis2_logo_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_dhis2_logo_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_diarrhea_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_diarrhea_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_diarrhea_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_discriminating_concentration_bioassays_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_discriminating_concentration_bioassays_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_discriminating_concentration_bioassays_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_doctor_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_doctor_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_doctor_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_domestic_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_domestic_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_domestic_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_donkey_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_donkey_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_donkey_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_drone_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_drone_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_drone_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_eco_care_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_eco_care_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_eco_care_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_elderly_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_elderly_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_elderly_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_electricity_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_electricity_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_electricity_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_emergency_post_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_emergency_post_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_emergency_post_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_expectorate_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_expectorate_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_expectorate_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_factory_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_factory_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_factory_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_family_planning_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_family_planning_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_family_planning_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_and_male_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_and_male_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_and_male_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_condom_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_condom_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_condom_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_sex_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_sex_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_female_sex_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fetus_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fetus_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fetus_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_2_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_2_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_2_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_chills_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_chills_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_chills_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_fever_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_persons_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_persons_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_persons_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forest_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forum_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forum_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_forum_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_0105y_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_0105y_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_0105y_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_1015y_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_1015y_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_girl_1015y_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meeting_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meeting_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meeting_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meetingx3_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meetingx3_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_group_discussion_meetingx3_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_happy_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_happy_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_happy_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hazardous_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hazardous_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hazardous_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_headache_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_headache_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_headache_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_form_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_form_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_form_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_health_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_cardiogram_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_cardiogram_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_cardiogram_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_heart_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_helicopter_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_helicopter_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_helicopter_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_bars_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_bars_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_bars_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_level_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_level_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_high_level_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_ind_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_ind_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_ind_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_neg_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_neg_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_neg_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_pos_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_pos_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_pos_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_self_test_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_self_test_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hiv_self_test_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_home_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_home_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_home_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hormonal_ring_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hormonal_ring_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hormonal_ring_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospital_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospital_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospital_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospitalized_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospitalized_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hospitalized_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hot_meal_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hot_meal_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hot_meal_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hpv_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hpv_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_hpv_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_certificate_paper_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_certificate_paper_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_certificate_paper_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_accepted_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_accepted_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_accepted_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_denied_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_denied_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_documents_denied_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_multiple_choice_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_multiple_choice_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_multiple_choice_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_qualification_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_qualification_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_exam_qualification_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_groups_perspective_crowd_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_groups_perspective_crowd_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_groups_perspective_crowd_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_note_action_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_note_action_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_note_action_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_schedule_school_date_time_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_schedule_school_date_time_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_schedule_school_date_time_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_training_class_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_training_class_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_training_class_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_utensils_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_utensils_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_i_utensils_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_image_not_supported.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_imm_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_imm_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_imm_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_implant_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_implant_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_implant_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_info_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_info_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_info_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_information_campaign_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_information_campaign_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_information_campaign_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_inpatient_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_inpatient_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_inpatient_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_insecticide_resistance_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_insecticide_resistance_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_insecticide_resistance_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_intensity_concentration_bioassays_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_intensity_concentration_bioassays_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_intensity_concentration_bioassays_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_iud_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_iud_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_iud_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_justice_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_justice_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_justice_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_lactation_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_lactation_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_lactation_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_letrina_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_letrina_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_letrina_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_llin_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_llin_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_llin_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_bars_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_bars_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_bars_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_level_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_level_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_low_level_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_machinery_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_machinery_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_machinery_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_magnifying_glass_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_magnifying_glass_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_magnifying_glass_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_mixed_microscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_mixed_microscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_mixed_microscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_negative_microscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_negative_microscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_negative_microscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_outbreak_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_outbreak_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_outbreak_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pf_microscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pf_microscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pf_microscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pv_microscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pv_microscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_pv_microscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_testing_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_testing_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_malaria_testing_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_and_female_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_and_female_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_and_female_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_condom_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_condom_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_condom_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_sex_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_sex_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_male_sex_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_man_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_man_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_man_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_market_stall_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_market_stall_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_market_stall_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mask_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mask_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mask_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_measles_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_measles_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_measles_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medicines_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medicines_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medicines_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_bars_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_bars_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_bars_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_level_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_level_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_medium_level_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_megaphone_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_megaphone_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_megaphone_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mental_disorders_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mental_disorders_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mental_disorders_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_microscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_microscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_microscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_military_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_military_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_military_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_miner_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_miner_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_miner_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mobile_clinic_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mobile_clinic_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mobile_clinic_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_money_bag_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_money_bag_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_money_bag_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_collection_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_collection_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_collection_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_mosquito_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_msm_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_msm_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_msm_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nausea_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nausea_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nausea_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_negative_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_negative_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_negative_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_4g_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_4g_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_4g_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_5g_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_5g_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_network_5g_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neurology_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neurology_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neurology_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neutral_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neutral_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_neutral_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_no_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_no_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_no_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_not_ok_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_not_ok_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_not_ok_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nurse_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nurse_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_nurse_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_observation_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_observation_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_observation_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_implant_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_implant_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_implant_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_odontology_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_officer_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_officer_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_officer_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ok_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ok_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ok_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_man_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_man_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_man_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_woman_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_woman_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_old_woman_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx21_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx21_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx21_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx28_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx28_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_oral_contraception_pillsx28_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_outpatient_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_outpatient_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_outpatient_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_overweight_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_overweight_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_overweight_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_palm_branches_roof_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_palm_branches_roof_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_palm_branches_roof_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pave_road_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pave_road_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pave_road_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_peace_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_peace_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_peace_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_people_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_people_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_people_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_person_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_person_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_person_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_phone_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_phone_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_phone_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pill_1_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pill_1_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pill_1_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_2_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_2_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_2_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_3_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_3_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_3_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_4_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_4_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pills_4_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_plantation_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_plantation_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_plantation_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_polygon_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_polygon_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_polygon_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_positive_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_positive_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_positive_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_0812w_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_0812w_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_0812w_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_2426w_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_2426w_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_2426w_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_32w_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_32w_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_32w_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_3638w_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_3638w_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_3638w_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pregnant_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_prisoner_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_prisoner_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_prisoner_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_proper_roof_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_proper_roof_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_proper_roof_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_provider_fst_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_provider_fst_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_provider_fst_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pwid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pwid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_pwid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_circle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_circle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_circle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_triangle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_triangle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_question_triangle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_invalid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_invalid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_invalid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_neg_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_negative_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_negative_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_negative_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_no_test_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_no_test_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_no_test_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_out_stock_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_out_stock_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_out_stock_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pf_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_positive_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_positive_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_positive_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_rectangular_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_rectangular_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rdt_result_pv_rectangular_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_referral_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_referral_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_referral_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_refused_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_refused_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_refused_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ribbon_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ribbon_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_ribbon_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rmnh_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rmnh_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rmnh_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_running_water_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_running_water_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_running_water_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rural_post_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rural_post_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_rural_post_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sad_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sad_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sad_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sanitizer_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sanitizer_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sanitizer_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sayana_press_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sayana_press_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sayana_press_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_security_worker_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_security_worker_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_security_worker_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sexual_reproductive_health_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sexual_reproductive_health_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sexual_reproductive_health_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_small_plane_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_small_plane_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_small_plane_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_social_distancing_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_social_distancing_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_social_distancing_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_spraying_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_spraying_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_spraying_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_large_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_large_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_large_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_medium_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_medium_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_medium_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_small_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_small_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_square_small_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_large_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_large_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_large_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_medium_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_medium_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_medium_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_small_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_small_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_star_small_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stethoscope_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stethoscope_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stethoscope_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sti_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sti_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sti_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stock_out_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stock_out_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stock_out_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stop_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stop_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_stop_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_surgical_sterilization_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_surgical_sterilization_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_surgical_sterilization_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sweating_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sweating_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_sweating_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_symptom_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_symptom_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_symptom_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_synergist_insecticide_bioassays_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_synergist_insecticide_bioassays_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_synergist_insecticide_bioassays_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_syringe_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_syringe_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_syringe_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tac_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tac_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tac_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tb_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tb_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_tb_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_transgender_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_transgender_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_transgender_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_traumatism_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_traumatism_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_traumatism_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_travel_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_travel_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_travel_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_treated_water_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_treated_water_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_treated_water_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_large_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_large_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_large_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_medium_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_medium_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_medium_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_small_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_small_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_triangle_small_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_truck_driver_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_truck_driver_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_truck_driver_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_un_pave_road_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_un_pave_road_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_un_pave_road_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_underweight_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_underweight_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_underweight_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vespa_motorcycle_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vespa_motorcycle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vespa_motorcycle_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vih_aids_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vih_aids_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vih_aids_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_virus_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_virus_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_virus_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vomiting_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vomiting_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_vomiting_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_war_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_war_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_war_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wash_hands_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wash_hands_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wash_hands_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_sanitation_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_sanitation_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_sanitation_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_treatment_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_treatment_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_water_treatment_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_weight_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_weight_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_weight_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wold_care_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wold_care_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_wold_care_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_woman_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_woman_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_woman_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_yes_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_yes_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_yes_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_young_people_negative.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_young_people_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/dhis2_young_people_positive.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/material_barcode.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/material_barcode_scanner.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/material_circle_outline.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/drawable/org_unit.xml (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_black.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_black_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_bold.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_bold_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_light.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_light_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_medium.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_medium_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_regular.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_thin.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/font/roboto_thin_italic.ttf (100%) rename designsystem/src/commonMain/{resources => composeResources}/values-es/strings.xml (91%) rename designsystem/src/commonMain/{resources => composeResources}/values/strings.xml (91%) delete mode 100644 designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt delete mode 100644 designsystem/src/commonMain/resources/drawable/dog.jpg delete mode 100644 designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt delete mode 100644 designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 85ef1daf0..bc658b127 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -10,7 +10,7 @@ kotlin { sourceSets { androidMain.dependencies { implementation(project(":common")) - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.activity:activity-compose:1.9.3") } } } diff --git a/android/src/main/java/org/hisp/dhis/android/MainActivity.kt b/android/src/main/java/org/hisp/dhis/android/MainActivity.kt index 4e9416a17..787e94777 100644 --- a/android/src/main/java/org/hisp/dhis/android/MainActivity.kt +++ b/android/src/main/java/org/hisp/dhis/android/MainActivity.kt @@ -64,7 +64,6 @@ fun SetStatusBarColor() { WindowCompat.getInsetsController(it, it.decorView).apply { isAppearanceLightStatusBars = true } - it.statusBarColor = 0xFFE2F2FF.toInt() } } } diff --git a/build.gradle.kts b/build.gradle.kts index b34be8e40..9b1ac6c91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + version = "0.4.1-SNAPSHOT" group = "org.hisp.dhis.mobile" @@ -8,7 +8,7 @@ plugins { id("com.android.application") apply false id("com.android.library") apply false id("org.jetbrains.compose") apply false - id("org.jlleitschuh.gradle.ktlint") version "11.5.1" + id("org.jlleitschuh.gradle.ktlint") version "12.1.2" id("org.jetbrains.dokka") version "1.9.20" id("io.github.gradle-nexus.publish-plugin") version "1.3.0" alias(libs.plugins.compose.compiler) @@ -33,8 +33,10 @@ allprojects { } } - tasks.withType().all { - kotlinOptions { freeCompilerArgs += "-Xexpect-actual-classes" } + tasks.withType>().all { + compilerOptions { + freeCompilerArgs.add("-Xexpect-actual-classes") + } } } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 1cd8290cc..eb7705a43 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -24,8 +24,8 @@ kotlin { implementation(kotlin("test")) } androidMain.dependencies { - api("androidx.appcompat:appcompat:1.6.1") - api("androidx.core:core-ktx:1.12.0") + api("androidx.appcompat:appcompat:1.7.0") + api("androidx.core:core-ktx:1.15.0") } val androidUnitTest by getting { dependencies { @@ -46,8 +46,8 @@ android { namespace = "org.hisp.dhis.mobile.ui.common" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources") - sourceSets["main"].resources.srcDirs("src/commonMain/resources") + sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") + sourceSets["main"].resources.srcDirs("src/commonMain/composeResources") defaultConfig { minSdk = (findProperty("android.minSdk") as String).toInt() diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts index cae8c7f33..ca03df5c7 100644 --- a/designsystem/build.gradle.kts +++ b/designsystem/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("org.jetbrains.compose") id("com.android.library") id("convention.publication") - id("app.cash.paparazzi").version("1.3.3") + id("app.cash.paparazzi").version("1.3.5") alias(libs.plugins.compose.compiler) } @@ -34,9 +34,9 @@ kotlin { val androidMain by getting { dependencies { - api("androidx.activity:activity-compose:1.8.2") - api("androidx.appcompat:appcompat:1.6.1") - api("androidx.core:core-ktx:1.12.0") + api("androidx.activity:activity-compose:1.9.3") + api("androidx.appcompat:appcompat:1.7.0") + api("androidx.core:core-ktx:1.15.0") implementation("com.google.zxing:core:3.5.2") implementation("se.warting.signature:signature-pad:0.1.2") } @@ -69,8 +69,8 @@ android { namespace = "org.hisp.dhis.mobile.ui.designsystem" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/resources") - sourceSets["main"].resources.srcDirs("src/commonMain/resources") + sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") + sourceSets["main"].resources.srcDirs("src/commonMain/composeResources") defaultConfig { minSdk = (findProperty("android.minSdk") as String).toInt() diff --git a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 3c3933e8c..000000000 --- a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.text.font.Font -import androidx.compose.ui.text.font.FontFamily - -@Composable -actual fun provideFontResource(font: String): FontFamily { - val context = LocalContext.current - val name = font.substringBefore(".") - val fontRes = context.resources.getIdentifier(name, "font", context.packageName) - return FontFamily(Font(fontRes)) -} diff --git a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt deleted file mode 100644 index f83a081af..000000000 --- a/designsystem/src/androidMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ /dev/null @@ -1,28 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.platform.LocalContext - -@Composable -actual fun provideStringResource(id: String): String { - val context = LocalContext.current - val resourceId = context.resources.getIdentifier(id, "string", context.packageName) - if (resourceId == 0) return id - return context.getString(resourceId) -} - -@Composable -actual fun provideQuantityStringResource(id: String, quantity: Int): String { - val appendToId = when (quantity) { - 1 -> "one" - else -> "other" - } - return provideStringResource("${id}_$appendToId").format(quantity) -} - -@Composable -actual fun resourceExists(resourceName: String, resourceType: String): Boolean { - val context = LocalContext.current - val resourceId = context.resources.getIdentifier(resourceName, resourceType, context.packageName) - return resourceId != 0 -} diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt index 6dab31887..b13a69868 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ExpandableItemColumnSnapshotTest.kt @@ -6,8 +6,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Sync import androidx.compose.material.icons.outlined.SyncDisabled import androidx.compose.material3.Icon +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.graphicsLayer +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem import org.hisp.dhis.mobile.ui.designsystem.component.Avatar import org.hisp.dhis.mobile.ui.designsystem.component.AvatarStyleData @@ -23,6 +25,9 @@ import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberAdditionalIn import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberListCardState import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect +import org.junit.Ignore import org.junit.Rule import org.junit.Test @@ -30,14 +35,25 @@ class ExpandableItemColumnSnapshotTest { @get:Rule val paparazzi = paparazzi() + @Ignore( + "This screen is performing layout calculations and does an 'animation effect'" + + "causing the screenshot to be taken before the final layout is displayed." + + "Paparazzi has an issue but as of version 1.3.5 it is not fixed." + + "https://github.com/cashapp/paparazzi/issues/1757", + ) + @OptIn(ExperimentalResourceApi::class) @Test fun launchAvatarTest() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } val items = listOf("Program number 1", "Program number 2") ExpandableItemColumn( modifier = Modifier.fillMaxSize().graphicsLayer { clip = false }, itemList = items, ) { item, verticalPadding, onSizeChanged -> + print("itemVerticalPadding: $verticalPadding") val index = items.indexOf(item) VerticalInfoListCard( listCardState = rememberListCardState( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt index c4b79d1ca..8a1870514 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputAgeSnapshotTest.kt @@ -1,5 +1,7 @@ package org.hisp.dhis.mobile.ui.designsystem +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalInspectionMode import androidx.compose.ui.text.input.TextFieldValue import org.hisp.dhis.mobile.ui.designsystem.component.AgeInputType import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer @@ -9,6 +11,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle import org.hisp.dhis.mobile.ui.designsystem.component.TimeUnitValues import org.hisp.dhis.mobile.ui.designsystem.component.state.InputAgeData import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberInputAgeState +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -17,9 +21,13 @@ class InputAgeSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchInputAgeSnapshot() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } ColumnScreenContainer { SubTitle("Input Age Component - Idle") InputAge( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt index 370446660..39856fe7b 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputDropDownSnapshotTest.kt @@ -2,6 +2,7 @@ package org.hisp.dhis.mobile.ui.designsystem import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,6 +11,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer import org.hisp.dhis.mobile.ui.designsystem.component.DropdownItem import org.hisp.dhis.mobile.ui.designsystem.component.InputDropDown @@ -19,6 +21,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.SubTitle import org.hisp.dhis.mobile.ui.designsystem.component.Title import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -27,9 +31,13 @@ class InputDropDownSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchInputDropDown() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } ColumnScreenContainer { val options = listOf( DropdownItem("Option 1"), diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt index ec4c4e301..38ca725b9 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/InputSequentialSnapshotTest.kt @@ -2,17 +2,21 @@ package org.hisp.dhis.mobile.ui.designsystem import android.graphics.Bitmap import android.graphics.BitmapFactory +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.remember import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.graphics.painter.BitmapPainter import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.ColumnScreenContainer import org.hisp.dhis.mobile.ui.designsystem.component.ImageCardData import org.hisp.dhis.mobile.ui.designsystem.component.InputSequential import org.hisp.dhis.mobile.ui.designsystem.component.InputShellState import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -21,9 +25,13 @@ class InputSequentialSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchMatrix() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } val res = LocalContext.current.resources val image = BitmapFactory.decodeResource( diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt index ba0a5647a..fcf54a61b 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/ListCardSelectableSnapshotTest.kt @@ -6,7 +6,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Sync import androidx.compose.material3.Icon +import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem import org.hisp.dhis.mobile.ui.designsystem.component.Avatar import org.hisp.dhis.mobile.ui.designsystem.component.AvatarStyleData @@ -18,6 +20,8 @@ import org.hisp.dhis.mobile.ui.designsystem.component.state.rememberListCardStat import org.hisp.dhis.mobile.ui.designsystem.resource.provideDHIS2Icon import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -26,9 +30,13 @@ class ListCardSelectableSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchListCard() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } Column( verticalArrangement = Arrangement.spacedBy(Spacing.Spacing4), modifier = Modifier.padding(horizontal = Spacing.Spacing8), diff --git a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt index ccdb47055..09071bcf9 100644 --- a/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt +++ b/designsystem/src/androidUnitTest/kotlin/org/hisp/dhis/mobile/ui/designsystem/LocationBarSearchSnapshotTest.kt @@ -1,8 +1,12 @@ package org.hisp.dhis.mobile.ui.designsystem +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.ui.platform.LocalInspectionMode import org.hisp.dhis.mobile.ui.designsystem.component.LocationBar import org.hisp.dhis.mobile.ui.designsystem.component.SearchBarMode import org.hisp.dhis.mobile.ui.designsystem.component.model.LocationItemModel +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.PreviewContextConfigurationEffect import org.junit.Rule import org.junit.Test @@ -10,9 +14,13 @@ class LocationBarSearchSnapshotTest { @get:Rule val paparazzi = paparazzi() + @OptIn(ExperimentalResourceApi::class) @Test fun launchSearchBarButtonTest() { paparazzi.snapshot { + CompositionLocalProvider(LocalInspectionMode provides true) { + PreviewContextConfigurationEffect() + } LocationBar( currentResults = listOf( LocationItemModel.StoredResult( diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_2g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_2g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_2g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_2g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_3g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_3g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_3g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_3g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_4x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_4x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_4x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_agriculture_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_agriculture_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_circle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_circle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_alert_triangle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_alert_triangle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulance_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulance_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulance_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ambulatory_clinic_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ambulatory_clinic_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ancv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ancv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ancv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0203m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0203m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0306m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0306m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_female_0609m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_female_0609m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0203m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0203m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0306m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0306m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_baby_male_0609m_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_baby_male_0609m_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_basic_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_basic_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bike_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bike_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bike_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bike_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_bills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_bills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_bills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_bills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x14_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x14_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x16_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x16_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_oval_x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_oval_x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x14_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x14_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x16_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x16_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blister_pills_round_x4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blister_pills_round_x4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_a_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_a_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_ab_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_ab_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_b_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_b_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_o_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_o_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_monitor_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_monitor_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_pressure_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_pressure_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_n_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_n_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_blood_rh_p_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_blood_rh_p_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_0105y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_0105y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_boy_1015y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_boy_1015y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_breeding_sites_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_breeding_sites_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_calendar_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_calendar_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_calendar_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_e_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_e_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cardiogram_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cardiogram_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cervical_cancer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cervical_cancer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_child_program_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_child_program_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_child_program_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_chills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_chills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_chills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_chills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cholera_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cholera_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cholera_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_church_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_church_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_church_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_church_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_circle_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_circle_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_circle_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_city_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_city_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_city_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clean_hands_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clean_hands_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_a_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_a_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_f_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_f_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_clinical_fe_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_clinical_fe_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coins_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coins_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coins_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coins_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cold_chain_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cold_chain_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_communication_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_communication_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_communication_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_communication_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_nets_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_nets_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cone_test_on_walls_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cone_test_on_walls_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_construction_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_construction_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contact_support_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contact_support_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contact_support_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_diaphragm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_diaphragm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_injection_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_injection_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_patch_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_patch_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_contraceptive_voucher_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_contraceptive_voucher_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_copper_iud_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_copper_iud_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_coughing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_coughing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_coughing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_credit_card_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_credit_card_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_credit_card_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_cross_country_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_cross_country_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_default_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_default_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_default_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_default_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_dhis2_logo_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_dhis2_logo_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_diarrhea_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_diarrhea_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_discriminating_concentration_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_doctor_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_doctor_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_doctor_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_domestic_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_domestic_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_donkey_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_donkey_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_donkey_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_drone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_drone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_drone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_drone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_eco_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_eco_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_eco_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_elderly_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_elderly_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_elderly_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_electricity_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_electricity_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_electricity_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_emergency_post_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_emergency_post_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_expectorate_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_expectorate_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_expectorate_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_factory_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_factory_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_family_planning_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_family_planning_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_family_planning_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_and_male_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_and_male_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_condom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_condom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_condom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_female_sex_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_female_sex_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fetus_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fetus_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fetus_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_chills_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_chills_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_fever_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_fever_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_fever_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_fever_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_persons_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_persons_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forest_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forest_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forest_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forest_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_forum_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_forum_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_forum_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_forum_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_0105y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_0105y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_girl_1015y_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_girl_1015y_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meeting_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meeting_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_group_discussion_meetingx3_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_group_discussion_meetingx3_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_happy_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_happy_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_happy_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_happy_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hazardous_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hazardous_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hazardous_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_headache_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_headache_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_headache_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_headache_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_form_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_form_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_health_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_health_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_health_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_cardiogram_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_cardiogram_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_heart_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_heart_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_heart_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_heart_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_helicopter_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_helicopter_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_helicopter_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_high_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_high_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_high_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_ind_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_ind_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_neg_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_neg_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_pos_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_pos_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hiv_self_test_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hiv_self_test_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_home_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_home_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_home_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_home_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hormonal_ring_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hormonal_ring_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospital_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospital_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospital_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hospitalized_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hospitalized_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hot_meal_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hot_meal_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_hpv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_hpv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_hpv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_certificate_paper_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_certificate_paper_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_accepted_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_accepted_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_documents_denied_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_documents_denied_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_multiple_choice_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_multiple_choice_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_exam_qualification_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_exam_qualification_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_groups_perspective_crowd_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_groups_perspective_crowd_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_note_action_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_note_action_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_schedule_school_date_time_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_schedule_school_date_time_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_training_class_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_training_class_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_i_utensils_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_i_utensils_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_image_not_supported.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_image_not_supported.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_image_not_supported.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_image_not_supported.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_imm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_imm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_imm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_imm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_implant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_implant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_implant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_implant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_info_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_info_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_info_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_info_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_information_campaign_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_information_campaign_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_inpatient_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_inpatient_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_inpatient_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_insecticide_resistance_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_insecticide_resistance_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_intensity_concentration_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_intensity_concentration_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_iud_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_iud_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_iud_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_iud_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_justice_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_justice_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_justice_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_justice_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_lactation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_lactation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_lactation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_letrina_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_letrina_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_letrina_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_llin_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_llin_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_llin_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_llin_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_low_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_low_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_low_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_machinery_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_machinery_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_machinery_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_magnifying_glass_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_magnifying_glass_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_mixed_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_mixed_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_negative_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_negative_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_outbreak_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_outbreak_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pf_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pf_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_pv_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_pv_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_malaria_testing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_malaria_testing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_and_female_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_and_female_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_condom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_condom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_condom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_male_sex_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_male_sex_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_man_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_man_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_man_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_man_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_market_stall_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_market_stall_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_market_stall_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mask_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mask_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mask_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mask_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_measles_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_measles_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_measles_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_measles_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medicines_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medicines_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medicines_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_bars_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_bars_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_medium_level_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_medium_level_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_medium_level_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_megaphone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_megaphone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_megaphone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mental_disorders_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mental_disorders_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_microscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_microscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_microscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_military_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_military_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_military_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_miner_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_miner_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mobile_clinic_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mobile_clinic_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_money_bag_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_money_bag_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_money_bag_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_collection_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_collection_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_mosquito_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_mosquito_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_mosquito_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_msm_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_msm_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_msm_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_msm_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nausea_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nausea_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nausea_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_negative_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_negative_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_negative_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_negative_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_4g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_4g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_4g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_network_5g_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_network_5g_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_network_5g_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neurology_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neurology_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neurology_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_neutral_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_neutral_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_neutral_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_no_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_no_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_no_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_no_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_not_ok_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_not_ok_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_not_ok_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_nurse_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_nurse_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_nurse_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_observation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_observation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_observation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_observation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_implant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_implant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_odontology_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_odontology_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_odontology_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_officer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_officer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_officer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_officer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ok_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ok_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ok_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ok_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_man_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_man_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_man_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_old_woman_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_old_woman_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_old_woman_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx21_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx21_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_oral_contraception_pillsx28_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_oral_contraception_pillsx28_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_outpatient_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_outpatient_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_outpatient_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_overweight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_overweight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_overweight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_palm_branches_roof_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_palm_branches_roof_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pave_road_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pave_road_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pave_road_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_peace_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_peace_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_peace_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_peace_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_people_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_people_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_people_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_people_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_person_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_person_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_person_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_person_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_phone_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_phone_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_phone_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_phone_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pill_1_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pill_1_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pill_1_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_2_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_2_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_2_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_3_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_3_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_3_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pills_4_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pills_4_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pills_4_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_plantation_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_plantation_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_polygon_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_polygon_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_polygon_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_positive_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_positive_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_positive_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_positive_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_0812w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_0812w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_2426w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_2426w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_32w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_32w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_3638w_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_3638w_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pregnant_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pregnant_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pregnant_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_prisoner_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_prisoner_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_prisoner_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_proper_roof_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_proper_roof_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_provider_fst_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_provider_fst_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_pwid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_pwid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_pwid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_circle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_circle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_circle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_question_triangle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_question_triangle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_mixed_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_neg_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_negative_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_negative_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_no_test_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_no_test_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_out_stock_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_out_stock_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pf_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_positive_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_positive_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_invalid_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rdt_result_pv_rectangular_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_referral_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_referral_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_referral_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_referral_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_refused_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_refused_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_refused_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_refused_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_ribbon_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_ribbon_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_ribbon_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rmnh_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rmnh_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rmnh_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_running_water_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_running_water_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_running_water_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_rural_post_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_rural_post_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_rural_post_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sad_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sad_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sad_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sad_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sanitizer_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sanitizer_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sayana_press_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sayana_press_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_security_worker_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_security_worker_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_security_worker_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sexual_reproductive_health_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sexual_reproductive_health_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_small_plane_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_small_plane_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_small_plane_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_social_distancing_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_social_distancing_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_spraying_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_spraying_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_spraying_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_square_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_square_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_square_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_star_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_star_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_star_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stethoscope_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stethoscope_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sti_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sti_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sti_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sti_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stock_out_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stock_out_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stock_out_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_stop_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_stop_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_stop_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_stop_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_surgical_sterilization_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_surgical_sterilization_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_sweating_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_sweating_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_sweating_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_symptom_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_symptom_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_symptom_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_synergist_insecticide_bioassays_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_syringe_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_syringe_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_syringe_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tac_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tac_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tac_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tac_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_tb_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_tb_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_tb_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_tb_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_transgender_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_transgender_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_transgender_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_traumatism_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_traumatism_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_traumatism_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_travel_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_travel_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_travel_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_travel_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_treated_water_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_treated_water_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_treated_water_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_large_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_large_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_medium_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_medium_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_triangle_small_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_triangle_small_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_truck_driver_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_truck_driver_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_un_pave_road_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_un_pave_road_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_underweight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_underweight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_underweight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vespa_motorcycle_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vespa_motorcycle_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vih_aids_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vih_aids_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_virus_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_virus_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_virus_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_virus_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_vomiting_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_vomiting_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_vomiting_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_war_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_war_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_war_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_war_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wash_hands_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wash_hands_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_sanitation_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_sanitation_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_water_treatment_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_water_treatment_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_weight_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_weight_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_weight_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_weight_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_wold_care_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_wold_care_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_wold_care_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_woman_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_woman_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_woman_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_woman_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_yes_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_yes_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_yes_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_yes_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_negative.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_negative.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_negative.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_negative.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_outline.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/dhis2_young_people_positive.xml b/designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_positive.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/dhis2_young_people_positive.xml rename to designsystem/src/commonMain/composeResources/drawable/dhis2_young_people_positive.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_barcode.xml b/designsystem/src/commonMain/composeResources/drawable/material_barcode.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_barcode.xml rename to designsystem/src/commonMain/composeResources/drawable/material_barcode.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_barcode_scanner.xml b/designsystem/src/commonMain/composeResources/drawable/material_barcode_scanner.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_barcode_scanner.xml rename to designsystem/src/commonMain/composeResources/drawable/material_barcode_scanner.xml diff --git a/designsystem/src/commonMain/resources/drawable/material_circle_outline.xml b/designsystem/src/commonMain/composeResources/drawable/material_circle_outline.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/material_circle_outline.xml rename to designsystem/src/commonMain/composeResources/drawable/material_circle_outline.xml diff --git a/designsystem/src/commonMain/resources/drawable/org_unit.xml b/designsystem/src/commonMain/composeResources/drawable/org_unit.xml similarity index 100% rename from designsystem/src/commonMain/resources/drawable/org_unit.xml rename to designsystem/src/commonMain/composeResources/drawable/org_unit.xml diff --git a/designsystem/src/commonMain/resources/font/roboto_black.ttf b/designsystem/src/commonMain/composeResources/font/roboto_black.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_black.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_black.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_black_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_black_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_black_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_black_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_bold.ttf b/designsystem/src/commonMain/composeResources/font/roboto_bold.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_bold.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_bold.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_bold_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_bold_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_bold_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_bold_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_light.ttf b/designsystem/src/commonMain/composeResources/font/roboto_light.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_light.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_light.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_light_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_light_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_light_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_light_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_medium.ttf b/designsystem/src/commonMain/composeResources/font/roboto_medium.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_medium.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_medium.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_medium_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_medium_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_medium_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_medium_italic.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_regular.ttf b/designsystem/src/commonMain/composeResources/font/roboto_regular.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_regular.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_regular.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_thin.ttf b/designsystem/src/commonMain/composeResources/font/roboto_thin.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_thin.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_thin.ttf diff --git a/designsystem/src/commonMain/resources/font/roboto_thin_italic.ttf b/designsystem/src/commonMain/composeResources/font/roboto_thin_italic.ttf similarity index 100% rename from designsystem/src/commonMain/resources/font/roboto_thin_italic.ttf rename to designsystem/src/commonMain/composeResources/font/roboto_thin_italic.ttf diff --git a/designsystem/src/commonMain/resources/values-es/strings.xml b/designsystem/src/commonMain/composeResources/values-es/strings.xml similarity index 91% rename from designsystem/src/commonMain/resources/values-es/strings.xml rename to designsystem/src/commonMain/composeResources/values-es/strings.xml index e347b3ed5..1cbf4f325 100644 --- a/designsystem/src/commonMain/resources/values-es/strings.xml +++ b/designsystem/src/commonMain/composeResources/values-es/strings.xml @@ -8,10 +8,10 @@ Años Meses Días - %d error - %d errores - %d advertencia - %d advertencias + %1$d error + %1$d errores + %1$d advertencia + %1$d advertencias Mostrar campos Ocultar campos Siguiente diff --git a/designsystem/src/commonMain/resources/values/strings.xml b/designsystem/src/commonMain/composeResources/values/strings.xml similarity index 91% rename from designsystem/src/commonMain/resources/values/strings.xml rename to designsystem/src/commonMain/composeResources/values/strings.xml index 523a10f8c..07c2d8db2 100644 --- a/designsystem/src/commonMain/resources/values/strings.xml +++ b/designsystem/src/commonMain/composeResources/values/strings.xml @@ -8,10 +8,10 @@ Years Months Days - %d error - %d errors - %d warning - %d warnings + %1$d error + %1$d errors + %1$d warning + %1$d warnings Show fields Hide fields Next diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt index 86252b2ab..5188375b7 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/AssistChip.kt @@ -4,9 +4,10 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsPressedAsState import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.offset -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.AssistChip import androidx.compose.material3.AssistChipDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -20,9 +21,9 @@ import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 [AssistChip] button with custom icon slot. @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param onClick: Will be called when the user taps the chip. * @param badge: the text to be displayed within the badge. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun AssistChip( modifier: Modifier = Modifier, @@ -47,9 +49,10 @@ fun AssistChip( ) { val interactionSource = remember { MutableInteractionSource() } val isPressed by interactionSource.collectIsPressedAsState() + val rippleConfiguration = customRippleConfiguration() Box(modifier = Modifier) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { AssistChip( onClick = { onClick.invoke() }, label = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt index c64b93ed1..1a93d1faf 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BaseCard.kt @@ -24,10 +24,10 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -87,7 +87,7 @@ fun BaseCard( .combinedClickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = when { @@ -215,7 +215,7 @@ fun ToggleInfoTextButton( }, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt index 3ebaf8d6c..5e8e61104 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicTextInput.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.Icon +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -127,7 +128,7 @@ internal fun BasicTextInput( modifier = modifier .testTag("INPUT_$testTag") .focusRequester(focusRequester) - .menuAnchor(), + .menuAnchor(MenuAnchorType.PrimaryEditable), isRequiredField = isRequiredField, title = title, primaryButton = deleteButton, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt index 85c1eea75..5adffb3ba 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Button.kt @@ -13,11 +13,12 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.Button import androidx.compose.material3.ButtonColors import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text @@ -35,12 +36,12 @@ import androidx.compose.ui.unit.dp import org.hisp.dhis.mobile.ui.designsystem.theme.Border import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Shape import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor import org.hisp.dhis.mobile.ui.designsystem.theme.buttonShadow +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -58,6 +59,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param modifier: optional [Modifier]. * @param onClick :Will be called when the user clicks the button. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Button( enabled: Boolean = true, @@ -101,12 +103,12 @@ fun Button( ColorStyle.ERROR -> getErrorTextButtonColors(style, enabled) ColorStyle.WARNING -> getWarningTextButtonColors(style, enabled) } - val theme = when (colorStyle) { - ColorStyle.DEFAULT -> Ripple.CustomDHISRippleTheme() - ColorStyle.ERROR -> Ripple.CustomDHISRippleTheme(SurfaceColor.Error) - ColorStyle.WARNING -> Ripple.CustomDHISRippleTheme(SurfaceColor.Warning) + val rippleConfiguration = when (colorStyle) { + ColorStyle.DEFAULT -> customRippleConfiguration() + ColorStyle.ERROR -> customRippleConfiguration(SurfaceColor.Error) + ColorStyle.WARNING -> customRippleConfiguration(SurfaceColor.Warning) } - CompositionLocalProvider(LocalRippleTheme provides theme) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { OutlinedButton( modifier = modifier, onClick = { onClick() }, @@ -155,7 +157,7 @@ fun Button( } else { TextColor.OnDisabledSurface } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { SimpleButton( modifier = modifier, onClick = { onClick() }, @@ -229,12 +231,12 @@ fun Button( ColorStyle.WARNING -> getWarningOutlinedButtonColors(enabled) } - val theme = when (colorStyle) { - ColorStyle.DEFAULT -> Ripple.CustomDHISRippleTheme() - ColorStyle.ERROR -> Ripple.CustomDHISRippleTheme(SurfaceColor.Error) - ColorStyle.WARNING -> Ripple.CustomDHISRippleTheme(SurfaceColor.Warning) + val rippleConfiguration = when (colorStyle) { + ColorStyle.DEFAULT -> customRippleConfiguration() + ColorStyle.ERROR -> customRippleConfiguration(SurfaceColor.Error) + ColorStyle.WARNING -> customRippleConfiguration(SurfaceColor.Warning) } - CompositionLocalProvider(LocalRippleTheme provides theme) { + CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) { OutlinedButton( modifier = modifier.hoverPointerIcon(enabled).height(Spacing.Spacing40), onClick = { onClick() }, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt index 6fe38b29d..3f2dfc411 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ButtonCarousel.kt @@ -14,8 +14,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.ripple.LocalRippleTheme -import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.remember @@ -23,12 +24,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing16 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing24 import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing.Spacing64 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,12 +37,13 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param buttonData: [CarouselButtonData] data model with all parameters for component. * @param modifier: optional [Modifier]. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CarouselButton( buttonData: CarouselButtonData, modifier: Modifier = Modifier, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( modifier = modifier .size(Spacing.Spacing80) @@ -51,7 +53,7 @@ fun CarouselButton( onClick = { buttonData.onClick.invoke() }, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), enabled = buttonData.enabled, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt index 9e79f959d..ff4b7fa18 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/CheckBox.kt @@ -7,9 +7,10 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.Checkbox import androidx.compose.material3.CheckboxDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -21,10 +22,10 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.AnnotatedString import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CheckBox( checkBoxData: CheckBoxData, @@ -67,7 +69,7 @@ fun CheckBox( ) .hoverPointerIcon(checkBoxData.enabled), ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Checkbox( checked = checkBoxData.checked, onCheckedChange = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt index 82bc9e0ad..ab969de6e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/FilterChip.kt @@ -5,10 +5,11 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Done -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -21,9 +22,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 [FilterChip] button with generic icon slot. @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param onSelected: Will be called when the user taps the chip. * @param badge: the text to be displayed within the badge. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun FilterChip( modifier: Modifier = Modifier, @@ -45,7 +47,7 @@ fun FilterChip( badge: String? = null, ) { Box(modifier = modifier) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { FilterChip( onClick = { onSelected?.invoke(!selected) }, label = { Text(label, color = TextColor.OnSurfaceVariant) }, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt index 601712d1d..cc505054a 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/IconButton.kt @@ -11,12 +11,13 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.ripple.LocalRippleTheme import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.ElevatedButton +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilledIconButton import androidx.compose.material3.FilledTonalIconButton import androidx.compose.material3.IconButtonDefaults +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.OutlinedIconButton import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -37,11 +38,11 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.Border import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Shape import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon import org.hisp.dhis.mobile.ui.designsystem.theme.iconButtonshadow @@ -178,6 +179,7 @@ internal fun BottomSheetIconButton( * @param scope: coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun StandardIconButton( enabled: Boolean = true, @@ -187,7 +189,7 @@ private fun StandardIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, @@ -277,6 +279,7 @@ private fun FilledIconButton( * @param scope: Coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun FilledTonalIconButton( enabled: Boolean = true, @@ -286,7 +289,7 @@ private fun FilledTonalIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, @@ -331,6 +334,7 @@ private fun FilledTonalIconButton( * @param scope: coroutine scope to be used. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable private fun OutlinedIconButton( enabled: Boolean = true, @@ -340,7 +344,7 @@ private fun OutlinedIconButton( scope: CoroutineScope = rememberCoroutineScope(), onClick: () -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Box( Modifier.size(InternalSizeValues.Size48).clickable( enabled = enabled, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt index 05ef5a352..cad7a307e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InfoBar.kt @@ -11,7 +11,8 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -22,9 +23,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import org.hisp.dhis.mobile.ui.designsystem.theme.Radius -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 InfoBar. Wraps compose [Row]. @@ -33,6 +34,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor * parameters for component. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun InfoBar( infoBarData: InfoBarData, @@ -53,7 +55,7 @@ fun InfoBar( Text(color = infoBarData.color, text = infoBarData.text, style = MaterialTheme.typography.bodyMedium) Spacer(Modifier.weight(1f)) if (infoBarData.onClick != null && infoBarData.actionText?.isNotEmpty() == true) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Column( Modifier .clip(shape = RoundedCornerShape(Radius.L)) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt index 6e5f3e031..bf99c3d15 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputChip.kt @@ -6,9 +6,10 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilterChipDefaults import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -23,9 +24,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.onSizeChanged import androidx.compose.ui.unit.IntOffset import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 Input Chip. Wraps material 3 · [InputChip]. @@ -41,6 +42,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * @param focusRequester: component focus requester. * @param modifier: optional modifier. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun InputChip( modifier: Modifier = Modifier, @@ -67,7 +69,7 @@ fun InputChip( ) } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { androidx.compose.material3.InputChip( enabled = enabled, onClick = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt index a7e75b862..794aefb73 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputDropDown.kt @@ -18,6 +18,7 @@ import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.Shapes import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -218,7 +219,7 @@ fun InputDropDown( shape = RoundedCornerShape(Spacing8), ), ) { - inputField(Modifier.menuAnchor()) + inputField(Modifier.menuAnchor(MenuAnchorType.PrimaryEditable)) MaterialTheme( shapes = Shapes(extraSmall = RoundedCornerShape(Spacing8)), diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt index 44704373c..52d35c632 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Legend.kt @@ -15,11 +15,11 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.outlined.HelpOutline import androidx.compose.material.icons.outlined.Info -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -63,7 +63,7 @@ fun Legend( }, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt index 28ad80f9c..fb8b31f9d 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ListCard.kt @@ -29,10 +29,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp import androidx.compose.material.icons.outlined.Sync -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -576,7 +576,7 @@ private fun ExpandShrinkButton( onClick = onClick, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) @@ -673,7 +673,7 @@ fun ProvideKeyValueItem( clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = additionalInfoItem.action ?: {}, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt index 74fd87cd0..08525a5e1 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/OrgBottomSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.filled.ClearAll import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -233,7 +233,7 @@ fun OrgUnitSelectorItem( interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple(bounded = true), + indication = ripple(bounded = true), ) { onItemClick(orgTreeItem.uid) } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt index 8e312f0de..f8c18d89f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/ProgressIndicator.kt @@ -53,7 +53,7 @@ fun ProgressIndicator( @Composable internal fun LinearIndicator(modifier: Modifier, progress: Float?, hasError: Boolean) { val color = if (hasError) SurfaceColor.Error else SurfaceColor.Primary - val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.ContainerHigh + val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.Container if (progress != null) { LinearProgressIndicator( progress = { progress }, @@ -78,18 +78,21 @@ internal fun CircularIndicator( hasError: Boolean, ) { val color = if (hasError) SurfaceColor.Error else SurfaceColor.Primary + val trackColor = if (hasError) SurfaceColor.ErrorContainer else SurfaceColor.Container if (progress != null) { CircularProgressIndicator( progress = { progress }, modifier = modifier, strokeWidth = strokeWidth, color = color, + trackColor = trackColor, ) } else { CircularProgressIndicator( modifier = modifier, strokeWidth = strokeWidth, color = color, + trackColor = trackColor, ) } } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt index daf89271c..70d83170f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/RadioButton.kt @@ -7,7 +7,8 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RadioButton import androidx.compose.material3.RadioButtonDefaults @@ -21,10 +22,10 @@ import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.AnnotatedString import org.hisp.dhis.mobile.ui.designsystem.theme.InternalSizeValues import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon /** @@ -36,6 +37,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.hoverPointerIcon * @param onClick Will be called when the user clicks the button. * */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun RadioButton( radioButtonData: RadioButtonData, @@ -59,7 +61,7 @@ fun RadioButton( enabled = radioButtonData.enabled, ), ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { RadioButton( selected = radioButtonData.selected, onClick = { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt index 3998263a1..325a85943 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SearchBar.kt @@ -13,13 +13,13 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Cancel import androidx.compose.material.icons.outlined.Search -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SearchBarDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextFieldDefaults +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -105,7 +105,7 @@ fun SearchBar( onClick = {}, role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( true, color = SurfaceColor.Primary, ), diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt index ecc7bba15..a036e5255 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Sections.kt @@ -23,10 +23,10 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowForward import androidx.compose.material.icons.filled.KeyboardArrowDown import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue @@ -266,7 +266,7 @@ internal fun SectionHeader( it.clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), ) { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt index 3e9033eed..244bc8dc4 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/SupportingText.kt @@ -6,7 +6,9 @@ import androidx.compose.foundation.interaction.PressInteraction import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.ClickableText -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.LocalRippleConfiguration +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.LaunchedEffect @@ -18,18 +20,22 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.LinkAnnotation import androidx.compose.ui.text.ParagraphStyle import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.TextLinkStyles import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.withLink import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.sp import kotlinx.coroutines.launch import org.hisp.dhis.mobile.ui.designsystem.resource.provideStringResource import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2SCustomTextStyles -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.Spacing import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 SupportingText component, wraps Compose [ClickableText]. @@ -45,6 +51,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * If the text to be shown has overflow the component will automatically add * the expand functionality. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun SupportingText( text: String, @@ -79,6 +86,29 @@ fun SupportingText( LaunchedEffect(textLayoutResult) { if (textLayoutResult == null) return@LaunchedEffect + val link = LinkAnnotation.Clickable( + tag = seeMoreTag, + styles = TextLinkStyles( + clickableTextStyle.copy(fontWeight = FontWeight.SemiBold), + ), + ) { + val link = it as LinkAnnotation.Clickable + if (link.tag == seeMoreTag) { + if (isClickable) { + isExpanded = !isExpanded + } + } else { + onNoInteraction?.invoke()?.let { (interactionSource, action) -> + scope.launch { + action.invoke() + val pressInteraction = PressInteraction.Press(Offset.Zero) + interactionSource.emit(pressInteraction) + interactionSource.emit(PressInteraction.Release(pressInteraction)) + } + } + } + } + when { !isExpanded && textLayoutResult.hasVisualOverflow -> { val lastCharIndex = textLayoutResult.getLineEnd(maxLines - 1) @@ -94,7 +124,7 @@ fun SupportingText( withStyle(style = nonClickableTextStyle) { append(unexpandedText) } - withStyle(style = clickableTextStyle) { + withLink(link) { append(showMoreText) } } @@ -118,9 +148,7 @@ fun SupportingText( ) { append(expandedText) } - withStyle( - style = clickableTextStyle, - ) { + withLink(link) { append(showLessText) } } @@ -135,27 +163,11 @@ fun SupportingText( } } - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { - ClickableText( + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { + Text( text = annotatedText, maxLines = if (isExpanded) Int.MAX_VALUE else maxLines, onTextLayout = { textLayoutResultState.value = it }, - onClick = { position -> - val annotations = - annotatedText.getStringAnnotations(seeMoreTag, start = position, end = position) - annotations.firstOrNull()?.let { - if (isClickable) { - isExpanded = !isExpanded - } - } ?: onNoInteraction?.invoke()?.let { (interactionSource, action) -> - scope.launch { - action.invoke() - val pressInteraction = PressInteraction.Press(Offset.Zero) - interactionSource.emit(pressInteraction) - interactionSource.emit(PressInteraction.Release(pressInteraction)) - } - } - }, modifier = modifier.padding(paddingValues).animateContentSize(), ) } diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt index f582f19b1..ae7bfa921 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/Switch.kt @@ -4,8 +4,9 @@ import androidx.compose.foundation.layout.size import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.outlined.Close -import androidx.compose.material.ripple.LocalRippleTheme +import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon +import androidx.compose.material3.LocalRippleConfiguration import androidx.compose.material3.Switch import androidx.compose.material3.SwitchDefaults import androidx.compose.runtime.Composable @@ -13,9 +14,9 @@ import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import org.hisp.dhis.mobile.ui.designsystem.theme.Outline -import org.hisp.dhis.mobile.ui.designsystem.theme.Ripple import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.hisp.dhis.mobile.ui.designsystem.theme.customRippleConfiguration /** * DHIS2 Switch wraps Material 3 [Switch]. @@ -25,6 +26,7 @@ import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor * clickable and will appear disabled to accessibility services. * @param onCheckedChange: access to the on checked changed event. */ +@OptIn(ExperimentalMaterial3Api::class) @Composable fun Switch( modifier: Modifier = Modifier, @@ -32,7 +34,7 @@ fun Switch( enabled: Boolean = true, onCheckedChange: (Boolean) -> Unit, ) { - CompositionLocalProvider(LocalRippleTheme provides Ripple.CustomDHISRippleTheme()) { + CompositionLocalProvider(LocalRippleConfiguration provides customRippleConfiguration()) { Switch( modifier = modifier.testTag("SWITCH"), checked = isChecked, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt index 44053c380..2c8d2ae5e 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/internal/modifiers/ClickableWithRipple.kt @@ -2,7 +2,7 @@ package org.hisp.dhis.mobile.ui.designsystem.component.internal.modifiers import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.material.ripple.rememberRipple +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -19,7 +19,7 @@ internal fun Modifier.clickableWithRipple( Modifier.clickable( role = role, interactionSource = remember { MutableInteractionSource() }, - indication = rememberRipple(color = color), + indication = ripple(color = color), onClick = onClick, ), ) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt index d6c3ff291..39045bf5f 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/navigationBar/NavigationBar.kt @@ -13,9 +13,12 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_bold import org.hisp.dhis.mobile.ui.designsystem.component.Badge import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_BORDER @@ -25,10 +28,10 @@ import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBa import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_LABEL_PREFIX import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_PREFIX import org.hisp.dhis.mobile.ui.designsystem.component.navigationBar.NavigationBarTestTags.NAVIGATION_BAR_ITEM_SELECTED_ICON_SUFFIX -import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource import org.hisp.dhis.mobile.ui.designsystem.theme.Outline import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor import org.hisp.dhis.mobile.ui.designsystem.theme.TextColor +import org.jetbrains.compose.resources.Font @Composable fun NavigationBar( @@ -61,7 +64,7 @@ fun NavigationBar( Text( style = if (selected) { MaterialTheme.typography.labelMedium.copy( - fontFamily = provideFontResource("roboto_bold"), + fontFamily = FontFamily(Font(Res.font.roboto_bold)), fontWeight = FontWeight.Bold, ) } else { diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt index 533f3be36..78c10d2ec 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/parameter/ParameterSelector.kt @@ -15,10 +15,10 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.wrapContentWidth -import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text +import androidx.compose.material3.ripple import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -75,7 +75,7 @@ private fun EmptyParameterField( .clickable( role = Role.Button, interactionSource = interactionSource, - indication = rememberRipple( + indication = ripple( color = SurfaceColor.Primary, ), onClick = onClick, diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 886b7de50..000000000 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.font.FontFamily - -@Composable -expect fun provideFontResource(font: String = "roboto_regular"): FontFamily diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt index 83b0abdfc..fa4cbf899 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Image.kt @@ -2,9 +2,10 @@ package org.hisp.dhis.mobile.ui.designsystem.resource import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.painter.Painter -import org.jetbrains.compose.resources.DrawableResource -import org.jetbrains.compose.resources.InternalResourceApi -import org.jetbrains.compose.resources.ResourceItem +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.allDrawableResources +import org.hisp.dhis.mobile.designsystem.generated.resources.dhis2_default_outline +import org.jetbrains.compose.resources.ExperimentalResourceApi import org.jetbrains.compose.resources.painterResource /** @@ -13,34 +14,11 @@ import org.jetbrains.compose.resources.painterResource */ @Composable fun provideDHIS2Icon(resourceName: String): Painter { - val iconName = if (!resourceExists(resourceName)) { - "dhis2_default_outline" - } else { - resourceName - } return painterResource( - drawableResource(iconName, "xml"), + drawableResource(resourceName) ?: Res.drawable.dhis2_default_outline, ) } -@Composable -fun provideImage(resourceName: String): Painter = - painterResource( - drawableResource(resourceName, "jpg"), - ) - -@OptIn(InternalResourceApi::class) -fun drawableResource(resourceName: String, fileExtension: String): DrawableResource = - lazy { - DrawableResource( - resourceName, - setOf( - ResourceItem( - setOf(), - "drawable/$resourceName.$fileExtension", - -1, - -1, - ), - ), - ) - }.value +@OptIn(ExperimentalResourceApi::class) +internal fun drawableResource(resourceName: String) = + Res.allDrawableResources[resourceName] diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt index dc4501f4d..c6718dee4 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt @@ -1,12 +1,46 @@ package org.hisp.dhis.mobile.ui.designsystem.resource import androidx.compose.runtime.Composable +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.allDrawableResources +import org.hisp.dhis.mobile.designsystem.generated.resources.allStringResources +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.stringResource +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun provideStringResource(id: String): String +fun provideStringResource(resourceName: String): String { + return if (resourceExists(resourceName, ResourceType.STRING)) { + stringResource(Res.allStringResources[resourceName]!!) + } else { + "Key not found" + } +} +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun provideQuantityStringResource(id: String, quantity: Int): String +fun provideQuantityStringResource(resourceName: String, quantity: Int): String { + val formattedName = when (quantity) { + 1 -> "${resourceName}_one" + else -> "${resourceName}_other" + } + return if (resourceExists(formattedName, ResourceType.STRING)) { + stringResource(Res.allStringResources[formattedName]!!, quantity) + } else { + "Key not found" + } +} +@OptIn(ExperimentalResourceApi::class) @Composable -expect fun resourceExists(resourceName: String, resourceType: String = "drawable"): Boolean +fun resourceExists(resourceName: String, resourceType: ResourceType = ResourceType.DRAWABLE): Boolean { + return when (resourceType) { + ResourceType.DRAWABLE -> Res.allDrawableResources.containsKey(resourceName) + ResourceType.STRING -> Res.allStringResources.containsKey(resourceName) + } +} + +enum class ResourceType { + DRAWABLE, + STRING, +} diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt index 0a97ff557..dcfdea2bd 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Ripple.kt @@ -1,26 +1,20 @@ package org.hisp.dhis.mobile.ui.designsystem.theme import androidx.compose.material.ripple.RippleAlpha -import androidx.compose.material.ripple.RippleTheme -import androidx.compose.runtime.Composable +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.RippleConfiguration import androidx.compose.ui.graphics.Color -object Ripple { - internal class CustomDHISRippleTheme( - private val color: Color = SurfaceColor.Primary, - ) : RippleTheme { - - private val alpha = RippleAlpha( - focusedAlpha = 0.16f, - draggedAlpha = 0.16f, - hoveredAlpha = 0.04f, - pressedAlpha = 0.16f, - ) - - @Composable - override fun defaultColor(): Color = color - - @Composable - override fun rippleAlpha(): RippleAlpha = alpha - } -} +@OptIn(ExperimentalMaterial3Api::class) +internal fun customRippleConfiguration( + color: Color = SurfaceColor.Primary, + alpha: RippleAlpha = RippleAlpha( + focusedAlpha = 0.16f, + draggedAlpha = 0.16f, + hoveredAlpha = 0.04f, + pressedAlpha = 0.16f, + ), +) = RippleConfiguration( + color, + alpha, +) diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt index 7739fa8dd..1034cccce 100644 --- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt +++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/theme/Theme.kt @@ -6,11 +6,15 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.sp -import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource +import org.hisp.dhis.mobile.designsystem.generated.resources.Res +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_medium +import org.hisp.dhis.mobile.designsystem.generated.resources.roboto_regular +import org.jetbrains.compose.resources.Font val DHIS2LightColorScheme = lightColorScheme( primary = SurfaceColor.Primary, @@ -41,7 +45,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 32.sp, lineHeight = 40.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -49,7 +53,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 28.sp, lineHeight = 36.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -57,7 +61,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 24.sp, lineHeight = 32.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, ), @@ -65,7 +69,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 20.sp, lineHeight = 28.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, ), @@ -73,7 +77,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 16.sp, lineHeight = 24.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.15.sp, @@ -83,7 +87,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.1.sp, @@ -92,7 +96,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.1.sp, @@ -101,7 +105,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 12.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -110,7 +114,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 11.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_medium"), + fontFamily = FontFamily(Font(Res.font.roboto_medium)), fontWeight = FontWeight.Medium, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -119,7 +123,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 16.sp, lineHeight = 24.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.5.sp, @@ -128,7 +132,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 14.sp, lineHeight = 20.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.25.sp, @@ -137,7 +141,7 @@ fun DHIS2Theme(content: @Composable () -> Unit) { fontSize = 12.sp, lineHeight = 16.sp, lineHeightStyle = LineHeightStyles.CentreAlignNoTrim, - fontFamily = provideFontResource("roboto_regular"), + fontFamily = FontFamily(Font(Res.font.roboto_regular)), fontWeight = FontWeight.Normal, color = TextColor.OnSurface, letterSpacing = 0.4.sp, diff --git a/designsystem/src/commonMain/resources/drawable/dog.jpg b/designsystem/src/commonMain/resources/drawable/dog.jpg deleted file mode 100644 index 800153d4f23788a5788bd1d3f49507cc0559377c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94347 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%0A-6K_S4-%HF5 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

?LiXsrUz_rgIN|6arnJpYsmk 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 PR!I;1A#uSI|5E-R(DqXE diff --git a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt deleted file mode 100644 index 6e3b63476..000000000 --- a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/Font.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.platform.Font - -@Composable -actual fun provideFontResource( - font: String, -): FontFamily = FontFamily( - Font(resource = "font/$font.ttf"), -) diff --git a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt b/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt deleted file mode 100644 index a5f33e329..000000000 --- a/designsystem/src/desktopMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/resource/String.kt +++ /dev/null @@ -1,72 +0,0 @@ -package org.hisp.dhis.mobile.ui.designsystem.resource - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.ui.res.useResource -import androidx.compose.ui.text.intl.Locale - -@Composable -actual fun provideStringResource(id: String): String { - val res by remember { mutableStateOf(getResources()) } - return res[id] ?: "Key not found" -} - -@Composable -actual fun provideQuantityStringResource(id: String, quantity: Int): String { - val appendToId = when (quantity) { - 1 -> "one" - else -> "other" - } - return provideStringResource("${id}_$appendToId").format(quantity) -} - -private fun getResources(): Map { - val stringsResources = mutableMapOf() - val localePath = "values-${Locale.current.language}/strings.xml" - val defaultPath = "values/strings.xml" - - try { - useResource(localePath) { inputStream -> - - val regex = Regex("""(.+?)""") - - inputStream.bufferedReader().useLines { lines -> - lines.forEach { line -> - val matchResult = regex.find(line) - if (matchResult != null) { - val key = matchResult.groupValues[1] - val value = matchResult.groupValues[2] - stringsResources[key] = value - } - } - } - } - } catch (e: IllegalArgumentException) { - useResource(defaultPath) { inputStream -> - val regex = Regex("""(.+?)""") - - inputStream.bufferedReader().useLines { lines -> - lines.forEach { line -> - val matchResult = regex.find(line) - if (matchResult != null) { - val key = matchResult.groupValues[1] - val value = matchResult.groupValues[2] - stringsResources[key] = value - } - } - } - } - } - return stringsResources -} - -@Composable -actual fun resourceExists(resourceName: String, resourceType: String): Boolean { - return try { - ClassLoader.getSystemResource("$resourceType/$resourceName.xml") != null - } catch (e: Exception) { - false - } -} diff --git a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png index 988d481c4..71f0cfd6d 100644 --- a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png +++ b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_ProgressIndicatorSnapshotTest_launchChip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6321860e91ededc6c6e8a833c0799444edc92570b946994bf5822f2c0ebdc7c -size 8446 +oid sha256:00cf549cc409781e800e48687795403c23f76ab33ec22ad9d3139b583ecea78a +size 14759 diff --git a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png index 88dcb99c6..bb91a4dbe 100644 --- a/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png +++ b/designsystem/src/test/snapshots/images/org.hisp.dhis.mobile.ui.designsystem_TopBarSnapshotTest_launchTopBar.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03c798becd02291a3829dcacdc715ed940d56bf5bdfd746b816b98978dc56e4c -size 15089 +oid sha256:30ac36051e0b5c2a4a957d613a2fa58b8cb8a3d7d97050627788b930bd475ddd +size 12928 diff --git a/gradle.properties b/gradle.properties index 7dfc47c20..0575ee64d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,11 +16,11 @@ kotlin.native.cacheKind=none #Android android.useAndroidX=true -android.compileSdk=34 -android.targetSdk=34 +android.compileSdk=35 +android.targetSdk=35 android.minSdk=21 #Versions -kotlin.version=2.0.0 -agp.version=8.4.1 -compose.version=1.6.11 \ No newline at end of file +kotlin.version=2.0.21 +agp.version=8.7.2 +compose.version=1.7.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 08085e25b..52663a93a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed May 22 17:58:24 IST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists