Skip to content

M
meser
Commit 35045735 authored by iman Fauzi's avatar iman Fauzi
Browse files
Options

remake item list

parent a222c180
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 54 deletions
app/src/main/java/com/yono/messeripos/HistoryActivity.java
View file @ 35045735
...@@ -10,8 +10,10 @@ import android.content.Intent; ...@@ -10,8 +10,10 @@ import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ProgressBar;
import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.appbar.MaterialToolbar;
import com.yono.messeripos.adapter.TransactionAdapter; import com.yono.messeripos.adapter.TransactionAdapter;
...@@ -31,6 +33,7 @@ public class HistoryActivity extends AppCompatActivity { ...@@ -31,6 +33,7 @@ public class HistoryActivity extends AppCompatActivity {
MainViewModels mainViewModels; MainViewModels mainViewModels;
RecyclerView recyclerView; RecyclerView recyclerView;
Utils utils = new Utils(); Utils utils = new Utils();
ProgressBar loading;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -44,6 +47,9 @@ public class HistoryActivity extends AppCompatActivity { ...@@ -44,6 +47,9 @@ public class HistoryActivity extends AppCompatActivity {
MaterialToolbar toolbars = findViewById(R.id.cAppBar); MaterialToolbar toolbars = findViewById(R.id.cAppBar);
recyclerView = findViewById(R.id.rvHistory); recyclerView = findViewById(R.id.rvHistory);
loading = findViewById(R.id.loading);
loading.setVisibility(View.VISIBLE);
recyclerView.addItemDecoration(utils.dividerItemDecoration(HistoryActivity.this)); recyclerView.addItemDecoration(utils.dividerItemDecoration(HistoryActivity.this));
transactionAdapter = new TransactionAdapter(); transactionAdapter = new TransactionAdapter();
mainViewModels = new ViewModelProvider(this).get(MainViewModels.class); mainViewModels = new ViewModelProvider(this).get(MainViewModels.class);
...@@ -75,6 +81,8 @@ public class HistoryActivity extends AppCompatActivity { ...@@ -75,6 +81,8 @@ public class HistoryActivity extends AppCompatActivity {
* SILAHKAN PINDAH KE ACTIVITY SELANJUTNYA PADA ON..... * SILAHKAN PINDAH KE ACTIVITY SELANJUTNYA PADA ON.....
* */ * */
loading.setVisibility(View.GONE);
recyclerView.setLayoutManager(new LinearLayoutManager(HistoryActivity.this,RecyclerView.VERTICAL,false)); recyclerView.setLayoutManager(new LinearLayoutManager(HistoryActivity.this,RecyclerView.VERTICAL,false));
recyclerView.setAdapter(transactionAdapter); recyclerView.setAdapter(transactionAdapter);
} }
......
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @ 35045735
...@@ -7,9 +7,11 @@ import android.content.Intent; ...@@ -7,9 +7,11 @@ import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.service.controls.actions.ModeAction;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
...@@ -415,11 +417,8 @@ public class MainActivity extends AppCompatActivity { ...@@ -415,11 +417,8 @@ public class MainActivity extends AppCompatActivity {
} }
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.menu_cart){
Toast.makeText(MainActivity.this, "dfjhgkjdfgkdfg", Toast.LENGTH_LONG).show();
}
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
......
app/src/main/res/drawable/ic_baseline_done_24.xml 0 → 100644
View file @ 35045735
<vector android:height="24dp" android:tint="#4DFF42"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>
app/src/main/res/layout/activity_history.xml
View file @ 35045735
...@@ -10,15 +10,23 @@ ...@@ -10,15 +10,23 @@
android:id="@+id/cAppBar" android:id="@+id/cAppBar"
layout="@layout/app_bar" /> layout="@layout/app_bar" />
<ProgressBar
android:id="@+id/loading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:elevation="1dp"/>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="600dp" android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:layout_below="@+id/cAppBar"> android:layout_below="@+id/cAppBar">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvHistory" android:id="@+id/rvHistory"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_below="@id/cAppBar" android:layout_below="@id/cAppBar"
tools:listitem="@layout/item_history" /> tools:listitem="@layout/item_history" />
</ScrollView> </ScrollView>
......
app/src/main/res/layout/item_list.xml
View file @ 35045735
...@@ -21,47 +21,45 @@ ...@@ -21,47 +21,45 @@
type="String" /> type="String" />
</data> </data>
<androidx.constraintlayout.widget.ConstraintLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="match_parent">
android:layout_marginHorizontal="5dp"
android:layout_marginVertical="10dp">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
app:cardElevation="0dp" app:cardElevation="0dp"
app:strokeWidth="1dp" app:strokeWidth="1dp"
app:strokeColor="#3CB3B3B3" app:strokeColor="#3CB3B3B3"
app:cardCornerRadius="10dp"> app:cardCornerRadius="10dp">
<androidx.constraintlayout.widget.ConstraintLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:padding="10dp">
<ImageView <ImageView
android:id="@+id/image_product" android:id="@+id/image_product"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@mipmap/ic_meser_icon" android:src="@mipmap/ic_meser_icon"
app:layout_constraintTop_toTopOf="parent" app:url="@{image}"/>
app:url="@{image}"
android:scaleType="fitXY"/>
<ImageView <ImageView
android:id="@+id/btnDelete" android:id="@+id/btnDelete"
android:layout_width="30dp" android:layout_width="wrap_content"
android:layout_height="30dp" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" android:layout_alignParentEnd="true"
app:layout_constraintTop_toTopOf="parent" android:layout_alignParentTop="true"
android:src="@drawable/ic_baseline_delete_24"/> android:src="@drawable/ic_baseline_delete_24"/>
<ImageView <ImageView
android:id="@+id/btnEdit" android:id="@+id/btnEdit"
android:layout_width="30dp" android:layout_width="wrap_content"
android:layout_height="30dp" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:layout_alignParentStart="true"
app:layout_constraintStart_toStartOf="parent" android:layout_alignParentTop="true"
android:src="@drawable/ic_baseline_edit_24"/> android:src="@drawable/ic_baseline_edit_24"/>
<TextView <TextView
...@@ -72,13 +70,12 @@ ...@@ -72,13 +70,12 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:text="@tools:sample/full_names" tools:text="@tools:sample/full_names"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:textSize="18sp" android:textSize="18sp"
android:lines="1" android:lines="1"
android:textStyle="bold" android:textStyle="bold"
android:text="@{products.productName}" android:text="@{products.productName}"
android:maxLength="25"/> android:maxLength="25"
android:layout_below="@id/image_product"/>
<TextView <TextView
android:id="@+id/price" android:id="@+id/price"
...@@ -88,42 +85,40 @@ ...@@ -88,42 +85,40 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
tools:text="@tools:sample/full_names" tools:text="@tools:sample/full_names"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:textSize="18sp" android:textSize="18sp"
android:lines="1" android:lines="1"
android:text="@{price}" android:text="@{price}"
android:maxLength="25"/> android:maxLength="25"
android:layout_below="@id/title_product"/>
<TextView <TextView
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/title_product" android:paddingHorizontal="10dp"
app:layout_constraintStart_toEndOf="@id/price"
tools:text="@tools:sample/full_names"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:textSize="10sp" android:textSize="10sp"
android:lines="1" android:lines="1"
android:textAllCaps="true" android:textAllCaps="true"
android:text="@{status}" android:text="@{status}"
android:maxLength="25"/> android:maxLength="25"
android:layout_toEndOf="@id/price"
</androidx.constraintlayout.widget.ConstraintLayout> android:layout_above="@id/materialBtnAddCart"
android:layout_marginLeft="15dp"
android:layout_marginBottom="5dp"
tools:text="@tools:sample/full_names"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/materialBtnAddCart"
android:padding="1dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/price"
android:text="Add To Cart"/>
<com.google.android.material.button.MaterialButton </RelativeLayout>
android:id="@+id/materialBtnAddCart"
android:padding="1dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="Add To Cart"/>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/menu/menu_bar.xml deleted 100644 → 0
View file @ a222c180
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
</menu>
\ No newline at end of file
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