Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CS123-CanteeneoAndroid
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Willard Torres
CS123-CanteeneoAndroid
Commits
08204b59
Commit
08204b59
authored
Dec 04, 2016
by
Willard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve look of icons and buttons
parent
c20d33d3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
41 additions
and
6 deletions
+41
-6
DishViewActivity.java
app/src/main/java/com/testapp/DishViewActivity.java
+1
-0
favorite_checkbox.xml
app/src/main/res/drawable/favorite_checkbox.xml
+6
-0
ic_add_circle_outline_black_24dp.xml
...rc/main/res/drawable/ic_add_circle_outline_black_24dp.xml
+9
-0
ic_clear_black_24dp.xml
app/src/main/res/drawable/ic_clear_black_24dp.xml
+1
-1
ic_star_black_24dp.xml
app/src/main/res/drawable/ic_star_black_24dp.xml
+9
-0
ic_star_border_black_24dp.xml
app/src/main/res/drawable/ic_star_border_black_24dp.xml
+9
-0
content_dish_view.xml
app/src/main/res/layout/content_dish_view.xml
+5
-2
review_row.xml
app/src/main/res/layout/review_row.xml
+1
-2
colors.xml
app/src/main/res/values/colors.xml
+0
-1
No files found.
app/src/main/java/com/testapp/DishViewActivity.java
View file @
08204b59
...
@@ -151,6 +151,7 @@ public class DishViewActivity extends AppCompatActivity {
...
@@ -151,6 +151,7 @@ public class DishViewActivity extends AppCompatActivity {
newReviews
.
remove
(
ownedReview
);
newReviews
.
remove
(
ownedReview
);
reviews
.
add
(
ownedReview
);
reviews
.
add
(
ownedReview
);
}
}
findViewById
(
R
.
id
.
add_review_button
).
setVisibility
(
ownedReview
!=
null
?
View
.
INVISIBLE
:
View
.
VISIBLE
);
reviews
.
addAll
(
newReviews
);
reviews
.
addAll
(
newReviews
);
adapter
.
notifyDataSetChanged
();
adapter
.
notifyDataSetChanged
();
...
...
app/src/main/res/drawable/favorite_checkbox.xml
0 → 100644
View file @
08204b59
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item
android:state_checked=
"false"
android:drawable=
"@drawable/ic_star_border_black_24dp"
/>
<item
android:state_checked=
"true"
android:drawable=
"@drawable/ic_star_black_24dp"
/>
<item
android:drawable=
"@drawable/ic_star_border_black_24dp"
/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml
0 → 100644
View file @
08204b59
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"
/>
</vector>
app/src/main/res/drawable/ic_clear_black_24dp.xml
View file @
08204b59
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
android:viewportWidth=
"24.0"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
android:viewportHeight=
"24.0"
>
<path
<path
android:fillColor=
"#FF
00
0000"
android:fillColor=
"#FF
FF
0000"
android:pathData=
"M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
/>
android:pathData=
"M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
/>
</vector>
</vector>
app/src/main/res/drawable/ic_star_black_24dp.xml
0 → 100644
View file @
08204b59
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#FFCCCC00"
android:pathData=
"M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"
/>
</vector>
app/src/main/res/drawable/ic_star_border_black_24dp.xml
0 → 100644
View file @
08204b59
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#FFCCCC00"
android:pathData=
"M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"
/>
</vector>
app/src/main/res/layout/content_dish_view.xml
View file @
08204b59
...
@@ -77,6 +77,7 @@
...
@@ -77,6 +77,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/favorite_checkbox"
android:id=
"@+id/favorite_checkbox"
android:button=
"@drawable/favorite_checkbox"
android:layout_marginBottom=
"10dp"
android:layout_marginBottom=
"10dp"
android:layout_weight=
"1"
/>
android:layout_weight=
"1"
/>
...
@@ -148,10 +149,12 @@
...
@@ -148,10 +149,12 @@
android:layout_weight=
"1"
/>
android:layout_weight=
"1"
/>
<Button
<Button
android:layout_width=
"
47dp
"
android:layout_width=
"
wrap_content
"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/add_review_button"
android:id=
"@+id/add_review_button"
android:text=
"+"
/>
android:drawableLeft=
"@drawable/ic_add_circle_outline_black_24dp"
android:text=
"Add your own review"
style=
"@style/Widget.AppCompat.Button.Borderless"
/>
</LinearLayout>
</LinearLayout>
...
...
app/src/main/res/layout/review_row.xml
View file @
08204b59
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"@dimen/activity_horizontal_margin"
>
android:padding
Bottom
=
"@dimen/activity_horizontal_margin"
>
<TextView
<TextView
...
@@ -50,7 +50,6 @@
...
@@ -50,7 +50,6 @@
android:layout_alignParentRight=
"true"
android:layout_alignParentRight=
"true"
android:layout_alignParentEnd=
"true"
android:layout_alignParentEnd=
"true"
android:id=
"@+id/delete_button"
android:id=
"@+id/delete_button"
android:backgroundTint=
"@color/deleteTint"
android:background=
"@drawable/ic_clear_black_24dp"
android:background=
"@drawable/ic_clear_black_24dp"
android:textAllCaps=
"false"
android:textAllCaps=
"false"
android:elevation=
"0dp"
android:elevation=
"0dp"
...
...
app/src/main/res/values/colors.xml
View file @
08204b59
...
@@ -3,5 +3,4 @@
...
@@ -3,5 +3,4 @@
<color
name=
"colorPrimary"
>
#3f51b5
</color>
<color
name=
"colorPrimary"
>
#3f51b5
</color>
<color
name=
"colorPrimaryDark"
>
#303F9F
</color>
<color
name=
"colorPrimaryDark"
>
#303F9F
</color>
<color
name=
"colorAccent"
>
#FF4081
</color>
<color
name=
"colorAccent"
>
#FF4081
</color>
<color
name=
"deleteTint"
>
#FF0000
</color>
</resources>
</resources>
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