Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
Your Cashier
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ahmad Abi Mulya
Your Cashier
Commits
9a97bd5e
Commit
9a97bd5e
authored
Aug 31, 2020
by
Wahyu Wibowo
Browse files
Options
Browse Files
Download
Plain Diff
merge from master
parents
e69326da
d5c598da
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
10 deletions
+3
-10
CartActivity.java
.../com/example/yourcashiertest/activities/CartActivity.java
+0
-1
ForgetPassword.java
...om/example/yourcashiertest/activities/ForgetPassword.java
+0
-4
PaymentActivity.java
...m/example/yourcashiertest/activities/PaymentActivity.java
+0
-1
activity_main.xml
app/src/main/res/layout/activity_main.xml
+0
-1
category_item.xml
app/src/main/res/layout/category_item.xml
+3
-3
No files found.
app/src/main/java/com/example/yourcashiertest/activities/CartActivity.java
View file @
9a97bd5e
...
@@ -2,7 +2,6 @@ package com.example.yourcashiertest.activities;
...
@@ -2,7 +2,6 @@ package com.example.yourcashiertest.activities;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.lifecycle.Observer
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
...
...
app/src/main/java/com/example/yourcashiertest/activities/ForgetPassword.java
View file @
9a97bd5e
...
@@ -14,12 +14,8 @@ import android.widget.Toast;
...
@@ -14,12 +14,8 @@ import android.widget.Toast;
import
com.example.yourcashiertest.R
;
import
com.example.yourcashiertest.R
;
import
com.example.yourcashiertest.databinding.ActivityForgetPasswordBinding
;
import
com.example.yourcashiertest.databinding.ActivityForgetPasswordBinding
;
import
com.example.yourcashiertest.models.Password
;
import
com.example.yourcashiertest.models.Password
;
import
com.example.yourcashiertest.models.User
;
import
com.example.yourcashiertest.utils.ViewUtil
;
import
com.example.yourcashiertest.viewmodels.UserViewModel
;
import
com.example.yourcashiertest.viewmodels.UserViewModel
;
import
java.util.List
;
public
class
ForgetPassword
extends
AppCompatActivity
{
public
class
ForgetPassword
extends
AppCompatActivity
{
ActivityForgetPasswordBinding
binding
;
ActivityForgetPasswordBinding
binding
;
...
...
app/src/main/java/com/example/yourcashiertest/activities/PaymentActivity.java
View file @
9a97bd5e
...
@@ -2,7 +2,6 @@ package com.example.yourcashiertest.activities;
...
@@ -2,7 +2,6 @@ package com.example.yourcashiertest.activities;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RequiresApi
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.cardview.widget.CardView
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.lifecycle.ViewModelProvider
;
...
...
app/src/main/res/layout/activity_main.xml
View file @
9a97bd5e
...
@@ -142,7 +142,6 @@
...
@@ -142,7 +142,6 @@
android:id=
"@+id/rvProducts"
android:id=
"@+id/rvProducts"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_height=
"0dp"
android:layout_marginVertical=
"15dp"
app:layout_constraintTop_toBottomOf=
"@id/rvCategory"
app:layout_constraintTop_toBottomOf=
"@id/rvCategory"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
app/src/main/res/layout/category_item.xml
View file @
9a97bd5e
...
@@ -33,13 +33,13 @@
...
@@ -33,13 +33,13 @@
<RelativeLayout
<RelativeLayout
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"
20
dp"
>
android:paddingHorizontal=
"
15
dp"
>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@{category}"
android:text=
"@{category}"
android:textS
tyle=
"bold
"
android:textS
ize=
"18sp
"
android:textSize=
"20sp
"
tools:text=
"@tools:sample/lorem
"
android:textColor=
"#fff"
android:textColor=
"#fff"
android:layout_centerInParent=
"true"
/>
android:layout_centerInParent=
"true"
/>
</RelativeLayout>
</RelativeLayout>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment