From ed22434bc2a9e3e2192b0e014a35183d49716721 Mon Sep 17 00:00:00 2001
From: defkev <defkev@gmail.com>
Date: Fri, 15 Jan 2016 18:20:53 +0100
Subject: [PATCH] Adds support for manual key entry (of RFC 3548 base32 key
 strings)

---
 .idea/encodings.xml                           |   6 +
 .idea/gradle.xml                              |   3 +-
 .idea/misc.xml                                |  16 ---
 .idea/vcs.xml                                 |   2 +-
 app/build.gradle                              |   1 +
 .../FloatingActionMenuBehavior.java           |  68 ++++++++++
 .../otp_authenticator/MainActivity.java       | 119 ++++++++++++++++--
 .../drawable-hdpi/ic_hardware_keyboard.png    | Bin 0 -> 272 bytes
 .../ic_image_camera_alt_135dgr.png            | Bin 0 -> 2320 bytes
 .../drawable-mdpi/ic_hardware_keyboard.png    | Bin 0 -> 161 bytes
 .../ic_image_camera_alt_135dgr.png            | Bin 0 -> 2320 bytes
 .../drawable-xhdpi/ic_hardware_keyboard.png   | Bin 0 -> 298 bytes
 .../ic_image_camera_alt_135dgr.png            | Bin 0 -> 2320 bytes
 .../drawable-xxhdpi/ic_hardware_keyboard.png  | Bin 0 -> 433 bytes
 .../ic_image_camera_alt_135dgr.png            | Bin 0 -> 3652 bytes
 .../drawable-xxxhdpi/ic_hardware_keyboard.png | Bin 0 -> 700 bytes
 .../ic_image_camera_alt_135dgr.png            | Bin 0 -> 4846 bytes
 app/src/main/res/layout/activity_main.xml     |  26 +++-
 .../main/res/layout/dialog_add_account.xml    |  40 ++++++
 app/src/main/res/values/strings.xml           |  14 +++
 20 files changed, 262 insertions(+), 33 deletions(-)
 create mode 100644 .idea/encodings.xml
 create mode 100644 app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java
 create mode 100644 app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png
 create mode 100644 app/src/main/res/layout/dialog_add_account.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..97626ba4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df476..76e6e147 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="D:\Program Files\Android\Android Studio\gradle\gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7158618b..5d199810 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -43,20 +43,4 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-  <component name="masterDetails">
-    <states>
-      <state key="ProjectJDKs.UI">
-        <settings>
-          <last-edited>1.8</last-edited>
-          <splitter-proportions>
-            <option name="proportions">
-              <list>
-                <option value="0.2" />
-              </list>
-            </option>
-          </splitter-proportions>
-        </settings>
-      </state>
-    </states>
-  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52d..94a25f7f 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 2040fcde..f95d50b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compile 'com.journeyapps:zxing-android-embedded:3.0.3@aar'
     compile 'com.google.zxing:core:3.2.1'
     compile 'commons-codec:commons-codec:1.5'
