diff --git a/CHANGELOG.md b/CHANGELOG.md index bcf9e12ef6d50a65f4f602fffda9d51c72c7fcba..a49762049b0994331461cfe48be4172a7a928184 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.4 + +- Put "delete" and "resume" buttons on same line + ## 1.0.3 - Split tag and publish CI/CD steps, minor CI/CD improvements diff --git a/lib/parameters/pages/parameters.dart b/lib/parameters/pages/parameters.dart index d07ef929945d9869f8f80636815010f26df2fc40..db584460bce23b06970527bd7ef0793b98da9def 100644 --- a/lib/parameters/pages/parameters.dart +++ b/lib/parameters/pages/parameters.dart @@ -51,31 +51,38 @@ class PageParameters extends StatelessWidget { } // Actions buttons (middle block) + final double buttonBaseSize = MediaQuery.of(context).size.width / 4; final List<Widget> blockActions = []; if (canBeResumed) { - // Resume activity - blockActions.add(AspectRatio( - aspectRatio: 3, - child: ActivityButtonResumeSaved( - onPressed: () { - appConfig.resumeActivity(context); - }, - ), - )); - // Delete saved activity - blockActions.add(SizedBox.square( - dimension: MediaQuery.of(context).size.width / 5, - child: ActivityButtonDeleteSaved( - onPressed: () { - appConfig.deleteCurrentActivity(context); - }, - ), + blockActions.add(Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + // Delete saved activity + SizedBox.fromSize( + size: Size(buttonBaseSize, buttonBaseSize), + child: ActivityButtonDeleteSaved( + onPressed: () { + appConfig.deleteCurrentActivity(context); + }, + ), + ), + // Resume activity + SizedBox.fromSize( + size: Size(2.9 * buttonBaseSize, buttonBaseSize), + child: ActivityButtonResumeSaved( + onPressed: () { + appConfig.resumeActivity(context); + }, + ), + ), + ], )); } else { // Start new activity blockActions.add( - AspectRatio( - aspectRatio: 3, + SizedBox.fromSize( + size: Size(4 * buttonBaseSize, buttonBaseSize), child: ActivityButtonStartNew( onPressed: () { appConfig.startNewActivity(context); diff --git a/pubspec.yaml b/pubspec.yaml index 1108353478ae1f668780c19ea18057f290d0dea4..ea201a54951fbdb1f1adc3b9da1fd21b4991124c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: "Flutter custom toolbox for org.benoitharrault.* projects." publish_to: https://pub.harrault.fr/ -version: 1.0.3 +version: 1.0.4 homepage: https://git.harrault.fr/android/flutter-toolbox