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
635bef40
Commit
635bef40
authored
Sep 04, 2020
by
Muhammad Suryono
Browse files
Options
Browse Files
Download
Plain Diff
fix with cart
parents
128938d6
3bbcccda
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
121 additions
and
19 deletions
+121
-19
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+12
-1
LoginState.java
app/src/main/java/com/yono/messeripos/LoginState.java
+1
-1
Utils.java
app/src/main/java/com/yono/messeripos/utils/Utils.java
+6
-15
ic_baseline_backspace_24.xml
app/src/main/res/drawable/ic_baseline_backspace_24.xml
+10
-0
custom_softkeyboard.xml
app/src/main/res/layout/custom_softkeyboard.xml
+69
-0
forgot_password_code.xml
app/src/main/res/layout/forgot_password_code.xml
+21
-1
login_form.xml
app/src/main/res/layout/login_form.xml
+2
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
635bef40
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
android:theme=
"@style/AppTheme.appbar"
/>
android:theme=
"@style/AppTheme.appbar"
/>
<activity
<activity
android:name=
".PaymentActivity"
android:name=
".PaymentActivity"
android:theme=
"@style/AppTheme.appbar"
></activity
>
android:theme=
"@style/AppTheme.appbar"
/
>
<activity
<activity
android:name=
".CartActivity"
android:name=
".CartActivity"
android:theme=
"@style/AppTheme.appbar"
/>
android:theme=
"@style/AppTheme.appbar"
/>
...
@@ -49,6 +49,17 @@
...
@@ -49,6 +49,17 @@
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
</intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
</intent-filter>
<intent-filter
android:label=
"@string/app_name"
>
<action
android:name=
"android.intent.action.VIEW"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
<category
android:name=
"android.intent.category.BROWSABLE"
/>
<data
android:host=
"rest-api-meser.herokuapp.com"
android:scheme=
"http"
/>
</intent-filter>
</activity>
</activity>
<activity
<activity
android:name=
".MainActivity"
android:name=
".MainActivity"
...
...
app/src/main/java/com/yono/messeripos/LoginState.java
View file @
635bef40
...
@@ -209,7 +209,7 @@ public class LoginState extends BottomSheetDialogFragment {
...
@@ -209,7 +209,7 @@ public class LoginState extends BottomSheetDialogFragment {
private
void
activateEmail
(
View
customLayout
)
{
private
void
activateEmail
(
View
customLayout
)
{
utils
=
new
Utils
(
customLayout
);
utils
=
new
Utils
(
customLayout
);
utils
.
dialog
(
context
,
false
,
customLayout
,
"Please Verif
i
y Email"
,
utils
.
dialog
(
context
,
false
,
customLayout
,
"Please Verify Email"
,
"Please verify your email before login"
,
"Please verify your email before login"
,
"close"
,
"verify"
)
"close"
,
"verify"
)
.
show
();
.
show
();
...
...
app/src/main/java/com/yono/messeripos/utils/Utils.java
View file @
635bef40
...
@@ -347,23 +347,14 @@ public class Utils {
...
@@ -347,23 +347,14 @@ public class Utils {
CardView
btnCard2
=
view
.
findViewById
(
R
.
id
.
cvAlertOnClick2
);
CardView
btnCard2
=
view
.
findViewById
(
R
.
id
.
cvAlertOnClick2
);
// set title and message
// set title and message
if
(
titles
!=
null
){
title
.
setText
(
titles
);
title
.
setText
(
titles
);
message
.
setText
(
messages
);
}
if
(
message
!=
null
){
btnCard
.
setVisibility
(
View
.
VISIBLE
);
message
.
setText
(
messages
);
button
.
setText
(
link
);
}
if
(
button
!=
null
){
btnCard2
.
setVisibility
(
View
.
VISIBLE
);
btnCard
.
setVisibility
(
View
.
VISIBLE
);
button2
.
setText
(
dismiss
);
button
.
setText
(
link
);
}
if
(
button2
!=
null
)
{
btnCard2
.
setVisibility
(
View
.
VISIBLE
);
button2
.
setText
(
dismiss
);
}
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
context
)
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
context
)
.
setCancelable
(
cancelable
)
.
setCancelable
(
cancelable
)
...
...
app/src/main/res/drawable/ic_baseline_backspace_24.xml
0 → 100644
View file @
635bef40
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24"
android:viewportHeight=
"24"
android:tint=
"?attr/colorControlNormal"
>
<path
android:fillColor=
"@android:color/white"
android:pathData=
"M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z"
/>
</vector>
app/src/main/res/layout/custom_softkeyboard.xml
0 → 100644
View file @
635bef40
<?xml version="1.0" encoding="utf-8"?>
<GridLayout
android:layout_height=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_gravity=
"center"
android:columnCount=
"3"
android:orientation=
"horizontal"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<Button
android:id=
"@+id/no1"
android:text=
"1"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no2"
android:text=
"2"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no3"
android:text=
"3"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no4"
android:text=
"4"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no5"
android:text=
"5"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no6"
android:text=
"6"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no7"
android:text=
"7"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no8"
android:text=
"8"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no9"
android:text=
"9"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<Button
android:id=
"@+id/no0"
android:layout_column=
"1"
android:text=
"0"
android:backgroundTint=
"@color/white"
android:textColor=
"@android:color/black"
/>
<ImageButton
android:id=
"@+id/backspace"
android:layout_gravity=
"center"
android:layout_column=
"2"
android:src=
"@drawable/ic_baseline_backspace_24"
/>
</GridLayout>
\ No newline at end of file
app/src/main/res/layout/forgot_password_code.xml
View file @
635bef40
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
android:padding=
"16dp"
>
android:padding=
"16dp"
>
<androidx.cardview.widget.CardView
<androidx.cardview.widget.CardView
android:id=
"@+id/verifCode"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerInParent=
"true"
>
android:layout_centerInParent=
"true"
>
...
@@ -32,6 +33,7 @@
...
@@ -32,6 +33,7 @@
android:gravity=
"center"
android:gravity=
"center"
android:padding=
"20dp"
android:padding=
"20dp"
android:nextFocusRight=
"@id/edit_text_2"
android:nextFocusRight=
"@id/edit_text_2"
android:singleLine=
"true"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@id/edit_text_2"
app:layout_constraintEnd_toStartOf=
"@id/edit_text_2"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
...
@@ -87,6 +89,24 @@
...
@@ -87,6 +89,24 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.cardview.widget.CardView>
</RelativeLayout>
<!-- <androidx.cardview.widget.CardView-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:layout_below="@id/verifCode"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content">-->
<!-- -->
<!-- <GridLayout-->
<!-- android:columnCount="3"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content">-->
<!-- -->
<!-- <com.google.android.material.button.MaterialButton-->
<!-- android:text="1"/>-->
<!-- -->
<!-- </GridLayout>-->
<!-- </androidx.cardview.widget.CardView>-->
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>
</layout>
\ No newline at end of file
app/src/main/res/layout/login_form.xml
View file @
635bef40
...
@@ -81,6 +81,7 @@
...
@@ -81,6 +81,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/formUsernameLogin"
android:layout_below=
"@id/formUsernameLogin"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
app:passwordToggleEnabled=
"true"
android:hint=
"@string/password"
>
android:hint=
"@string/password"
>
<com.google.android.material.textfield.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
...
@@ -89,7 +90,7 @@
...
@@ -89,7 +90,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:imeOptions=
"actionDone|actionGo"
android:imeOptions=
"actionDone|actionGo"
android:textColor=
"@color/colorPrimary"
android:textColor=
"@color/colorPrimary"
android:inputType=
"textPassword"
/>
android:inputType=
"text
|text
Password"
/>
</com.google.android.material.textfield.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
...
...
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