diff --git a/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java b/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java index ddfc88d73..bcd115fcc 100644 --- a/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/hamburger/NavigationBaseFragment.java @@ -10,6 +10,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; @@ -31,22 +32,22 @@ public class NavigationBaseFragment extends Fragment { ImageView pictureOfTheDay; @BindView(R.id.upload_item) - TextView uploadItem; + LinearLayout uploadItem; @BindView(R.id.nearby_item) - TextView nearbyItem; + LinearLayout nearbyItem; @BindView(R.id.about_item) - TextView aboutItem; + LinearLayout aboutItem; @BindView(R.id.settings_item) - TextView settingsItem; + LinearLayout settingsItem; @BindView(R.id.feedback_item) - TextView feedbackItem; + LinearLayout feedbackItem; @BindView(R.id.logout_item) - TextView logoutItem; + LinearLayout logoutItem; private DrawerLayout drawerLayout; private RelativeLayout drawerPane; diff --git a/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 000000000..ad0f63e5b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png new file mode 100644 index 000000000..f03168559 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_feedback_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png new file mode 100644 index 000000000..5e5b9fc4a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_file_upload_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png new file mode 100644 index 000000000..4b5ab06e1 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_info_outline_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png new file mode 100644 index 000000000..df1f34062 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_location_on_black_24dp.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..acf1ddf85 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 000000000..dee407b59 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_feedback_black_24dp.png new file mode 100644 index 000000000..8be6849cb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_feedback_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png new file mode 100644 index 000000000..c5f2954bd Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_file_upload_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png new file mode 100644 index 000000000..e0c9fe0eb Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_info_outline_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png new file mode 100644 index 000000000..92a073827 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_location_on_black_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..c59419c02 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 000000000..5a536d57c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png new file mode 100644 index 000000000..63bec2331 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_feedback_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png new file mode 100644 index 000000000..41694c101 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_file_upload_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png new file mode 100644 index 000000000..b706f0d06 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_info_outline_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_location_on_black_24dp.png new file mode 100644 index 000000000..b2696b6d4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_location_on_black_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..e84e188a1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 000000000..53b79d4c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png new file mode 100644 index 000000000..e68ceb906 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_feedback_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_file_upload_black_24dp.png new file mode 100644 index 000000000..bb5d0923b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_file_upload_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png new file mode 100644 index 000000000..3847a9fe7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_info_outline_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_location_on_black_24dp.png new file mode 100644 index 000000000..5a21dfae6 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_location_on_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..3023ff8da Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png new file mode 100644 index 000000000..e30632b6b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_exit_to_app_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_feedback_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_feedback_black_24dp.png new file mode 100644 index 000000000..1343fa837 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_feedback_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_file_upload_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_file_upload_black_24dp.png new file mode 100644 index 000000000..9ce5b8a7b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_file_upload_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png new file mode 100644 index 000000000..c1e2a03a4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_info_outline_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png new file mode 100644 index 000000000..7c2217e46 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_location_on_black_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..476d5c978 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ diff --git a/app/src/main/res/drawable/hamburger_item_bg.xml b/app/src/main/res/drawable/hamburger_item_bg.xml new file mode 100644 index 000000000..cdd545602 --- /dev/null +++ b/app/src/main/res/drawable/hamburger_item_bg.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/navigation_drawer_menu.xml b/app/src/main/res/layout/navigation_drawer_menu.xml index 9b0e5cfb2..71d093e1e 100644 --- a/app/src/main/res/layout/navigation_drawer_menu.xml +++ b/app/src/main/res/layout/navigation_drawer_menu.xml @@ -1,6 +1,7 @@ - + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> - + + + + + + android:layout_height="52dp" + android:background="@drawable/hamburger_item_bg" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 19959021f..60164d6bf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,4 +22,5 @@ #77000000 #44000000 + #f5f5f5 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d48714b16..2194587a7 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -3,4 +3,5 @@ 4dp 8dp 240dp + 18sp