diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7e40dfca2..17958cf8b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,17 +27,7 @@
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/app.iml b/app/app.iml
index 5426740f7..6d2447d90 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -8,11 +8,11 @@
-
-
-
+
+
+
- generateFlavor1DebugSources
+ generateDebugSources
@@ -23,13 +23,13 @@
-
+
-
-
-
+
+
+
@@ -38,60 +38,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -116,14 +76,6 @@
-
-
-
-
-
-
-
-
@@ -132,9 +84,19 @@
+
+
+
+
+
+
+
+
+
+
@@ -145,8 +107,10 @@
+
+
@@ -154,6 +118,7 @@
+
@@ -161,9 +126,9 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 918e257f4..c27e6ca75 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,12 +28,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
-
- productFlavors {
- flavor1 {
- applicationId = "com.android.keepass"
- }
- }
}
dependencies {
diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/PasswordActivity.java
index e4ccf804e..e20132b98 100644
--- a/app/src/main/java/com/keepassdroid/PasswordActivity.java
+++ b/app/src/main/java/com/keepassdroid/PasswordActivity.java
@@ -38,7 +38,6 @@ import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.TextView;
@@ -83,6 +82,8 @@ public class PasswordActivity extends LockingActivity {
private boolean mRememberKeyfile;
SharedPreferences prefs;
+ private boolean isShowPasswordChecked = false;
+
public static void Launch(Activity act, String fileName) throws FileNotFoundException {
Launch(act,fileName,"");
}
@@ -420,21 +421,21 @@ public class PasswordActivity extends LockingActivity {
Button confirmButton = (Button) findViewById(R.id.pass_ok);
confirmButton.setOnClickListener(new OkClickHandler());
- CheckBox checkBox = (CheckBox) findViewById(R.id.show_password);
+ View showPasswordView = findViewById(R.id.show_password);
// Show or hide password
- checkBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
- public void onCheckedChanged(CompoundButton buttonView,
- boolean isChecked) {
- TextView password = (TextView) findViewById(R.id.password);
-
- if ( isChecked ) {
- password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
- } else {
- password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
- }
+ showPasswordView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ EditText password = (EditText) findViewById(R.id.password);
+ if ( isShowPasswordChecked ) {
+ password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+ isShowPasswordChecked = false;
+ } else {
+ password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+ isShowPasswordChecked = true;
+ }
+ password.setSelection(password.getText().length());
}
-
});
if (password != null) {
diff --git a/app/src/main/res/layout/file_row.xml b/app/src/main/res/layout/file_row.xml
index dc6f95dee..2d4aa73c4 100644
--- a/app/src/main/res/layout/file_row.xml
+++ b/app/src/main/res/layout/file_row.xml
@@ -17,11 +17,17 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see .
-->
-
\ No newline at end of file
+ android:layout_height="wrap_content">
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/file_selection.xml b/app/src/main/res/layout/file_selection.xml
index 143ccda7c..b5eb3ab4d 100644
--- a/app/src/main/res/layout/file_selection.xml
+++ b/app/src/main/res/layout/file_selection.xml
@@ -31,7 +31,7 @@
android:layout_marginRight="@dimen/default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="?android:attr/listSeparatorTextViewStyle"
+ style="@style/TitleTextStyle"
android:text="@string/open_recent" />
-
-
-
-
-
-
-
-
-
-
-
+ android:id="@+id/container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 74dbe765a..fa48816ae 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -53,6 +53,10 @@
- @color/white
- 16sp
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b3715b1d5..05ca384fa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Mar 26 15:21:55 CDT 2017
+#Wed Oct 25 20:52:47 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip