From 4458aa0b48fc8e4a16dbf43a5e26054d50b467d9 Mon Sep 17 00:00:00 2001 From: Pulkit Bhatia Date: Fri, 13 Jan 2017 16:15:26 +0530 Subject: [PATCH] #32 : Improvements --- .../com/pulkit4tech/privy/MainActivity.java | 39 ++++++++++++------ app/src/main/res/drawable/google.png | Bin 0 -> 4924 bytes app/src/main/res/layout/app_bar_main.xml | 4 +- .../main/res/menu/activity_main_drawer.xml | 8 ++-- app/src/main/res/values/dimens.xml | 4 +- app/src/main/res/values/strings.xml | 11 +++++ 6 files changed, 48 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/google.png diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java index 31bbf8b..d17d437 100644 --- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java +++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java @@ -116,8 +116,20 @@ private void setUpNavigationHeader() { private void setUpNavigationHeaderValue() { // TODO : Set Profile Image - userName.setText(mSharedPreferences.getString(NAME, getResources().getString(R.string.sign_in))); + userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in))); emailId.setText(mSharedPreferences.getString(EMAIL, "")); + + changeSignInSignOutOption(); + } + + private void changeSignInSignOutOption() { + Menu menu = navigationView.getMenu(); + MenuItem sign_in_out_item = menu.findItem(R.id.nav_sign_in_out); + if (checkIfLoggedIn()) { + sign_in_out_item.setTitle(R.string.sign_out); + } else { + sign_in_out_item.setTitle(R.string.sign_in); + } } private void setUpFab() { @@ -143,9 +155,10 @@ private void signOut() { @Override public void onResult(@NonNull Status status) { if (status.isSuccess()) { - snackMsg("Signed Out!!"); + fab.show(); + snackMsg(getString(R.string.sign_out_msg)); } else { - snackMsg("Some error while signing out!"); + snackMsg(getString(R.string.sign_out_error_msg)); Log.d(DEBUG, "Sign out error : " + status.toString()); } } @@ -185,10 +198,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis case MY_PERMISSIONS_REQUEST_FINE_LOCATIONS: if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) { loadMapFragment(); - snackMsg("Permission granted!!"); + snackMsg(getString(R.string.location_permission_success)); } else { loadFragment(new NoLocationPermission()); - snackMsg("Please give permission for location"); + snackMsg(getString(R.string.location_permission_failed)); } break; @@ -245,7 +258,7 @@ public boolean onNavigationItemSelected(MenuItem item) { } else if (id == R.id.nav_request_new) { loadAddNewPrivyActivity(); closeDrawer(); - } else if (id == R.id.nav_sign_in_up) { + } else if (id == R.id.nav_sign_in_out) { if (checkIfLoggedIn()) signOut(); else @@ -268,10 +281,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (placeToAdd.getLatLng() != null) { requestNewPrivy(placeToAdd); } else { - snackMsg("Some Error!! Was not able to retrieve information properly"); + snackMsg(getString(R.string.error_retrieving_data_msg)); } } else { - snackMsg("Please Select a Location if you wished to request Privy!"); + snackMsg(getString(R.string.select_location_request_msg)); } navigationView.getMenu().getItem(0).setChecked(true); @@ -303,7 +316,7 @@ private void handleSignInResultAndLaunchNewRequestPrivy(GoogleSignInResult resul fab.hide(); } else { clearSharedPreference(); - snackMsg("Please Sign in to request new Privy"); + snackMsg(getString(R.string.request_location_permission)); } setUpNavigationHeaderValue(); } @@ -318,7 +331,7 @@ private void handleSignInResult(GoogleSignInResult result) { fab.hide(); } else { clearSharedPreference(); - snackMsg("Please Sign in to request new Privy"); + snackMsg(getString(R.string.request_location_permission)); } setUpNavigationHeaderValue(); } @@ -330,6 +343,8 @@ private void addLoginInfo(GoogleSignInAccount acct) { editor.putString(NAME, acct.getDisplayName()); editor.putString(EMAIL, acct.getEmail()); editor.commit(); + + snackMsg(getString(R.string.sign_in_msg)); } private void clearSharedPreference() { @@ -364,7 +379,7 @@ private void loadAddNewPrivyActivity() { } } else { startGoogleSignInActivity(RC_SIGN_IN_NEW_PRIVY_REQUEST); - snackMsg("Please Sign In to add new Privy"); + snackMsg(getString(R.string.request_location_permission)); } } @@ -390,7 +405,7 @@ private boolean checkLocationEnabledPermission() { @Override public void onConnectionFailed(@NonNull ConnectionResult connectionResult) { - snackMsg("Some Error while Connecting to Google Service!!"); + snackMsg(getString(R.string.google_api_client_connection_faliure_msg)); Log.d(DEBUG, "OnConnectionFailed: " + connectionResult.toString()); } diff --git a/app/src/main/res/drawable/google.png b/app/src/main/res/drawable/google.png new file mode 100644 index 0000000000000000000000000000000000000000..8688a62b3dd1c3bb436423146785d373b53f537f GIT binary patch literal 4924 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 u2LS!I5k1!%YOi(spuL_tVJCF0000 + app:srcCompat="@drawable/google" + app:backgroundTint="@android:color/white" + /> diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 56926df..9fcc469 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -5,19 +5,19 @@ + android:title="@string/nav_nearby_privy" /> + android:title="@string/nav_add_privy" /> + android:title="@string/sign_in" /> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 336b8f7..3cfc99c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,8 +1,10 @@ - + 16dp 160dp 16dp 16sp 16sp + + 36dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68e7587..f433e71 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,4 +10,15 @@ Close Navigation Drawer Settings Sign In + Sign Out + Signed Out!! + Signed In!! + Some error while signing out! + Permission granted!! + Please give permission for location + Please Sign In to request new Privy. + Some Error while Connecting to Google Service!! + Please select a location to request new Privy. + Nearby Privy\'s + Add Privy