+    compile 'com.github.clans:fab:1.6.2'
 
     androidTestCompile 'com.android.support:support-annotations:23.1.1'
     androidTestCompile 'com.android.support.test:runner:0.4.1'
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java b/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java
new file mode 100644
index 00000000..35b6679a
--- /dev/null
+++ b/app/src/main/java/net/bierbaumer/otp_authenticator/FloatingActionMenuBehavior.java
@@ -0,0 +1,68 @@
+package net.bierbaumer.otp_authenticator;
+
+import android.content.Context;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.view.ViewPropertyAnimatorListener;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.github.clans.fab.FloatingActionMenu;
+
+import java.util.List;
+
+public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
+    private float mTranslationY;
+
+    public FloatingActionMenuBehavior(Context context, AttributeSet attrs) {
+        super();
+    }
+
+    @Override
+    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
+        return dependency instanceof Snackbar.SnackbarLayout;
+    }
+
+    @Override
+    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
+        if (child instanceof FloatingActionMenu && dependency instanceof Snackbar.SnackbarLayout) {
+            this.updateTranslation(parent, child, dependency);
+        }
+
+        return false;
+    }
+
+    private void updateTranslation(CoordinatorLayout parent, View child, View dependency) {
+        float translationY = this.getTranslationY(parent, child);
+        if (translationY != this.mTranslationY) {
+            ViewCompat.animate(child)
+                    .cancel();
+            if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
+                ViewCompat.animate(child)
+                        .translationY(translationY)
+                        .setListener((ViewPropertyAnimatorListener) null);
+            } else {
+                ViewCompat.setTranslationY(child, translationY);
+            }
+
+            this.mTranslationY = translationY;
+        }
+
+    }
+
+    private float getTranslationY(CoordinatorLayout parent, View child) {
+        float minOffset = 0.0F;
+        List dependencies = parent.getDependencies(child);
+        int i = 0;
+
+        for (int z = dependencies.size(); i < z; ++i) {
+            View view = (View) dependencies.get(i);
+            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
+                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
+            }
+        }
+
+        return minOffset;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java b/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
index 0ea4f9fc..3d89cdb2 100644
--- a/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
+++ b/app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
@@ -10,12 +10,13 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.ActionMode;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -29,15 +30,21 @@
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.ProgressBar;
+//import android.widget.Spinner; ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
 
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
 import com.google.zxing.client.android.Intents;
 import com.google.zxing.integration.android.IntentIntegrator;
 
+import org.apache.commons.codec.binary.Base32;
+
 import java.util.ArrayList;
 
 public class MainActivity extends AppCompatActivity implements  ActionMode.Callback {
     private ArrayList<Entry> entries;
     private EntriesAdapter adapter;
+    private FloatingActionMenu fam;
     private FloatingActionButton fab;
 
     private Handler handler;
@@ -69,7 +76,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String permissi
                // permission was granted
                doScanQRCode();
            } else {
-               Snackbar.make(fab, R.string.msg_camera_permission, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+               Snackbar.make(fam, R.string.msg_camera_permission, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                    @Override
                    public void onDismissed(Snackbar snackbar, int event) {
                        super.onDismissed(snackbar, event);
@@ -88,11 +95,11 @@ public void onDismissed(Snackbar snackbar, int event) {
 
     private Entry nextSelection = null;
     private void showNoAccount(){
-        Snackbar noAccountSnackbar = Snackbar.make(fab, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
+        Snackbar noAccountSnackbar = Snackbar.make(fam, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
                 .setAction(R.string.button_add, new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        scanQRCode();
+                        fam.open(true);
                     }
                 });
         noAccountSnackbar.show();
@@ -107,11 +114,38 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        fab = (FloatingActionButton) findViewById(R.id.action_scan);
+        fam = (FloatingActionMenu) findViewById(R.id.action_scan);
+        fam.setClosedOnTouchOutside(true);
+        fam.setOnMenuToggleListener(new FloatingActionMenu.OnMenuToggleListener() {
+            @Override
+            public void onMenuToggle(boolean opened) {
+                Integer icon;
+                if (opened) {
+                    icon = R.drawable.ic_image_camera_alt_135dgr;
+                    fam.setOnMenuButtonClickListener(new FloatingActionMenu.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            scanQRCode();
+                        }
+                    });
+                } else {
+                    icon = R.drawable.ic_add_white_24dp;
+                    fam.setOnMenuButtonClickListener(new FloatingActionMenu.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            fam.open(true);
+                        }
+                    });
+                }
+                fam.getMenuIconView().setImageResource(icon);
+            }
+        });
+        fab = (FloatingActionButton) findViewById(R.id.action_enter);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                scanQRCode();
+            public void onClick(View v) {
+                fam.close(true);
+                addAccount();
             }
         });
 
@@ -162,6 +196,71 @@ public void run() {
         };
     }
 
