#16 : Improved UI

Author: pulkit4tech

.DS_Store

@@ -13,7 +13,7 @@
     <application
         android:name="android.support.multidex.MultiDexApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">

app/.DS_Store

@@ -151,8 +151,10 @@ private void changeSignInSignOutOption() {
         MenuItem sign_in_out_item = menu.findItem(R.id.nav_sign_in_out);
         if (checkIfLoggedIn()) {
             sign_in_out_item.setTitle(R.string.sign_out);
+            sign_in_out_item.setIcon(this.getResources().getDrawable(R.drawable.sign_out));
         } else {
             sign_in_out_item.setTitle(R.string.sign_in);
+            sign_in_out_item.setIcon(this.getResources().getDrawable(R.drawable.sign_in));
         }
     }
 
@@ -247,27 +249,27 @@ public void onBackPressed() {
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(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.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        // Inflate the menu; this adds items to the action bar if it is present.
+//        getMenuInflater().inflate(R.menu.main, menu);
+//        return true;
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(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.
+//        int id = item.getItemId();
+//
+//        //noinspection SimplifiableIfStatement
+//        if (id == R.id.action_settings) {
+//            return true;
+//        }
+//
+//        return super.onOptionsItemSelected(item);
+//    }
 
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
@@ -282,15 +284,38 @@ public boolean onNavigationItemSelected(MenuItem item) {
             loadAddNewPrivyActivity();
             closeDrawer();
         } else if (id == R.id.nav_sign_in_out) {
-            if (checkIfLoggedIn())
+            if (checkIfLoggedIn()) {
                 signOut();
-            else
+            } else {
                 startGoogleSignInActivity(RC_SIGN_IN);
+            }
+        } else if (id == R.id.nav_share) {
+            shareApp();
+            closeDrawer();
+        } else if (id == R.id.nav_feedback) {
+            sendFeedBack();
+            closeDrawer();
         }
-        //TODO : Add other conditions
         return true;
     }
 
+    private void sendFeedBack() {
+        Intent Email = new Intent(Intent.ACTION_SEND);
+        Email.setType("text/email");
+        Email.putExtra(Intent.EXTRA_EMAIL, new String[]{getString(R.string.app_feedback_mail)});
+        Email.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.feedback_subject));
+        startActivity(Intent.createChooser(Email, getString(R.string.send_feedback_msg)));
+    }
+
+    private void shareApp() {
+        Intent sendIntent = new Intent();
+        sendIntent.setAction(Intent.ACTION_SEND);
+        sendIntent.putExtra(Intent.EXTRA_TEXT,
+                getString(R.string.social_share_msg));
+        sendIntent.setType("text/plain");
+        startActivity(sendIntent);
+    }
+
     private void closeDrawer() {
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);
@@ -367,7 +392,6 @@ private void handleSignInResult(GoogleSignInResult result) {
     }
 
     private void addLoginInfo(GoogleSignInAccount acct) {
-        // TODO : add Profile Picture
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(LOGGED_IN, true);
         if (acct.getDisplayName() != null)

app/src/.DS_Store

@@ -36,7 +36,6 @@ public LocationData getCurrentLocation() {
         criteria.setPowerRequirement(Criteria.POWER_MEDIUM);
         String bestProvider = locationManager.getBestProvider(criteria, true);
         if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            // TODO: Consider calling
             //    ActivityCompat#requestPermissions
             // here to request the missing permissions, and then overriding
             //   public void onRequestPermissionsResult(int requestCode, String[] permissions,