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
2398384d
Commit
2398384d
authored
Aug 26, 2020
by
Ahmad Abi Mulya
Browse files
Options
Browse Files
Download
Plain Diff
fix conflict merging
parents
65267ae4
af0e083b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
31 additions
and
23 deletions
+31
-23
ProductActivity.java
...m/example/yourcashiertest/activities/ProductActivity.java
+31
-23
No files found.
app/src/main/java/com/example/yourcashiertest/activities/ProductActivity.java
View file @
2398384d
...
@@ -13,19 +13,13 @@ import android.content.Context;
...
@@ -13,19 +13,13 @@ import android.content.Context;
import
android.content.DialogInterface
;
import
android.content.DialogInterface
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.database.Cursor
;
import
android.database.Cursor
;
import
android.graphics.Bitmap
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Environment
;
import
android.os.Environment
;
import
android.provider.MediaStore
;
import
android.provider.MediaStore
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.View
;
import
android.widget.AdapterView
;
import
android.widget.ArrayAdapter
;
import
android.widget.AutoCompleteTextView
;
import
android.widget.ImageView
;
import
android.widget.Spinner
;
import
android.widget.Toast
;
import
com.example.yourcashiertest.R
;
import
com.example.yourcashiertest.R
;
import
com.example.yourcashiertest.databinding.ActivityProductBinding
;
import
com.example.yourcashiertest.databinding.ActivityProductBinding
;
...
@@ -36,7 +30,6 @@ import com.example.yourcashiertest.viewmodels.ProductViewModel;
...
@@ -36,7 +30,6 @@ import com.example.yourcashiertest.viewmodels.ProductViewModel;
import
java.io.File
;
import
java.io.File
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
public
class
ProductActivity
extends
AppCompatActivity
{
public
class
ProductActivity
extends
AppCompatActivity
{
private
static
final
int
PICK_IMAGE
=
123
;
private
static
final
int
PICK_IMAGE
=
123
;
...
@@ -63,7 +56,10 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -63,7 +56,10 @@ public class ProductActivity extends AppCompatActivity{
if
(
product
!=
null
){
if
(
product
!=
null
){
isUpdate
=
true
;
isUpdate
=
true
;
viewModel
.
setPhoto
(
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"
);
}
else
{
}
else
{
...
@@ -85,10 +81,10 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -85,10 +81,10 @@ public class ProductActivity extends AppCompatActivity{
}
}
if
(
file
!=
null
){
if
(
file
!=
null
){
// fixProduct.setPhoto(file.getAbsolutePath());
fixProduct
.
setPhoto
(
file
.
getAbsolutePath
());
fixProduct
.
setPhoto
(
selectedImageUri
.
toString
());
}
else
{
}
else
{
fixProduct
.
setPhoto
(
""
);
fixProduct
.
setPhoto
(
""
);
}
}
fixProduct
.
setName
(
binding
.
etProduct
.
getText
().
toString
());
fixProduct
.
setName
(
binding
.
etProduct
.
getText
().
toString
());
...
@@ -167,9 +163,9 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -167,9 +163,9 @@ public class ProductActivity extends AppCompatActivity{
}
}
private
void
openGallery
(){
private
void
openGallery
(){
Intent
gallery
=
new
Intent
(
Intent
.
ACTION_PICK
,
MediaStore
.
Images
.
Media
.
INTERNAL_CONTENT_URI
);
Intent
intent
=
new
Intent
(
Intent
.
ACTION_PICK
);
intent
.
setType
(
"image/*"
);
startActivityForResult
(
gallery
,
PICK_IMAGE
);
startActivityForResult
(
intent
,
PICK_IMAGE
);
}
}
...
@@ -200,20 +196,32 @@ public class ProductActivity extends AppCompatActivity{
...
@@ -200,20 +196,32 @@ public class ProductActivity extends AppCompatActivity{
@Override
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
// if (requestCode == PICK_IMAGE && resultCode == RESULT_OK) {
Uri
imageUri
;
// imageUri = data.getData();
// String[] filePathColumn = { MediaStore.Images.Media.DATA };
if
(
resultCode
==
RESULT_OK
&&
requestCode
==
PICK_IMAGE
){
// Cursor cursor = getContentResolver().query(imageUri,
//set image to image view
// filePathColumn, null, null, null
);
binding
.
ivProduct
.
setImageURI
(
data
.
getData
()
);
// cursor.moveToFirst
();
imageUri
=
data
.
getData
();
// cursor.close();
if
(
imageUri
!=
null
){
if
(
requestCode
==
REQUEST_IMAGE_CAPTURE
)
{
file
=
new
File
(
getPath
(
imageUri
));
if
(
resultCode
==
RESULT_OK
)
{
}
else
{
selectedImageUri
=
data
.
getData
();
file
=
file
.
getAbsoluteFile
();
}
}
}
}
}
}
public
String
getPath
(
Uri
uri
)
{
String
[]
projection
=
{
MediaStore
.
Images
.
Media
.
DATA
};
Cursor
cursor
=
getContentResolver
().
query
(
uri
,
projection
,
null
,
null
,
null
);
if
(
cursor
==
null
)
return
null
;
int
column_index
=
cursor
.
getColumnIndexOrThrow
(
MediaStore
.
Images
.
Media
.
DATA
);
cursor
.
moveToFirst
();
String
s
=
cursor
.
getString
(
column_index
);
cursor
.
close
();
return
s
;
}
@Override
@Override
public
boolean
onSupportNavigateUp
()
{
public
boolean
onSupportNavigateUp
()
{
onBackPressed
();
onBackPressed
();
...
...
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