Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer

Switch to MaterialDrawer library

OpenKeychain/build.gradle

@@ -23,6 +23,11 @@ dependencies {
     compile "com.splitwise:tokenautocomplete:1.3.3@aar"
     compile 'se.emilsjolander:stickylistheaders:2.6.0'
     compile 'org.sufficientlysecure:html-textview:1.1'
+    compile 'com.mikepenz.materialdrawer:library:2.7.9@aar'
+    compile 'com.mikepenz.iconics:library:0.9.1@aar'
+    compile 'com.mikepenz.iconics:octicons-typeface:2.2.0@aar'
+    compile 'com.mikepenz.iconics:meteocons-typeface:1.1.1@aar'
+    compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar'
 
     // libs as submodules
     compile project(':extern:openpgp-api-lib')
@@ -56,6 +61,11 @@ dependencyVerification {
             'com.splitwise:tokenautocomplete:20bee71cc59b3828eb000b684d46ddf738efd56b8fee453a509cd16fda42c8cb',
             'se.emilsjolander:stickylistheaders:8c05981ec5725be33f7cee5e68c13f3db49cd5c75f1aaeb04024920b1ef96ad4',
             'org.sufficientlysecure:html-textview:ca24b1522be88378634093815ce9ff1b4920c72e7513a045a7846e14069ef988',
+            'com.mikepenz.materialdrawer:library:3ef80c6e1ca1b29cfcbb27fa7927c02b2246e068c17fe52283703c4897449923',
+            'com.mikepenz.iconics:library:4698a36ee4c2af765d0a85779c61474d755b90d66a59020105b6760a8a909e9e',
+            'com.mikepenz.iconics:octicons-typeface:67ed7d456a9ce5f5307b85f955797bfb3dd674e2f6defb31c6b8bbe2ede290be',
+            'com.mikepenz.iconics:meteocons-typeface:39a8a9e70cd8287cdb119af57a672a41dd09240dba6697f5a0dbda1ccc33298b',
+            'com.mikepenz.iconics:community-material-typeface:f1c5afee5f0f10d66beb3ed0df977246a02a9c46de4e05d7c0264bcde53b6b7f',
 //            'OpenKeychain.extern:openpgp-api-lib:f05a9215cdad3a6597e4c5ece6fcec92b178d218195a3e88d2c0937c48dd9580',
 //            'OpenKeychain.extern:openkeychain-api-lib:50f6ebb5452d3fdc7be137ccf857a0ff44d55539fcb7b91baef495766ed7f429',
 //            'com.madgag.spongycastle:core:df8fcc028a95ac5ffab3b78c9163f5cfa672e41cd50128ca55d458b6cfbacf4b',

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
  * Copyright (C) 2014 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ * Copyright (C) 2015 Kai Jiang <jiangkai@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,36 +21,97 @@ package org.sufficientlysecure.keychain.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.AdapterView;
+
+import com.mikepenz.community_material_typeface_library.CommunityMaterial;
+import com.mikepenz.google_material_typeface_library.GoogleMaterial;
+import com.mikepenz.iconics.typeface.FontAwesome;
+import com.mikepenz.materialdrawer.Drawer;
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.operations.results.OperationResult;
 import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
-import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.util.FabContainer;
+import org.sufficientlysecure.keychain.util.Preferences;
 
-import it.neokree.materialnavigationdrawer.MaterialNavigationDrawer;
+public class MainActivity extends ActionBarActivity implements FabContainer {
 
-public class MainActivity extends MaterialNavigationDrawer implements FabContainer {
+    public Drawer.Result result;
+
+    private KeyListFragment mKeyListFragment ;
+    private AppsListFragment mAppsListFragment;
+    private EncryptDecryptOverviewFragment mEncryptDecryptOverviewFragment;
+    private Fragment lastUsedFragment;
 
     @Override
-    public void init(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
-        // don't open drawer on first run
+        super.onCreate(savedInstanceState);
-        disableLearningPattern();
+        setContentView(R.layout.main_activity);
 
-//        addMultiPaneSupport();
+        //initialize FragmentLayout with KeyListFragment at first
+        Fragment mainFragment = new KeyListFragment();
+        FragmentManager fm = getSupportFragmentManager();
+        FragmentTransaction transaction = fm.beginTransaction();
+        transaction.replace(R.id.main_fragment_container, mainFragment);
+        transaction.commit();
 
-        // set the header image
+        final Toolbar toolbar = (Toolbar) findViewById(R.id.activity_main_toolbar);
-        // create and set the header
+        toolbar.setTitle(R.string.app_name);
-        setDrawerHeaderImage(R.drawable.drawer_header);
+        setSupportActionBar(toolbar);
 
-        // create sections
+        result = new Drawer()
-        addSection(newSection(getString(R.string.nav_keys), R.drawable.ic_vpn_key_black_24dp, new KeyListFragment()));
+                .withActivity(this)
-        addSection(newSection(getString(R.string.nav_encrypt_decrypt), R.drawable.ic_lock_black_24dp, new EncryptDecryptOverviewFragment()));
+                .withHeader(R.layout.main_drawer_header)
-        addSection(newSection(getString(R.string.title_api_registered_apps), R.drawable.ic_apps_black_24dp, new AppsListFragment()));
+                .withToolbar(toolbar)
-
+                .addDrawerItems(
-        // create bottom section
+                        new PrimaryDrawerItem().withName(R.string.nav_keys).withIcon(CommunityMaterial.Icon.cmd_key).withIdentifier(1).withCheckable(false),
-        addBottomSection(newSection(getString(R.string.menu_preferences), R.drawable.ic_settings_black_24dp, new Intent(this, SettingsActivity.class)));
+                        new PrimaryDrawerItem().withName(R.string.nav_encrypt_decrypt).withIcon(FontAwesome.Icon.faw_lock).withIdentifier(2).withCheckable(false),
-        addBottomSection(newSection(getString(R.string.menu_help), R.drawable.ic_help_black_24dp, new Intent(this, HelpActivity.class)));
+                        new PrimaryDrawerItem().withName(R.string.title_api_registered_apps).withIcon(CommunityMaterial.Icon.cmd_apps).withIdentifier(3).withCheckable(false)
+                )
+                .addStickyDrawerItems(
+                        // display and stick on bottom of drawer
+                        new PrimaryDrawerItem().withName(R.string.menu_preferences).withIcon(GoogleMaterial.Icon.gmd_settings).withIdentifier(4).withCheckable(false),
+                        new PrimaryDrawerItem().withName(R.string.menu_help).withIcon(CommunityMaterial.Icon.cmd_help_circle).withIdentifier(5).withCheckable(false)
+                )
+                .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id, IDrawerItem drawerItem) {
+                        if (drawerItem != null) {
+                            Intent intent = null;
+                            switch(drawerItem.getIdentifier()) {
+                                case 1:
+                                    onKeysSelected();
+                                    break;
+                                case 2:
+                                    onEnDecryptSelected();
+                                    break;
+                                case 3:
+                                    onAppsSelected();
+                                    break;
+                                case 4:
+                                    intent = new Intent(MainActivity.this, SettingsActivity.class);
+                                    break;
+                                case 5:
+                                    intent = new Intent(MainActivity.this, HelpActivity.class);
+                                    break;
+                            }
+                            if (intent != null) {
+                                MainActivity.this.startActivity(intent);
+                            }
+                        }
+                    }
+                })
+                .withSelectedItem(-1)
+                .withSavedInstance(savedInstanceState)
+                .build();
 
         // if this is the first time show first time activity
         Preferences prefs = Preferences.getPreferences(this);
@@ -69,9 +131,80 @@ public class MainActivity extends MaterialNavigationDrawer implements FabContain
         }
     }
 