+    protected void addAccount() {
+        LayoutInflater inflater = getLayoutInflater();
+        View aa_layout = inflater.inflate(R.layout.dialog_add_account, null);
+        final EditText account_label = (EditText) aa_layout.findViewById(R.id.account_label);
+        final EditText account_key = (EditText) aa_layout.findViewById(R.id.account_key);
+
+        /* ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+        Spinner keyType = (Spinner) addAccountLayout.findViewById(R.id.key_type);
+        ArrayAdapter keyTypeAdapter = ArrayAdapter.createFromResource(this, R.array.spinner_key_type, android.R.layout.simple_spinner_item);
+        keyTypeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        keyType.setAdapter(keyTypeAdapter);
+        */
+
+        AlertDialog.Builder aa_dialog = new AlertDialog.Builder(this);
+        aa_dialog.setTitle(R.string.add_account_title);
+        aa_dialog.setView(aa_layout);
+        aa_dialog.setNegativeButton(R.string.add_account_cancel, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (entries.isEmpty()) {
+                    showNoAccount();
+                }
+            }
+        });
+        aa_dialog.setPositiveButton(R.string.add_account_ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                try {
+                    Entry e = new Entry();
+                    e.setLabel(account_label.getText().toString());
+                    e.setSecret(new Base32().decode(account_key.getText().toString()));
+                    entries.add(e);
+                    SettingsHelper.store(getApplicationContext(), entries);
+                    adapter.notifyDataSetChanged();
+                    Snackbar.make(fam, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
+                } catch (Exception e) {
+                    Snackbar.make(fam, R.string.msg_invalid_key, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                        @Override
+                        public void onDismissed(Snackbar snackbar, int event) {
+                            super.onDismissed(snackbar, event);
+                            if (entries.isEmpty()) {
+                                showNoAccount();
+                            }
+                        }
+                    }).show();
+                }
+            }
+        });
+        final AlertDialog dialog = aa_dialog.create();
+        TextWatcher aa_validator = new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+            @Override
+            public void afterTextChanged(Editable s) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(s.length() == 0 ? false : true);
+            }
+        };
+        account_key.addTextChangedListener(aa_validator);
+        dialog.show();
+        dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -189,9 +288,9 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
 
                 adapter.notifyDataSetChanged();
 
