Add Material style and change layouts

This commit is contained in:
Jeremy
2017-10-17 17:57:53 +02:00
parent c3e77b21ec
commit 714245a5ba
49 changed files with 876 additions and 961 deletions

View File

@@ -53,6 +53,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1Debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/flavor1/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/flavor1/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/assets" type="java-test-resource" />
@@ -61,13 +68,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavor1Debug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavor1/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/flavor1/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/flavor1/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavor1/assets" type="java-resource" />
@@ -116,14 +116,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -132,14 +124,40 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/cmake" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -8,15 +8,17 @@
android:largeScreens="true"
android:anyDensity="true"
/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.VIBRATE" />
<application
android:label="@string/app_name"
android:icon="@drawable/launcher"
android:name="com.keepassdroid.app.App"
android:allowBackup="true"
android:backupAgent="com.keepassdroid.backup.SettingsBackupAgent">
<meta-data android:name="com.google.android.backup.api_key"
android:label="@string/app_name"
android:icon="@drawable/launcher"
android:name="com.keepassdroid.app.App"
android:allowBackup="true"
android:backupAgent="com.keepassdroid.backup.SettingsBackupAgent"
android:theme="@style/KeepassoidStyle">
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIKwReNelmy5SvhZzK3bpK_JisjzUko6cL_8GR4w" />
<activity android:name=".KeePass"
android:label="@string/app_name">
@@ -25,11 +27,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.keepassdroid.fileselect.FileSelectActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"
/>
<activity android:name="com.keepassdroid.PasswordActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
<activity android:name="com.keepassdroid.fileselect.FileSelectActivity" android:configChanges="orientation|keyboardHidden" />
<activity android:name="com.keepassdroid.PasswordActivity" android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -65,46 +64,44 @@
<data android:mimeType="application/octet-stream" />
</intent-filter>
</activity>
<activity android:name="com.keepassdroid.GroupActivityV3" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
<activity android:name="com.keepassdroid.GroupActivityV3" android:configChanges="orientation|keyboardHidden">
<!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
<!-- whenever the user invokes search while in this Activity. -->
<meta-data android:name="android.app.default_searchable"
android:value="com.keepassdroid.search.SearchResults" />
</activity>
<activity android:name="com.keepassdroid.GroupActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar">
<activity android:name="com.keepassdroid.GroupActivityV4" android:configChanges="orientation|keyboardHidden">
<!-- This metadata entry causes .app.SearchQueryResults to be the default context -->
<!-- whenever the user invokes search while in this Activity. -->
<meta-data android:name="android.app.default_searchable"
android:value="com.keepassdroid.search.SearchResults"
android:exported="false" />
</activity>
<activity android:name="com.keepassdroid.EntryActivity" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.LockingActivity"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryEditActivityV3" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.EntryEditActivityV4" android:configChanges="orientation|keyboardHidden"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.GroupEditActivity" android:theme="@style/Dialog"></activity>
<activity android:name="com.keepassdroid.IconPickerActivity" android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.search.SearchResults" android:launchMode="standard"
android:theme="@style/NoTitleBar">
<activity
android:name="com.keepassdroid.EntryActivity"
android:configChanges="orientation|keyboardHidden" />
<activity
android:name="com.keepassdroid.EntryActivityV4"
android:configChanges="orientation|keyboardHidden" />
<activity
android:name="com.keepassdroid.EntryEditActivityV3"
android:configChanges="orientation|keyboardHidden" />
<activity
android:name="com.keepassdroid.EntryEditActivityV4"
android:configChanges="orientation|keyboardHidden" />
<activity android:name="com.keepassdroid.GroupEditActivity" />
<activity android:name="com.keepassdroid.IconPickerActivity" />
<activity android:name="com.keepassdroid.search.SearchResults" android:launchMode="standard">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
</activity>
<activity android:name="com.keepassdroid.settings.AppSettingsActivity"
android:theme="@style/NoTitleBar"></activity>
<activity android:name="com.keepassdroid.GeneratePasswordActivity"
android:theme="@style/NoTitleBar"></activity>
<service android:name="com.keepassdroid.services.TimeoutService"></service>
<activity android:name="com.keepassdroid.settings.AppSettingsActivity" />
<activity android:name="com.keepassdroid.GeneratePasswordActivity" />
<service android:name="com.keepassdroid.services.TimeoutService" />
<meta-data android:name="com.a0soft.gphone.aTrackDog.webURL" android:value="http://keepassdroid.com" />
</application>
</manifest>

View File

