Aperture: Reorder secondary top bar buttons
* Place mode specific settings before common ones
* While at it make sure all buttons has constraint vertical bias set
Change-Id: I942612f0519f7de8b968d7f5e5fef875157fe70e
diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index 4c34aaf..bcec96d 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -114,18 +114,7 @@
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
- <Button
- android:id="@+id/timerButton"
- style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
- android:drawableTop="@drawable/ic_timer_off"
- android:text="@string/timer_off"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/aspectRatioButton"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0" />
-
+ <!-- Photo mode specific settings -->
<Button
android:id="@+id/aspectRatioButton"
style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
@@ -134,10 +123,24 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/videoQualityButton"
app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/timerButton"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
<Button
+ android:id="@+id/effectButton"
+ style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
+ android:drawableTop="@drawable/ic_effect_none"
+ android:text="@string/effect_none"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/timerButton"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/micButton"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
+
+ <!-- Video mode specific settings -->
+ <Button
android:id="@+id/videoQualityButton"
style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
android:drawableTop="@drawable/ic_video_quality_hd"
@@ -146,7 +149,8 @@
app:layout_constraintEnd_toStartOf="@+id/videoFramerateButton"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/aspectRatioButton"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/videoFramerateButton"
@@ -154,32 +158,11 @@
android:drawableTop="@drawable/ic_video_framerate"
android:text="@string/video_framerate_auto"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/effectButton"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/videoQualityButton"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/effectButton"
- style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
- android:drawableTop="@drawable/ic_effect_none"
- android:text="@string/effect_none"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/gridButton"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/videoFramerateButton"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/gridButton"
- style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
- android:drawableTop="@drawable/ic_grid_off"
- android:text="@string/grid_off"
- app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/micButton"
app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/effectButton"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintStart_toEndOf="@+id/videoQualityButton"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/micButton"
@@ -187,9 +170,34 @@
android:drawableTop="@drawable/ic_mic_off"
android:text="@string/mic_off"
app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/timerButton"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/videoFramerateButton"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
+
+ <!-- Common settings -->
+ <Button
+ android:id="@+id/timerButton"
+ style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
+ android:drawableTop="@drawable/ic_timer_off"
+ android:text="@string/timer_off"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toStartOf="@+id/gridButton"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/effectButton"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0" />
+
+ <Button
+ android:id="@+id/gridButton"
+ style="@style/Theme.Aperture.Camera.SecondaryTopBarButton"
+ android:drawableTop="@drawable/ic_grid_off"
+ android:text="@string/grid_off"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/settingsButton"
app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/gridButton"
+ app:layout_constraintStart_toEndOf="@+id/timerButton"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
@@ -201,7 +209,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toEndOf="@+id/micButton"
+ app:layout_constraintStart_toEndOf="@+id/gridButton"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
</androidx.constraintlayout.widget.ConstraintLayout>