|
|
@ -50,10 +50,11 @@
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
|
|
|
|
app:layout_constraintBottom_toTopOf="@id/bottom_bar"/>
|
|
|
|
|
|
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
<View
|
|
|
|
android:id="@+id/bottom_bar"
|
|
|
|
android:id="@+id/bottom_bar"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_width="0dp"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_height="56dp"
|
|
|
|
android:background="?bottomBarBackground"
|
|
|
|
android:background="?bottomBarBackground"
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
|
@ -123,6 +124,5 @@
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"/>
|
|
|
|
app:layout_constraintBottom_toBottomOf="parent"/>
|
|
|
|
|
|
|
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</androidx.constraintlayout.motion.widget.MotionLayout>
|
|
|
|
</androidx.constraintlayout.motion.widget.MotionLayout>
|
|
|
|
|
|
|
|
|
|
|
|