-                Snackbar.make(fab, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
+                Snackbar.make(fam, R.string.msg_account_added, Snackbar.LENGTH_LONG).show();
             } catch (Exception e) {
-                Snackbar.make(fab, R.string.msg_invalid_qr_code, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                Snackbar.make(fam, R.string.msg_invalid_qr_code, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                     @Override
                     public void onDismissed(Snackbar snackbar, int event) {
                         super.onDismissed(snackbar, event);
@@ -262,7 +361,7 @@ public boolean onActionItemClicked(final ActionMode actionMode, MenuItem menuIte
                 public void onClick(DialogInterface dialog, int whichButton) {
                     entries.remove(adapter.getCurrentSelection());
 
-                    Snackbar.make(fab, R.string.msg_account_removed, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
+                    Snackbar.make(fam, R.string.msg_account_removed, Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
                         @Override
                         public void onDismissed(Snackbar snackbar, int event) {
                             super.onDismissed(snackbar, event);
diff --git a/app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-hdpi/ic_hardware_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..569256b5ddfe2d0872a032408d27cab7011ae064
GIT binary patch
literal 272
zcmV+r0q_2aP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk0002jNkl<ZXo2n6
zOAdlC7yw}|f)_E|32(s7*t@{P;KukEHyR0Xfv^4*=1bT>Lpq_0(xQ+gNs=T<($WDX
zPy@}6uNo+$W7j}WIz3QD25%F_-gS||hk)R7WbiQ{n4E%}!Lw#OxlhLA5_~dvG||!c
z*###N8GIhirRA|vXm9t1n}<)vWEtEHp3QPeFFyF$Qk?aYPQu`X!Iug1d-XT)zk}a+
zr@=V|PuXdGdr61>9(Gf{$d~ORgDcV=@$88_;<-hyfDOMt#M=O?&{#>5BuSDa<=_fp
W2Amq+eYL3o0000<MNUMnLSTX^M|W)i

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-hdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11f3e61c72ee22f81148c10797161a9e14b49e8
GIT binary patch
literal 2320
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
PI3N$Sk4yWBu)==;xE@<`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-mdpi/ic_hardware_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9b62ba3332a54f059f4904330c37ce92986b7a4
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dE8J;eVArY-_uNv|-C<rh(#%cWf
z&&c*~!8+02sS}ka?g+lfFgvDD({qxFD}&gA3+ovwT^@)DT)!gNSe>At%+&w;asD|r
zt4DnYif0{I-&b+&0Q+~I9C_C_57SPpI_=Qg!F=t5gXg3#{^I6SD>d3&_2YqdGI+ZB
KxvX<aXaWFyxI0?_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-mdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11f3e61c72ee22f81148c10797161a9e14b49e8
GIT binary patch
literal 2320
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
PI3N$Sk4yWBu)==;xE@<`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xhdpi/ic_hardware_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec6f7969c1a95d016fb119229f7006597ba5aecd
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdl8)A3a?hLn`LHy=lvJ$U(p%QGfBr
zcTH;S!Q5;AREsgLR*{xCk@B?mslber+2xxjs(4O<p;cTPnEMX&)|f9~o%Kd<Geh))
zIk$5zOqEh%YJU?XeCv&!>jBl>ms+aJ<|{pz7@O$@q<JI`dmLzdFE;bK#D~lS49skj
z1{pdJqEfzV9%?W=kbUl<_gP+vIno9e<_QIH$p^mQ_?SK6?s5+1V+jW&cqEu>ru|W5
zKK5PGV8{7}gSGYI1-$tOlUG%QSfz%~x{&%^lS%5A`<tyhnSQ^q+kC-2r?EQEc)|XK
hi>Fn<-3(;d$4mO(*uKLc?FP{E44$rjF6*2UngG5)dPV>M

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..a11f3e61c72ee22f81148c10797161a9e14b49e8
GIT binary patch
literal 2320
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
PI3N$Sk4yWBu)==;xE@<`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xxhdpi/ic_hardware_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..cae861634c881ac742ac457622ccbcffa30c5c2d
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q}r7FjjcFIEGZrd3(p#Pt;MO?V`2e
z4p!ki^MxncS_NIy;4b9&G5t7W&&l3{T0bn(@5~Lkr*8YkN(QJO4g3(l>iKosuYlOE
zUt&Y&uiE@7<@>(q(DkeIql^E<$FIJ8*E&CN?+QIL_K1hk=RbO{yZ0upZsF&<)%xLk
z@9+KPB)<E5+`3=;s=v18mA&5^Q@XeM>r@bf>HM?<n@e3DRNt%Ja-O5c{lUXk@=W|{
z9}1ZG)jt#*XPKAs{oZNS4>?!Q-(9?ZOZEGwR!Sdi-`m|vXW6F=Rm8*}{#U4C!>jLx
zhkZ5zRR~pVW0|MhnC|`HCXo5+e6Ykj#dA9z&FS|8TLv_Y(<Ykf{I#Cn7JWc>ynni?
ze|LENi^zWrb=!dMoA*?dPyKFOfYII5^B;w#9e!A_!f&?h&rMZ(tDmpk^>@<!((0v`
u&R&z@f4uBh%-nGO^7q_mLB+uE!R0S&?J~KY`&8O^L6V-XelF{r5}E+o_`~S{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xxhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..32c98e0a0271a54d97296824ff776bf2c1d07ce3
GIT binary patch
literal 3652
zcmb`K_dgVX8^_6IuLx&vr!&r39T^$fJ9~t)PM00-2sw%q5}i?wNRqRoIuw_AD&u5!
z_NeTUmGJfb7rw9W51;4#%k#tM^Ljnc>v=s`8!KZrW&vgz8X7iJ6GOXmqW&vJ`tz#c
zt4=uwQ>ckc1Pu)f*MCJznTr2+-n?&WsArEVT*srUJREqs$6j{n6E2qNUvXx!`-$d#
zt%+1!5q*}QFUyV{f_1`Pz-Tb36(-j$($g|ZOPsqVU<*~Yjc@2&e~G<%>L~k4vNkSm
zU@sOKG`)`8jQu&?GSE14n%xx?GBEYC@C4tq|7_p;ov&2JM5O0+BVsQAlxYz<|NjHO
z`PTS2@Ia?b+1#(KPu7!zjcp{xqaM1z=m;18<BQ|AFRBP90Lf>L6IEyN0cKJIvKTxy
zprTc8=`!w^AoQ}qbcq)yT2W<!UF0{Y%Q?P`;~;41EltB^1c=3bNe&`}o$EN3o8o9A
z&MMz2bKRoa9VpKDXe?*qnycTFz5;MG;ht5(d*Zqj$e=EJXua6$*Bh{?4Z2LoY;Dnp
zucFmy$ppu8m+BEDqrrrEEynjPE;D~w$8{+cW6*Dlekq#pCNlx)W*V$b8b)lWI4E9r
zbBn$B?4LR`A`V*=5G!aJtVX(-CD^*O>kI$3&QSFwgfF5uv^6+HkX$W|Vh$&Qget95
ztBFbT&d?s@>->eLSC&%mvu6WU4@}|gBOMY&J22cqYT%!vm{WX^I5Fzn1i@(*sO==9
zUsB5MVEdJ4c##gAw}9d~vYq14uLc-P@o9N1Ny4YYUEZ4MFM7bG-U8MNHyEfsc&Ra?
zP{VLyN&uk{l3N0fRj<Dsa!F;Z*q#{FEc)Fvd|f8ydfhVD&v@6RIXfL9?STV2C!apS
zacMuT|A)$?h0<82!HwXf5<6ic?XJVL0<XTui-wQ$yL|d?Ox+e-%+Pw6eWXHo*0E;2
zZ!Zt{IkGvk1|dnxLO;CxMZt+y`Bt)xJRfSSW#waG(vUjl3e8h~<~<g9W~B01G}f70
zPjXNOBfjeb<}>~1PZS*VZC(8cF1DR;+*|@q>MJcjh8?)$j7@fX*~IvF*z244<!-h_
zPtjwbu`qklylEB&DJc|iKUG72w^Q|zQa~|KTuTdTsXe`i?1~t(6SGp}wgly46B_y^
z;9<d+(wk@3s1*%XONuzQQ&W!7y1t}N)%8HQR53NIUynp*INWXvXUY#$x#d?v21GCC
zZs!K@9I^?R(@ovR6<7Ro^2_M^2A^y(_$m=PQ%2z>6iV%Hwc7h(`{<a9keb&wR!_9@
zGBPrPDkYzf*kcN?HUn`Mq?s4>Z4O5d`Zn!PYZ_wj)s={=#yl3iDir@B=hXV-Ft1P4
zKE85CSr^hz9ZH%`&R^(yW-+tZ74u2hA%|*+87lGvi{j?-z^d0XPDj~&U|f*Z3Q7c(
z)_QOVjajqOUZy`;5Qh8u*m=tPe`YwJL`Nt~xb4W^V)>=7dtSM^(p?c>${5>f!rw6a
zhq~VcJ&8%SXzbmgS>N64(ah9-(e`Q^zdc%c#{vDevp{l%oR7>+mHQ*)Mvx$y0#e{7
zDP^c&{^0{lD2HJ9H6}W$C_6`y!YWMUk3Q}UTRjr}H=1EBV8NmI<6olfSv)bnARgBj
zCqWhM_vrN~cES;ZnMpAFfgCI~{E{`V!oMedeD=Z54HYvlug=)v#!^SZCdl_+rynhm
z4j(&j91`FqUyTaH3alG}+1B>xC!JxfO2f%E3&d4$v)XfgCDU{cvu(IG5(J1d_sg)N
zFnVedsoa_T9A8=Dz8;-k>n<k>XS{lqQim=2jqEIx7pn0Fp$&DnKevf52dem|bEYwD
z;^E8B`m?nCvfZze5CUB>`r<Nmzwq-=&)OXjH2cD!vOJBe`FMnD9yCe4L0!j6elGDL
zgfD_(bmHx;efoC1yOHy156#JB?N-<XhZ<KP)xZWsLUbrYQ!2;)NKS7YbQYG(Di}=u
z2G`o7vCbB5z80C@o?NR69PA}LOxd<qN1W4Yu`UJ9fL$-{Bp*wqAJLX^sI!U(ULd+*
zRA&C0wFmB_){QHo@S>2zqELX`b<|tK7&jI4_;}#q1zcO2hF6RGqa%*hUC}N^tXcpp
z;jt4@lY&aQu>^>|1Mun5)3y8!ljXcF(Wb&%ns77%AAM1LJfApAOKRn2c{~=0eLY3!
zz9b2FJ`<Td-QFb1A6QjW@ze`1`#nRUaFb86RJ2ZUo^^c#n3qBy)Q%MC{IT@cY8UzM
zUA_vvEN#tBM7IPGgp4e!Z!T5F-~j@QsV-R4<2@6Xgezj{QTKY{IGKeZNjNT|Ow_3l
zo6^yo_`Lh#ThsVL)%HW$mpZ(;h>+y%=29+<N5ljpZ|l;h6s}zqM{jZz?FQW=rI7pe
zbfINdxTK%{odd#zF+RK6n@0tTw9&=_yLGa7FKNDNvBZQLXA8~2P&jfSUIW#j!EnGO
z$xrI|V8h-7$inal;7Ie{H78DR^zJo!;A>7Z>2bBZ#)ad~mF6U_c9hn3#J#FZ2X_lX
zEfDD_t_#80Ni!c*ehd(u=-n=aQfhc&$HyM7xfRH|C6VW{O`Ijd8m?O?B4=%LJ{c3<
zx3I1Np7fOk27C5IBNUbsYW`R&`TTQUg1<?1w^1ii0Z2)`I93e*<79wiVspr#b7SyF
z;80S&P5dLDrW=|o-SAz**7#OWgIXz{NZ9~NSz9?cTyFyK)?Z;~0O$oDvJnAtU0ldm
zE($Acx8`FAAr}n)JVZb)rmq@kPmna~h339#eY~H-89qRPj_sj6;$Ggt@E0Fghvn3p
zbZh1CJ@islSj@o6B`D@<X&A7pEet0j|2=<vsaY43lRCVYrPJNnu+`3~edpKqd)srz
z`4(Vh-$X`j_*2XLP)%(Fp=1V(5MUql?3DQf)Ge=g)192Hb;RzITu#g2YOYr{Hm-fQ
zVDR31Me@{xn42vQbiFhsfsZ7MIC98kH*F=NTW8up=sG)UM=rb`YM9KhkU|;yvNrjs
zY1Z3yuw&2L4pmW4-?R~4Au*(<nHeRJc4RJ@fxY_Wme;fzxtVu|f>7c0d6i(7{qkb!
z67A1BxfU>Q6cuKtx?)@K_mxi8`($oZs<9)op!juOWL)pSdxv>x<G=d90X`dd8$QXs
z^KbA@ue4;1y>YT{QQwrYC5eD?GyitZ7&#3|zFnrA_xFH$z^0h>2;CNN9ANCk*wg0z
zm9(<=OruCG_HHxX7enbcW|T0^Ku=y4y>Yij+0S+E*H-0)A0b2(>hM=?^j}Q0$NU;^
z|2{9h`$BJ-S2Uo<JBB!jVrIV^WjDG8((7pMH+ZnTS-d<>v2m%_13hsBf>pIfeBUt!
z(2w|9D5$v$iAU*jg6GCFt_~eRy`4y4-5JfcqF7a=U5*G+T^Jug?yO0P=L}zN+PGiU
z=>F@ZXVI&`eT4)v1gf{*$W=R)1Gil=cVoBK+;{;emA!LK<zVL#_=040SzstAM(Zqp
z`pquSjpO_G@qQ+Gv75Zs8QSU$*}e;Ht9mcBYZ?OxV7>sVeUNDX6^hTXC+1?+R`(|T
z!eN}Zg@2AY-tIzxzf&3(o>>r>tu^8XtH@9xNUDoO`A}msm;TVCK?SCd!tt%_<<$3k
zOjD@?L+&xe<-Z5@7{_J4kQk$2osMm1#oWYFCa<t$D0Hl(opwTX#=9mk7^En?zpJ>l
zkcndo!b8FigkO@{a+%FAH%m6&xmfT`NXiKI$T_}~>nwrYz0CMwKwH^XMPxrg6bDmV
zwDP)A2fQQb$4yOq!vW!o<Yr|II1iOGw8$-)$u=}6@-yn5=&3tB@q2cdSlHq1j6^+d
zM*7ZL-{O3+&v<A4S}>_8hd6&CwDzF_?>=}LLz~HXoNU5c2Z5E#<gxX>+S03_C&rfR
zv}%4gQX0W^to`u&*ld=5M`rbVWi7$FZh2?gEJ{;^BCR3mX~f)|_4WKrbKO!n8Agp+
z#u3=XR32{D=?fSsR!kX27trkgx^=~W1r@aU*$h$%Q%_wY)KZQsM%*?YPBLxK<Llzg
zl%H9YV>#0@{49qSXKl8(Jbu`R>-jLz7i~9F&dh$8r&IS{FtYQM3^J$5s(B7PMW~Y6
zBgV?qOw;NFxBonYV2yMIfR5_tSx}fnD=9aPi9l<YtgEzJ;D_VO0^d4KOJPd$#RjL^
zyM}2IN%;nm-^xB!cbD=2=xRX_KEi=A`L&@?k^E#N+>!<%EBKl0nX@eQ<05&nS{LG<
zi<Fx^NE_v3ZB;qn`bwL-a#6823?TRAUDFuJvI^PVtRphH7d2JUG~Mre8nNz!U`*ok
zRY=;UBpHr*6qFv~NlJ9vTs=__nVT?Mz|Z@iRW+e&JR38;t~<{omFJj{;krcRs7)0~
zLvz|v*ypk3X@nd3Vzm?y#n|=5R`z(#Bd102b`4tT*P&RZhg(07I$gCi@UW#y_R9n6
zUiJmuj+^BUxo6nXjG)ne34|J{{kVpVdQeV#i$Q4Ge1a*JRgly_IwM_8q^$-4VPsXd
zx|#-=;piJ~R^wgm2aWyzZdE~I<1F)BHL}HkoS#0(<VgCrFbCC2$yGphl~tnHZ&mjM
zRc?X_#>xP?=+^Pd3nd81w>`vW%vtRESx$Q8lgp%beEHrd^qrS+Bh=g06DFCnG$74D
r4kBZ=G^`_w$x5hTw)4sVi0y>Maths(jQQd7w~)s4hLvHBz8B^{o=oe(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png b/app/src/main/res/drawable-xxxhdpi/ic_hardware_keyboard.png
new file mode 100644
index 0000000000000000000000000000000000000000..c54b4bd4f88eab5a7d13ed6afe1da1fef58a7959
GIT binary patch
literal 700
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuFE&U~2YsaSW-L^Y-rEK3P|h*1-0J
zd+iL8a=k2_6P1lvzMY=HV5pf9*U0lf;exw?pyziU)3Bc=*+<=VuimuY;dp<Yx<Ak?
zykN(kSDRnmes%p->7I3UtM{#+_x9ZLO{@A>uV1y@`trX6e<N#SZST&#zBEKW)c(!c
zvMKX}4jm7!-D!QXF|X`-8RymIS7+bN<omMjS5kT1<IwwW{E9YA-~Cy7{jb#WuI9V%
z&gJiU_5H3U-?uW5bp0E@!cBL7_D*NgyE*rMh311v2#)QBhVK>kmOcyrey~&ILqT1s
z{G1hWw$Bc&H`~99-|x$T@OAG#?(sgm{#~=M=7WcSUfEepWRg3Fh5PgVaU^3arK?W9
z`*ZB{{s+_E039P2aiH4febDFCzaO}8Rak(GUeeG`1h;(tjEXI-@wp&(y=Y{8a=+}k
zc^ub{6ri`3HhAObe7*ioK>aq*!&mQz^S!8@_tx10<oOq$fdSEHho9+RyryEa_5P2$
zcF&mg|5#}3>Q(Q{mRsED1_oTX?dx}H1#-tq*Y+>nb#v}Bhx6sn%OtN}es%nAC*P;y
zuP5K#(ObG(=-!jR2bABhdail@cW`ao-W7SD-yYa?`(W-@qy0beCJmtEKk<KzKA((d
TtP>Jf0jc$L^>bP0l+XkKN2gc`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png b/app/src/main/res/drawable-xxxhdpi/ic_image_camera_alt_135dgr.png
new file mode 100644
index 0000000000000000000000000000000000000000..2316708f1c867d3137a85d8b49850a7c4119cf7e
GIT binary patch
literal 4846
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ad65da55..637cce49 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -49,12 +49,28 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.github.clans.fab.FloatingActionMenu
+        xmlns:fab="http://schemas.android.com/apk/res-auto"
         android:id="@+id/action_scan"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/fab_margin"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_add_white_24dp"></android.support.design.widget.FloatingActionButton>
+        android:paddingBottom="10dp"
+        fab:layout_behavior="net.bierbaumer.otp_authenticator.FloatingActionMenuBehavior"
+        fab:menu_backgroundColor="#BF000000"
+        fab:menu_colorNormal="@color/colorAccent"
+        fab:menu_colorPressed="@color/colorAccent"
+        fab:menu_fab_label="@string/fam_label_scan">
+
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/action_enter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_hardware_keyboard"
+            fab:fab_size="mini"
+            fab:fab_label="@string/fab_label_enter"/>
+
+    </com.github.clans.fab.FloatingActionMenu>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/dialog_add_account.xml b/app/src/main/res/layout/dialog_add_account.xml
new file mode 100644
index 00000000..33eb1439
--- /dev/null
+++ b/app/src/main/res/layout/dialog_add_account.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp">
+
+        <!--  Name -->
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <EditText android:id="@+id/account_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/add_account_label"/>
+        </android.support.design.widget.TextInputLayout>
+
+        <!-- Key -->
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <EditText android:id="@+id/account_key"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textVisiblePassword|textCapCharacters|textMultiLine"
+                android:hint="@string/add_account_key"/>
+        </android.support.design.widget.TextInputLayout>
+
+        <!-- ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+        <Spinner
+            android:id="@+id/key_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+        -->
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4eef8a54..6a8f707a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,4 +17,18 @@
     <string name="alert_rename">Rename</string>
     <string name="alert_remove">"Remove "</string>
     <string name="msg_camera_permission">Camera permission not granted</string>
+    <string name="fam_label_scan">Scan QR code</string>
+    <string name="fab_label_enter">Enter private key</string>
+    <!-- ToDo: Preparation to support other key types, see https://github.com/0xbb/otp-authenticator/issues/10
+    <string-array name="spinner_key_type">
+        <item>TOTP (Time based)</item>
+        <item>HOTP (Counter based)</item>
+    </string-array>
+    -->
+    <string name="add_account_title">Add account</string>
+    <string name="add_account_label">Label</string>
+    <string name="add_account_key">Key</string>
+    <string name="add_account_ok">Add</string>
+    <string name="add_account_cancel">Cancel</string>
+    <string name="msg_invalid_key">Invalid key</string>
 </resources>