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
888446cd
Commit
888446cd
authored
Sep 03, 2020
by
Muhammad Suryono
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cart' into dev
parents
89dcbb63
60cd013e
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
77 additions
and
11 deletions
+77
-11
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
LoginActivity.java
app/src/main/java/com/yono/messeripos/LoginActivity.java
+6
-0
MainActivity.java
app/src/main/java/com/yono/messeripos/MainActivity.java
+1
-6
TransactionActivity.java
...rc/main/java/com/yono/messeripos/TransactionActivity.java
+8
-0
TransactionSuccess.java
...om/yono/messeripos/transactiontab/TransactionSuccess.java
+57
-1
activity_cart.xml
app/src/main/res/layout/activity_cart.xml
+1
-1
activity_list_transaction.xml
app/src/main/res/layout/activity_list_transaction.xml
+2
-2
app_bar.xml
app/src/main/res/layout/app_bar.xml
+1
-1
No files found.
app/src/main/AndroidManifest.xml
View file @
888446cd
...
@@ -30,6 +30,7 @@
...
@@ -30,6 +30,7 @@
android:theme=
"@style/AppTheme.appbar"
/>
android:theme=
"@style/AppTheme.appbar"
/>
<activity
<activity
android:name=
".LoginActivity"
android:name=
".LoginActivity"
android:windowSoftInputMode=
"adjustResize"
android:theme=
"@style/AppTheme.appbar"
/>
android:theme=
"@style/AppTheme.appbar"
/>
<activity
<activity
android:name=
".PaymentActivity"
android:name=
".PaymentActivity"
...
...
app/src/main/java/com/yono/messeripos/LoginActivity.java
View file @
888446cd
...
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
...
@@ -4,6 +4,7 @@ import android.app.AlertDialog;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
...
@@ -101,6 +102,11 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -101,6 +102,11 @@ public class LoginActivity extends AppCompatActivity {
btnSignIn
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
btnSignIn
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
Uri
data
=
LoginActivity
.
this
.
getIntent
().
getData
();
if
(
data
!=
null
&&
data
.
isHierarchical
())
{
String
uri
=
LoginActivity
.
this
.
getIntent
().
getDataString
();
Log
.
d
(
"TAG"
,
"onBackPressed: "
+
uri
);
}
loginState
=
new
LoginState
(
LoginActivity
.
this
,
mainViewModels
);
loginState
=
new
LoginState
(
LoginActivity
.
this
,
mainViewModels
);
loginState
.
setCancelable
(
false
);
loginState
.
setCancelable
(
false
);
loginState
.
show
(
getSupportFragmentManager
(),
loginState
.
getTag
());
loginState
.
show
(
getSupportFragmentManager
(),
loginState
.
getTag
());
...
...
app/src/main/java/com/yono/messeripos/MainActivity.java
View file @
888446cd
...
@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
...
@@ -6,6 +6,7 @@ import android.app.ProgressDialog;
import
android.content.Context
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.SharedPreferences
;
import
android.content.SharedPreferences
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Handler
;
...
@@ -550,10 +551,4 @@ public class MainActivity extends AppCompatActivity {
...
@@ -550,10 +551,4 @@ public class MainActivity extends AppCompatActivity {
binding
.
pbLoading
.
setVisibility
(
View
.
GONE
);
binding
.
pbLoading
.
setVisibility
(
View
.
GONE
);
}
}
}
}
@Override
public
void
onBackPressed
()
{
super
.
onBackPressed
();
finish
();
}
}
}
\ No newline at end of file
app/src/main/java/com/yono/messeripos/TransactionActivity.java
View file @
888446cd
package
com
.
yono
.
messeripos
;
package
com
.
yono
.
messeripos
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.PersistableBundle
;
import
android.os.PersistableBundle
;
import
android.view.Window
;
import
android.view.WindowManager
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
...
@@ -26,6 +29,11 @@ public class TransactionActivity extends AppCompatActivity {
...
@@ -26,6 +29,11 @@ public class TransactionActivity extends AppCompatActivity {
viewPager
=
findViewById
(
R
.
id
.
viewPager
);
viewPager
=
findViewById
(
R
.
id
.
viewPager
);
tabLayout
=
findViewById
(
R
.
id
.
tabLayout
);
tabLayout
=
findViewById
(
R
.
id
.
tabLayout
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
KITKAT
)
{
Window
w
=
getWindow
();
w
.
setFlags
(
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
,
WindowManager
.
LayoutParams
.
FLAG_LAYOUT_NO_LIMITS
);
}
MaterialToolbar
toolbars
=
findViewById
(
R
.
id
.
toolbar
);
MaterialToolbar
toolbars
=
findViewById
(
R
.
id
.
toolbar
);
setSupportActionBar
(
toolbars
);
setSupportActionBar
(
toolbars
);
getSupportActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
getSupportActionBar
().
setDisplayHomeAsUpEnabled
(
true
);
...
...
app/src/main/java/com/yono/messeripos/transactiontab/TransactionSuccess.java
View file @
888446cd
package
com
.
yono
.
messeripos
.
transactiontab
;
package
com
.
yono
.
messeripos
.
transactiontab
;
import
android.app.AlertDialog
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.ProgressBar
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.Fragment
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.lifecycle.Observer
;
import
androidx.lifecycle.ViewModelProvider
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
import
com.google.android.material.appbar.MaterialToolbar
;
import
com.yono.messeripos.CartActivity
;
import
com.yono.messeripos.HistoryActivity
;
import
com.yono.messeripos.R
;
import
com.yono.messeripos.R
;
import
com.yono.messeripos.adapter.TabAdapterTransaction
;
import
com.yono.messeripos.adapter.TransactionAdapter
;
import
com.yono.messeripos.models.MainViewModels
;
import
com.yono.messeripos.models.PaymentsModels
;
import
com.yono.messeripos.response.DataResponse
;
import
com.yono.messeripos.utils.Utils
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
TransactionSuccess
extends
Fragment
{
public
class
TransactionSuccess
extends
Fragment
{
TransactionAdapter
transactionAdapter
;
PaymentsModels
paymentsModels
;
MainViewModels
mainViewModels
;
RecyclerView
recyclerView
;
Utils
utils
=
new
Utils
();
ProgressBar
loading
;
@Nullable
@Nullable
@Override
@Override
public
View
onCreateView
(
@NonNull
LayoutInflater
inflater
,
@Nullable
ViewGroup
container
,
@Nullable
Bundle
savedInstanceState
)
{
public
View
onCreateView
(
@NonNull
LayoutInflater
inflater
,
@Nullable
ViewGroup
container
,
@Nullable
Bundle
savedInstanceState
)
{
return
inflater
.
inflate
(
R
.
layout
.
activity_history
,
container
,
false
);
View
v
=
inflater
.
inflate
(
R
.
layout
.
activity_history
,
container
,
false
);
// MaterialToolbar toolbars = v.findViewById(R.id.cAppBar);
recyclerView
=
v
.
findViewById
(
R
.
id
.
rvHistory
);
loading
=
v
.
findViewById
(
R
.
id
.
loading
);
loading
.
setVisibility
(
View
.
VISIBLE
);
// recyclerView.addItemDecoration(utils.dividerItemDecoration(this));
transactionAdapter
=
new
TransactionAdapter
();
mainViewModels
=
new
ViewModelProvider
(
this
).
get
(
MainViewModels
.
class
);
mainViewModels
.
getAllTransactions
().
observe
(
getViewLifecycleOwner
(),
new
Observer
<
DataResponse
<
List
<
PaymentsModels
<
String
>>>>()
{
@Override
public
void
onChanged
(
DataResponse
<
List
<
PaymentsModels
<
String
>>>
listDataResponse
)
{
ArrayList
<
PaymentsModels
>
newData
=
new
ArrayList
<>();
newData
.
addAll
(
listDataResponse
.
getData
());
transactionAdapter
.
setTransactionAdapter
(
v
.
getContext
(),
newData
);
loading
.
setVisibility
(
View
.
GONE
);
Log
.
d
(
"TAG"
,
"onChanged: "
+
newData
);
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
v
.
getContext
(),
RecyclerView
.
VERTICAL
,
false
));
recyclerView
.
setAdapter
(
transactionAdapter
);
}
});
return
v
;
}
}
}
}
app/src/main/res/layout/activity_cart.xml
View file @
888446cd
...
@@ -22,10 +22,10 @@
...
@@ -22,10 +22,10 @@
android:id=
"@+id/cartEmptyText"
android:id=
"@+id/cartEmptyText"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"Cart is empty!"
android:layout_below=
"@id/cartEmpty"
android:layout_below=
"@id/cartEmpty"
android:layout_centerInParent=
"true"
android:layout_centerInParent=
"true"
android:textSize=
"30dp"
android:textSize=
"30dp"
android:text=
"No item in cart :("
android:textColor=
"#61333333"
android:textColor=
"#61333333"
/>
/>
...
...
app/src/main/res/layout/activity_list_transaction.xml
View file @
888446cd
...
@@ -12,10 +12,10 @@
...
@@ -12,10 +12,10 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:minHeight=
"?actionBarSize"
android:minHeight=
"?actionBarSize"
app:tabGravity=
"fill"
app:tabGravity=
"fill"
app:tabIndicatorColor=
"@color/color
Green
"
app:tabIndicatorColor=
"@color/color
Accent
"
app:tabIndicatorHeight=
"4dp"
app:tabIndicatorHeight=
"4dp"
app:tabTextColor=
"@color/colorWhite"
app:tabTextColor=
"@color/colorWhite"
app:tabBackground=
"@
drawable/gradient
"
app:tabBackground=
"@
color/colorPrimary
"
app:layout_constraintTop_toBottomOf=
"@id/toolbar"
app:layout_constraintTop_toBottomOf=
"@id/toolbar"
app:tabMode=
"fixed"
/>
app:tabMode=
"fixed"
/>
...
...
app/src/main/res/layout/app_bar.xml
View file @
888446cd
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:elevation=
"0dp"
android:elevation=
"0dp"
android:paddingTop=
"20dp"
android:paddingTop=
"20dp"
android:background=
"@
drawable/gradient
"
android:background=
"@
color/colorPrimary
"
style=
"@style/Widget.MaterialComponents.Toolbar.Primary"
style=
"@style/Widget.MaterialComponents.Toolbar.Primary"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
...
...
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