Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meser
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
Muhammad Suryono
meser
Commits
3abd9e8d
Commit
3abd9e8d
authored
Aug 25, 2020
by
Alfansyah Fadlian
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://git.mdd.co.id:44195/muhammadsuryono/meser
into dashboard
parents
9a937309
22083683
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
6 deletions
+26
-6
MainActivity.java
app/src/main/java/com/yono/messeripos/MainActivity.java
+12
-1
ProductAdapter.java
...main/java/com/yono/messeripos/adapter/ProductAdapter.java
+0
-3
MainViewModelsCart.java
...n/java/com/yono/messeripos/models/MainViewModelsCart.java
+11
-2
CartRepositories.java
...va/com/yono/messeripos/repositories/CartRepositories.java
+3
-0
No files found.
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @
3abd9e8d
...
@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity;
...
@@ -16,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.databinding.DataBindingUtil
;
import
androidx.lifecycle.Observer
;
import
androidx.lifecycle.Observer
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.lifecycle.ViewModelProviders
;
import
androidx.lifecycle.ViewModelProviders
;
import
androidx.recyclerview.widget.GridLayoutManager
;
import
androidx.recyclerview.widget.GridLayoutManager
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
...
@@ -25,6 +26,8 @@ import com.google.android.material.button.MaterialButton;
...
@@ -25,6 +26,8 @@ import com.google.android.material.button.MaterialButton;
import
com.yono.messeripos.adapter.ProductAdapter
;
import
com.yono.messeripos.adapter.ProductAdapter
;
import
com.yono.messeripos.databinding.ActivityMainBinding
;
import
com.yono.messeripos.databinding.ActivityMainBinding
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.MainViewModelsCart
;
import
com.yono.messeripos.models.ProductCartModels
;
import
com.yono.messeripos.models.ProductModels
;
import
com.yono.messeripos.models.ProductModels
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.yono.messeripos.adapter.CategoryAdapter
;
import
com.yono.messeripos.adapter.CategoryAdapter
;
...
@@ -46,7 +49,7 @@ public class MainActivity extends AppCompatActivity {
...
@@ -46,7 +49,7 @@ public class MainActivity extends AppCompatActivity {
CategoryAdapter
categoryAdapter
;
CategoryAdapter
categoryAdapter
;
ProductAdapter
productAdapter
;
ProductAdapter
productAdapter
;
public
static
Boolean
status_update
=
false
;
public
static
Boolean
status_update
=
false
;
Ma
terialButton
addTo
Cart
;
Ma
inViewModelsCart
mainViewModels
Cart
;
@Override
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
...
@@ -58,6 +61,7 @@ public class MainActivity extends AppCompatActivity {
...
@@ -58,6 +61,7 @@ public class MainActivity extends AppCompatActivity {
categoryAdapter
=
new
CategoryAdapter
();
categoryAdapter
=
new
CategoryAdapter
();
productAdapter
=
new
ProductAdapter
();
productAdapter
=
new
ProductAdapter
();
mainViewModelsCart
=
new
ViewModelProvider
(
this
).
get
(
MainViewModelsCart
.
class
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
)
{
...
@@ -76,6 +80,13 @@ public class MainActivity extends AppCompatActivity {
...
@@ -76,6 +80,13 @@ public class MainActivity extends AppCompatActivity {
status_update
=
true
;
status_update
=
true
;
binding
.
rvCategory
.
setVisibility
(
View
.
GONE
);
binding
.
rvCategory
.
setVisibility
(
View
.
GONE
);
productAdapter
.
notifyDataSetChanged
();
productAdapter
.
notifyDataSetChanged
();
mainViewModelsCart
.
getCartProduct
().
observe
(
MainActivity
.
this
,
new
Observer
<
List
<
ProductCartModels
>>()
{
@Override
public
void
onChanged
(
List
<
ProductCartModels
>
productCartModels
)
{
String
js
=
new
Gson
().
toJson
(
productCartModels
);
Log
.
d
(
"from cart"
,
"Response "
+
js
);
}
});
}
else
if
(
id
==
R
.
id
.
create
)
{
}
else
if
(
id
==
R
.
id
.
create
)
{
startActivity
(
new
Intent
(
getApplicationContext
(),
FormProductActivity
.
class
));
startActivity
(
new
Intent
(
getApplicationContext
(),
FormProductActivity
.
class
));
}
}
...
...
app/src/main/java/com/yono/messeripos/adapter/ProductAdapter.java
View file @
3abd9e8d
...
@@ -120,9 +120,6 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.MyViewHo
...
@@ -120,9 +120,6 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.MyViewHo
products
.
getPriceProduct
(),
products
.
getPriceProduct
(),
0
0
));
));
String
js
=
new
Gson
().
toJson
(
mainViewModelsCart
.
getCart
());
Log
.
d
(
"onClick: "
,
""
+
js
);
}
}
});
});
}
}
...
...
app/src/main/java/com/yono/messeripos/models/MainViewModelsCart.java
View file @
3abd9e8d
package
com
.
yono
.
messeripos
.
models
;
package
com
.
yono
.
messeripos
.
models
;
import
android.app.Application
;
import
android.app.Application
;
import
android.util.Log
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.lifecycle.AndroidViewModel
;
import
androidx.lifecycle.AndroidViewModel
;
...
@@ -8,6 +9,7 @@ import androidx.lifecycle.LiveData;
...
@@ -8,6 +9,7 @@ import androidx.lifecycle.LiveData;
import
androidx.lifecycle.MutableLiveData
;
import
androidx.lifecycle.MutableLiveData
;
import
androidx.lifecycle.Transformations
;
import
androidx.lifecycle.Transformations
;
import
com.google.gson.Gson
;
import
com.yono.messeripos.repositories.CartRepositories
;
import
com.yono.messeripos.repositories.CartRepositories
;
import
java.util.List
;
import
java.util.List
;
...
@@ -19,14 +21,19 @@ public class MainViewModelsCart extends AndroidViewModel {
...
@@ -19,14 +21,19 @@ public class MainViewModelsCart extends AndroidViewModel {
private
CartRepositories
cartRepositories
;
private
CartRepositories
cartRepositories
;
public
void
set
Produc
t
(
ProductCartModels
product
){
this
.
cart
.
setValue
(
product
);}
public
void
set
Car
t
(
ProductCartModels
product
){
this
.
cart
.
setValue
(
product
);}
public
LiveData
<
List
<
ProductCartModels
>>
getProduct
(){
return
productsLive
;}
public
LiveData
<
List
<
ProductCartModels
>>
getCartProduct
(){
return
productsLive
;
}
public
MainViewModelsCart
(
@NonNull
Application
application
)
{
public
MainViewModelsCart
(
@NonNull
Application
application
)
{
super
(
application
);
super
(
application
);
cartRepositories
=
new
CartRepositories
(
application
);
cartRepositories
=
new
CartRepositories
(
application
);
productsLive
=
cartRepositories
.
getDataCart
();
}
}
public
void
insertCart
(
ProductCartModels
productCartModels
){
cartRepositories
.
insert
(
productCartModels
);}
public
void
insertCart
(
ProductCartModels
productCartModels
){
cartRepositories
.
insert
(
productCartModels
);}
...
@@ -36,6 +43,8 @@ public class MainViewModelsCart extends AndroidViewModel {
...
@@ -36,6 +43,8 @@ public class MainViewModelsCart extends AndroidViewModel {
public
void
deleteCart
(
ProductCartModels
productCartModels
){
cartRepositories
.
delete
(
productCartModels
);}
public
void
deleteCart
(
ProductCartModels
productCartModels
){
cartRepositories
.
delete
(
productCartModels
);}
public
MutableLiveData
<
ProductCartModels
>
getCart
(){
public
MutableLiveData
<
ProductCartModels
>
getCart
(){
// String js = new Gson().toJson(cartRepositories.getDataCart());
// Log.d("Get data cart", "Response "+js);
return
cart
;
return
cart
;
}
}
}
}
app/src/main/java/com/yono/messeripos/repositories/CartRepositories.java
View file @
3abd9e8d
package
com
.
yono
.
messeripos
.
repositories
;
package
com
.
yono
.
messeripos
.
repositories
;
import
android.app.Application
;
import
android.app.Application
;
import
android.util.Log
;
import
androidx.lifecycle.LiveData
;
import
androidx.lifecycle.LiveData
;
import
com.google.gson.Gson
;
import
com.yono.messeripos.daos.CartDaos
;
import
com.yono.messeripos.daos.CartDaos
;
import
com.yono.messeripos.database.LocalDatabase
;
import
com.yono.messeripos.database.LocalDatabase
;
import
com.yono.messeripos.models.ProductCartModels
;
import
com.yono.messeripos.models.ProductCartModels
;
...
@@ -18,6 +20,7 @@ public class CartRepositories {
...
@@ -18,6 +20,7 @@ public class CartRepositories {
LocalDatabase
db
=
LocalDatabase
.
geDatabase
(
application
);
LocalDatabase
db
=
LocalDatabase
.
geDatabase
(
application
);
cartDaos
=
db
.
cartDaos
();
cartDaos
=
db
.
cartDaos
();
products
=
cartDaos
.
getCart
();
products
=
cartDaos
.
getCart
();
Log
.
d
(
"Data cart"
,
"Response "
+
products
);
}
}
public
void
insert
(
ProductCartModels
productCartModels
){
public
void
insert
(
ProductCartModels
productCartModels
){
...
...
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