diff --git a/Habitica/res/drawable-hdpi/ic_action_warning.png b/Habitica/res/drawable-hdpi/ic_action_warning.png deleted file mode 100644 index 55c68431b..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_action_warning.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-hdpi/ic_menu_white_24dp.png deleted file mode 100644 index 8962cbd91..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_menu_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_message_white_24dp.png b/Habitica/res/drawable-hdpi/ic_message_white_24dp.png deleted file mode 100644 index dc9341cea..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_message_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_people_black_24dp.png b/Habitica/res/drawable-hdpi/ic_people_black_24dp.png deleted file mode 100644 index 8461410d9..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_people_black_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_people_white_24dp.png b/Habitica/res/drawable-hdpi/ic_people_white_24dp.png deleted file mode 100644 index 9fabef1fb..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_people_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-hdpi/ic_settings_white_24dp.png deleted file mode 100644 index 6a7126924..000000000 Binary files a/Habitica/res/drawable-hdpi/ic_settings_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_action_warning.png b/Habitica/res/drawable-mdpi/ic_action_warning.png deleted file mode 100644 index 04365b98a..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_action_warning.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-mdpi/ic_menu_white_24dp.png deleted file mode 100644 index c62db8c86..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_menu_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_message_white_24dp.png b/Habitica/res/drawable-mdpi/ic_message_white_24dp.png deleted file mode 100644 index 6979bbe5b..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_message_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_people_black_24dp.png b/Habitica/res/drawable-mdpi/ic_people_black_24dp.png deleted file mode 100644 index 8e1f6d905..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_people_black_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_people_white_24dp.png b/Habitica/res/drawable-mdpi/ic_people_white_24dp.png deleted file mode 100644 index cacc7cfae..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_people_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-mdpi/ic_settings_white_24dp.png deleted file mode 100644 index c1a426ec0..000000000 Binary files a/Habitica/res/drawable-mdpi/ic_settings_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/menu_messages.png b/Habitica/res/drawable-mdpi/menu_messages.png new file mode 100644 index 000000000..070650d1d Binary files /dev/null and b/Habitica/res/drawable-mdpi/menu_messages.png differ diff --git a/Habitica/res/drawable-mdpi/menu_settings.png b/Habitica/res/drawable-mdpi/menu_settings.png new file mode 100644 index 000000000..31e75beba Binary files /dev/null and b/Habitica/res/drawable-mdpi/menu_settings.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_action_warning.png b/Habitica/res/drawable-xhdpi/ic_action_warning.png deleted file mode 100644 index 4117c9fc6..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_action_warning.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png deleted file mode 100644 index 36859f094..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_menu_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_message_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_message_white_24dp.png deleted file mode 100644 index 8eedc8a38..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_message_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xhdpi/ic_people_black_24dp.png deleted file mode 100644 index 2f2b7eba8..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_people_black_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_people_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_people_white_24dp.png deleted file mode 100644 index 604642598..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_people_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-xhdpi/ic_settings_white_24dp.png deleted file mode 100644 index c757012db..000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_settings_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/menu_messages.png b/Habitica/res/drawable-xhdpi/menu_messages.png new file mode 100644 index 000000000..b00a39dd1 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/menu_messages.png differ diff --git a/Habitica/res/drawable-xhdpi/menu_settings.png b/Habitica/res/drawable-xhdpi/menu_settings.png new file mode 100644 index 000000000..c52350737 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/menu_settings.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_action_warning.png b/Habitica/res/drawable-xxhdpi/ic_action_warning.png deleted file mode 100644 index 2d2053222..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_action_warning.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_menu_white_24dp.png deleted file mode 100644 index 591b45192..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_menu_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_message_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_message_white_24dp.png deleted file mode 100644 index e1d812bb5..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_message_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png deleted file mode 100644 index 40449b855..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_people_black_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png deleted file mode 100644 index 752be5067..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_people_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png deleted file mode 100644 index 7df0935c5..000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_settings_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/menu_messages.png b/Habitica/res/drawable-xxhdpi/menu_messages.png new file mode 100644 index 000000000..b7003637c Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/menu_messages.png differ diff --git a/Habitica/res/drawable-xxhdpi/menu_settings.png b/Habitica/res/drawable-xxhdpi/menu_settings.png new file mode 100644 index 000000000..c10f32edd Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/menu_settings.png differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png deleted file mode 100644 index c15d63467..000000000 Binary files a/Habitica/res/drawable-xxxhdpi/ic_menu_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_message_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_message_white_24dp.png deleted file mode 100644 index 494b8bf53..000000000 Binary files a/Habitica/res/drawable-xxxhdpi/ic_message_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png deleted file mode 100644 index 844f53577..000000000 Binary files a/Habitica/res/drawable-xxxhdpi/ic_people_black_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png deleted file mode 100644 index 5c260dd3b..000000000 Binary files a/Habitica/res/drawable-xxxhdpi/ic_people_white_24dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png deleted file mode 100644 index 0ade7cfa8..000000000 Binary files a/Habitica/res/drawable-xxxhdpi/ic_settings_white_24dp.png and /dev/null differ diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml index d45a57a18..e43b817e0 100644 --- a/Habitica/res/layout/drawer_main.xml +++ b/Habitica/res/layout/drawer_main.xml @@ -38,14 +38,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@color/transparent" - android:src="@drawable/ic_message_white_24dp" + android:src="@drawable/menu_messages" android:layout_marginLeft="16dp"/> diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt index d2ae72f96..600220e75 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt @@ -5,10 +5,10 @@ import android.app.ActionBar import android.content.Intent import android.content.res.Configuration import android.os.Bundle -import android.support.v4.app.ActionBarDrawerToggle import android.support.v4.app.DialogFragment import android.support.v4.view.GravityCompat import android.support.v4.widget.DrawerLayout +import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View @@ -33,6 +33,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment +import com.habitrpg.android.habitica.ui.helpers.NavbarUtils import com.habitrpg.android.habitica.ui.menu.HabiticaDrawerItem import kotlinx.android.synthetic.main.drawer_main.* import rx.Subscription @@ -45,11 +46,6 @@ import rx.functions.Action1 */ class NavigationDrawerFragment : DialogFragment() { - /** - * Helper component that ties the action bar to the navigation drawer. - */ - private var drawerToggle: ActionBarDrawerToggle? = null - private var drawerLayout: DrawerLayout? = null private var fragmentContainerView: View? = null @@ -77,6 +73,8 @@ class NavigationDrawerFragment : DialogFragment() { super.onActivityCreated(savedInstanceState) // Indicate that this fragment would like to influence the set of actions in the action bar. setHasOptionsMenu(true) + + context?.let {recyclerView.setPadding(0, 0, 0, NavbarUtils.getNavbarHeight(it)) } } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, @@ -222,41 +220,6 @@ class NavigationDrawerFragment : DialogFragment() { // set a custom shadow that overlays the main content when the drawer opens this.drawerLayout?.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START) // set up the drawer's list view with items and click listener - - // ActionBarDrawerToggle ties together the the proper interactions - // between the navigation drawer and the action bar app icon. - drawerToggle = object : ActionBarDrawerToggle( - activity, /* host Activity */ - this.drawerLayout, /* DrawerLayout object */ - R.drawable.ic_menu_white_24dp, /* nav drawer image to replace 'Up' caret */ - R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ - R.string.navigation_drawer_close /* "close drawer" description for accessibility */ - ) { - override fun onDrawerClosed(drawerView: View) { - super.onDrawerClosed(drawerView) - if (!isAdded) { - return - } - - activity?.invalidateOptionsMenu() // calls onPrepareOptionsMenu() - } - - override fun onDrawerOpened(drawerView: View) { - super.onDrawerOpened(drawerView) - if (!isAdded) { - return - } - - activity?.invalidateOptionsMenu() // calls onPrepareOptionsMenu() - } - } - - drawerToggle?.isDrawerIndicatorEnabled = true - - // Defer code dependent on restoration of previous instance state. - this.drawerLayout?.post { drawerToggle?.syncState() } - - //this.drawerLayout?.setDrawerListener(drawerToggle) } fun openDrawer() { @@ -289,12 +252,6 @@ class NavigationDrawerFragment : DialogFragment() { outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition) } - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - // Forward the new configuration the drawer toggle component. - drawerToggle?.onConfigurationChanged(newConfig) - } - companion object { const val SIDEBAR_TASKS = "tasks"