Skip to content

Commit 4d088ac

Browse files
pulkit4techpulkit4tech
authored
Merge pull request #34 from pulkit4tech/correct_sign_in_out
#32 : Improvements
2 parents 1097c7e + 4458aa0 commit 4d088ac

File tree

6 files changed

+48
-18
lines changed

6 files changed

+48
-18
lines changed

‎app/src/main/java/com/pulkit4tech/privy/MainActivity.java

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,20 @@ private void setUpNavigationHeader() {
116116

117117
private void setUpNavigationHeaderValue() {
118118
// TODO : Set Profile Image
119-
userName.setText(mSharedPreferences.getString(NAME, getResources().getString(R.string.sign_in)));
119+
userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in)));
120120
emailId.setText(mSharedPreferences.getString(EMAIL, ""));
121+
122+
changeSignInSignOutOption();
123+
}
124+
125+
private void changeSignInSignOutOption() {
126+
Menu menu = navigationView.getMenu();
127+
MenuItem sign_in_out_item = menu.findItem(R.id.nav_sign_in_out);
128+
if (checkIfLoggedIn()) {
129+
sign_in_out_item.setTitle(R.string.sign_out);
130+
} else {
131+
sign_in_out_item.setTitle(R.string.sign_in);
132+
}
121133
}
122134

123135
private void setUpFab() {
@@ -143,9 +155,10 @@ private void signOut() {
143155
@Override
144156
public void onResult(@NonNull Status status) {
145157
if (status.isSuccess()) {
146-
snackMsg("Signed Out!!");
158+
fab.show();
159+
snackMsg(getString(R.string.sign_out_msg));
147160
} else {
148-
snackMsg("Some error while signing out!");
161+
snackMsg(getString(R.string.sign_out_error_msg));
149162
Log.d(DEBUG, "Sign out error : " + status.toString());
150163
}
151164
}
@@ -185,10 +198,10 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
185198
case MY_PERMISSIONS_REQUEST_FINE_LOCATIONS:
186199
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
187200
loadMapFragment();
188-
snackMsg("Permission granted!!");
201+
snackMsg(getString(R.string.location_permission_success));
189202
} else {
190203
loadFragment(new NoLocationPermission());
191-
snackMsg("Please give permission for location");
204+
snackMsg(getString(R.string.location_permission_failed));
192205
}
193206
break;
194207

@@ -245,7 +258,7 @@ public boolean onNavigationItemSelected(MenuItem item) {
245258
} else if (id == R.id.nav_request_new) {
246259
loadAddNewPrivyActivity();
247260
closeDrawer();
248-
} else if (id == R.id.nav_sign_in_up) {
261+
} else if (id == R.id.nav_sign_in_out) {
249262
if (checkIfLoggedIn())
250263
signOut();
251264
else
@@ -268,10 +281,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
268281
if (placeToAdd.getLatLng() != null) {
269282
requestNewPrivy(placeToAdd);
270283
} else {
271-
snackMsg("Some Error!! Was not able to retrieve information properly");
284+
snackMsg(getString(R.string.error_retrieving_data_msg));
272285
}
273286
} else {
274-
snackMsg("Please Select a Location if you wished to request Privy!");
287+
snackMsg(getString(R.string.select_location_request_msg));
275288
}
276289

277290
navigationView.getMenu().getItem(0).setChecked(true);
@@ -303,7 +316,7 @@ private void handleSignInResultAndLaunchNewRequestPrivy(GoogleSignInResult resul
303316
fab.hide();
304317
} else {
305318
clearSharedPreference();
306-
snackMsg("Please Sign in to request new Privy");
319+
snackMsg(getString(R.string.request_location_permission));
307320
}
308321
setUpNavigationHeaderValue();
309322
}
@@ -318,7 +331,7 @@ private void handleSignInResult(GoogleSignInResult result) {
318331
fab.hide();
319332
} else {
320333
clearSharedPreference();
321-
snackMsg("Please Sign in to request new Privy");
334+
snackMsg(getString(R.string.request_location_permission));
322335
}
323336
setUpNavigationHeaderValue();
324337
}
@@ -330,6 +343,8 @@ private void addLoginInfo(GoogleSignInAccount acct) {
330343
editor.putString(NAME, acct.getDisplayName());
331344
editor.putString(EMAIL, acct.getEmail());
332345
editor.commit();
346+
347+
snackMsg(getString(R.string.sign_in_msg));
333348
}
334349

