revert preview layout update

lovoo · Jun 2, 2020 · c790376 · c790376
1 parent 9a341c9
commit c790376
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 34 deletions.
diff --git a/pickapp/src/main/res/layout/pickpic_activity.xml b/pickapp/src/main/res/layout/pickpic_activity.xml
@@ -25,41 +25,28 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <include
+        android:id="@+id/selection_bar"
+        style="@style/PickPicSelectionbar"
+        layout="@layout/pickpic_layout_selectionbar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/preview_pager"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/pickpic_background_toolbar"
-            android:visibility="gone"
-            app:layout_constraintBottom_toTopOf="@id/selection_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <include
-            android:id="@+id/selection_bar"
-            style="@style/PickPicSelectionbar"
-            layout="@layout/pickpic_layout_selectionbar"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:visibility="visible"/>
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:visibility="invisible" />
 
-        <View
-            android:id="@+id/top_stroke"
-            style="@style/PickPicStroke"
-            android:layout_width="0dp"
-            app:layout_anchor="@+id/selection_bar"
-            app:layout_constraintBottom_toTopOf="@id/selection_bar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_anchorGravity="top" />
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/preview_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:background="@color/pickpic_background_toolbar"
+        android:visibility="gone" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    <View
+        android:id="@+id/top_stroke"
+        style="@style/PickPicStroke"
+        android:layout_width="match_parent"
+        app:layout_anchor="@+id/selection_bar"
+        app:layout_anchorGravity="top" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/pickapp/src/main/res/values/styles.xml b/pickapp/src/main/res/values/styles.xml
@@ -121,7 +121,7 @@
     </style>
 
     <style name="PickPicSelectionbar">
-        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:padding">0dp</item>
         <item name="android:background">@color/pickpic_background_toolbar</item>