From 92c1892501ccea9cf2dcc257f4bd948a272cbebc Mon Sep 17 00:00:00 2001 From: Domagalski Date: Sun, 30 Sep 2018 21:55:32 +0200 Subject: [PATCH] fragments rewritten into activities, all menus in BaseActivity, need to clean up the code and remove unused components --- .idea/assetWizardSettings.xml | 14 -- .idea/misc.xml | 8 +- .../findmytutor/activity/BaseActivity.java | 125 ++++++++++++++++++ app/src/main/res/layout/base_activity.xml | 41 ++++++ 4 files changed, 172 insertions(+), 16 deletions(-) delete mode 100644 .idea/assetWizardSettings.xml create mode 100644 app/src/main/res/layout/base_activity.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml deleted file mode 100644 index 2a9c5e0..0000000 --- a/.idea/assetWizardSettings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..b0c7b20 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,22 +5,26 @@ diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java index b68740e..4b0e776 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java @@ -1,20 +1,46 @@ package com.uam.wmi.findmytutor.activity; import android.content.Intent; +import android.content.res.Configuration; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.Toolbar; +import android.text.TextUtils; +import android.view.Menu; import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.FrameLayout; +import android.widget.ListView; +import android.widget.Toast; +import com.uam.wmi.findmytutor.ListViewAdapter; import com.uam.wmi.findmytutor.R; +import java.util.ArrayList; + public abstract class BaseActivity extends AppCompatActivity implements BottomNavigationView.OnNavigationItemSelectedListener { protected BottomNavigationView navigationView; + protected Toolbar toolbar; + + public DrawerLayout drawerLayout; + private ActionBarDrawerToggle actionBarDrawerToggle; + // 4 search + private ListView listView; + private ArrayList stringArrayList; + private ListViewAdapter adapter; + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -22,6 +48,105 @@ public abstract class BaseActivity navigationView = findViewById(R.id.navigation); navigationView.setOnNavigationItemSelectedListener(this); + + } + + @Override + public void setContentView(int layoutResID) { + DrawerLayout fullView = (DrawerLayout) getLayoutInflater().inflate(R.layout.base_activity, null); + FrameLayout activityContainer = (FrameLayout) fullView.findViewById(R.id.activity_content); + getLayoutInflater().inflate(layoutResID, activityContainer, true); + super.setContentView(fullView); + + initToolbar(); + } + + private void initToolbar() { + toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + } + private void setData() { + stringArrayList = new ArrayList<>(); + stringArrayList.add("Quynh Trang"); + stringArrayList.add("Hoang Bien"); + stringArrayList.add("Duc Tuan"); + stringArrayList.add("Dang Thanh"); + stringArrayList.add("Xuan Luu"); + stringArrayList.add("Phan Thanh"); + stringArrayList.add("Kim Kien"); + stringArrayList.add("Ngo Trang"); + stringArrayList.add("Thanh Ngan"); + stringArrayList.add("Nguyen Duong"); + stringArrayList.add("Quoc Cuong"); + stringArrayList.add("Tran Ha"); + stringArrayList.add("Vu Danh"); + stringArrayList.add("Minh Meo"); + } + + + private void setUpNav() { + + drawerLayout = (DrawerLayout) findViewById(R.id.activity_container); + actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawerLayout.addDrawerListener(actionBarDrawerToggle); + + ActionBar actionBar = getSupportActionBar(); + + if (actionBar != null) { + actionBar.setDisplayShowTitleEnabled(false); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + } + } + + + @Override + public void onPostCreate(Bundle savedInstanceState) { + super.onPostCreate(savedInstanceState); + setUpNav(); + + actionBarDrawerToggle.syncState(); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + actionBarDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public boolean onCreateOptionsMenu( Menu menu) { + getMenuInflater().inflate( R.menu.menu_main, menu); + + MenuItem myActionMenuItem = menu.findItem( R.id.action_search); + final SearchView searchView = (SearchView) myActionMenuItem.getActionView(); + searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String query) { + return false; + } + + @Override + public boolean onQueryTextChange(String newText) { + if (TextUtils.isEmpty(newText)) { + adapter.filter(""); + listView.clearTextFilter(); + } else { + adapter.filter(newText); + } + return true; + } + }); + + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (actionBarDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + return super.onOptionsItemSelected(item); } @Override diff --git a/app/src/main/res/layout/base_activity.xml b/app/src/main/res/layout/base_activity.xml new file mode 100644 index 0000000..2edc8cc --- /dev/null +++ b/app/src/main/res/layout/base_activity.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file