Aperture: Make SecondaryTopBarButton square

This makes sure that text after rotation will be rendered perfectly.

Change-Id: If829ac348227fbcfb1a5b87b4c4da83486d43756

2 files changed, 9 insertions, 1 deletions

diff --git a/app/src/main/res/layout/activity_camera.xml b/app/src/main/res/layout/activity_camera.xml
index a4e82ae..b92353a 100644
--- a/app/src/main/res/layout/activity_camera.xml
+++ b/app/src/main/res/layout/activity_camera.xml
@@ -133,6 +133,7 @@
                 android:drawableTop="@drawable/ic_aspect_ratio_4_3"
                 android:text="@string/aspect_ratio_4_3"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/effectButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="parent"
@@ -145,6 +146,7 @@
                 android:drawableTop="@drawable/ic_effect_none"
                 android:text="@string/effect_none"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/videoQualityButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/aspectRatioButton"
@@ -158,6 +160,7 @@
                 android:drawableTop="@drawable/ic_video_quality_hd"
                 android:text="@string/video_quality_fhd"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/videoFramerateButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/effectButton"
@@ -170,6 +173,7 @@
                 android:drawableTop="@drawable/ic_video_framerate"
                 android:text="@string/video_framerate_auto"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/micButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/videoQualityButton"
@@ -182,6 +186,7 @@
                 android:drawableTop="@drawable/ic_mic_off"
                 android:text="@string/mic_off"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/timerButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/videoFramerateButton"
@@ -195,6 +200,7 @@
                 android:drawableTop="@drawable/ic_timer_off"
                 android:text="@string/timer_off"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/gridButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/micButton"
@@ -207,6 +213,7 @@
                 android:drawableTop="@drawable/ic_grid_off"
                 android:text="@string/grid_off"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toStartOf="@+id/settingsButton"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/timerButton"
@@ -219,6 +226,7 @@
                 android:drawableTop="@drawable/ic_settings"
                 android:text="@string/settings"
                 app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintDimensionRatio="1:1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/gridButton"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 24072b4..71b293f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -66,7 +66,7 @@
 
     <!-- Secondary top bar icons theme -->
     <style name="Theme.Aperture.Camera.SecondaryTopBarButton" parent="Theme.Aperture.Camera.SecondaryBarButton">
-        <item name="android:layout_width">108dp</item>
+        <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingHorizontal">0dp</item>
         <item name="android:textStyle">bold</item>