+    private void clearFragments() {
+        mKeyListFragment = null;
+        mAppsListFragment = null;
+        mEncryptDecryptOverviewFragment = null;
+
+        getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+    }
+
+    private void setFragment(Fragment fragment) {
+        setFragment(fragment, true);
+    }
+
+    private void setFragment(Fragment fragment, boolean addToBackStack) {
+        this.lastUsedFragment = fragment;
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+        ft.replace(R.id.main_fragment_container, fragment);
+        if (addToBackStack) {
+            ft.addToBackStack(null);
+        }
+        ft.commit();
+    }
+
+    private boolean onKeysSelected() {
+        clearFragments();
+
+        if (mKeyListFragment == null) {
+            mKeyListFragment = new KeyListFragment();
+        }
+
+        setFragment(mKeyListFragment, false);
+        return true;
+    }
+
+    private boolean onEnDecryptSelected() {
+        clearFragments();
+        if (mEncryptDecryptOverviewFragment == null) {
+            mEncryptDecryptOverviewFragment = new EncryptDecryptOverviewFragment();
+        }
+
+        setFragment(mEncryptDecryptOverviewFragment);
+        return true;
+    }
+
+    private boolean onAppsSelected() {
+        clearFragments();
+        if (mAppsListFragment == null) {
+            mAppsListFragment = new AppsListFragment();
+        }
+
+        setFragment(mAppsListFragment);
+        return true;
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        //add the values which need to be saved from the drawer to the bundle
+        outState = result.saveInstanceState(outState);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onBackPressed(){
+        //handle the back press :D close the drawer first and if the drawer is closed close the activity
+        if (result != null && result.isDrawerOpen()) {
+            result.closeDrawer();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
     @Override
     public void fabMoveUp(int height) {
-        Object fragment = getCurrentSection().getTargetFragment();
+        Object fragment = getSupportFragmentManager()
+                .findFragmentById(R.id.main_fragment_container);
         if (fragment instanceof FabContainer) {
             ((FabContainer) fragment).fabMoveUp(height);
         }
@@ -79,7 +212,8 @@ public class MainActivity extends MaterialNavigationDrawer implements FabContain
 
     @Override
     public void fabRestorePosition() {
-        Object fragment = getCurrentSection().getTargetFragment();
+        Object fragment = getSupportFragmentManager()
+                .findFragmentById(R.id.main_fragment_container);
         if (fragment instanceof FabContainer) {
             ((FabContainer) fragment).fabRestorePosition();
         }

OpenKeychain/src/main/res/layout/main_activity.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/activity_main_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="4dp"
+        android:background="?attr/colorPrimary"/>
+
+    <FrameLayout
+        android:id="@+id/main_fragment_container"
+        android:layout_gravity="center"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"/>
+
+</LinearLayout>

OpenKeychain/src/main/res/layout/main_drawer_header.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:src="@drawable/drawer_header"
+    android:adjustViewBounds="true"
+    android:scaleType="fitCenter">
+</ImageView>