Skip to content

Commit

Permalink
#57 edit window menu drinkable
Browse files Browse the repository at this point in the history
  • Loading branch information
@DariaZubkova
DariaZubkova authored Jul 10, 2020
1 parent 13dd88c commit b64613b
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 74 deletions.
177 changes: 104 additions & 73 deletions app/src/main/res/layout/activity_menu_filter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,107 +6,138 @@
android:layout_height="match_parent"
tools:context=".MenuFilterActivity">

<RelativeLayout
<LinearLayout
android:id="@+id/windowFilter"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/rounded_new_background"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints">

<TextView
android:id="@+id/sizeFilter"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="30sp"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="20dp"
android:background="@drawable/rounded_new_background"
android:fontFamily="@font/roboto_bold"
android:textStyle="bold"
android:textColor="@color/colorAccent"
android:text="Size"
android:textAlignment="center"
/>
android:textColor="@color/colorAccent"
android:textSize="26sp"
android:textStyle="bold" />

<Button
android:id="@+id/s1"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/layoutSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/sizeFilter"
android:orientation="horizontal"
app:layout_constraintTop_toTopOf="@id/sizeFilter"
android:layout_marginTop="15dp"
app:layout_constraintStart_toStartOf="@id/sizeFilter"
android:layout_marginStart="15dp"
android:gravity="center"
android:background="@drawable/rounded_button"
android:fontFamily="@font/roboto_bold"
android:textColor="@color/colorBackground"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.2"
tools:ignore="ButtonStyle"
/>
android:layout_marginTop="15dp">

<Button
android:id="@+id/s2"
android:layout_width="wrap_content"
<Button
android:id="@+id/s1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/colorBackground"
android:textStyle="bold"
android:alpha="0.7"
android:background="@drawable/rounded_button"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.2"
tools:ignore="ButtonStyle"
/>

<Button
android:id="@+id/s2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/colorBackground"
android:textStyle="bold"
android:alpha="0.7"
android:background="@drawable/rounded_button"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.4"
tools:ignore="ButtonStyle"
/>

<Button
android:id="@+id/s3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/colorBackground"
android:textStyle="bold"
android:alpha="0.7"
android:background="@drawable/rounded_button"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.5"
tools:ignore="ButtonStyle"
/>
</LinearLayout>

<TextView
android:id="@+id/priceFilter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/sizeFilter"
android:layout_marginTop="15dp"
app:layout_constraintStart_toStartOf="@id/s1"
android:layout_marginStart="5dp"
android:gravity="center"
android:background="@drawable/rounded_button"
android:fontFamily="@font/roboto_bold"
android:textColor="@color/colorBackground"
android:layout_below="@id/sizeFilter"
android:layout_toRightOf="@id/s1"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.4"
tools:ignore="ButtonStyle"
/>
app:layout_constraintTop_toTopOf="@id/layoutSize"
android:layout_marginTop="30dp"
android:text="Price"
android:textStyle="bold"
android:textColor="@color/colorAccent"
android:textSize="26sp"
android:gravity="center" />


</LinearLayout>

<LinearLayout
android:id="@+id/layoutBottom"
android:padding="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginBottom="16dp"
android:orientation="horizontal">

<Button
android:id="@+id/s3"
android:layout_width="wrap_content"
android:id="@+id/buttonResent"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="15dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="5dp"
android:gravity="center"
android:background="@drawable/rounded_button"
android:fontFamily="@font/roboto_bold"
android:text="@string/reset"
android:textColor="@color/colorBackground"
android:layout_below="@id/sizeFilter"
android:layout_toRightOf="@id/s2"
android:textSize="18sp"
android:textAllCaps="false"
android:text="0.5"
tools:ignore="ButtonStyle"
/>
android:textStyle="bold"
android:textSize="16sp"/>

<Space
android:layout_weight="1.9"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<Button
android:id="@+id/buttonAccept"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:background="@drawable/rounded_button"
android:fontFamily="@font/roboto_bold"
android:text="@string/accept"
android:textColor="@color/colorBackground"
android:layout_alignParentBottom="true"
android:textSize="18sp"
android:textAllCaps="false"
android:text="Accept"
tools:ignore="ButtonStyle"
/>



android:textStyle="bold"
android:textSize="16sp"/>

</RelativeLayout>
</LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/grid_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:layout_below="@id/sizeDrinkables"
android:layout_marginTop="5dp"
app:layout_constraintTop_toTopOf="@id/sizeDrinkables"
app:srcCompat="@drawable/ic_launcher_foreground" />
android:src="@drawable/ic_launcher_foreground" />

<TextView
android:id="@+id/priceDrinkables"
Expand Down

0 comments on commit b64613b

Please sign in to comment.