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
c90ed98c
Commit
c90ed98c
authored
Sep 02, 2020
by
Wahyu Wibowo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.mdd.co.id:44195/abimulya/your-cashier
into wahyu
parents
d01599e5
a77ad910
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
3 deletions
+32
-3
LoginActivity.java
...com/example/yourcashiertest/activities/LoginActivity.java
+3
-0
RegisterActivity.java
.../example/yourcashiertest/activities/RegisterActivity.java
+2
-1
User.java
...rc/main/java/com/example/yourcashiertest/models/User.java
+23
-0
UserViewModel.java
...com/example/yourcashiertest/viewmodels/UserViewModel.java
+4
-2
No files found.
app/src/main/java/com/example/yourcashiertest/activities/LoginActivity.java
View file @
c90ed98c
...
@@ -76,6 +76,9 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -76,6 +76,9 @@ public class LoginActivity extends AppCompatActivity {
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
prefManager
.
setDataUser
(
response
.
body
().
getData
().
getFullName
());
prefManager
.
setDataUser
(
response
.
body
().
getData
().
getFullName
());
finish
();
finish
();
}
else
if
(
response
.
code
()
==
302
){
Toast
.
makeText
(
getApplicationContext
(),
"Please verify your account!"
,
Toast
.
LENGTH_LONG
).
show
();
binding
.
setLoading
(
false
);
}
else
{
}
else
{
Toast
.
makeText
(
getApplicationContext
(),
response
.
body
().
getMessages
(),
Toast
.
LENGTH_LONG
).
show
();
Toast
.
makeText
(
getApplicationContext
(),
response
.
body
().
getMessages
(),
Toast
.
LENGTH_LONG
).
show
();
binding
.
setLoading
(
false
);
binding
.
setLoading
(
false
);
...
...
app/src/main/java/com/example/yourcashiertest/activities/RegisterActivity.java
View file @
c90ed98c
...
@@ -48,7 +48,8 @@ public class RegisterActivity extends AppCompatActivity {
...
@@ -48,7 +48,8 @@ public class RegisterActivity extends AppCompatActivity {
user
.
setPassword
(
binding
.
etPassword
.
getText
().
toString
());
user
.
setPassword
(
binding
.
etPassword
.
getText
().
toString
());
user
.
setPhoneNumber
(
binding
.
etPhoneNumber
.
getText
().
toString
());
user
.
setPhoneNumber
(
binding
.
etPhoneNumber
.
getText
().
toString
());
viewModel
.
registrasi
(
user
);
viewModel
.
registrasi
(
user
);
Toast
.
makeText
(
getApplicationContext
(),
"Register Was Successful"
,
Toast
.
LENGTH_LONG
).
show
();
Toast
.
makeText
(
getApplicationContext
(),
viewModel
.
getMessages
(),
Toast
.
LENGTH_LONG
).
show
();
startActivity
(
new
Intent
(
getApplicationContext
(),
LoginActivity
.
class
));
startActivity
(
new
Intent
(
getApplicationContext
(),
LoginActivity
.
class
));
finish
();
finish
();
}
}
...
...
app/src/main/java/com/example/yourcashiertest/models/User.java
View file @
c90ed98c
...
@@ -22,6 +22,13 @@ public class User implements Parcelable {
...
@@ -22,6 +22,13 @@ public class User implements Parcelable {
@SerializedName
(
"email"
)
@SerializedName
(
"email"
)
private
String
email
;
private
String
email
;
@SerializedName
(
"token"
)
private
String
token
;
@SerializedName
(
"status"
)
private
int
status
;
public
User
(
Parcel
in
)
{
public
User
(
Parcel
in
)
{
id
=
in
.
readInt
();
id
=
in
.
readInt
();
password
=
in
.
readString
();
password
=
in
.
readString
();
...
@@ -85,6 +92,22 @@ public class User implements Parcelable {
...
@@ -85,6 +92,22 @@ public class User implements Parcelable {
public
String
getEmail
(){
public
String
getEmail
(){
return
email
;
return
email
;
}
}
public
String
getToken
()
{
return
token
;
}
public
void
setToken
(
String
token
)
{
this
.
token
=
token
;
}
public
int
getStatus
()
{
return
status
;
}
public
void
setStatus
(
int
status
)
{
this
.
status
=
status
;
}
@Override
@Override
public
int
describeContents
()
{
public
int
describeContents
()
{
...
...
app/src/main/java/com/example/yourcashiertest/viewmodels/UserViewModel.java
View file @
c90ed98c
package
com
.
example
.
yourcashiertest
.
viewmodels
;
package
com
.
example
.
yourcashiertest
.
viewmodels
;
import
android.util.Log
;
import
android.util.Log
;
import
android.widget.Toast
;
import
androidx.lifecycle.MutableLiveData
;
import
androidx.lifecycle.MutableLiveData
;
import
androidx.lifecycle.ViewModel
;
import
androidx.lifecycle.ViewModel
;
import
com.example.yourcashiertest.activities.RegisterActivity
;
import
com.example.yourcashiertest.clients.ApiClient
;
import
com.example.yourcashiertest.clients.ApiClient
;
import
com.example.yourcashiertest.models.Login
;
import
com.example.yourcashiertest.models.Login
;
import
com.example.yourcashiertest.models.Password
;
import
com.example.yourcashiertest.models.Password
;
...
@@ -12,6 +14,7 @@ import com.example.yourcashiertest.models.ResponseUser;
...
@@ -12,6 +14,7 @@ import com.example.yourcashiertest.models.ResponseUser;
import
com.example.yourcashiertest.models.User
;
import
com.example.yourcashiertest.models.User
;
import
com.example.yourcashiertest.services.UserService
;
import
com.example.yourcashiertest.services.UserService
;
import
java.util.Collections
;
import
java.util.List
;
import
java.util.List
;
import
retrofit2.Call
;
import
retrofit2.Call
;
...
@@ -27,13 +30,11 @@ public class UserViewModel extends ViewModel {
...
@@ -27,13 +30,11 @@ public class UserViewModel extends ViewModel {
public
MutableLiveData
<
List
<
User
>>
getListUser
(){
public
MutableLiveData
<
List
<
User
>>
getListUser
(){
return
this
.
listUser
;
return
this
.
listUser
;
}
}
public
void
registrasi
(
User
user
){
public
void
registrasi
(
User
user
){
ApiClient
.
client
(
UserService
.
class
,
BASE_URL
).
registerUser
(
user
)
ApiClient
.
client
(
UserService
.
class
,
BASE_URL
).
registerUser
(
user
)
.
enqueue
(
new
Callback
<
User
>()
{
.
enqueue
(
new
Callback
<
User
>()
{
@Override
@Override
public
void
onResponse
(
Call
<
User
>
call
,
Response
<
User
>
response
)
{
public
void
onResponse
(
Call
<
User
>
call
,
Response
<
User
>
response
)
{
}
}
@Override
@Override
...
@@ -43,6 +44,7 @@ public class UserViewModel extends ViewModel {
...
@@ -43,6 +44,7 @@ public class UserViewModel extends ViewModel {
});
});
}
}
public
void
setListUser
(){
public
void
setListUser
(){
ApiClient
.
client
(
UserService
.
class
,
BASE_URL
).
getAllUser
().
enqueue
(
new
Callback
<
ResponseUser
>()
{
ApiClient
.
client
(
UserService
.
class
,
BASE_URL
).
getAllUser
().
enqueue
(
new
Callback
<
ResponseUser
>()
{
@Override
@Override
...
...
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