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
3ab8267f
Commit
3ab8267f
authored
Sep 02, 2020
by
Alfansyah Fadlian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Register State
parent
937a02d8
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
78 additions
and
11 deletions
+78
-11
Project.xml
.idea/codeStyles/Project.xml
+24
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
RegisterState.java
app/src/main/java/com/yono/messeripos/RegisterState.java
+31
-3
MainViewModels.java
.../main/java/com/yono/messeripos/models/MainViewModels.java
+4
-3
UsersModels.java
...src/main/java/com/yono/messeripos/models/UsersModels.java
+16
-2
PlaceholderFragment.java
...java/com/yono/messeripos/ui/main/PlaceholderFragment.java
+2
-2
No files found.
.idea/codeStyles/Project.xml
View file @
3ab8267f
<component
name=
"ProjectCodeStyleConfiguration"
>
<component
name=
"ProjectCodeStyleConfiguration"
>
<code_scheme
name=
"Project"
version=
"173"
>
<code_scheme
name=
"Project"
version=
"173"
>
<DBN-PSQL>
<case-options
enabled=
"true"
>
<option
name=
"KEYWORD_CASE"
value=
"lower"
/>
<option
name=
"FUNCTION_CASE"
value=
"lower"
/>
<option
name=
"PARAMETER_CASE"
value=
"lower"
/>
<option
name=
"DATATYPE_CASE"
value=
"lower"
/>
<option
name=
"OBJECT_CASE"
value=
"preserve"
/>
</case-options>
<formatting-settings
enabled=
"false"
/>
</DBN-PSQL>
<DBN-SQL>
<case-options
enabled=
"true"
>
<option
name=
"KEYWORD_CASE"
value=
"lower"
/>
<option
name=
"FUNCTION_CASE"
value=
"lower"
/>
<option
name=
"PARAMETER_CASE"
value=
"lower"
/>
<option
name=
"DATATYPE_CASE"
value=
"lower"
/>
<option
name=
"OBJECT_CASE"
value=
"preserve"
/>
</case-options>
<formatting-settings
enabled=
"false"
>
<option
name=
"STATEMENT_SPACING"
value=
"one_line"
/>
<option
name=
"CLAUSE_CHOP_DOWN"
value=
"chop_down_if_statement_long"
/>
<option
name=
"ITERATION_ELEMENTS_WRAPPING"
value=
"chop_down_if_not_single"
/>
</formatting-settings>
</DBN-SQL>
<DBN-PSQL>
<DBN-PSQL>
<case-options
enabled=
"true"
>
<case-options
enabled=
"true"
>
<option
name=
"KEYWORD_CASE"
value=
"lower"
/>
<option
name=
"KEYWORD_CASE"
value=
"lower"
/>
...
...
app/src/main/AndroidManifest.xml
View file @
3ab8267f
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<activity
<activity
android:name=
".ListTransactions"
android:name=
".ListTransactions"
android:label=
"@string/title_activity_list_transactions"
android:label=
"@string/title_activity_list_transactions"
android:theme=
"@style/AppTheme.appbar
.NoActionBar
"
></activity>
android:theme=
"@style/AppTheme.appbar"
></activity>
<activity
android:name=
".RegisterActivity"
/>
<activity
android:name=
".RegisterActivity"
/>
<activity
<activity
android:name=
".BottomSheets"
android:name=
".BottomSheets"
...
...
app/src/main/java/com/yono/messeripos/RegisterState.java
View file @
3ab8267f
...
@@ -12,15 +12,24 @@ import android.widget.RelativeLayout;
...
@@ -12,15 +12,24 @@ import android.widget.RelativeLayout;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.lifecycle.LifecycleOwner
;
import
com.google.android.material.bottomsheet.BottomSheetBehavior
;
import
com.google.android.material.bottomsheet.BottomSheetBehavior
;
import
com.google.android.material.bottomsheet.BottomSheetDialog
;
import
com.google.android.material.bottomsheet.BottomSheetDialog
;
import
com.google.android.material.bottomsheet.BottomSheetDialogFragment
;
import
com.google.android.material.bottomsheet.BottomSheetDialogFragment
;
import
com.google.android.material.button.MaterialButton
;
import
com.google.android.material.button.MaterialButton
;
import
com.google.android.material.textfield.TextInputEditText
;
import
com.google.android.material.textfield.TextInputEditText
;
import
com.yono.messeripos.api.client.Client
;
import
com.yono.messeripos.api.service.UsersService
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.UsersModels
;
import
com.yono.messeripos.response.DataResponse
;
import
com.yono.messeripos.utils.Utils
;
import
com.yono.messeripos.utils.Utils
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
public
class
RegisterState
extends
BottomSheetDialogFragment
{
public
class
RegisterState
extends
BottomSheetDialogFragment
{
private
static
final
String
TAG
=
"RegisterState"
;
private
static
final
String
TAG
=
"RegisterState"
;
...
@@ -78,9 +87,12 @@ public class RegisterState extends BottomSheetDialogFragment {
...
@@ -78,9 +87,12 @@ public class RegisterState extends BottomSheetDialogFragment {
Log
.
d
(
TAG
,
"onCreateDialog: "
+
sheetBehavior2
.
getState
());
Log
.
d
(
TAG
,
"onCreateDialog: "
+
sheetBehavior2
.
getState
());
// loginButton.setOnClickListener(view1 -> {
registerButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
// if (sheetBehavior.getState() != BottomSheetBehavior.STATE_EXPANDED) loginAuth(view1);
@Override
// });
public
void
onClick
(
View
view
)
{
mainViewModels
.
postRegis
(
new
UsersModels
(
username
.
getText
().
toString
(),
email
.
getText
().
toString
(),
password
.
getText
().
toString
(),
repassword
.
getText
().
toString
()));
}
});
// close btn is clicked
// close btn is clicked
closeBtn
.
setOnClickListener
(
view12
->
{
closeBtn
.
setOnClickListener
(
view12
->
{
...
@@ -91,5 +103,21 @@ public class RegisterState extends BottomSheetDialogFragment {
...
@@ -91,5 +103,21 @@ public class RegisterState extends BottomSheetDialogFragment {
return
sheetDialog2
;
return
sheetDialog2
;
}
}
private
void
registerUser
(
View
view
){
// Client client = new Client();
// UsersService usersService = client.Client(UsersService.class);
// usersService.postRegister(new UsersModels(username.getText().toString(),email.getText().toString(),password.getText().toString(),repassword.getText().toString()).enqueue(new Callback<DataResponse<UsersModels>>() {
// @Override
// public void onResponse(Call<DataResponse<UsersModels>> call, Response<DataResponse<UsersModels>> response) {
//
// }
//
// @Override
// public void onFailure(Call<DataResponse<UsersModels>> call, Throwable t) {
//
// }
// });
}
}
}
app/src/main/java/com/yono/messeripos/models/MainViewModels.java
View file @
3ab8267f
...
@@ -151,12 +151,13 @@ public class MainViewModels extends ViewModel {
...
@@ -151,12 +151,13 @@ public class MainViewModels extends ViewModel {
return
usersLogin
;
return
usersLogin
;
}
}
public
MutableLiveData
<
DataResponse
<
UsersModels
>>
checkRegis
(
UsersModels
usersModels
)
{
public
MutableLiveData
<
DataResponse
<
UsersModels
>>
postRegis
(
UsersModels
usersModels
)
{
usersRegister
=
new
MutableLiveData
<>();
usersRegister
=
new
MutableLiveData
<>();
CreateRegister
(
usersModels
);
CreateRegister
(
usersModels
);
return
usersRegister
;
return
usersRegister
;
}
}
private
void
PeriksaLogin
(
UsersModels
usersModels
)
{
private
void
PeriksaLogin
(
UsersModels
usersModels
)
{
UsersService
usersService
=
client
.
Client
(
UsersService
.
class
);
UsersService
usersService
=
client
.
Client
(
UsersService
.
class
);
...
...
app/src/main/java/com/yono/messeripos/models/UsersModels.java
View file @
3ab8267f
...
@@ -12,17 +12,23 @@ public class UsersModels {
...
@@ -12,17 +12,23 @@ public class UsersModels {
@SerializedName
(
"password"
)
@SerializedName
(
"password"
)
private
String
passwordUsers
;
private
String
passwordUsers
;
public
UsersModels
(
String
usernameUsers
,
String
passwordUsers
)
{
@SerializedName
(
"password_confirmation"
)
private
String
passwordConfirmationUsers
;
public
UsersModels
(
String
usernameUsers
,
String
passwordUsers
)
{
this
.
usernameUsers
=
usernameUsers
;
this
.
usernameUsers
=
usernameUsers
;
this
.
passwordUsers
=
passwordUsers
;
this
.
passwordUsers
=
passwordUsers
;
}
}
public
UsersModels
(
String
usernameUsers
,
String
emailUsers
,
String
passwordUsers
)
{
public
UsersModels
(
String
usernameUsers
,
String
emailUsers
,
String
passwordUsers
,
String
passwordConfirmationUsers
)
{
this
.
usernameUsers
=
usernameUsers
;
this
.
usernameUsers
=
usernameUsers
;
this
.
emailUsers
=
emailUsers
;
this
.
emailUsers
=
emailUsers
;
this
.
passwordUsers
=
passwordUsers
;
this
.
passwordUsers
=
passwordUsers
;
this
.
passwordConfirmationUsers
=
passwordConfirmationUsers
;
}
}
public
String
getEmailUsers
()
{
public
String
getEmailUsers
()
{
return
emailUsers
;
return
emailUsers
;
}
}
...
@@ -46,4 +52,12 @@ public class UsersModels {
...
@@ -46,4 +52,12 @@ public class UsersModels {
public
void
setPasswordUsers
(
String
passwordUsers
)
{
public
void
setPasswordUsers
(
String
passwordUsers
)
{
this
.
passwordUsers
=
passwordUsers
;
this
.
passwordUsers
=
passwordUsers
;
}
}
public
String
getPasswordConfirmationUsers
()
{
return
passwordConfirmationUsers
;
}
public
void
setPasswordConfirmationUsers
(
String
passwordConfirmationUsers
)
{
this
.
passwordConfirmationUsers
=
passwordConfirmationUsers
;
}
}
}
app/src/main/java/com/yono/messeripos/ui/main/PlaceholderFragment.java
View file @
3ab8267f
...
@@ -46,9 +46,9 @@ public class PlaceholderFragment extends Fragment {
...
@@ -46,9 +46,9 @@ public class PlaceholderFragment extends Fragment {
public
View
onCreateView
(
public
View
onCreateView
(
@NonNull
LayoutInflater
inflater
,
ViewGroup
container
,
@NonNull
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
Bundle
savedInstanceState
)
{
View
root
=
inflater
.
inflate
(
R
.
layout
.
fragment_
main
,
container
,
false
);
View
root
=
inflater
.
inflate
(
R
.
layout
.
fragment_
list_transactions
,
container
,
false
);
final
TextView
textView
=
root
.
findViewById
(
R
.
id
.
section_label
);
final
TextView
textView
=
root
.
findViewById
(
R
.
id
.
section_label
);
pageViewModel
.
getText
().
observe
(
this
,
new
Observer
<
String
>()
{
pageViewModel
.
getText
().
observe
(
getViewLifecycleOwner
()
,
new
Observer
<
String
>()
{
@Override
@Override
public
void
onChanged
(
@Nullable
String
s
)
{
public
void
onChanged
(
@Nullable
String
s
)
{
textView
.
setText
(
s
);
textView
.
setText
(
s
);
...
...
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