mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-29 13:53:54 +01:00
Merge branch 'master' into featuredImages
This commit is contained in:
commit
463673f942
343 changed files with 11434 additions and 3062 deletions
|
|
@ -10,6 +10,11 @@
|
|||
android:icon="@drawable/ic_location_black_24dp"
|
||||
android:title="@string/navigation_item_nearby"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_notifications"
|
||||
android:icon="@drawable/ic_notifications_black_24dp"
|
||||
android:title="@string/navigation_item_notification"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_about"
|
||||
android:icon="@drawable/ic_info_outline_black_24dp"
|
||||
|
|
@ -22,7 +27,7 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/action_introduction"
|
||||
android:icon="@drawable/ic_info_outline_black_24dp"
|
||||
android:icon="@drawable/ic_help_black_24dp"
|
||||
android:title="@string/navigation_item_info"/>
|
||||
|
||||
<item
|
||||
|
|
@ -35,15 +40,8 @@
|
|||
android:icon="@drawable/ic_exit_to_app_black_24dp"
|
||||
android:title="@string/navigation_item_logout"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_notifications"
|
||||
android:icon="@drawable/ic_notifications_black_24dp"
|
||||
android:title="@string/navigation_item_notification"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_featured_images"
|
||||
android:icon="@drawable/ic_star_black_24dp"
|
||||
android:title="@string/navigation_item_featured_images"/>
|
||||
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue