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
041fcb0e
Commit
041fcb0e
authored
Sep 01, 2020
by
iman Fauzi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into cart
parents
f9c55f16
18818fbe
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
93 additions
and
14 deletions
+93
-14
FormProductActivity.java
...rc/main/java/com/yono/messeripos/FormProductActivity.java
+24
-11
LoginActivity.java
app/src/main/java/com/yono/messeripos/LoginActivity.java
+56
-0
MainActivity.java
app/src/main/java/com/yono/messeripos/MainActivity.java
+6
-3
Utils.java
app/src/main/java/com/yono/messeripos/utils/Utils.java
+7
-0
No files found.
app/src/main/java/com/yono/messeripos/FormProductActivity.java
View file @
041fcb0e
...
@@ -44,7 +44,9 @@ import java.io.File;
...
@@ -44,7 +44,9 @@ import java.io.File;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
retrofit2.Call
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Callback
;
...
@@ -177,22 +179,33 @@ public class FormProductActivity extends AppCompatActivity {
...
@@ -177,22 +179,33 @@ public class FormProductActivity extends AppCompatActivity {
});
});
}
}
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
N
)
private
void
setSpinner
(
String
s
)
{
private
void
setSpinner
(
String
s
)
{
progressDialog
.
show
();
HashSet
<
String
>
set
=
new
HashSet
<>();
List
<
String
>
str
=
new
ArrayList
<>();
categoryModels
=
new
ArrayList
<>();
categoryModels
=
new
ArrayList
<>();
categoryModels
.
add
(
"SELECT CATEGORY"
);
str
.
add
(
"SELECT CATEGORY"
);
mainViewModels
.
getCategory
().
observe
(
this
,
listDataResponse
->
{
mainViewModels
.
getCategory
().
observe
(
this
,
listDataResponse
->
{
progressDialog
.
dismiss
();
List
<
CategoryModels
>
cate
=
listDataResponse
.
getData
();
for
(
CategoryModels
cd:
listDataResponse
.
getData
()){
for
(
CategoryModels
cd:
cate
){
categoryModels
.
add
(
cd
.
getNameCategory
());
categoryModels
.
add
(
cd
.
getNameCategory
());
}
}
// Log.i("Spinner data", "onCreate: "+utils.convertGson(categoryModels));
@SuppressLint
(
"ResourceType"
)
List
<
String
>
collect
=
categoryModels
.
stream
().
map
(
v
->
{
ArrayAdapter
<
String
>
dataAdapter
=
new
ArrayAdapter
<
String
>(
FormProductActivity
.
this
,
R
.
id
.
listCategory
,
categoryModels
);
if
(
set
.
add
(
v
)
==
true
)
{
binding
.
listCategory
.
setAdapter
(
dataAdapter
);
str
.
add
(
v
);
progressDialog
.
dismiss
();
}
return
v
;
}).
collect
(
Collectors
.
toList
());
Log
.
i
(
"SPINNER"
,
"setSpinner: "
+
utils
.
convertGson
(
str
));
@SuppressLint
(
"ResourceType"
)
ArrayAdapter
<
String
>
dataAdapter
=
new
ArrayAdapter
<
String
>(
FormProductActivity
.
this
,
R
.
id
.
listCategory
,
str
);
binding
.
listCategory
.
setAdapter
(
dataAdapter
);
});
});
}
}
...
...
app/src/main/java/com/yono/messeripos/LoginActivity.java
View file @
041fcb0e
...
@@ -26,6 +26,7 @@ import com.google.android.material.textfield.TextInputEditText;
...
@@ -26,6 +26,7 @@ import com.google.android.material.textfield.TextInputEditText;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.UsersModels
;
import
com.yono.messeripos.models.UsersModels
;
import
com.yono.messeripos.response.DataResponse
;
import
com.yono.messeripos.response.DataResponse
;
import
com.yono.messeripos.utils.Utils
;
public
class
LoginActivity
extends
AppCompatActivity
{
public
class
LoginActivity
extends
AppCompatActivity
{
...
@@ -34,6 +35,7 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -34,6 +35,7 @@ public class LoginActivity extends AppCompatActivity {
MainViewModels
mainViewModels
;
MainViewModels
mainViewModels
;
ProgressBar
progressBar
;
ProgressBar
progressBar
;
SharedPreferences
sharedPreferences
;
SharedPreferences
sharedPreferences
;
Utils
utils
=
new
Utils
();
MaterialButton
btnSignin
;
MaterialButton
btnSignin
;
ConstraintLayout
loginSheetLayout
;
ConstraintLayout
loginSheetLayout
;
...
@@ -69,6 +71,7 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -69,6 +71,7 @@ public class LoginActivity extends AppCompatActivity {
sheetBehavior
=
BottomSheetBehavior
.
from
(
loginSheetLayout
);
sheetBehavior
=
BottomSheetBehavior
.
from
(
loginSheetLayout
);
sheetBehavior
.
setDraggable
(
false
);
sheetBehavior
.
setDraggable
(
false
);
// button on click
// button on click
btnSignin
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
btnSignin
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
...
@@ -81,6 +84,59 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -81,6 +84,59 @@ public class LoginActivity extends AppCompatActivity {
}
}
});
});
/*
* LOGIN LOGIKA DIBAWAH INI
* */
//<<<<<<< HEAD
// public void onClick(View v) {
// Snackbar snackbar = Snackbar.make(v, "Oppss! Wrong Username Or Password!", Snackbar.LENGTH_LONG);
//
// if (TextUtils.isEmpty(username.getText().toString()) &&
// TextUtils.isEmpty(password.getText().toString())){
// username.setError("This field can't empty");
// password.setError("This field can't empty");
// }else if (TextUtils.isEmpty(username.getText().toString())){
// username.setError("This field can't empty");
// }else if (TextUtils.isEmpty(password.getText().toString())){
// password.setError("This field can't empty");
// }else{
// progressBar.setVisibility(View.VISIBLE);
// username.setEnabled(false);
// password.setEnabled(false);
// btnLogin.setEnabled(false);
//
// mainViewModels.checkLogin(new UsersModels(username.getText().toString(),
// password.getText().toString())).observe(LoginActivity.this, new Observer<DataResponse<UsersModels>>() {
// @Override
// public void onChanged(DataResponse<UsersModels> usersModelsDataResponse) {
// Log.d("Status", usersModelsDataResponse.getMessageData());
//
// if (usersModelsDataResponse != null){
// if (usersModelsDataResponse.getStatusData()){
// SharedPreferences.Editor editor = sharedPreferences.edit();
// editor.putBoolean(SplashScreen.SESSION, true);
// editor.commit();
//
// startActivity(new Intent(LoginActivity.this, MainActivity.class));
//
// progressBar.setVisibility(View.GONE);
// username.setEnabled(true);
// password.setEnabled(true);
// btnLogin.setEnabled(true);
// }else {
// utils.snackBar(v,"Oppss! Wrong Username Or Password!").show();
// progressBar.setVisibility(View.GONE);
// username.setEnabled(true);
// password.setEnabled(true);
// btnLogin.setEnabled(true);
// }
// }else{
// utils.snackBar(v, "Oppss! ログイン中にエラーが発生しました。しばらくしてからもう一度お試しください").show();
// }
//
// }
// });
//=======
// set Callback
// set Callback
sheetBehavior
.
setBottomSheetCallback
(
new
BottomSheetBehavior
.
BottomSheetCallback
()
{
sheetBehavior
.
setBottomSheetCallback
(
new
BottomSheetBehavior
.
BottomSheetCallback
()
{
...
...
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @
041fcb0e
...
@@ -390,7 +390,6 @@ public class MainActivity extends AppCompatActivity {
...
@@ -390,7 +390,6 @@ public class MainActivity extends AppCompatActivity {
categoryAdapter
.
setListener
(
new
CategoryAdapter
.
CategoryListener
()
{
categoryAdapter
.
setListener
(
new
CategoryAdapter
.
CategoryListener
()
{
@Override
@Override
public
void
onGetProduct
(
CategoryModels
categoryModels
)
{
public
void
onGetProduct
(
CategoryModels
categoryModels
)
{
progressDialog
.
show
();
Log
.
i
(
"diluar if"
,
"onGetProduct: "
+
selectCategory
);
Log
.
i
(
"diluar if"
,
"onGetProduct: "
+
selectCategory
);
if
(!
selectCategory
){
if
(!
selectCategory
){
binding
.
rvProduct
.
setVisibility
(
View
.
GONE
);
binding
.
rvProduct
.
setVisibility
(
View
.
GONE
);
...
@@ -400,14 +399,16 @@ public class MainActivity extends AppCompatActivity {
...
@@ -400,14 +399,16 @@ public class MainActivity extends AppCompatActivity {
Log
.
i
(
"setelah if"
,
"onGetProduct: "
+
selectCategory
);
Log
.
i
(
"setelah if"
,
"onGetProduct: "
+
selectCategory
);
if
(
categoryModels
.
getIdCategory
()
==
0
){
if
(
categoryModels
.
getIdCategory
()
==
0
){
progressDialog
.
show
();
if
(
mainViewModels
.
getProduct
().
getValue
().
getData
().
size
()
!=
0
){
if
(
mainViewModels
.
getProduct
().
getValue
().
getData
().
size
()
!=
0
){
selectCategory
=
false
;
selectCategory
=
false
;
mainViewModels
.
getProduct
().
observe
(
MainActivity
.
this
,
new
Observer
<
DataResponse
<
List
<
ProductModels
<
CategoryModels
>>>>()
{
mainViewModels
.
getProduct
().
observe
(
MainActivity
.
this
,
new
Observer
<
DataResponse
<
List
<
ProductModels
<
CategoryModels
>>>>()
{
@Override
@Override
public
void
onChanged
(
DataResponse
<
List
<
ProductModels
<
CategoryModels
>>>
listDataResponse
)
{
public
void
onChanged
(
DataResponse
<
List
<
ProductModels
<
CategoryModels
>>>
listDataResponse
)
{
progressDialog
.
dismiss
();
productModelsArrayList
.
clear
();
productModelsArrayList
.
clear
();
productModelsArrayList
.
addAll
(
listDataResponse
.
getData
());
productModelsArrayList
.
addAll
(
listDataResponse
.
getData
());
progressDialog
.
dismiss
();
binding
.
rvProduct
.
setVisibility
(
View
.
VISIBLE
);
binding
.
rvProduct
.
setVisibility
(
View
.
VISIBLE
);
binding
.
imgEmpty
.
setVisibility
(
View
.
GONE
);
binding
.
imgEmpty
.
setVisibility
(
View
.
GONE
);
productAdapter
.
setProduct
(
MainActivity
.
this
,
productModelsArrayList
);
productAdapter
.
setProduct
(
MainActivity
.
this
,
productModelsArrayList
);
...
@@ -422,14 +423,16 @@ public class MainActivity extends AppCompatActivity {
...
@@ -422,14 +423,16 @@ public class MainActivity extends AppCompatActivity {
// binding.imgEmpty.bringToFront();
// binding.imgEmpty.bringToFront();
}
}
}
else
{
}
else
{
progressDialog
.
show
();
selectCategory
=
false
;
selectCategory
=
false
;
mainViewModels
.
getProductByCategory
(
categoryModels
.
getIdCategory
()).
observe
(
MainActivity
.
this
,
new
Observer
<
DataResponse
<
List
<
ProductModels
>>>()
{
mainViewModels
.
getProductByCategory
(
categoryModels
.
getIdCategory
()).
observe
(
MainActivity
.
this
,
new
Observer
<
DataResponse
<
List
<
ProductModels
>>>()
{
@Override
@Override
public
void
onChanged
(
DataResponse
<
List
<
ProductModels
>>
listDataResponse
)
{
public
void
onChanged
(
DataResponse
<
List
<
ProductModels
>>
listDataResponse
)
{
progressDialog
.
dismiss
();
if
(
listDataResponse
!=
null
)
{
if
(
listDataResponse
!=
null
)
{
productModelsArrayList
.
clear
();
productModelsArrayList
.
clear
();
productModelsArrayList
.
addAll
(
listDataResponse
.
getData
());
productModelsArrayList
.
addAll
(
listDataResponse
.
getData
());
progressDialog
.
dismiss
();
showLoading
(
false
);
showLoading
(
false
);
if
(
productModelsArrayList
.
isEmpty
())
{
if
(
productModelsArrayList
.
isEmpty
())
{
binding
.
rvProduct
.
setVisibility
(
View
.
GONE
);
binding
.
rvProduct
.
setVisibility
(
View
.
GONE
);
...
...
app/src/main/java/com/yono/messeripos/utils/Utils.java
View file @
041fcb0e
...
@@ -7,12 +7,14 @@ import android.graphics.BitmapFactory;
...
@@ -7,12 +7,14 @@ import android.graphics.BitmapFactory;
import
android.os.Build
;
import
android.os.Build
;
import
android.util.Base64
;
import
android.util.Base64
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.View
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
androidx.annotation.RequiresApi
;
import
androidx.annotation.RequiresApi
;
import
androidx.recyclerview.widget.DividerItemDecoration
;
import
androidx.recyclerview.widget.DividerItemDecoration
;
import
com.bumptech.glide.load.engine.Resource
;
import
com.bumptech.glide.load.engine.Resource
;
import
com.google.android.material.snackbar.Snackbar
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
java.io.ByteArrayOutputStream
;
import
java.io.ByteArrayOutputStream
;
...
@@ -162,4 +164,9 @@ public class Utils {
...
@@ -162,4 +164,9 @@ public class Utils {
return
inSampleSize
;
return
inSampleSize
;
}
}
public
Snackbar
snackBar
(
View
v
,
String
message
){
Snackbar
snackbar
=
Snackbar
.
make
(
v
,
message
,
Snackbar
.
LENGTH_LONG
);
return
snackbar
;
}
}
}
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