Commit f7f4a276 authored by Trio Saputra's avatar Trio Saputra

Merge branch 'update_trio'

parents 9154539c 14842768
app/src/main/res/drawable/minus.png

2.87 KB | W: | H:

app/src/main/res/drawable/minus.png

2.47 KB | W: | H:

app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
app/src/main/res/drawable/minus.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable/plus.png

3.52 KB | W: | H:

app/src/main/res/drawable/plus.png

5.69 KB | W: | H:

app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
app/src/main/res/drawable/plus.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
<path <path
android:pathData="M12 0H66C72.6274 0 78 5.37258 78 12V28C78 34.6274 72.6274 40 66 40H12C5.37258 40 0 34.6274 0 28V12C0 5.37258 5.37258 0 12 0Z" android:pathData="M12 0H66C72.6274 0 78 5.37258 78 12V28C78 34.6274 72.6274 40 66 40H12C5.37258 40 0 34.6274 0 28V12C0 5.37258 5.37258 0 12 0Z"
android:strokeWidth="4" android:fillColor="@color/colorPrimary"
android:strokeColor="#4D000000"
android:fillColor="#72B5B7"
/> />
</group> </group>
......
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
android:id="@+id/items" android:id="@+id/items"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="21dp" android:layout_height="21dp"
android:layout_marginStart="50dp" android:layout_marginEnd="5dp"
android:gravity="top" android:gravity="top"
android:text="" tools:text="$342424"
app:layout_constraintBottom_toBottomOf="@+id/cart" app:layout_constraintBottom_toBottomOf="@+id/cart"
app:layout_constraintStart_toEndOf="@+id/cart" app:layout_constraintStart_toEndOf="@+id/cart"
app:layout_constraintEnd_toStartOf="@+id/amount" app:layout_constraintEnd_toStartOf="@+id/amount"
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
<View <View
android:id="@+id/amount" android:id="@+id/amount"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="35dp" android:layout_height="50dp"
android:background="@drawable/rectangle_1" android:background="@drawable/rectangle_1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="65dp" android:layout_marginTop="62dp"
android:layout_marginEnd="40dp" android:layout_marginEnd="52dp"
app:layout_constraintStart_toEndOf="@+id/items" app:layout_constraintStart_toEndOf="@+id/items"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
......
...@@ -60,9 +60,10 @@ ...@@ -60,9 +60,10 @@
android:gravity="top" android:gravity="top"
android:text="" android:text=""
tools:text="$6000" tools:text="$6000"
android:layout_marginStart="20dp"
android:layout_marginBottom="20dp"
android:textAppearance="@style/some_id" android:textAppearance="@style/some_id"
app:layout_constraintBottom_toBottomOf="@+id/imageView" app:layout_constraintBottom_toBottomOf="@+id/imageView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.106" app:layout_constraintHorizontal_bias="0.106"
app:layout_constraintStart_toEndOf="@+id/imageView" app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/burger_medi" app:layout_constraintTop_toBottomOf="@+id/burger_medi"
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="@drawable/rec_qty" android:background="@drawable/rec_qty"
android:elevation="4dp"
app:layout_constraintBottom_toBottomOf="@+id/some_id" app:layout_constraintBottom_toBottomOf="@+id/some_id"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_bias="1.0"
...@@ -83,22 +85,24 @@ ...@@ -83,22 +85,24 @@
app:layout_constraintTop_toTopOf="@+id/some_id" app:layout_constraintTop_toTopOf="@+id/some_id"
app:layout_constraintVertical_bias="1.0" /> app:layout_constraintVertical_bias="1.0" />
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/btn_min" android:id="@+id/btn_min"
android:layout_width="10dp" android:layout_width="15dp"
android:layout_height="10dp" android:layout_height="15dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@drawable/minus" android:background="@drawable/minus"
app:rippleColor="@color/black"
app:layout_constraintBottom_toBottomOf="@+id/v_add" app:layout_constraintBottom_toBottomOf="@+id/v_add"
app:layout_constraintStart_toStartOf="@+id/v_add" app:layout_constraintStart_toStartOf="@+id/v_add"
app:layout_constraintTop_toTopOf="@+id/v_add" app:layout_constraintTop_toTopOf="@+id/v_add"
app:layout_constraintVertical_bias="0.566" /> app:layout_constraintVertical_bias="0.566" />
<Button <com.google.android.material.button.MaterialButton
android:id="@+id/btn_add" android:id="@+id/btn_add"
android:layout_width="10dp" android:layout_width="15dp"
android:layout_height="10dp" android:layout_height="15dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
app:rippleColor="@color/black"
android:background="@drawable/plus" android:background="@drawable/plus"
app:layout_constraintBottom_toBottomOf="@+id/v_add" app:layout_constraintBottom_toBottomOf="@+id/v_add"
app:layout_constraintEnd_toEndOf="@+id/v_add" app:layout_constraintEnd_toEndOf="@+id/v_add"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment