-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into refactor/cafeteria
- Loading branch information
Showing
6 changed files
with
30 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M15.869,4.329C16.08,4.54 16.198,4.826 16.198,5.124C16.198,5.422 16.08,5.708 15.869,5.919L9.914,11.874L15.869,17.829C15.98,17.932 16.068,18.056 16.13,18.194C16.191,18.332 16.224,18.481 16.227,18.632C16.23,18.783 16.202,18.933 16.145,19.073C16.089,19.213 16.005,19.341 15.898,19.448C15.791,19.554 15.664,19.639 15.524,19.695C15.384,19.752 15.233,19.78 15.082,19.777C14.931,19.774 14.782,19.741 14.644,19.68C14.506,19.618 14.382,19.529 14.279,19.419L7.529,12.669C7.319,12.458 7.2,12.172 7.2,11.874C7.2,11.576 7.319,11.29 7.529,11.079L14.279,4.329C14.49,4.118 14.776,4 15.074,4C15.372,4 15.658,4.118 15.869,4.329Z" | ||
android:fillColor="#7F8295" | ||
android:fillType="evenOdd"/> | ||
</vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters