release 4.6.6

k0shk0sh · Mar 25, 2018 · a2ac3d7 · a2ac3d7
1 parent 16d096f
commit a2ac3d7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 465
-        versionName "4.6.5"
+        versionCode 466
+        versionName "4.6.6"
         buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
         buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
         buildConfigString "IMGUR_CLIENT_ID", (buildProperties.secrets['imgur_client_id'] | buildProperties.notThere['imgur_client_id']).string

diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
@@ -220,7 +220,7 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
     }
 
     @Override public void onBackPressed() {
-        if (drawer != null && (drawer.isDrawerOpen(GravityCompat.START) || drawer.isDrawerOpen(GravityCompat.END))) {
+        if (drawer != null && drawer.isDrawerOpen(GravityCompat.START)) {
             closeDrawer();
         } else {
             boolean clickTwiceToExit = !PrefGetter.isTwiceBackButtonDisabled();
@@ -400,10 +400,7 @@ public void closeDrawer() {
         if (drawer != null) {
             if (drawer.isDrawerOpen(GravityCompat.START)) {
                 drawer.closeDrawer(GravityCompat.START);
-            } else if (drawer.isDrawerOpen(GravityCompat.END)) {
-                drawer.closeDrawer(GravityCompat.END);
             }
-            drawer.closeDrawers();
         }
     }
 

diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainActivity.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainActivity.java
@@ -91,7 +91,6 @@ public class MainActivity extends BaseActivity<MainMvp.View, MainPresenter> impl
 
     @Override public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.search_menu, menu);
-        menu.findItem(R.id.secondMenu).setVisible(true);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -106,9 +105,6 @@ public class MainActivity extends BaseActivity<MainMvp.View, MainPresenter> impl
             ViewHelper.tintDrawable(item.setIcon(R.drawable.ic_notifications_none).getIcon(), ViewHelper.getIconColor(this));
             startActivity(new Intent(this, NotificationActivity.class));
             return true;
-        } else if (item.getItemId() == R.id.secondMenu) {
-            if (drawer != null) drawer.openDrawer(GravityCompat.END);
-            return true;
         }
         return super.onOptionsItemSelected(item);
     }

diff --git a/app/src/main/res/menu/search_menu.xml b/app/src/main/res/menu/search_menu.xml
@@ -13,11 +13,4 @@
         android:icon="@drawable/ic_search"
         android:title="@string/search"
         app:showAsAction="always"/>
-
-    <item
-        android:id="@+id/secondMenu"
-        android:visible="false"
-        android:icon="@drawable/ic_profile"
-        android:title="@string/profile"
-        app:showAsAction="always"/>
 </menu>