Feature/jaino/#95

app/src/main/java/com/wap/wapp/MainActivity.kt

@@ -116,6 +116,7 @@ private fun handleBottomBarState(
     profileSettingNavigationRoute -> setBottomBarState(false)
     attendanceManagementNavigationRoute -> setBottomBarState(false)
     ManagementSurveyRoute.surveyFormRegistrationRoute -> setBottomBarState(false)
+    ManagementSurveyRoute.surveyFormEditRoute("{id}") -> setBottomBarState(false)
     eventRegistrationNavigationRoute -> setBottomBarState(false)
     SurveyRoute.answerRoute("{id}") ->setBottomBarState(false)
     else -> setBottomBarState(true)

core/designresource/src/main/res/drawable/ic_add_question.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M29.32,0C36.12,0 40,3.84 40,10.66V29.34C40,36.12 36.14,40 29.34,40H10.66C3.84,40 0,36.12 0,29.34V10.66C0,3.84 3.84,0 10.66,0H29.32ZM19.98,11.02C19.06,11.02 18.32,11.76 18.32,12.68V18.32H12.66C12.22,18.32 11.8,18.5 11.48,18.8C11.18,19.12 11,19.538 11,19.98C11,20.9 11.74,21.64 12.66,21.66H18.32V27.32C18.32,28.24 19.06,28.98 19.98,28.98C20.9,28.98 21.64,28.24 21.64,27.32V21.66H27.32C28.24,21.64 28.98,20.9 28.98,19.98C28.98,19.06 28.24,18.32 27.32,18.32H21.64V12.68C21.64,11.76 20.9,11.02 19.98,11.02Z"
+      android:fillColor="#FBCF34"/>
+</vector>

core/designresource/src/main/res/drawable/ic_back.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="7dp"
-    android:height="14dp"
+    android:width="10dp"
+    android:height="20dp"
     android:viewportWidth="10"
     android:viewportHeight="20">
   <path

core/designresource/src/main/res/drawable/ic_close.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="15dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15">
+  <path
+      android:pathData="M15,1.511L13.489,0L7.5,5.989L1.511,0L0,1.511L5.989,7.5L0,13.489L1.511,15L7.5,9.011L13.489,15L15,13.489L9.011,7.5L15,1.511Z"
+      android:fillColor="#ffffff"/>
+</vector>

feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/EventsState.kt

@@ -0,0 +1,9 @@
+package com.wap.wapp.feature.management.survey
+
+import com.wap.wapp.core.model.event.Event
+
+sealed class EventsState {
+    data object Loading : EventsState()
+    data class Success(val events: List<Event>) : EventsState()
+    data class Failure(val throwable: Throwable) : EventsState()
+}

feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyDeadlineContent.kt

@@ -32,20 +32,21 @@ import java.time.LocalTime
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun SurveyDeadlineContent(
-    date: LocalDate,
-    time: LocalTime,
+    dateDeadline: LocalDate,
+    timeDeadline: LocalTime,
     timePickerState: TimePickerState,
     showDatePicker: Boolean,
     showTimePicker: Boolean,
     onDatePickerStateChanged: (Boolean) -> Unit,
     onTimePickerStateChanged: (Boolean) -> Unit,
     onDateChanged: (LocalDate) -> Unit,
     onTimeChanged: (LocalTime) -> Unit,
+    onPreviousButtonClicked: () -> Unit,
     onRegisterButtonClicked: () -> Unit,
 ) {
     if (showDatePicker) {
         WappDatePickerDialog(
-            date = date,
+            date = dateDeadline,
             onDismissRequest = { onDatePickerStateChanged(false) },
             onDateChanged = onDateChanged,
         )
@@ -77,27 +78,37 @@ internal fun SurveyDeadlineContent(
 
         DeadlineCard(
             title = stringResource(R.string.date),
-            hint = date.format(DateUtil.yyyyMMddFormatter),
+            hint = dateDeadline.format(DateUtil.yyyyMMddFormatter),
             onCardClicked = {
                 onDatePickerStateChanged(true)
             },
         )
 
         DeadlineCard(
             title = stringResource(R.string.time),
-            hint = time.format(DateUtil.HHmmFormatter),
+            hint = timeDeadline.format(DateUtil.HHmmFormatter),
             onCardClicked = {
                 onTimePickerStateChanged(true)
             },
         )
 
         Spacer(modifier = Modifier.weight(1f))
 
-        WappButton(
-            textRes = R.string.register_survey,
-            onClick = onRegisterButtonClicked,
-            modifier = Modifier.padding(bottom = 20.dp),
-        )
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(8.dp),
+        ) {
+            WappButton(
+                textRes = R.string.previous,
+                onClick = onPreviousButtonClicked,
+                modifier = Modifier.weight(1f),
+            )
+
+            WappButton(
+                textRes = R.string.next,
+                onClick = onRegisterButtonClicked,
+                modifier = Modifier.weight(1f),
+            )
+        }
     }
 }
 

feature/management-survey/src/main/java/com/wap/wapp/feature/management/survey/SurveyEventContent.kt

@@ -21,51 +21,52 @@ import com.wap.designsystem.component.CircleLoader
 import com.wap.designsystem.component.WappButton
 import com.wap.designsystem.component.WappTitle
 import com.wap.wapp.core.model.event.Event
-import com.wap.wapp.feature.management.survey.registration.SurveyFormRegistrationViewModel.EventsState
 
 @Composable
 internal fun SurveyEventContent(
     eventsState: EventsState,
     selectedEvent: Event,
     onEventSelected: (Event) -> Unit,
     onNextButtonClicked: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
-    WappTitle(
-        title = stringResource(R.string.event_selection_title),
-        content = stringResource(R.string.event_selection_content),
-        modifier = Modifier.padding(top = 10.dp, bottom = 40.dp),
-    )
+    Column(modifier = Modifier.fillMaxSize()) {
+        WappTitle(
+            title = stringResource(R.string.event_selection_title),
+            content = stringResource(R.string.event_selection_content),
+            modifier = Modifier.padding(top = 10.dp, bottom = 40.dp),
+        )
 
-    LazyColumn(
-        verticalArrangement = Arrangement.spacedBy(16.dp),
-        modifier = modifier,
-    ) {
-        when (eventsState) {
-            is EventsState.Loading -> item {
-                CircleLoader(
-                    modifier = Modifier.fillMaxSize(),
-                )
-            }
-
-            is EventsState.Success ->
-                items(eventsState.events) { event ->
-                    EventCard(
-                        event = event,
-                        selectedEvent = selectedEvent,
-                        onEventSelected = onEventSelected,
+        LazyColumn(
+            verticalArrangement = Arrangement.spacedBy(16.dp),
+            modifier = Modifier.weight(1f),
+        ) {
+            when (eventsState) {
+                is EventsState.Loading -> item {
+                    CircleLoader(
+                        modifier = Modifier.fillMaxSize(),
                     )
                 }
 
-            is EventsState.Failure -> {}
+                is EventsState.Success -> {
+                    items(eventsState.events) { event ->
+                        EventCard(
+                            event = event,
+                            selectedEvent = selectedEvent,
+                            onEventSelected = onEventSelected,
+                        )
+                    }
+                }
+
+                is EventsState.Failure -> {}
+            }
         }
-    }
 
-    WappButton(
-        textRes = R.string.next,
-        onClick = onNextButtonClicked,
-        modifier = Modifier.padding(top = 20.dp, bottom = 20.dp),
-    )
+        WappButton(
+            textRes = R.string.next,
+            onClick = onNextButtonClicked,
+            modifier = Modifier.padding(top = 16.dp),
+        )
+    }
 }
 
 @Composable