Commit 37892e22 authored by Wahyu Wibowo's avatar Wahyu Wibowo

Merge branch 'master' of https://git.mdd.co.id:44195/abimulya/your-cashier into wahyu

parents 486f275f e5617de2
......@@ -13,13 +13,14 @@
android:required="true" />
<application
android:name=".CashierApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:name=".CashierApp"
android:theme="@style/AppTheme2">
<activity android:name=".activities.OrderActivity"></activity>
<activity
android:name=".activities.SkActivity"
android:screenOrientation="portrait" />
......
package com.example.yourcashiertest.activities;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import com.example.yourcashiertest.R;
public class OrderActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_order);
}
}
\ No newline at end of file
......@@ -97,7 +97,6 @@ public class PaymentActivity extends AppCompatActivity {
}
}
}
}
@Override
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp"
tools:context=".activities.OrderActivity">
<TextView
android:id="@+id/tvListOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="top"
android:layout_marginBottom="4dp"
android:text="TRANSACTION LIST"
android:textAppearance="@style/payment"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.105" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnPending"
android:layout_width="190dp"
android:layout_height="wrap_content"
android:text="PENDING"
android:textSize="10dp"
android:backgroundTint="@color/colorPending"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvListOrder"
app:layout_constraintBottom_toTopOf="@id/rvListOrder"
tools:layout_editor_absoluteX="16dp"
tools:layout_editor_absoluteY="654dp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSuccess"
android:layout_width="190dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:text="SUCCESS"
android:textSize="10dp"
app:layout_constraintBottom_toTopOf="@id/rvListOrder"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvListOrder"
app:layout_constraintVertical_bias="0.0" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvListOrder"
android:layout_width="match_parent"
android:layout_height="0dp"
android:padding="@dimen/space_small"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/btnPending"
tools:listitem="@layout/item_order" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="cartProduct"
type="com.example.yourcashiertest.entities.Cart" />
<variable
name="qty"
type="String" />
<variable
name="price"
type="String" />
</data>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Burger Medium -->
<TextView
android:id="@+id/tvOrderNumber"
android:layout_width="136dp"
android:layout_height="41dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:text="Order Number : "
android:textAppearance="@style/burger_medi"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
<TextView
android:id="@+id/tvOrderId"
android:layout_width="250dp"
android:layout_height="41dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:textAppearance="@style/some_id"
app:layout_constraintStart_toEndOf="@id/tvOrderNumber"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="169dp"
tools:text="@{price}" />
<TextView
android:id="@+id/tvTotal"
android:layout_width="136dp"
android:layout_height="41dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:text="Total : "
android:textAppearance="@style/burger_medi"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvOrderNumber" />
<TextView
android:id="@+id/tvAmount"
android:layout_width="250dp"
android:layout_height="41dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:textAppearance="@style/some_id"
app:layout_constraintStart_toEndOf="@id/tvTotal"
app:layout_constraintTop_toBottomOf="@id/tvOrderId"
tools:layout_editor_absoluteX="169dp"
tools:text="@{price}"/>
<TextView
android:id="@+id/tvStatus"
android:layout_width="136dp"
android:layout_height="41dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:gravity="center"
android:text="@{}"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvTotal"
tools:text="Success" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnContinue"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="4dp"
android:text="CONTINUE"
android:textSize="10dp"
app:layout_constraintStart_toEndOf="@id/tvStatus"
app:layout_constraintTop_toBottomOf="@id/tvAmount" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnCancel"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="4dp"
android:text="CANCEL"
android:textSize="10dp"
app:backgroundTint="@color/colorDanger"
app:layout_constraintStart_toEndOf="@id/btnContinue"
app:layout_constraintTop_toBottomOf="@id/tvAmount" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</layout>
\ No newline at end of file
......@@ -12,6 +12,7 @@
<color name="color_white">#fff</color>
<color name="color_grey">#fff</color>
<color name="blue">#2196F3</color>
<color name="colorPending">#FF9800</color>
<!-- dots inactive colors -->
<color name="dot_dark_screen1">#FFFFF0</color>
<color name="dot_dark_screen2">#FFFFF0</color>
......
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