#110 extrabutton added (used for delete)
This commit is contained in:
		
							parent
							
								
									d929415582
								
							
						
					
					
						commit
						88ebbe4de1
					
				
					 1 changed files with 14 additions and 5 deletions
				
			
		|  | @ -23,7 +23,10 @@ import be.ugent.sel.studeez.R.string as AppText | ||||||
| abstract class AbstractTimerFormScreen(private val timerInfo: TimerInfo) { | abstract class AbstractTimerFormScreen(private val timerInfo: TimerInfo) { | ||||||
| 
 | 
 | ||||||
|     @Composable |     @Composable | ||||||
|     operator fun invoke(onSaveClick: (TimerInfo) -> Unit) { |     operator fun invoke( | ||||||
|  |         onSaveClick: (TimerInfo) -> Unit, | ||||||
|  |         extraButton: @Composable () -> Unit | ||||||
|  |     ) { | ||||||
| 
 | 
 | ||||||
|         var name by remember { mutableStateOf(timerInfo.name) } |         var name by remember { mutableStateOf(timerInfo.name) } | ||||||
|         var description by remember { mutableStateOf(timerInfo.description) } |         var description by remember { mutableStateOf(timerInfo.description) } | ||||||
|  | @ -34,7 +37,9 @@ abstract class AbstractTimerFormScreen(private val timerInfo: TimerInfo) { | ||||||
| 
 | 
 | ||||||
|         Column( |         Column( | ||||||
|             verticalArrangement = Arrangement.SpaceBetween, |             verticalArrangement = Arrangement.SpaceBetween, | ||||||
|             modifier = Modifier.fillMaxHeight().verticalScroll(rememberScrollState()), |             modifier = Modifier | ||||||
|  |                 .fillMaxHeight() | ||||||
|  |                 .verticalScroll(rememberScrollState()), | ||||||
|         ) { |         ) { | ||||||
|             Column( |             Column( | ||||||
|                 modifier = Modifier.fillMaxWidth(), |                 modifier = Modifier.fillMaxWidth(), | ||||||
|  | @ -45,7 +50,7 @@ abstract class AbstractTimerFormScreen(private val timerInfo: TimerInfo) { | ||||||
|                 LabelledInputField( |                 LabelledInputField( | ||||||
|                     value = name, |                     value = name, | ||||||
|                     onNewValue = { name = it }, |                     onNewValue = { name = it }, | ||||||
|                     label = R.string.name |                     label = R.string.name, | ||||||
|                 ) |                 ) | ||||||
| 
 | 
 | ||||||
|                 LabelledInputField( |                 LabelledInputField( | ||||||
|  | @ -58,8 +63,12 @@ abstract class AbstractTimerFormScreen(private val timerInfo: TimerInfo) { | ||||||
|                 ExtraFields() |                 ExtraFields() | ||||||
| 
 | 
 | ||||||
|             } |             } | ||||||
|             BasicButton(R.string.save, Modifier.basicButton()) { | 
 | ||||||
|                 onSaveClick(timerInfo) |             Column { | ||||||
|  |                 BasicButton(R.string.save, Modifier.basicButton()) { | ||||||
|  |                     onSaveClick(timerInfo) | ||||||
|  |                 } | ||||||
|  |                 extraButton() | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Lukas Barragan Torres
						Lukas Barragan Torres