diff --git a/app/build.gradle b/app/build.gradle index 906ad91d..fd862e6d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,14 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:24.1.1' compile 'com.android.support:design:24.1.1' compile 'me.dm7.barcodescanner:zxing:1.9' + compile 'com.android.support:cardview-v7:24.1.1' + compile 'com.android.support:recyclerview-v7:24.1.1' + compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7' + compile 'com.android.support:support-v4:24.1.1' + compile 'com.android.support:recyclerview-v7:24.1.1' + compile 'com.yarolegovich:lovely-dialog:1.0.4' + testCompile 'junit:junit:4.12' } diff --git a/app/src/main/java/me/impy/aegis/MainActivity.java b/app/src/main/java/me/impy/aegis/MainActivity.java index fa3ddde8..b9ccfd02 100644 --- a/app/src/main/java/me/impy/aegis/MainActivity.java +++ b/app/src/main/java/me/impy/aegis/MainActivity.java @@ -1,6 +1,7 @@ package me.impy.aegis; import android.content.Intent; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.inputmethodservice.Keyboard; import android.support.design.widget.FloatingActionButton; @@ -14,6 +15,10 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.TextView; +import android.widget.Toast; + +import com.yarolegovich.lovelydialog.LovelyCustomDialog; +import com.yarolegovich.lovelydialog.LovelyTextInputDialog; import java.util.ArrayList; @@ -64,7 +69,7 @@ public class MainActivity extends AppCompatActivity { if (requestCode == GET_KEYINFO) { // Make sure the request was successful if (resultCode == RESULT_OK) { - KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile"); + final KeyProfile keyProfile = (KeyProfile)data.getSerializableExtra("KeyProfile"); String otp; try { @@ -75,8 +80,30 @@ public class MainActivity extends AppCompatActivity { } keyProfile.Code = otp; - mKeyProfiles.add(keyProfile); - mKeyProfileAdapter.notifyDataSetChanged(); + + new LovelyTextInputDialog(this, R.style.EditTextTintTheme) + .setTopColorRes(R.color.colorHeaderSuccess) + .setTitle("New profile added") + .setMessage("How do you want to call it?") + .setIcon(R.drawable.ic_check) + .setInitialInput(keyProfile.Name) + .setInputFilter("Nah, not possible man.", new LovelyTextInputDialog.TextFilter() { + @Override + public boolean check(String text) { + return true; + //return text.matches("\\w+"); + } + }) + .setConfirmButton(android.R.string.ok, new LovelyTextInputDialog.OnTextInputConfirmListener() { + @Override + public void onTextInputConfirmed(String text) { + keyProfile.Name = text; + mKeyProfiles.add(keyProfile); + mKeyProfileAdapter.notifyDataSetChanged(); + } + }) + .show(); + //TODO: do something with the result. } } diff --git a/app/src/main/res/drawable/ic_check.png b/app/src/main/res/drawable/ic_check.png new file mode 100644 index 00000000..4eb240b3 Binary files /dev/null and b/app/src/main/res/drawable/ic_check.png differ diff --git a/app/src/main/res/layout/dialog_new_profile.xml b/app/src/main/res/layout/dialog_new_profile.xml new file mode 100644 index 00000000..aac41360 --- /dev/null +++ b/app/src/main/res/layout/dialog_new_profile.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3ab3e9cb..4733b87c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,4 +3,5 @@ #3F51B5 #303F9F #FF4081 + #12b600 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 545b9c6d..a388344c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,4 +17,8 @@ +