335350
private void clearSharedPreference() {
@@ -364,7 +379,7 @@ private void loadAddNewPrivyActivity() {
364379
}
365380
} else {
366381
startGoogleSignInActivity(RC_SIGN_IN_NEW_PRIVY_REQUEST);
367-
snackMsg("Please Sign In to add new Privy");
382+
snackMsg(getString(R.string.request_location_permission));
368383
}
369384
}
370385

@@ -390,7 +405,7 @@ private boolean checkLocationEnabledPermission() {
390405

391406
@Override
392407
public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
393-
snackMsg("Some Error while Connecting to Google Service!!");
408+
snackMsg(getString(R.string.google_api_client_connection_faliure_msg));
394409
Log.d(DEBUG, "OnConnectionFailed: " + connectionResult.toString());
395410
}
396411

‎app/src/main/res/drawable/google.png

4.81 KB
Loading

‎app/src/main/res/layout/app_bar_main.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
android:layout_height="wrap_content"
3131
android:layout_gravity="bottom|end"
3232
android:layout_margin="@dimen/fab_margin"
33-
app:srcCompat="@android:drawable/ic_dialog_email" />
33+
app:srcCompat="@drawable/google"
34+
app:backgroundTint="@android:color/white"
35+
/>
3436

3537
</android.support.design.widget.CoordinatorLayout>

‎app/src/main/res/menu/activity_main_drawer.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<item
66
android:id="@+id/nav_nearby_privy"
77
android:icon="@drawable/ic_menu_camera"
8-
android:title="Nearby Privy's" />
8+
android:title="@string/nav_nearby_privy" />
99
<item
1010
android:id="@+id/nav_request_new"
1111
android:icon="@drawable/ic_menu_gallery"
12-
android:title="Add Privy" />
12+
android:title="@string/nav_add_privy" />
1313
<!--<item-->
1414
<!--android:id="@+id/nav_slideshow"-->
1515
<!--android:icon="@drawable/ic_menu_slideshow"-->
1616
<!--android:title="Slideshow" />-->
1717
<item
18-
android:id="@+id/nav_sign_in_up"
18+
android:id="@+id/nav_sign_in_out"
1919
android:icon="@drawable/ic_menu_manage"
20-
android:title="Sign In" />
20+
android:title="@string/sign_in" />
2121
</group>
2222

2323
<item android:title="Communicate">

‎app/src/main/res/values/dimens.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
<resources>
1+
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Default screen margins, per the Android Design guidelines. -->
33
<dimen name="activity_horizontal_margin">16dp</dimen>
44
<dimen name="nav_header_height">160dp</dimen>
55
<dimen name="activity_vertical_margin">16dp</dimen>
66
<dimen name="nav_header_vertical_spacing">16sp</dimen>
77
<dimen name="fab_margin">16sp</dimen>
8+
<!--Floating action button-->
9+
<dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
810
</resources>

‎app/src/main/res/values/strings.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,15 @@
1010
<string name="navigation_drawer_close">Close Navigation Drawer</string>
1111
<string name="action_settings">Settings</string>
1212
<string name="sign_in">Sign In</string>
13+
<string name="sign_out">Sign Out</string>
14+
<string name="sign_out_msg">Signed Out!!</string>
15+
<string name="sign_in_msg">Signed In!!</string>
16+
<string name="sign_out_error_msg">Some error while signing out!</string>
17+
<string name="location_permission_success">Permission granted!!</string>
18+
<string name="location_permission_failed">Please give permission for location</string>
19+
<string name="request_location_permission">Please Sign In to request new Privy.</string>
20+
<string name="google_api_client_connection_faliure_msg">Some Error while Connecting to Google Service!!</string>
21+
<string name="select_location_request_msg">Please select a location to request new Privy.</string>
22+
<string name="nav_nearby_privy">Nearby Privy\'s</string>
23+
<string name="nav_add_privy">Add Privy</string>
1324
</resources>

0 commit comments

Comments
 (0)