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
33ce9b6c
Commit
33ce9b6c
authored
Aug 25, 2020
by
Wahyu Wibowo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing beberapa file
parent
962be717
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
36 deletions
+1
-36
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-7
ProductAdapter.java
.../com/example/yourcashiertest/adapters/ProductAdapter.java
+0
-18
LocalDatabase.java
.../com/example/yourcashiertest/databases/LocalDatabase.java
+0
-4
elips.xml
app/src/main/res/drawable/elips.xml
+0
-4
strings.xml
app/src/main/res/values/strings.xml
+0
-3
No files found.
app/src/main/AndroidManifest.xml
View file @
33ce9b6c
...
...
@@ -29,9 +29,9 @@
<activity
android:name=
".activities.CartActivity"
android:theme=
"@style/AppTheme2"
/>
<<<<<<
< HEAD
<activity
android:name=
".activities.MainActivity"
android:theme=
"@style/AppTheme2"
/>
<activity
android:name=
".activities.ProductActivity"
android:theme=
"@style/AppTheme2"
/>
<activity
android:name=
".activities.LoginActivity"
/>
<provider
android:name=
"androidx.core.content.FileProvider"
...
...
@@ -42,12 +42,6 @@
android:name=
"android.support.FILE_PROVIDER_PATHS"
android:resource=
"@xml/file_path"
/>
</provider>
=======
<activity
android:name=
".activities.MainActivity"
/>
<activity
android:name=
".activities.ProductActivity"
/>
<activity
android:name=
".activities.LoginActivity"
/>
>>>>>>> 5500bf2eb4a0f6bfbdc181bfe395dd5e256a1959
<meta-data
android:name=
"preloaded_fonts"
android:resource=
"@array/preloaded_fonts"
/>
...
...
app/src/main/java/com/example/yourcashiertest/adapters/ProductAdapter.java
View file @
33ce9b6c
...
...
@@ -19,10 +19,7 @@ import java.util.List;
public
class
ProductAdapter
extends
RecyclerView
.
Adapter
<
ProductAdapter
.
ViewHolder
>
{
private
List
<
Product
>
products
=
new
ArrayList
<>();
<<<<<<<
HEAD
private
Boolean
visibility
;
=======
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
public
interface
ProductListener
{
void
onUpdate
(
Product
product
);
...
...
@@ -48,11 +45,7 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ViewHold
return
new
ViewHolder
(
DataBindingUtil
.
inflate
(
LayoutInflater
.
from
(
parent
.
getContext
()),
<<<<<<<
HEAD
R
.
layout
.
item_list
,
=======
R
.
layout
.
item_product
,
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
parent
,
false
)
...
...
@@ -62,10 +55,7 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ViewHold
@Override
public
void
onBindViewHolder
(
@NonNull
ProductAdapter
.
ViewHolder
holder
,
int
position
)
{
holder
.
bindData
(
products
.
get
(
position
),
listener
);
<<<<<<<
HEAD
holder
.
binding
.
setVisibility
(
visibility
);
=======
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
}
@Override
...
...
@@ -75,11 +65,7 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ViewHold
public
static
class
ViewHolder
extends
RecyclerView
.
ViewHolder
{
private
ItemListBinding
binding
;
<<<<<<<
HEAD
private
Boolean
visibility
;
=======
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
public
ViewHolder
(
@NonNull
ItemListBinding
binding
)
{
super
(
binding
.
getRoot
());
...
...
@@ -104,12 +90,8 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ViewHold
binding
.
ivDelete
.
setOnClickListener
(
view
->
listener
.
onDelete
(
product
));
}
}
<<<<<<<
HEAD
public
void
setVisibility
(
Boolean
visibility
){
this
.
visibility
=
visibility
;
}
=======
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
}
\ No newline at end of file
app/src/main/java/com/example/yourcashiertest/databases/LocalDatabase.java
View file @
33ce9b6c
...
...
@@ -32,11 +32,7 @@ public abstract class LocalDatabase extends RoomDatabase {
synchronized
(
LocalDatabase
.
class
)
{
if
(
INSTANCE
==
null
)
{
INSTANCE
=
Room
.
databaseBuilder
(
context
.
getApplicationContext
(),
<<<<<<<
HEAD
LocalDatabase
.
class
,
"yourcashier_database"
)
=======
LocalDatabase
.
class
,
"pasarindo_database"
)
>>>>>>>
5500
bf2eb4a0f6bfbdc181bfe395dd5e256a1959
.
build
();
}
}
...
...
app/src/main/res/drawable/elips.xml
View file @
33ce9b6c
...
...
@@ -6,11 +6,7 @@
android:radius=
"200dp"
/>
<stroke
<<<<<<<
HEAD
android:width=
"0.5dp"
=======
android:width=
"10dp"
>
>>>>>> 5500bf2eb4a0f6bfbdc181bfe395dd5e256a1959
android:color=
"#FFFFFF"
/>
<solid
android:color=
"@color/color_white"
/>
...
...
app/src/main/res/values/strings.xml
View file @
33ce9b6c
...
...
@@ -21,10 +21,7 @@
<string
name=
"deskripsi"
>
Burger medium with tomato and meet.
</string>
<string
name=
"name"
>
Burger Medium
</string>
<string
name=
"price"
>
$600.00
</string>
<<<<<<
< HEAD
<string
name=
"btn_edit"
>
Update Product
</string>
<string
name=
"form_error_message"
>
Nama produk, harga, deskripsi, quantity tidak boleh kosong
</string>
<string
name=
"add_product"
>
Tambah Produk
</string>
=======
>>>>>>> 5500bf2eb4a0f6bfbdc181bfe395dd5e256a1959
</resources>
\ No newline at end of file
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