Skip to content

Fixes #380: Use Material Icons #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-hdpi/social_send_now.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-mdpi/social_send_now.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-xhdpi/social_send_now.png
Diff not rendered.
2 changes: 1 addition & 1 deletion app/src/main/res/menu/activity_share.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_upload_single"
android:title="@string/menu_upload_single"
android:icon="@drawable/social_send_now"
android:icon="@drawable/ic_send_white_24dp"
android:enabled="false"
app:showAsAction="always" />
</menu>
2 changes: 1 addition & 1 deletion app/src/main/res/menu/fragment_categorization.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/menu_save_categories"
android:title="@string/menu_save_categories"
android:icon="@android:drawable/ic_menu_save"
android:icon="@drawable/ic_save_white_24dp"
app:showAsAction="always" />
</menu>
4 changes: 2 additions & 2 deletions app/src/main/res/menu/fragment_contributions_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
android:title="@string/menu_from_camera"
android:orderInCategory="100"
app:showAsAction="ifRoom|withText"
android:icon="@android:drawable/ic_menu_camera"
android:icon="@drawable/ic_photo_camera_white_24dp"
/>
<item android:id="@+id/menu_from_gallery"
android:title="@string/menu_from_gallery"
android:orderInCategory="200"
app:showAsAction="ifRoom|withText"
android:icon="@android:drawable/ic_menu_gallery"
android:icon="@drawable/ic_photo_white_24dp"
/>
<item android:id="@+id/menu_settings"
android:title="@string/menu_settings"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/fragment_image_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<item
android:id="@+id/menu_retry_current_image"
android:enabled="false"
android:icon="@android:drawable/ic_menu_revert"
android:icon="@drawable/ic_undo_white_24dp"
android:title="@string/menu_retry_upload"
android:visible="false"
app:showAsAction="ifRoom|withText" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/fragment_multiple_upload_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<item android:id="@+id/menu_upload_multiple"
android:title="@string/share_upload_button"
app:showAsAction="always|withText"
android:icon="@android:drawable/ic_menu_send"
android:icon="@drawable/ic_send_white_24dp"
/>
</menu>