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
cffac8b8
Commit
cffac8b8
authored
Aug 31, 2020
by
Ahmad Abi Mulya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some bugs
parent
ef2faae8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
13 deletions
+29
-13
LoginActivity.java
...com/example/yourcashiertest/activities/LoginActivity.java
+3
-1
MainActivity.java
.../com/example/yourcashiertest/activities/MainActivity.java
+1
-1
PrefManager.java
...a/com/example/yourcashiertest/activities/PrefManager.java
+10
-0
ProductActivity.java
...m/example/yourcashiertest/activities/ProductActivity.java
+10
-5
Product.java
...in/java/com/example/yourcashiertest/entities/Product.java
+2
-2
activity_login.xml
app/src/main/res/layout/activity_login.xml
+0
-1
activity_product.xml
app/src/main/res/layout/activity_product.xml
+3
-3
No files found.
app/src/main/java/com/example/yourcashiertest/activities/LoginActivity.java
View file @
cffac8b8
...
@@ -61,7 +61,9 @@ public class LoginActivity extends AppCompatActivity {
...
@@ -61,7 +61,9 @@ public class LoginActivity extends AppCompatActivity {
&&
binding
.
etPassword
.
getText
().
toString
().
equals
(
users
.
get
(
i
).
getPassword
()))
{
&&
binding
.
etPassword
.
getText
().
toString
().
equals
(
users
.
get
(
i
).
getPassword
()))
{
prefManager
.
setFirstLogin
(
false
);
prefManager
.
setFirstLogin
(
false
);
binding
.
setLoading
(
false
);
binding
.
setLoading
(
false
);
startActivity
(
new
Intent
(
LoginActivity
.
this
,
MainActivity
.
class
).
putExtra
(
DATA_LOGIN
,
users
.
get
(
i
).
getFullName
()).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
startActivity
(
new
Intent
(
LoginActivity
.
this
,
MainActivity
.
class
)
.
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
).
addFlags
(
Intent
.
FLAG_ACTIVITY_CLEAR_TOP
));
prefManager
.
setDataUser
(
users
.
get
(
i
).
getFullName
());
finish
();
finish
();
return
;
return
;
}
}
...
...
app/src/main/java/com/example/yourcashiertest/activities/MainActivity.java
View file @
cffac8b8
...
@@ -59,7 +59,7 @@ public class MainActivity extends AppCompatActivity {
...
@@ -59,7 +59,7 @@ public class MainActivity extends AppCompatActivity {
if
(
carts
.
size
()
!=
0
)
binding
.
tvCount
.
setText
(
String
.
valueOf
(
carts
.
size
()));
if
(
carts
.
size
()
!=
0
)
binding
.
tvCount
.
setText
(
String
.
valueOf
(
carts
.
size
()));
else
binding
.
tvCount
.
setText
(
String
.
valueOf
(
0
));
else
binding
.
tvCount
.
setText
(
String
.
valueOf
(
0
));
});
});
String
name
=
getIntent
().
getStringExtra
(
LoginActivity
.
DATA_LOGIN
);
String
name
=
prefManager
.
getDataUser
(
);
binding
.
tvUser
.
setText
(
name
);
binding
.
tvUser
.
setText
(
name
);
// settings menu
// settings menu
binding
.
ivCart
.
setOnClickListener
(
view
->
startActivity
(
new
Intent
(
MainActivity
.
this
,
CartActivity
.
class
)));
binding
.
ivCart
.
setOnClickListener
(
view
->
startActivity
(
new
Intent
(
MainActivity
.
this
,
CartActivity
.
class
)));
...
...
app/src/main/java/com/example/yourcashiertest/activities/PrefManager.java
View file @
cffac8b8
...
@@ -15,6 +15,7 @@ public class PrefManager {
...
@@ -15,6 +15,7 @@ public class PrefManager {
private
static
final
String
PREF_NAME
=
"prefWelcome"
;
private
static
final
String
PREF_NAME
=
"prefWelcome"
;
private
static
final
String
IS_FIRST_WELCOME
=
"IsFirstWelcome"
;
private
static
final
String
IS_FIRST_WELCOME
=
"IsFirstWelcome"
;
private
static
final
String
IS_FIRST_LOGIN
=
"IsFirstLogin"
;
private
static
final
String
IS_FIRST_LOGIN
=
"IsFirstLogin"
;
private
static
final
String
DATA_USER
=
"data_user"
;
public
PrefManager
(
Context
context
)
{
public
PrefManager
(
Context
context
)
{
this
.
_context
=
context
;
this
.
_context
=
context
;
...
@@ -30,6 +31,15 @@ public class PrefManager {
...
@@ -30,6 +31,15 @@ public class PrefManager {
editor
.
putBoolean
(
IS_FIRST_LOGIN
,
isFirstTime
);
editor
.
putBoolean
(
IS_FIRST_LOGIN
,
isFirstTime
);
editor
.
commit
();
editor
.
commit
();
}
}
public
void
setDataUser
(
String
fullname
){
editor
.
putString
(
DATA_USER
,
fullname
);
editor
.
commit
();
}
public
String
getDataUser
(){
return
pref
.
getString
(
DATA_USER
,
"User"
);
}
public
boolean
isFirstLogin
(){
return
pref
.
getBoolean
(
IS_FIRST_LOGIN
,
true
);}
public
boolean
isFirstLogin
(){
return
pref
.
getBoolean
(
IS_FIRST_LOGIN
,
true
);}
public
boolean
isFirstWelcome
()
{
return
pref
.
getBoolean
(
IS_FIRST_WELCOME
,
true
);
}
public
boolean
isFirstWelcome
()
{
return
pref
.
getBoolean
(
IS_FIRST_WELCOME
,
true
);
}
...
...
app/src/main/java/com/example/yourcashiertest/activities/ProductActivity.java
View file @
cffac8b8
...
@@ -44,7 +44,8 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -44,7 +44,8 @@ public class ProductActivity extends AppCompatActivity{
}
}
if
(
product
!=
null
){
if
(
product
!=
null
){
isUpdate
=
true
;
isUpdate
=
true
;
viewModel
.
setPhoto
(
product
.
getPhoto
());
binding
.
setPhoto
(
product
.
getPhoto
());
Log
.
d
(
"Photo"
,
product
.
getPhoto
());
viewModel
.
setProduct
(
product
);
viewModel
.
setProduct
(
product
);
binding
.
btnSubmit
.
setText
(
R
.
string
.
btn_edit
);
binding
.
btnSubmit
.
setText
(
R
.
string
.
btn_edit
);
binding
.
tvHeadProduct
.
setText
(
"UPDATE PRODUCT"
);
binding
.
tvHeadProduct
.
setText
(
"UPDATE PRODUCT"
);
...
@@ -69,9 +70,11 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -69,9 +70,11 @@ public class ProductActivity extends AppCompatActivity{
fixProduct
.
setName
(
binding
.
etProduct
.
getText
().
toString
());
fixProduct
.
setName
(
binding
.
etProduct
.
getText
().
toString
());
fixProduct
.
setCategory
(
binding
.
etCategory
.
getText
().
toString
());
fixProduct
.
setCategory
(
binding
.
etCategory
.
getText
().
toString
());
fixProduct
.
setDescription
(
binding
.
etDescription
.
getText
().
toString
());
fixProduct
.
setDescription
(
binding
.
etDescription
.
getText
().
toString
());
fixProduct
.
setPrice
(
Long
.
parseLong
(
binding
.
etPrice
.
getText
().
toString
()));
fixProduct
.
setPrice
(
Long
.
parseLong
(
TextUtils
.
fixProduct
.
setQuantity
(
Long
.
parseLong
(
binding
.
etQuantity
.
getText
().
toString
()));
isEmpty
(
binding
.
etPrice
.
getText
().
toString
())
?
"0"
:
binding
.
etPrice
.
getText
().
toString
()));
if
(
isUpdate
){
fixProduct
.
setQuantity
(
Long
.
parseLong
(
TextUtils
.
isEmpty
(
binding
.
etQuantity
.
getText
().
toString
())
?
"0"
:
binding
.
etQuantity
.
getText
().
toString
()));
if
(
isUpdate
){
viewModel
.
updateProduct
(
fixProduct
);
viewModel
.
updateProduct
(
fixProduct
);
}
else
{
}
else
{
viewModel
.
insertProduct
(
fixProduct
);
viewModel
.
insertProduct
(
fixProduct
);
...
@@ -141,13 +144,15 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -141,13 +144,15 @@ public class ProductActivity extends AppCompatActivity{
Uri
imageUri
;
Uri
imageUri
;
if
(
resultCode
==
RESULT_OK
&&
requestCode
==
PICK_IMAGE
){
if
(
resultCode
==
RESULT_OK
&&
requestCode
==
PICK_IMAGE
){
//set image to image view
//set image to image view
binding
.
ivProduct
.
setImageURI
(
data
.
getData
());
//
binding.ivProduct.setImageURI(data.getData());
imageUri
=
data
.
getData
();
imageUri
=
data
.
getData
();
if
(
imageUri
!=
null
){
if
(
imageUri
!=
null
){
file
=
new
File
(
getPath
(
imageUri
));
file
=
new
File
(
getPath
(
imageUri
));
}
else
{
}
else
{
file
=
file
.
getAbsoluteFile
();
file
=
file
.
getAbsoluteFile
();
}
}
Log
.
d
(
"testPhoto"
,
""
+
file
.
getAbsolutePath
());
binding
.
setPhoto
(
file
.
getAbsolutePath
());
}
else
if
(
requestCode
==
REQUEST_IMAGE_CAPTURE
&&
resultCode
==
RESULT_OK
)
{
}
else
if
(
requestCode
==
REQUEST_IMAGE_CAPTURE
&&
resultCode
==
RESULT_OK
)
{
Log
.
d
(
"photo"
,
""
+
requestCode
);
Log
.
d
(
"photo"
,
""
+
requestCode
);
binding
.
setPhoto
(
file
.
getAbsolutePath
());
binding
.
setPhoto
(
file
.
getAbsolutePath
());
...
...
app/src/main/java/com/example/yourcashiertest/entities/Product.java
View file @
cffac8b8
...
@@ -129,9 +129,9 @@ public class Product implements Parcelable {
...
@@ -129,9 +129,9 @@ public class Product implements Parcelable {
public
static
void
setImage
(
ImageView
view
,
String
path
)
{
public
static
void
setImage
(
ImageView
view
,
String
path
)
{
if
(
TextUtils
.
isEmpty
(
path
))
view
.
setImageResource
(
R
.
drawable
.
unnamed
);
if
(
TextUtils
.
isEmpty
(
path
))
view
.
setImageResource
(
R
.
drawable
.
unnamed
);
else
{
else
{
//
File file = new File(path);
File
file
=
new
File
(
path
);
Uri
uri
=
Uri
.
parse
(
path
);
Uri
uri
=
Uri
.
parse
(
path
);
Glide
.
with
(
view
).
load
(
new
File
(
uri
.
getPath
())
).
into
(
view
);
Glide
.
with
(
view
).
load
(
file
).
into
(
view
);
// if (file.exists()) Glide.with(view).load(file).into(view);
// if (file.exists()) Glide.with(view).load(file).into(view);
// else view.setImageResource(R.drawable.unnamed);
// else view.setImageResource(R.drawable.unnamed);
}
}
...
...
app/src/main/res/layout/activity_login.xml
View file @
cffac8b8
...
@@ -10,7 +10,6 @@
...
@@ -10,7 +10,6 @@
type=
"boolean"
/>
type=
"boolean"
/>
</data>
</data>
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:padding=
"10dp"
android:padding=
"10dp"
...
...
app/src/main/res/layout/activity_product.xml
View file @
cffac8b8
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:scaleType=
"centerCrop"
android:scaleType=
"centerCrop"
android:src=
"@drawable/unnamed"
android:src=
"@drawable/unnamed"
app:file=
"@{
viewModel.product.
photo}"
/>
app:file=
"@{photo}"
/>
</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"Harga"
android:hint=
"Harga"
android:text=
"@{viewModel.product.price + ``}"
android:text=
"@{viewModel.product.price
== 0 ? `` : viewModel.product.price
+ ``}"
android:inputType=
"number"
android:inputType=
"number"
android:textSize=
"@dimen/text_default"
/>
android:textSize=
"@dimen/text_default"
/>
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"Jumlah"
android:hint=
"Jumlah"
android:text=
"@{viewModel.product.quantity + ``}"
android:text=
"@{viewModel.product.quantity
== 0 ? `` : viewModel.product.quantity
+ ``}"
android:inputType=
"number"
android:inputType=
"number"
android:textSize=
"@dimen/text_default"
/>
android:textSize=
"@dimen/text_default"
/>
</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