@@ -40,8 +40,6 @@ public class FileNameView extends RelativeLayout {
inflate(context);
}
private void inflate(Context context) {
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.file_selection_filename, this);
@@ -58,7 +56,7 @@ public class FileNameView extends RelativeLayout {
TextView tv = (TextView) findViewById(R.id.label_warning);
TextView label = (TextView) findViewById(R.id.label_open_by_filename);
RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT);
RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
if (warning != -1) {
tv.setText(warning);

View File

@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="@color/white"
tools:targetApi="lollipop">
<item>
<layer-list>
<item android:right="1dp" android:top="5dp">
<shape>
<corners android:radius="3dp" />
<solid android:color="#14000000" />
</shape>
</item>
<item android:bottom="2dp" android:left="2dp">
<shape>
<gradient android:angle="270"
android:endColor="#E2E2E2" android:startColor="#BABABA" />
<corners
android:radius="2dp" />
<padding
android:left="14dp"
android:right="14dp"
android:top="8dp"
android:bottom="12dp"/>
<solid android:color="@color/green"/>
</shape>
</item>
</layer-list>
</item>
</ripple>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
</vector>

View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
</vector>

View File

@@ -17,7 +17,8 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_margin="@dimen/activity_default_margin"
android:id="@+id/entry_table"
android:layout_height="wrap_content"
android:layout_width="fill_parent"

View File

@@ -17,88 +17,80 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_margin="@dimen/activity_default_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/about_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/AboutText"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/AboutText"/>
<ImageView android:id="@+id/divider1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/about_title"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
<TextView android:id="@+id/version_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:text="@string/version_label"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/version_label"/>
<TextView android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:layout_alignParentRight="true"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"/>
<ImageView android:id="@+id/divider2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/version_title"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
<TextView android:id="@+id/homepage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider2"
android:text="@string/about_homepage"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_homepage"/>
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:layout_gravity="end"
android:text="@string/homepage_short" />
<TextView android:id="@+id/feedback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_feedback"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/homepage_short"
android:layout_below="@id/divider2"
android:layout_alignParentRight="true"
android:autoLink="web"/>
<TextView android:id="@+id/feedback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/homepage"
android:text="@string/about_feedback"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/issues"
android:layout_below="@id/homepage"
android:layout_alignParentRight="true"
android:autoLink="web"/>
android:layout_height="wrap_content"
android:text="@string/issues"
android:layout_gravity="end"
android:autoLink="web"/>
<TextView android:id="@+id/Twitter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/feedback"
android:text="@string/about_twitter"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/about_twitter"/>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/twitter"
android:layout_below="@id/feedback"
android:layout_alignParentRight="true"
android:autoLink="web"/>
android:layout_height="wrap_content"
android:text="@string/twitter"
android:layout_gravity="end"
android:autoLink="web"/>
<ImageView android:id="@+id/divider3"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/Twitter"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
<TextView android:id="@+id/disclaimer"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider3"
android:text="@string/disclaimer_formal"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/disclaimer_formal"/>
<Button android:id="@+id/about_button"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/disclaimer"
android:layout_centerHorizontal="true"
android:text="@android:string/ok"
android:width="100sp"/>
</RelativeLayout>
android:layout_margin="@dimen/button_margin"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@android:string/ok"
android:width="100sp"/>
</LinearLayout>

View File

@@ -17,15 +17,11 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<!--
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -37,19 +33,19 @@
android:gravity="center_horizontal"
android:orientation="vertical">
<Button android:id="@+id/install_market"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/install_from_market"
/>
android:layout_margin="@dimen/button_margin"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/install_from_market" />
<Button android:id="@+id/install_web"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/install_from_website"
/>
android:layout_margin="@dimen/button_margin"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/install_from_website" />
<Button android:id="@+id/cancel"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/cancel"
/>
android:layout_margin="@dimen/button_margin"
android:layout_width="200sp"
android:layout_height="wrap_content"
android:text="@string/cancel" />
</LinearLayout>
</LinearLayout>

View File

@@ -18,8 +18,9 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<EditText android:id="@+id/rounds"
android:hint="@string/rounds_hint"
android:layout_height="wrap_content"

View File

@@ -18,164 +18,167 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button android:id="@+id/entry_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/entry_save"/>
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/entry_save"/>
<Button android:id="@+id/entry_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/entry_save"
android:text="@string/entry_cancel"/>
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/entry_save"
android:text="@string/entry_cancel"/>
<View android:id="@+id/entry_divider"
android:layout_above="@id/entry_save"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_above="@id/entry_save"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<com.keepassdroid.view.NoFocusScrollView android:id="@+id/entry_scroll"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@id/entry_divider"
android:fillViewport="true">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_above="@id/entry_divider"
android:fillViewport="true">
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content">
<!-- Title -->
<TextView android:id="@+id/entry_title_label"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/entry_title" />
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/entry_title" />
<ImageButton android:id="@+id/icon_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic00"
android:layout_alignParentRight="true"
android:layout_below="@id/entry_title_label"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic00"
android:layout_alignParentRight="true"
android:layout_below="@id/entry_title_label"/>
<EditText android:id="@+id/entry_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/icon_button"
android:singleLine="true"
android:layout_below="@id/entry_title_label"
android:hint="@string/hint_title"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/icon_button"
android:singleLine="true"
android:layout_below="@id/entry_title_label"
android:hint="@string/hint_title"/>
<View android:id="@+id/divider_title"
android:layout_below="@id/icon_button"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/icon_button"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<!-- Username -->
<TextView android:id="@+id/entry_user_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_title"
android:text="@string/entry_user_name" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_title"
android:text="@string/entry_user_name" />
<EditText android:id="@+id/entry_user_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_below="@id/entry_user_name_label"
android:hint="@string/hint_username"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textEmailAddress"
android:layout_below="@id/entry_user_name_label"
android:hint="@string/hint_username"/>
<View android:id="@+id/divider_username"
android:layout_below="@id/entry_user_name"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/entry_user_name"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<!-- URL -->
<TextView android:id="@+id/entry_url_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_username"
android:text="@string/entry_url" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_username"
android:text="@string/entry_url" />
<EditText android:id="@+id/entry_url"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textUri"
android:layout_below="@id/entry_url_label"
android:hint="@string/hint_url"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:inputType="textUri"
android:layout_below="@id/entry_url_label"
android:hint="@string/hint_url"/>
<View android:id="@+id/divider_url"
android:layout_below="@id/entry_url"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/entry_url"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<!-- Password -->
<TextView android:id="@+id/entry_password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_url"
android:text="@string/entry_password" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_url"
android:text="@string/entry_password" />
<Button android:id="@+id/generate_button"
android:layout_below="@id/entry_password_label"
android:layout_width="wrap_content"
android:text="@string/ellipsis"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"/>
android:layout_below="@id/entry_password_label"
android:layout_width="wrap_content"
android:text="@string/ellipsis"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"/>
<com.keepassdroid.view.PasswordEditText android:id="@+id/entry_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:typeface="monospace"
android:singleLine="true"
android:layout_toLeftOf="@id/generate_button"
android:hint="@string/hint_pass"
android:layout_alignTop="@id/generate_button"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:typeface="monospace"
android:singleLine="true"
android:layout_toLeftOf="@id/generate_button"
android:hint="@string/hint_pass"
android:layout_alignTop="@id/generate_button"/>
<View android:id="@+id/divider_password"
android:layout_below="@id/generate_button"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/generate_button"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<!-- Confirm Password -->
<TextView android:id="@+id/entry_confpassword_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_password"
android:text="@string/entry_confpassword" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_password"
android:text="@string/entry_confpassword" />
<com.keepassdroid.view.PasswordEditText android:id="@+id/entry_confpassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:typeface="monospace"
android:singleLine="true"
android:layout_below="@id/entry_confpassword_label"
android:hint="@string/hint_conf_pass"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:typeface="monospace"
android:singleLine="true"
android:layout_below="@id/entry_confpassword_label"
android:hint="@string/hint_conf_pass"/>
<View android:id="@+id/divider_confpassword"
android:layout_below="@id/entry_confpassword"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/entry_confpassword"
android:layout_marginTop="6dp"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<!-- Comment -->
<TextView android:id="@+id/entry_comment_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_confpassword"
android:text="@string/entry_comment" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider_confpassword"
android:text="@string/entry_comment" />
<EditText android:id="@+id/entry_comment"
android:inputType="textMultiLine"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/entry_comment_label"
android:hint="@string/hint_comment"/>
android:inputType="textMultiLine"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/entry_comment_label"
android:hint="@string/hint_comment"/>
<View android:id="@+id/divider_comment"
android:layout_below="@id/entry_comment"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
android:layout_below="@id/entry_comment"
android:scaleType="fitXY"
style="@style/DividerEntry"/>
<LinearLayout android:id="@+id/advanced_container"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider_comment"
android:orientation="vertical">
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider_comment"
android:orientation="vertical">
</LinearLayout>
<ImageButton android:id="@+id/add_advanced"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_below="@id/advanced_container"
android:contentDescription="@string/add_string"
android:src="@android:drawable/ic_input_add"
android:scaleType="centerCrop"
android:visibility="gone"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_below="@id/advanced_container"
android:contentDescription="@string/add_string"
android:src="@android:drawable/ic_input_add"
android:scaleType="centerCrop"
android:visibility="gone"
/>
</RelativeLayout>
</com.keepassdroid.view.NoFocusScrollView>

View File

@@ -18,8 +18,9 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<com.keepassdroid.view.EntryEditSection xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<EditText android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -34,7 +35,7 @@
android:layout_below="@id/title"
android:text="@string/protection"
/>
<ImageButton android:id="@+id/delete"
<ImageView android:id="@+id/delete"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"

View File

@@ -18,8 +18,9 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<!-- Title -->
<LinearLayout android:id="@+id/title_block"
android:layout_alignParentTop="true"

View File

@@ -17,7 +17,8 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_margin="@dimen/activity_default_margin"
android:id="@+id/entry_table"
android:layout_height="wrap_content"
android:layout_width="fill_parent"

View File

@@ -18,6 +18,7 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_margin="@dimen/activity_default_margin"
android:id="@+id/parent"
android:layout_width="fill_parent"
android:layout_height="fill_parent">

View File

@@ -18,56 +18,20 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:id="@+id/file_listtop"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/open_recent"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/open_recent" />
<com.keepassdroid.view.FileNameView android:id="@+id/file_select"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
/>
<!--
<Button android:id="@+id/open"
android:text="@string/menu_open"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignParentBottom="true"
android:width="100sp"/>
<Button android:id="@+id/create"
android:text="@string/menu_create"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/open"
android:width="100sp"/>
<ImageButton android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher_folder_small"
android:layout_alignParentRight="true"
android:layout_alignTop="@id/file_filename"
/>
<EditText android:id="@+id/file_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_above="@id/open"
android:layout_toLeftOf="@id/browse_button"
/>
<TextView android:id="@+id/label_open_by_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/file_filename"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/enter_filename"/>
-->
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true" />
<ListView android:id="@+id/file_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@id/file_listtop"
android:layout_above="@id/file_select"/>
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@id/file_listtop"
android:layout_above="@id/file_select" />
</RelativeLayout>

View File

@@ -18,44 +18,46 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/label_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:visibility="invisible" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:visibility="invisible" />
<TextView android:id="@+id/label_open_by_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/enter_filename"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/enter_filename"/>
<ImageButton android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher_folder_small"
android:layout_alignParentRight="true"
android:layout_below="@id/label_open_by_filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_folder_white_24dp"
android:layout_alignParentRight="true"
android:layout_below="@id/label_open_by_filename"
/>
<EditText android:id="@+id/file_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_below="@id/label_open_by_filename"
android:layout_toLeftOf="@id/browse_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_below="@id/label_open_by_filename"
android:layout_toLeftOf="@id/browse_button"
/>
<Button android:id="@+id/open"
android:text="@string/menu_open"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:width="100sp"/>
android:layout_margin="@dimen/button_margin"
android:text="@string/menu_open"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:width="100sp"/>
<Button android:id="@+id/create"
android:text="@string/menu_create"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:layout_toRightOf="@id/open"
android:width="100sp"/>
android:layout_margin="@dimen/button_margin"
android:text="@string/menu_create"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:layout_toRightOf="@id/open"
android:width="100sp"/>
</RelativeLayout>

View File

@@ -18,48 +18,13 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.keepassdroid.view.FileNameView android:id="@+id/file_select"
android:layout_width="fill_parent"
android:layout_height="fill_parent"/>
<!--
<TextView android:id="@+id/label_open_by_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
style="?android:attr/listSeparatorTextViewStyle"
android:text="@string/enter_filename"/>
<ImageButton android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher_folder_small"
android:layout_alignParentRight="true"
android:layout_alignTop="@id/file_filename"
/>
<EditText android:id="@+id/file_filename"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_below="@id/label_open_by_filename"
android:layout_toLeftOf="@id/browse_button"
/>
<Button android:id="@+id/open"
android:text="@string/menu_open"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:width="100sp"/>
<Button android:id="@+id/create"
android:text="@string/menu_create"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/file_filename"
android:layout_toRightOf="@id/open"
android:width="100sp"/>
-->
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
<!-- Small hack because I need to include a list since this is a list activity -->
<ListView android:id="@+id/file_list"
android:layout_width="0sp"
android:layout_height="0sp"/>
android:layout_width="0sp"
android:layout_height="0sp" />
</RelativeLayout>

View File

@@ -18,123 +18,127 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<Button android:id="@+id/accept_button"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/accept"
android:layout_alignParentBottom="true" />
android:layout_margin="@dimen/button_margin"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/accept"
android:layout_alignParentBottom="true" />
<Button android:id="@+id/cancel_button"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/cancel"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/accept_button" />
android:layout_margin="@dimen/button_margin"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/cancel"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/accept_button" />
<ScrollView android:id="@+id/ScrollView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/cancel_button">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/cancel_button">
<RelativeLayout android:id="@+id/RelativeLayout"
android:layout_height="wrap_content"
android:layout_width="wrap_content">
<EditText android:id="@+id/password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:ems="10"
android:singleLine="true"
android:typeface="monospace"
android:hint="@string/hint_generated_password" />
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:ems="10"
android:singleLine="true"
android:typeface="monospace"
android:hint="@string/hint_generated_password" />
<Button android:id="@+id/generate_password_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:text="@string/generate_password" />
android:layout_margin="@dimen/button_margin"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:text="@string/generate_password" />
<TextView android:id="@+id/length_label"
android:text="@string/length"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_below="@id/generate_password_button" />
android:text="@string/length"
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_below="@id/generate_password_button" />
<Button android:id="@+id/btn_length16"
android:text="@string/generate_16"
android:layout_alignParentRight="true"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_below="@id/length_label" />
android:text="@string/generate_16"
android:layout_alignParentRight="true"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_below="@id/length_label" />
<Button android:id="@+id/btn_length12"
android:text="@string/generate_12"
android:layout_toLeftOf="@id/btn_length16"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
android:text="@string/generate_12"
android:layout_toLeftOf="@id/btn_length16"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
<Button android:id="@+id/btn_length8"
android:text="@string/generate_8"
android:layout_toLeftOf="@id/btn_length12"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
android:text="@string/generate_8"
android:layout_toLeftOf="@id/btn_length12"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
<Button android:id="@+id/btn_length6"
android:text="@string/generate_6"
android:layout_toLeftOf="@id/btn_length8"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
android:text="@string/generate_6"
android:layout_toLeftOf="@id/btn_length8"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:minWidth="60dp"
android:layout_alignTop="@id/btn_length16" />
<EditText android:id="@+id/length"
android:layout_width="fill_parent"
android:layout_toLeftOf="@id/btn_length6"
android:layout_height="wrap_content"
android:layout_alignTop="@id/btn_length16"
android:singleLine="true"
android:inputType="number"
android:text="@string/generate_8"
android:hint="@string/hint_length"/>
android:layout_width="fill_parent"
android:layout_toLeftOf="@id/btn_length6"
android:layout_height="wrap_content"
android:layout_alignTop="@id/btn_length16"
android:singleLine="true"
android:inputType="number"
android:text="@string/generate_8"
android:hint="@string/hint_length"/>
<CheckBox android:id="@+id/cb_uppercase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/uppercase"
android:checked="true"
android:layout_below="@id/length" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/uppercase"
android:checked="true"
android:layout_below="@id/length" />
<CheckBox android:id="@+id/cb_lowercase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lowercase"
android:checked="true"
android:layout_below="@id/cb_uppercase" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lowercase"
android:checked="true"
android:layout_below="@id/cb_uppercase" />
<CheckBox android:id="@+id/cb_digits"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/digits"
android:checked="true"
android:layout_below="@id/cb_lowercase" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/digits"
android:checked="true"
android:layout_below="@id/cb_lowercase" />
<CheckBox android:id="@+id/cb_minus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/minus"
android:layout_below="@id/cb_digits" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/minus"
android:layout_below="@id/cb_digits" />
<CheckBox android:id="@+id/cb_underline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/underline"
android:layout_below="@id/cb_minus" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/underline"
android:layout_below="@id/cb_minus" />
<CheckBox android:id="@+id/cb_space"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/space"
android:layout_below="@id/cb_underline" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/space"
android:layout_below="@id/cb_underline" />
<CheckBox android:id="@+id/cb_specials"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/special"
android:layout_below="@id/cb_space" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/special"
android:layout_below="@id/cb_space" />
<CheckBox android:id="@+id/cb_brackets"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brackets"
android:layout_below="@id/cb_specials" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/brackets"
android:layout_below="@id/cb_specials" />
</RelativeLayout>
</ScrollView>
</RelativeLayout>

View File

@@ -18,33 +18,35 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.keepassdroid.view.GroupHeaderView
android:id="@+id/group_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:id="@+id/group_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<Button android:id="@+id/add_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/add_group"/>
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/add_group"/>
<Button android:id="@+id/add_entry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/add_group"
android:layout_alignParentBottom="true"
android:text="@string/add_entry"/>
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/add_group"
android:layout_alignParentBottom="true"
android:text="@string/add_entry"/>
<ImageView android:id="@+id/divider2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/add_entry"
android:scaleType="fitXY"
android:tint="@color/blue_highlight"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/add_entry"
android:scaleType="fitXY"
android:tint="@color/blue_highlight"
android:src="@android:drawable/divider_horizontal_dark"/>
<ListView android:id="@+id/group_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/divider2"
android:layout_below="@id/group_header"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@id/divider2"
android:layout_below="@id/group_header"/>
</RelativeLayout>

View File

@@ -18,32 +18,35 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ImageButton android:id="@+id/icon_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic00"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic00"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"/>
<EditText android:id="@+id/group_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_toLeftOf="@+id/icon_button"
android:singleLine="true"
android:hint="@string/hint_group_name"/>
<Button android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="100dp"
android:layout_below="@id/group_name"
android:text="@android:string/ok"/>
<Button android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="100dp"
android:layout_below="@id/group_name"
android:layout_toRightOf="@id/ok"
android:text="@string/cancel"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_toLeftOf="@+id/icon_button"
android:singleLine="true"
android:hint="@string/hint_group_name"/>
<Button android:id="@+id/ok"
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="100dp"
android:layout_below="@id/group_name"
android:text="@android:string/ok"/>
<Button android:id="@+id/cancel"
android:layout_margin="@dimen/button_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="100dp"
android:layout_below="@id/group_name"
android:layout_toRightOf="@id/ok"
android:text="@string/cancel"/>
</RelativeLayout>

View File

@@ -18,8 +18,9 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.keepassdroid.view.GroupHeaderView
android:id="@+id/group_header"
android:layout_width="wrap_content"

View File

@@ -18,71 +18,71 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView android:id="@+id/filename_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_filename" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_filename" />
<ImageView android:id="@+id/divider1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/filename_label"
android:scaleType="fitXY"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/filename_label"
android:scaleType="fitXY"
android:src="@android:drawable/divider_horizontal_dark"/>
<TextView android:id="@+id/filename"
style="@style/GroupText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:singleLine="true"/>
style="@style/GroupText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:singleLine="true"/>
<ImageView android:id="@+id/divider2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/filename"
android:scaleType="fitXY"
android:src="@android:drawable/divider_horizontal_dark"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/filename"
android:scaleType="fitXY"
android:src="@android:drawable/divider_horizontal_dark"/>
<CheckBox android:id="@+id/default_database"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider2"
android:text="@string/default_checkbox"
/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider2"
android:text="@string/default_checkbox" />
<TextView android:id="@+id/password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/default_database"
android:text="@string/entry_and_or" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/default_database"
android:text="@string/entry_and_or" />
<EditText android:id="@+id/password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password_label"
android:singleLine="true"
android:inputType="textPassword"
android:hint="@string/hint_login_pass"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password_label"
android:singleLine="true"
android:inputType="textPassword"
android:hint="@string/hint_login_pass"/>
<ImageButton android:id="@+id/browse_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher_folder_small"
android:layout_below="@id/password"
android:layout_alignParentRight="true"
/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_folder_white_24dp"
android:layout_below="@id/password"
android:layout_alignParentRight="true" />
<EditText android:id="@+id/pass_keyfile"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:layout_toLeftOf="@id/browse_button"
android:singleLine="true"
android:hint="@string/entry_keyfile"/>
<Button android:id="@+id/pass_ok"
android:text="@android:string/ok"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:layout_toLeftOf="@id/browse_button"
android:singleLine="true"
android:hint="@string/entry_keyfile"/>
<Button android:id="@+id/pass_ok"
android:layout_margin="@dimen/button_margin"
android:text="@android:string/ok"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"/>
<CheckBox android:id="@+id/show_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/pass_ok"
android:layout_toRightOf="@id/pass_ok"
android:text="@string/show_password"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/pass_ok"
android:layout_toRightOf="@id/pass_ok"
android:text="@string/show_password"/>
</RelativeLayout>

View File

@@ -18,37 +18,39 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_margin="@dimen/activity_default_margin"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<EditText android:id="@+id/pass_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:hint="@string/hint_pass"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:hint="@string/hint_pass"/>
<EditText android:id="@+id/pass_conf_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pass_password"
android:inputType="textPassword"
android:singleLine="true"
android:hint="@string/hint_conf_pass"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pass_password"
android:inputType="textPassword"
android:singleLine="true"
android:hint="@string/hint_conf_pass"/>
<EditText android:id="@+id/pass_keyfile"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pass_conf_password"
android:singleLine="true"
android:hint="@string/hint_keyfile"/>
<Button android:id="@+id/ok"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"
android:text="@android:string/ok"/>
<Button android:id="@+id/cancel"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"
android:layout_toRightOf="@id/ok"
android:text="@string/cancel"/>
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pass_conf_password"
android:singleLine="true"
android:hint="@string/hint_keyfile"/>
<Button android:id="@+id/ok"
android:layout_margin="@dimen/button_margin"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"
android:text="@android:string/ok"/>
<Button android:id="@+id/cancel"
android:layout_margin="@dimen/button_margin"
android:layout_width="100sp"
android:layout_height="wrap_content"
android:layout_below="@id/pass_keyfile"
android:layout_toRightOf="@id/ok"
android:text="@string/cancel"/>
</RelativeLayout>

View File

@@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012-2015 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
KeePassDroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_lock"
android:icon="@android:drawable/ic_lock_lock"
android:title="@string/menu_lock"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_toggle_pass"
android:title="@string/menu_showpass"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_goto_url"
android:title="@string/menu_url"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_copy_user"
android:title="@string/menu_copy_user"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_copy_pass"
android:title="@string/menu_copy_pass"
android:showAsAction="ifRoom"
/>
</menu>

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012-2015 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
KeePassDroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_toggle_pass"
android:title="@string/menu_showpass"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/>
</menu>

View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
KeePassDroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_about"
android:title="@string/menu_about"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_app_settings"
android:title="@string/menu_app_settings"
android:showAsAction="ifRoom"
/>
</menu>

View File

@@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
KeePassDroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_search"
android:icon="@android:drawable/ic_menu_search"
android:title="@string/menu_search"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_lock"
android:icon="@android:drawable/ic_lock_lock"
android:title="@string/menu_lock"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_donate"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:title="@string/menu_app_settings"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_change_master_key"
android:title="@string/menu_change_key"
android:showAsAction="never"
/>
<item android:id="@+id/menu_sort"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:title="@string/sort_name"
android:showAsAction="never"
/>
</menu>

View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2012 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
KeePassDroid is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_about"
android:title="@string/menu_about"
android:showAsAction="ifRoom"
/>
<item android:id="@+id/menu_app_settings"
android:title="@string/menu_app_settings"
android:showAsAction="ifRoom"
/>
</menu>

View File

@@ -17,29 +17,34 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/>
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_toggle_pass"
android:icon="@android:drawable/ic_menu_view"
android:icon="@drawable/ic_visibility_white_24dp"
android:title="@string/menu_showpass"
/>
<item android:id="@+id/menu_goto_url"
android:icon="@android:drawable/ic_menu_upload"
android:title="@string/menu_url"
/>
<item android:id="@+id/menu_copy_user"
android:icon="@android:drawable/ic_menu_set_as"
android:title="@string/menu_copy_user"
/>
<item android:id="@+id/menu_copy_pass"
android:icon="@android:drawable/ic_menu_agenda"
android:title="@string/menu_copy_pass"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_lock"
android:icon="@android:drawable/ic_lock_lock"
android:icon="@drawable/ic_key_white_24dp"
android:title="@string/menu_lock"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_goto_url"
android:icon="@drawable/ic_file_upload_white_24dp"
android:title="@string/menu_url"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_donate"
android:icon="@drawable/ic_share_white_24dp"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_copy_user"
android:title="@string/menu_copy_user"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_copy_pass"
android:title="@string/menu_copy_pass"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
</menu>

View File

@@ -17,14 +17,17 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_toggle_pass"
android:icon="@android:drawable/ic_menu_view"
android:icon="@drawable/ic_visibility_white_24dp"
android:title="@string/menu_showpass"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:icon="@drawable/ic_share_white_24dp"
android:title="@string/menu_donate"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
</menu>

View File

@@ -17,17 +17,21 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/>
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:icon="@drawable/ic_settings_white_24dp"
android:title="@string/menu_app_settings"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_donate"
android:icon="@drawable/ic_share_white_24dp"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_about"
android:icon="@android:drawable/ic_menu_help"
android:icon="@drawable/ic_help_white_24dp"
android:title="@string/menu_about"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
</menu>

View File

@@ -17,29 +17,42 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_donate"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/menu_donate"
/>
<item android:id="@+id/menu_lock"
android:icon="@android:drawable/ic_lock_lock"
android:title="@string/menu_lock"
/>
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_search"
android:icon="@android:drawable/ic_menu_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
/>
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:title="@string/menu_app_settings"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_lock"
android:icon="@drawable/ic_lock_white_24dp"
android:title="@string/menu_lock"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_change_master_key"
android:icon="@android:drawable/ic_menu_manage"
android:icon="@drawable/ic_key_white_24dp"
android:title="@string/menu_change_key"
/>
android:showAsAction="never"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_sort"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:icon="@drawable/ic_sort_white_24dp"
android:title="@string/sort_name"
/>
android:showAsAction="never"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_app_settings"
android:icon="@drawable/ic_settings_white_24dp"
android:title="@string/menu_app_settings"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_donate"
android:icon="@drawable/ic_share_white_24dp"
android:title="@string/menu_donate"
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute"
/>
</menu>

View File

@@ -17,13 +17,16 @@
You should have received a copy of the GNU General Public License
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_app_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:icon="@drawable/ic_settings_white_24dp"
android:title="@string/menu_app_settings"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
<item android:id="@+id/menu_about"
android:icon="@android:drawable/ic_menu_help"
android:icon="@drawable/ic_help_white_24dp"
android:title="@string/menu_about"
/>
android:showAsAction="ifRoom"
tools:ignore="UnusedAttribute" />
</menu>

View File

@@ -18,52 +18,29 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="NoTitleBar"
parent="android:Theme.Holo"></style>
<style name="Dialog" parent="android:Theme.Holo.Dialog"></style>
<style name="KeepassoidStyle" parent="android:Theme.Holo">
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
<item name="android:windowBackground">@color/background</item>
<item name="android:buttonStyle">@style/ButtonStyle</item>
<item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
</style>
<style name="ActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar">
<item name="android:background">@color/green</item>
</style>
<style name="GroupTextSmall" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">15sp</item>
</style>
<style name="GroupText" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">20sp</item>
</style>
<style name="GroupTextLarge" parent="android:Theme.Holo">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">28sp</item>
</style>
<style name="ElementTextSmall">
<item name="@android:textSize">15sp</item>
</style>
<style name="ElementText">
<item name="@android:textSize">20sp</item>
</style>
<style name="ElementTextLarge">
<item name="@android:textSize">28sp</item>
</style>
<style name="GroupLabel">
<item name="@android:textSize">20sp</item>
</style>
<style name="WhiteOnBlack">
<!-- <item name="@android:background">#666666</item> -->
<item
name="@android:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item>
</style>
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item>
</style>
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item>
<!-- <item name="@android:background">#222222</item> -->
</style>
<style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item>
</style>
<style name="EntryItem">
<item name="@android:padding">5sp</item>
</style>
<style name="DividerEntry">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>

View File

@@ -18,49 +18,31 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="NoTitleBar" parent="android:Theme.Material"></style>
<style name="Dialog" parent="android:Theme.Material.Dialog"></style>
<style name="KeepassoidStyle" parent="@android:style/Theme.Material">
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
<item name="android:windowBackground">@color/background</item>
<item name="android:buttonStyle">@style/ButtonStyle</item>
<item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
<item name="android:colorPrimary">@color/green</item>
<item name="android:colorPrimaryDark">@color/green_dark</item>
<item name="android:colorAccent">@color/green</item>
</style>
<style name="ActionBarStyle" parent="@android:style/Widget.Material.ActionBar">
<item name="android:background">@color/green</item>
</style>
<style name="GroupTextSmall" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">15sp</item>
</style>
<style name="GroupText" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">20sp</item>
</style>
<style name="GroupTextLarge" parent="android:Theme.Material">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">28sp</item>
</style>
<style name="ElementTextSmall">
<item name="@android:textSize">15sp</item>
</style>
<style name="ElementText">
<item name="@android:textSize">20sp</item>
</style>
<style name="ElementTextLarge">
<item name="@android:textSize">28sp</item>
</style>
<style name="GroupLabel">
<item name="@android:textSize">20sp</item>
</style>
<style name="WhiteOnBlack">
<!-- <item name="@android:background">#666666</item> -->
<item
name="@android:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item>
</style>
<style name="WhiteOnBlackSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item>
</style>
<style name="WhiteOnDarkSmall" parent="WhiteOnBlack">
<item name="@android:textSize">12sp</item>
<!-- <item name="@android:background">#222222</item> -->
</style>
<style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item>
</style>
<style name="EntryItem">
<item name="@android:padding">5sp</item>
</style>
</resources>

View File

@@ -18,8 +18,13 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<color name="transparent">#00ffffff</color>
<color name="white">#ffffff</color>
<color name="green">#43a047</color>
<color name="green_dark">#388e3c</color>
<color name="blue_highlight">#0000dd</color>
<color name="group">#ffffff</color>
<color name="background">#303030</color>
<color name="icon_background">#555555</color>
<color name="icon_text">#000000</color>
<color name="group_header_background">#888888</color>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<dimen name="activity_default_margin">12dp</dimen>
<dimen name="button_margin">5dp</dimen>
</resources>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2009-2015 Brian Pellin.
This file is part of KeePassDroid.
KeePassDroid is free software: you can redistribute it and/or modify
@@ -18,14 +18,31 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<style name="NoTitleBar" parent="android:Theme.NoTitleBar"></style>
<style name="Dialog" parent="android:Theme.Dialog"></style>
<style name="KeepassoidStyle" parent="android:Theme.Black">
<!-- No action bar for pre API 11 -->
<item name="android:windowBackground">@color/background</item>
<item name="android:buttonStyle">@style/ButtonStyle</item>
<item name="android:imageButtonStyle">@style/ImageButtonStyle</item>
</style>
<style name="ButtonStyle" parent="@android:style/Widget.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_background</item>
</style>
<style name="ImageButtonStyle" parent="@android:style/Widget.ImageButton">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_background</item>
</style>
<style name="ButtonText" parent="@android:style/Widget.Button">
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/button_background</item>
</style>
<style name="GroupTextSmall" parent="android:Theme">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">15sp</item>
</style>
<style name="GroupText" parent="android:Theme">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
<item name="@android:textSize">20sp</item>
</style>
<style name="GroupTextLarge" parent="android:Theme">
@@ -48,7 +65,6 @@
<item name="@android:textSize">12sp</item>
</style>
<style name="WhiteOnBlack">
<!-- <item name="@android:background">#666666</item>-->
<item name="@android:textColor">@android:color/primary_text_dark</item>
<item name="@android:textSize">20sp</item>
</style>
@@ -63,7 +79,7 @@
<!-- <item name="@android:background">#222222</item> -->
</style>
<style name="ElementTextTitle" parent="WhiteOnBlack">
<item name="@android:textColor">@color/group</item>
<item name="@android:textColor">@color/white</item>
</style>
<style name="EntryItem">
<item name="@android:padding">5sp</item>