From b616ec471799bd2ae602633fc507126aef6128c0 Mon Sep 17 00:00:00 2001 From: Gustavo Martin Morcuende Date: Sun, 4 Sep 2016 03:09:39 +0200 Subject: [PATCH] Using Navigation Drawer --- .../information/activity/AboutActivity.java | 5 +- .../information/activity/MainTabsActivity.java | 174 ++++++++++----- .../main/res/drawable-hdpi/ic_menu_white_24dp.png | Bin 0 -> 92 bytes .../ic_perm_device_information_white_24dp.png | Bin 0 -> 183 bytes .../main/res/drawable-mdpi/ic_menu_white_24dp.png | Bin 0 -> 83 bytes .../ic_perm_device_information_white_24dp.png | Bin 0 -> 130 bytes .../main/res/drawable-xhdpi/ic_menu_white_24dp.png | Bin 0 -> 93 bytes .../ic_perm_device_information_white_24dp.png | Bin 0 -> 181 bytes .../res/drawable-xxhdpi/ic_menu_white_24dp.png | Bin 0 -> 95 bytes .../ic_perm_device_information_white_24dp.png | Bin 0 -> 246 bytes .../res/drawable-xxxhdpi/ic_menu_white_24dp.png | Bin 0 -> 99 bytes .../ic_perm_device_information_white_24dp.png | Bin 0 -> 323 bytes app/src/main/res/layout/weather_about.xml | 234 +++++++++++---------- .../main/res/layout/weather_general_toolbar.xml | 11 + .../res/layout/weather_main_drawer_entry_list.xml | 11 + .../main/res/layout/weather_main_drawer_header.xml | 24 +++ app/src/main/res/layout/weather_main_tabs.xml | 65 ++++-- app/src/main/res/menu/weather_main_menu.xml | 66 +++--- app/src/main/res/values-v11/styles.xml | 2 +- app/src/main/res/values-v14/styles.xml | 2 +- app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 2 +- 22 files changed, 374 insertions(+), 224 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_perm_device_information_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_perm_device_information_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_perm_device_information_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_perm_device_information_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_perm_device_information_white_24dp.png create mode 100644 app/src/main/res/layout/weather_general_toolbar.xml create mode 100644 app/src/main/res/layout/weather_main_drawer_entry_list.xml create mode 100644 app/src/main/res/layout/weather_main_drawer_header.xml diff --git a/app/src/main/java/name/gumartinm/weather/information/activity/AboutActivity.java b/app/src/main/java/name/gumartinm/weather/information/activity/AboutActivity.java index 6ef65d0..452473f 100644 --- a/app/src/main/java/name/gumartinm/weather/information/activity/AboutActivity.java +++ b/app/src/main/java/name/gumartinm/weather/information/activity/AboutActivity.java @@ -20,6 +20,7 @@ import android.net.Uri; import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.View; import name.gumartinm.weather.information.R; @@ -31,8 +32,10 @@ public class AboutActivity extends AppCompatActivity { super.onCreate(savedInstanceState); this.setContentView(R.layout.weather_about); + final Toolbar toolbar = (Toolbar) findViewById(R.id.weather_main_toolbar); + this.setSupportActionBar(toolbar); + final ActionBar actionBar = this.getSupportActionBar(); - actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayShowHomeEnabled(true); actionBar.setIcon(R.drawable.ic_launcher); diff --git a/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java b/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java index 85090a9..fd3a004 100644 --- a/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java +++ b/app/src/main/java/name/gumartinm/weather/information/activity/MainTabsActivity.java @@ -17,18 +17,24 @@ package name.gumartinm.weather.information.activity; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.annotation.NonNull; +import android.support.design.widget.NavigationView; import android.support.design.widget.TabLayout; import android.support.v4.app.DialogFragment; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; +import android.view.View; import java.text.MessageFormat; import java.util.Locale; @@ -43,66 +49,40 @@ import name.gumartinm.weather.information.model.WeatherLocation; public class MainTabsActivity extends AppCompatActivity { private static final int NUM_ITEMS = 2; - private ViewPager mPager; - private TabLayout tabLayout; + + private Toolbar mToolbar; + private TabLayout mTabLayout; + private DrawerLayout mDrawerLayout; + private NavigationView mNavigationView; + private ActionBarDrawerToggle mDrawerToggle; @Override protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); this.setContentView(R.layout.weather_main_tabs); - this.mPager = (ViewPager)this.findViewById(R.id.pager); - this.mPager.setAdapter(new TabsAdapter(this.getSupportFragmentManager())); - - // Give the TabLayout the ViewPager - tabLayout = (TabLayout) findViewById(R.id.sliding_tabs); - tabLayout.setupWithViewPager(mPager); + this.mToolbar = (Toolbar) findViewById(R.id.weather_main_toolbar); + this.mToolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); + this.mToolbar.setNavigationContentDescription(R.string.drawer_open); + this.setSupportActionBar(mToolbar); - final ActionBar actionBar = this.getSupportActionBar(); - actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); - actionBar.setDisplayUseLogoEnabled(true); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowHomeEnabled(true); - actionBar.setIcon(R.drawable.ic_launcher); + this.mDrawerLayout = (DrawerLayout) findViewById(R.id.weather_main_drawer_layout); + this.mDrawerToggle = this.doDrawerToggle(this.mDrawerLayout, this.mToolbar); + // Set the drawer toggle as the DrawerListener + this.mDrawerLayout.addDrawerListener(mDrawerToggle); - PreferenceManager.setDefaultValues(this, R.xml.weather_preferences, false); - } + this.mNavigationView = (NavigationView) findViewById(R.id.weather_main_left_drawer); + // Set the list's click listener + this.mNavigationView.setNavigationItemSelectedListener(new NavigationViewClickListener()); - @Override - public boolean onCreateOptionsMenu(final Menu menu) { + final ViewPager pager = (ViewPager)this.findViewById(R.id.pager); + pager.setAdapter(new TabsAdapter(this.getSupportFragmentManager())); - this.getMenuInflater().inflate(R.menu.weather_main_menu, menu); - - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(final MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - super.onOptionsItemSelected(item); - - Intent intent; - final int itemId = item.getItemId(); - if (itemId == R.id.weather_menu_settings) { - intent = new Intent(this.getApplicationContext(), PreferencesActivity.class); - this.startActivity(intent); - return true; - } else if (itemId == R.id.weather_menu_map) { - intent = new Intent(this.getApplicationContext(), MapActivity.class); - this.startActivity(intent); - return true; - } else if (itemId == R.id.weather_menu_about) { - intent = new Intent(this.getApplicationContext(), AboutActivity.class); - this.startActivity(intent); - return true; - } else { - } + // Give the TabLayout the ViewPager + this.mTabLayout = (TabLayout) findViewById(R.id.weather_main_sliding_tabs); + this.mTabLayout.setupWithViewPager(pager); - // TODO: calling again super method? - return super.onOptionsItemSelected(item); + PreferenceManager.setDefaultValues(this, R.xml.weather_preferences, false); } @Override @@ -133,7 +113,6 @@ public class MainTabsActivity extends AppCompatActivity { // 1. Update title. - final ActionBar actionBar = this.getSupportActionBar(); final DatabaseQueries query = new DatabaseQueries(this.getApplicationContext()); final WeatherLocation weatherLocation = query.queryDataBase(); if (weatherLocation != null) { @@ -142,14 +121,14 @@ public class MainTabsActivity extends AppCompatActivity { array[1] = weatherLocation.getCountry(); final MessageFormat message = new MessageFormat("{0},{1}", Locale.US); final String cityCountry = message.format(array); - actionBar.setTitle(cityCountry); + mToolbar.setTitle(cityCountry); } else { - actionBar.setTitle(this.getString(R.string.text_field_no_chosen_location)); + mToolbar.setTitle(this.getString(R.string.text_field_no_chosen_location)); } // 2. Set currently tab text. final String currently = this.getString(R.string.text_tab_currently); - tabLayout.getTabAt(0).setText(currently); + this.mTabLayout.getTabAt(0).setText(currently); // 3. Update forecast tab text. final String keyPreference = this.getString(R.string.weather_preferences_day_forecast_key); @@ -162,7 +141,7 @@ public class MainTabsActivity extends AppCompatActivity { } else if (value.equals(this.getString(R.string.weather_preferences_day_forecast_fourteen_day))) { forecast = this.getString(R.string.text_tab_fourteen_days_forecast); } - tabLayout.getTabAt(1).setText(forecast); + this.mTabLayout.getTabAt(1).setText(forecast); } @Override @@ -170,6 +149,56 @@ public class MainTabsActivity extends AppCompatActivity { super.onSaveInstanceState(savedInstanceState); } + @Override + protected void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + // Sync the toggle state after onRestoreInstanceState has occurred. + mDrawerToggle.syncState(); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + + this.mDrawerToggle.onConfigurationChanged(newConfig); + } + + /* Called whenever we call invalidateOptionsMenu() */ + @Override + public boolean onPrepareOptionsMenu(Menu menu) { + // If the nav drawer is open, hide action items related to the content view + boolean drawerOpen = this.mDrawerLayout.isDrawerOpen(this.mNavigationView); + if (!drawerOpen) { + this.mToolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); + } + + return super.onPrepareOptionsMenu(menu); + } + + private ActionBarDrawerToggle doDrawerToggle(final DrawerLayout drawerLayout, final Toolbar toolbar) { + // ActionBarDrawerToggle ties together the the proper interactions + // between the sliding drawer and the action bar app icon + return new ActionBarDrawerToggle( + this, + drawerLayout, + toolbar, + R.string.drawer_open, + R.string.drawer_close + ) { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerOpened(drawerView); + MainTabsActivity.this.invalidateOptionsMenu(); + } + + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + MainTabsActivity.this.invalidateOptionsMenu(); + } + }; + } + private class TabsAdapter extends FragmentPagerAdapter { public TabsAdapter(final FragmentManager fm) { @@ -191,4 +220,39 @@ public class MainTabsActivity extends AppCompatActivity { } } + + private class NavigationViewClickListener implements NavigationView.OnNavigationItemSelectedListener { + + @Override + public boolean onNavigationItemSelected(@NonNull final MenuItem item) { + //Checking if the item is in checked state or not, if not make it in checked state + if(item.isChecked()) { + item.setChecked(false); + } + + final int itemId = item.getItemId(); + if (itemId == R.id.weather_menu_settings) { + //Closing drawer on item click + MainTabsActivity.this.mDrawerLayout.closeDrawers(); + Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), PreferencesActivity.class); + MainTabsActivity.this.startActivity(intent); + return true; + } else if (itemId == R.id.weather_menu_map) { + //Closing drawer on item click + MainTabsActivity.this.mDrawerLayout.closeDrawers(); + Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), MapActivity.class); + MainTabsActivity.this.startActivity(intent); + return true; + } else if (itemId == R.id.weather_menu_about) { + //Closing drawer on item click + MainTabsActivity.this.mDrawerLayout.closeDrawers(); + Intent intent = new Intent(MainTabsActivity.this.getApplicationContext(), AboutActivity.class); + MainTabsActivity.this.startActivity(intent); + return true; + } else { + return false; + } + + } + } } diff --git a/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..238cfd66b4898d94602df3b9939f2937b5f94b34 GIT binary patch literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>`VBp6OsFEs^HOeH~n!3+##lh0ZJd7_>!jv*C{ n$qJ$${{R0kKXb{>s!t3I&*G(X-_5)J6Qs@4)z4*}Q$iB}y>uFl literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_perm_device_information_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_perm_device_information_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e7c1ea3561bab9eb26c9549d161b82cfc1f6bc8d GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ou`Xqh{y4_*Di7%P~c$+xVwgV zg|zD?fBTq&XV*#3SnQ^G<%jwwho)yv5uqI#0xuFmMO+jw$e!C?^6iWlhqy>rwwzL#nR8sYb*%M;#=5W9?%4g;KfCpn>876o6Kj&ro>f_r h!=meGH1qpchCBCWbN&5reGbqi44$rjF6*2Ung9*SN3j3^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d3cec05646ba9db5b07edf68e5ac42ebf0d2660a GIT binary patch literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1DNh&25R22v2@&Hr5(PMP#n fRb9Efn1O>KFzdSJ6Ga<8pehDWS3j3^P6o^sE literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_perm_device_information_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_perm_device_information_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7e37ba18d730ae6106b1da90e43be3fc8eb94ec2 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Pfr)e5R22v2@3Lm`2YO>WN-H2 z)qeXj-WyY!4|u5?Rre&!VhkXJzBl(TEE7p gvyI`p|5xAPy}n{ajNIf(pgR~mUHx3vIVCg!0IKRn3IG5A literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9cb03482360f7357894c5ad1340238ca06fac6e2 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc@my3jv*C{ q$r6(m{IloyqulIjBT;%afQ4bba7p3K1NRd_Iz3(eT-G@yGywqarWs)X literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_perm_device_information_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_perm_device_information_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9f70599ebbec00b086c1dae01305761ff52aa9e2 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_IkQFhEy=Vz2(T&Jz5e1_YL@Wna~`?z_X{MYC-KYM5AFyLo2+nr s&$`WP0$0av{;5$OC_d{E`-xk!YjURh`y|IN0(ykO)78&qol`;+0H`})vH$=8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_menu_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..623d1471354caaf0786d7e96a92f81013f6e034d GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc@?<<+978G? ulNE$}nEw3__|P~_=F`CpiJrED8Vn3(8rL-!S-MJqbbGq`xvX+Nkrz9t8O)%?W|Fs{6}?7Ex26yBK-og#KIM1A_V{<7V#mapnz*IZ$c rZEwfDRI2o4{G3%&XP>cCte-1BTYl1U?}z((K&E-R`njxgN@xNA#*1}- literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/weather_about.xml b/app/src/main/res/layout/weather_about.xml index 659570e..3316c59 100644 --- a/app/src/main/res/layout/weather_about.xml +++ b/app/src/main/res/layout/weather_about.xml @@ -14,118 +14,130 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:layout_height="match_parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/weather_general_toolbar.xml b/app/src/main/res/layout/weather_general_toolbar.xml new file mode 100644 index 0000000..08ac0de --- /dev/null +++ b/app/src/main/res/layout/weather_general_toolbar.xml @@ -0,0 +1,11 @@ + + diff --git a/app/src/main/res/layout/weather_main_drawer_entry_list.xml b/app/src/main/res/layout/weather_main_drawer_entry_list.xml new file mode 100644 index 0000000..d5082ec --- /dev/null +++ b/app/src/main/res/layout/weather_main_drawer_entry_list.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/layout/weather_main_drawer_header.xml b/app/src/main/res/layout/weather_main_drawer_header.xml new file mode 100644 index 0000000..cd9fef8 --- /dev/null +++ b/app/src/main/res/layout/weather_main_drawer_header.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/layout/weather_main_tabs.xml b/app/src/main/res/layout/weather_main_tabs.xml index c1e137a..5636a08 100644 --- a/app/src/main/res/layout/weather_main_tabs.xml +++ b/app/src/main/res/layout/weather_main_tabs.xml @@ -14,30 +14,57 @@ See the License for the specific language governing permissions and limitations under the License. --> - + android:layout_height="match_parent" + tools:context="name.gumartinm.weather.information.activity.MainTabsActivity"> - + - - - + + + + + + + - + android:layout_weight="1" + android:layout_margin="4dip"> + + + + + + + + + + - diff --git a/app/src/main/res/menu/weather_main_menu.xml b/app/src/main/res/menu/weather_main_menu.xml index 3be5333..7efc69b 100644 --- a/app/src/main/res/menu/weather_main_menu.xml +++ b/app/src/main/res/menu/weather_main_menu.xml @@ -14,40 +14,36 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - - - + + + + + + + + + + + + diff --git a/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml index 175d9eb..2da02d1 100644 --- a/app/src/main/res/values-v11/styles.xml +++ b/app/src/main/res/values-v11/styles.xml @@ -20,7 +20,7 @@ Base application theme for API 11+. This theme completely replaces AppBaseTheme from res/values/styles.xml on API 11+ devices. --> - diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml index 4fb0b9c..0ad62e2 100644 --- a/app/src/main/res/values-v14/styles.xml +++ b/app/src/main/res/values-v14/styles.xml @@ -21,7 +21,7 @@ AppBaseTheme from BOTH res/values/styles.xml and res/values-v11/styles.xml on API 14+ devices. --> - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72942c5..a263002 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -160,6 +160,8 @@ 5 10 14 + Open navigation drawer + Close navigation drawer diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8d14eff..b270ece 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -20,7 +20,7 @@ Base application theme, dependent on API level. This theme is replaced by AppBaseTheme from res/values-vXX/styles.xml on newer devices. --> -