From b0cfda854833e02c938ed942c5f9f60542d2eaf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sun, 28 Oct 2018 22:58:53 +0100 Subject: [PATCH 1/4] fixed drawer --- .../findmytutor/activity/BaseActivity.java | 43 +++++++++++++++++++ .../wmi/findmytutor/activity/MapActivity.java | 1 - .../activity/SettingsActivity.java | 11 ----- app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/layout/base_activity.xml | 4 +- .../main/res/menu/activity_main_drawer.xml | 22 +++------- app/src/main/res/values/strings.xml | 6 ++- 7 files changed, 55 insertions(+), 33 deletions(-) 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 4b0e776..2f4717c 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,9 +1,11 @@ package com.uam.wmi.findmytutor.activity; +import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; +import android.support.design.widget.NavigationView; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; @@ -12,6 +14,7 @@ import android.os.Bundle; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; import android.text.TextUtils; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -22,6 +25,7 @@ import android.widget.Toast; import com.uam.wmi.findmytutor.ListViewAdapter; import com.uam.wmi.findmytutor.R; +import com.uam.wmi.findmytutor.utils.PrefUtils; import java.util.ArrayList; @@ -30,6 +34,8 @@ public abstract class BaseActivity implements BottomNavigationView.OnNavigationItemSelectedListener { protected BottomNavigationView navigationView; + protected NavigationView drawerNavigationView; + protected DrawerLayout sideDrawer; protected Toolbar toolbar; @@ -45,7 +51,44 @@ public abstract class BaseActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(getContentViewId()); + drawerNavigationView = findViewById(R.id.nav_view); + sideDrawer = findViewById(R.id.activity_container); + drawerNavigationView.setNavigationItemSelectedListener( + new NavigationView.OnNavigationItemSelectedListener() { + @Override + public boolean onNavigationItemSelected(@NonNull MenuItem item) { + String itemName = (String)item.getTitle(); + Intent launchIntent; + if(itemName.equals("Whitelist")){ + /*launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class); + startActivity(launchIntent);*/ + }else if (itemName.equals("Blacklist")){ +/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class); + startActivity(launchIntent);*/ + }else if (itemName.equals("Profile")){ +/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class); + startActivity(launchIntent);*/ + }else if (itemName.equals("Settings")){ + launchIntent = new Intent(getApplicationContext(), SettingsActivity.class); + startActivity(launchIntent); + }else if (itemName.equals("Log out")){ + PrefUtils.cleanUserLocalStorage(getApplicationContext()); + Intent i = getBaseContext().getPackageManager() + .getLaunchIntentForPackage(getBaseContext().getPackageName()); + if (i != null) { + i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + } + startActivity(i); + finish(); + } + + sideDrawer.closeDrawers(); + + return true; + } + } + ); navigationView = findViewById(R.id.navigation); navigationView.setOnNavigationItemSelectedListener(this); diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index f4cb8bd..91dcd71 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -97,7 +97,6 @@ public class MapActivity extends BaseActivity { button.setOnClickListener(view -> { PrefUtils.cleanUserLocalStorage(getApplicationContext()); - Intent i = getBaseContext().getPackageManager() .getLaunchIntentForPackage(getBaseContext().getPackageName()); if (i != null) { diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java index 13b75a1..3005dda 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java @@ -32,17 +32,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.pref_main); - - //TODO add on change listeners for preferences - - // feedback preference click listener - Preference myPref = findPreference(getString(R.string.key_send_feedback)); - myPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - public boolean onPreferenceClick(Preference preference) { - sendFeedback(getActivity()); - return true; - } - }); } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 807eab3..ccd5432 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -69,6 +69,7 @@ app:layout_anchorGravity="bottom|center" app:menu="@menu/nav_items" /> + + android:layout_height="?actionBarSize"/> + android:title="@string/navigation_item_whitelist" /> + android:title="@string/navigation_item_blacklist" /> + android:title="@string/navigation_item_profile" /> - + android:title="@string/navigation_item_settings" /> + android:title="@string/navigation_item_logout" /> - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f5d9839..85ca5b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,7 +11,11 @@ Drawer Open Drawer Closed - + Blacklist + Whitelist + Settings + Profile + Log out Settings Notes From d879258266c73d27fa228830cb1b3acc10e8ce4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Sun, 28 Oct 2018 23:02:05 +0100 Subject: [PATCH 2/4] removed floating log out --- .../wmi/findmytutor/activity/MapActivity.java | 19 ++----------------- app/src/main/res/layout/activity_map.xml | 11 +---------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index 91dcd71..f2d4732 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.widget.Toast; @@ -42,8 +41,7 @@ public class MapActivity extends BaseActivity { // Customize map with markers, polylines, etc. }); - // TODO remove logout button - configureLogoutButton(); + } @@ -91,21 +89,8 @@ public class MapActivity extends BaseActivity { mapView.onSaveInstanceState(outState); } - private void configureLogoutButton(){ - // Logout button - final FloatingActionButton button = findViewById(R.id.logoutButton); - button.setOnClickListener(view -> { - PrefUtils.cleanUserLocalStorage(getApplicationContext()); - Intent i = getBaseContext().getPackageManager() - .getLaunchIntentForPackage(getBaseContext().getPackageName()); - if (i != null) { - i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - } - startActivity(i); - finish(); - }); - } + private void fn_permission() { if ((ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED)) { diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 8b3659c..f312185 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -19,16 +19,7 @@ - + Date: Fri, 2 Nov 2018 01:45:25 +0100 Subject: [PATCH 3/4] added logo and changed icons in drawer --- .../main/res/drawable/logo_design_black2.xml | 49 +++++++++++++++++++ app/src/main/res/layout/activity_login.xml | 8 +++ app/src/main/res/layout/nav_header_main.xml | 19 +++---- .../main/res/menu/activity_main_drawer.xml | 25 ++++++---- 4 files changed, 80 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/logo_design_black2.xml diff --git a/app/src/main/res/drawable/logo_design_black2.xml b/app/src/main/res/drawable/logo_design_black2.xml new file mode 100644 index 0000000..61baafc --- /dev/null +++ b/app/src/main/res/drawable/logo_design_black2.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index f4cbc1b..a3d5a78 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,5 +1,6 @@ + + - - + android:layout_height="match_parent" + + android:visibility="visible" + app:srcCompat="@drawable/logo_design_black2" /> + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 9c9a0c8..d9c6b19 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -1,22 +1,27 @@ - - - - - \ No newline at end of file From 7019864b9a4f275f810fdf05eb7b9b94bbe43892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Jedy=C5=84ski?= Date: Fri, 2 Nov 2018 02:05:02 +0100 Subject: [PATCH 4/4] fixed comments --- .../java/com/uam/wmi/findmytutor/activity/BaseActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 2f4717c..939a83c 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 @@ -60,13 +60,13 @@ public abstract class BaseActivity String itemName = (String)item.getTitle(); Intent launchIntent; if(itemName.equals("Whitelist")){ - /*launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class); + /* launchIntent = new Intent(getApplicationContext(), WhitelistActivity.class); startActivity(launchIntent);*/ }else if (itemName.equals("Blacklist")){ -/* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class); + /* launchIntent = new Intent(getApplicationContext(), BlacklistActivity.class); startActivity(launchIntent);*/ }else if (itemName.equals("Profile")){ -/* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class); + /* launchIntent = new Intent(getApplicationContext(), ProfileActivity.class); startActivity(launchIntent);*/ }else if (itemName.equals("Settings")){ launchIntent = new Intent(getApplicationContext(), SettingsActivity.class);