From 73a3bafc576a4a8099f20adcb2889d25d396b165 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 27 Oct 2017 23:49:21 +0200 Subject: [PATCH] Change style and add toolbar --- app/app.iml | 19 ++- app/build.gradle | 16 ++- .../com/keepassdroid/GroupEditActivity.java | 2 - .../com/keepassdroid/LockingActivity.java | 6 +- .../LockingClosePreferenceActivity.java | 32 ----- .../LockingPreferenceActivity.java | 44 ------ .../com/keepassdroid/PasswordActivity.java | 28 ++-- .../fileselect/FileSelectActivity.java | 13 +- .../settings/AppSettingsActivity.java | 129 +++++++----------- .../settings/AppSettingsFragment.java | 107 +++++++++++++++ .../java/com/keepassdroid/utils/Util.java | 9 -- .../res/drawable-v21/button_background.xml | 2 +- .../drawable-v21/button_small_background.xml | 2 +- .../main/res/drawable-v21/fab_background.xml | 2 +- .../main/res/drawable/button_background.xml | 2 +- .../res/drawable/button_small_background.xml | 2 +- app/src/main/res/drawable/fab_background.xml | 2 +- app/src/main/res/layout/activity_toolbar.xml | 16 +++ app/src/main/res/layout/entry_edit.xml | 7 +- .../main/res/layout/entry_edit_section.xml | 15 +- app/src/main/res/layout/entry_view.xml | 7 +- app/src/main/res/layout/entry_view_v4.xml | 7 +- app/src/main/res/layout/file_selection.xml | 5 + .../res/layout/file_selection_filename.xml | 20 ++- app/src/main/res/layout/generate_password.xml | 8 +- app/src/main/res/layout/group_add_entry.xml | 5 + app/src/main/res/layout/group_edit.xml | 4 + app/src/main/res/layout/group_header.xml | 6 +- .../main/res/layout/list_entries_entry.xml | 7 +- .../main/res/layout/list_entries_group.xml | 10 +- app/src/main/res/layout/password.xml | 30 +++- app/src/main/res/layout/set_password.xml | 1 + app/src/main/res/layout/toolbar_default.xml | 12 ++ app/src/main/res/values-v11/styles.xml | 32 ----- app/src/main/res/values-v21/styles.xml | 38 +----- app/src/main/res/values/attrs.xml | 6 + app/src/main/res/values/colors.xml | 16 ++- app/src/main/res/values/styles.xml | 72 ++++++++-- build.gradle | 5 + 39 files changed, 423 insertions(+), 323 deletions(-) delete mode 100644 app/src/main/java/com/keepassdroid/LockingClosePreferenceActivity.java delete mode 100644 app/src/main/java/com/keepassdroid/LockingPreferenceActivity.java create mode 100644 app/src/main/java/com/keepassdroid/settings/AppSettingsFragment.java create mode 100644 app/src/main/res/layout/activity_toolbar.xml create mode 100644 app/src/main/res/layout/toolbar_default.xml delete mode 100644 app/src/main/res/values-v11/styles.xml create mode 100644 app/src/main/res/values/attrs.xml diff --git a/app/app.iml b/app/app.iml index e21d94195..3f3cab42f 100644 --- a/app/app.iml +++ b/app/app.iml @@ -106,7 +106,6 @@ - @@ -121,9 +120,23 @@ - + + + + + + + + + - + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index c27e6ca75..f08d7bc10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { applicationId = "com.android.keepass" - minSdkVersion 3 - targetSdkVersion 12 + minSdkVersion 11 + targetSdkVersion 25 versionCode = 154 versionName = "2.5.0.0" @@ -30,9 +30,15 @@ android { } } +def supportVersion = "25.4.0" +def spongycastleVersion = "1.54.0.0" + dependencies { androidTestCompile files('libs/junit4.jar') - compile 'com.madgag.spongycastle:core:1.54.0.0' - compile 'com.madgag.spongycastle:prov:1.54.0.0' - compile 'joda-time:joda-time:2.9.4' + compile "com.android.support:appcompat-v7:$supportVersion" + compile "com.android.support:design:$supportVersion" + compile "com.android.support:preference-v7:$supportVersion" + compile "com.madgag.spongycastle:core:$spongycastleVersion" + compile "com.madgag.spongycastle:prov:$spongycastleVersion" + compile "joda-time:joda-time:2.9.9" } diff --git a/app/src/main/java/com/keepassdroid/GroupEditActivity.java b/app/src/main/java/com/keepassdroid/GroupEditActivity.java index 40ec3d831..8b87fe2c7 100644 --- a/app/src/main/java/com/keepassdroid/GroupEditActivity.java +++ b/app/src/main/java/com/keepassdroid/GroupEditActivity.java @@ -49,8 +49,6 @@ public class GroupEditActivity extends Activity super.onCreate(savedInstanceState); setContentView(R.layout.group_edit); setTitle(R.string.add_group_title); - - Util.colorStatusBar(this); ImageButton iconButton = (ImageButton) findViewById(R.id.icon_button); iconButton.setOnClickListener(new View.OnClickListener() diff --git a/app/src/main/java/com/keepassdroid/LockingActivity.java b/app/src/main/java/com/keepassdroid/LockingActivity.java index af97156fb..ed9b263c4 100644 --- a/app/src/main/java/com/keepassdroid/LockingActivity.java +++ b/app/src/main/java/com/keepassdroid/LockingActivity.java @@ -19,12 +19,12 @@ */ package com.keepassdroid; -import android.app.Activity; +import android.support.v7.app.AppCompatActivity; import com.keepassdroid.timeout.TimeoutHelper; import com.keepassdroid.utils.Util; -public abstract class LockingActivity extends Activity { +public abstract class LockingActivity extends AppCompatActivity { @Override protected void onPause() { @@ -37,8 +37,6 @@ public abstract class LockingActivity extends Activity { protected void onResume() { super.onResume(); - Util.colorStatusBar(this); - TimeoutHelper.resume(this); } } diff --git a/app/src/main/java/com/keepassdroid/LockingClosePreferenceActivity.java b/app/src/main/java/com/keepassdroid/LockingClosePreferenceActivity.java deleted file mode 100644 index 559e44327..000000000 --- a/app/src/main/java/com/keepassdroid/LockingClosePreferenceActivity.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft. - * - * This file is part of KeePass DX. - * - * KeePass DX 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. - * - * KeePass DX 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 KeePass DX. If not, see . - * - */ -package com.keepassdroid; - -import com.keepassdroid.timeout.TimeoutHelper; - -public class LockingClosePreferenceActivity extends LockingPreferenceActivity { - - @Override - protected void onResume() { - super.onResume(); - - TimeoutHelper.checkShutdown(this); - } -} diff --git a/app/src/main/java/com/keepassdroid/LockingPreferenceActivity.java b/app/src/main/java/com/keepassdroid/LockingPreferenceActivity.java deleted file mode 100644 index d59ef2016..000000000 --- a/app/src/main/java/com/keepassdroid/LockingPreferenceActivity.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft. - * - * This file is part of KeePass DX. - * - * KeePass DX 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. - * - * KeePass DX 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 KeePass DX. If not, see . - * - */ -package com.keepassdroid; - -import android.preference.PreferenceActivity; - -import com.keepassdroid.timeout.TimeoutHelper; -import com.keepassdroid.utils.Util; - -public abstract class LockingPreferenceActivity extends PreferenceActivity { - - @Override - protected void onPause() { - super.onPause(); - - TimeoutHelper.pause(this); - } - - @Override - protected void onResume() { - super.onResume(); - - Util.colorStatusBar(this); - - TimeoutHelper.resume(this); - } -} diff --git a/app/src/main/java/com/keepassdroid/PasswordActivity.java b/app/src/main/java/com/keepassdroid/PasswordActivity.java index d71a87e09..aa72f68a0 100644 --- a/app/src/main/java/com/keepassdroid/PasswordActivity.java +++ b/app/src/main/java/com/keepassdroid/PasswordActivity.java @@ -30,6 +30,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; +import android.support.v7.widget.Toolbar; import android.text.InputType; import android.view.Menu; import android.view.MenuInflater; @@ -171,6 +172,13 @@ public class PasswordActivity extends LockingActivity { mRememberKeyfile = prefs.getBoolean(getString(R.string.keyfile_key), getResources().getBoolean(R.bool.keyfile_default)); setContentView(R.layout.password); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitle(getString(R.string.app_name)); + setSupportActionBar(toolbar); + assert getSupportActionBar() != null; + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setDisplayShowHomeEnabled(true); + new InitTask().execute(i); } @@ -310,14 +318,18 @@ public class PasswordActivity extends LockingActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch ( item.getItemId() ) { - case R.id.menu_about: - AboutDialog dialog = new AboutDialog(this); - dialog.show(); - return true; + case R.id.menu_about: + AboutDialog dialog = new AboutDialog(this); + dialog.show(); + return true; - case R.id.menu_app_settings: - AppSettingsActivity.Launch(this); - return true; + case R.id.menu_app_settings: + AppSettingsActivity.Launch(this); + return true; + + case android.R.id.home: + finish(); + break; } return super.onOptionsItemSelected(item); @@ -446,7 +458,7 @@ public class PasswordActivity extends LockingActivity { CheckBox defaultCheck = (CheckBox) findViewById(R.id.default_database); defaultCheck.setOnCheckedChangeListener(new DefaultCheckChange()); - ImageButton browse = (ImageButton) findViewById(R.id.browse_button); + View browse = findViewById(R.id.browse_button); browse.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { diff --git a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java index d9c8b8883..79d9f3fd7 100644 --- a/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java +++ b/app/src/main/java/com/keepassdroid/fileselect/FileSelectActivity.java @@ -19,7 +19,6 @@ */ package com.keepassdroid.fileselect; -import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ContentResolver; import android.content.Intent; @@ -29,6 +28,8 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.Menu; @@ -72,7 +73,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URLDecoder; -public class FileSelectActivity extends Activity { +public class FileSelectActivity extends AppCompatActivity { private ListView mList; private ListAdapter mAdapter; @@ -90,8 +91,6 @@ public class FileSelectActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - Util.colorStatusBar(this); fileHistory = App.getFileHistory(); @@ -102,6 +101,10 @@ public class FileSelectActivity extends Activity { setContentView(R.layout.file_selection_no_recent); } + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitle(getString(R.string.app_name)); + setSupportActionBar(toolbar); + mList = (ListView)findViewById(R.id.file_list); mList.setOnItemClickListener( @@ -208,7 +211,7 @@ public class FileSelectActivity extends Activity { }); - ImageButton browseButton = (ImageButton) findViewById(R.id.browse_button); + View browseButton = findViewById(R.id.browse_button); browseButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { diff --git a/app/src/main/java/com/keepassdroid/settings/AppSettingsActivity.java b/app/src/main/java/com/keepassdroid/settings/AppSettingsActivity.java index 5e3dcaf28..a32d598a0 100644 --- a/app/src/main/java/com/keepassdroid/settings/AppSettingsActivity.java +++ b/app/src/main/java/com/keepassdroid/settings/AppSettingsActivity.java @@ -21,23 +21,36 @@ package com.keepassdroid.settings; import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; import android.os.Bundle; -import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.MenuItem; import com.android.keepass.R; -import com.keepassdroid.Database; -import com.keepassdroid.LockingClosePreferenceActivity; -import com.keepassdroid.app.App; import com.keepassdroid.compat.BackupManagerCompat; -import com.keepassdroid.database.PwEncryptionAlgorithm; +import com.keepassdroid.timeout.TimeoutHelper; -public class AppSettingsActivity extends LockingClosePreferenceActivity { +public class AppSettingsActivity extends AppCompatActivity { public static boolean KEYFILE_DEFAULT = false; private BackupManagerCompat backupManager; + + private Toolbar toolbar; + + @Override + protected void onPause() { + super.onPause(); + + TimeoutHelper.pause(this); + } + + @Override + protected void onResume() { + super.onResume(); + + TimeoutHelper.resume(this); + TimeoutHelper.checkShutdown(this); + } public static void Launch(Context ctx) { Intent i = new Intent(ctx, AppSettingsActivity.class); @@ -48,65 +61,32 @@ public class AppSettingsActivity extends LockingClosePreferenceActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - addPreferencesFromResource(R.xml.preferences); - - Preference keyFile = findPreference(getString(R.string.keyfile_key)); - keyFile.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - - public boolean onPreferenceChange(Preference preference, Object newValue) { - Boolean value = (Boolean) newValue; - - if ( ! value.booleanValue() ) { - App.getFileHistory().deleteAllKeys(); - } - - return true; - } - }); - - Preference recentHistory = findPreference(getString(R.string.recentfile_key)); - recentHistory.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - - public boolean onPreferenceChange(Preference preference, Object newValue) { - Boolean value = (Boolean) newValue; - - if (value == null) { - value = true; - } - - if (!value) { - App.getFileHistory().deleteAll(); - } - - return true; - } - }); - - Database db = App.getDB(); - if ( db.Loaded() && db.pm.appSettingsEnabled() ) { - Preference rounds = findPreference(getString(R.string.rounds_key)); - rounds.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - - public boolean onPreferenceChange(Preference preference, Object newValue) { - setRounds(App.getDB(), preference); - return true; - } - }); - - setRounds(db, rounds); - - Preference algorithm = findPreference(getString(R.string.algorithm_key)); - setAlgorithm(db, algorithm); - - } else { - Preference dbSettings = findPreference(getString(R.string.db_key)); - dbSettings.setEnabled(false); - } - + + setContentView(R.layout.activity_toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar.setTitle(R.string.application_settings); + setSupportActionBar(toolbar); + assert getSupportActionBar() != null; + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + getFragmentManager().beginTransaction() + .replace(R.id.fragment_container, new AppSettingsFragment()).commit(); + backupManager = new BackupManagerCompat(this); - + + // TODO NESTED Preference } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch ( item.getItemId() ) { + case android.R.id.home: + finish(); + break; + } + + return super.onOptionsItemSelected(item); + } @Override protected void onStop() { @@ -115,21 +95,4 @@ public class AppSettingsActivity extends LockingClosePreferenceActivity { super.onStop(); } - private void setRounds(Database db, Preference rounds) { - rounds.setSummary(Long.toString(db.pm.getNumRounds())); - } - - private void setAlgorithm(Database db, Preference algorithm) { - int resId; - if ( db.pm.getEncAlgorithm() == PwEncryptionAlgorithm.Rjindal ) { - resId = R.string.rijndael; - } else { - resId = R.string.twofish; - } - - algorithm.setSummary(resId); - } - - - } diff --git a/app/src/main/java/com/keepassdroid/settings/AppSettingsFragment.java b/app/src/main/java/com/keepassdroid/settings/AppSettingsFragment.java new file mode 100644 index 000000000..29285ac2d --- /dev/null +++ b/app/src/main/java/com/keepassdroid/settings/AppSettingsFragment.java @@ -0,0 +1,107 @@ +/* + * Copyright 2017 Jeremy Jamet / Kunzisoft. + * + * This file is part of KeePass DX. + * + * KeePass DX 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. + * + * KeePass DX 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 KeePass DX. If not, see . + * + */ +package com.keepassdroid.settings; + +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceFragment; + +import com.android.keepass.R; +import com.keepassdroid.Database; +import com.keepassdroid.app.App; +import com.keepassdroid.database.PwEncryptionAlgorithm; + +public class AppSettingsFragment extends PreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences); + + Preference keyFile = findPreference(getString(R.string.keyfile_key)); + keyFile.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + + public boolean onPreferenceChange(Preference preference, Object newValue) { + Boolean value = (Boolean) newValue; + + if (!value) { + App.getFileHistory().deleteAllKeys(); + } + + return true; + } + }); + + Preference recentHistory = findPreference(getString(R.string.recentfile_key)); + recentHistory.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + + public boolean onPreferenceChange(Preference preference, Object newValue) { + Boolean value = (Boolean) newValue; + + if (value == null) { + value = true; + } + + if (!value) { + App.getFileHistory().deleteAll(); + } + + return true; + } + }); + + Database db = App.getDB(); + if (db.Loaded() && db.pm.appSettingsEnabled()) { + Preference rounds = findPreference(getString(R.string.rounds_key)); + rounds.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + + public boolean onPreferenceChange(Preference preference, Object newValue) { + setRounds(App.getDB(), preference); + return true; + } + }); + + setRounds(db, rounds); + + Preference algorithm = findPreference(getString(R.string.algorithm_key)); + setAlgorithm(db, algorithm); + + } else { + Preference dbSettings = findPreference(getString(R.string.db_key)); + dbSettings.setEnabled(false); + } + } + + private void setRounds(Database db, Preference rounds) { + rounds.setSummary(Long.toString(db.pm.getNumRounds())); + } + + private void setAlgorithm(Database db, Preference algorithm) { + int resId; + if ( db.pm.getEncAlgorithm() == PwEncryptionAlgorithm.Rjindal ) { + resId = R.string.rijndael; + } else { + resId = R.string.twofish; + } + + algorithm.setSummary(resId); + } +} diff --git a/app/src/main/java/com/keepassdroid/utils/Util.java b/app/src/main/java/com/keepassdroid/utils/Util.java index 21d910fb7..d0069f687 100644 --- a/app/src/main/java/com/keepassdroid/utils/Util.java +++ b/app/src/main/java/com/keepassdroid/utils/Util.java @@ -96,13 +96,4 @@ public class Util { } } - public static void colorStatusBar(Activity activity) { - if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = activity.getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - window.setStatusBarColor(activity.getResources().getColor(R.color.green_dark)); - } - } - } diff --git a/app/src/main/res/drawable-v21/button_background.xml b/app/src/main/res/drawable-v21/button_background.xml index 09bb31e1c..508f2f8ba 100644 --- a/app/src/main/res/drawable-v21/button_background.xml +++ b/app/src/main/res/drawable-v21/button_background.xml @@ -22,7 +22,7 @@ android:right="14dp" android:top="8dp" android:bottom="12dp"/> - + diff --git a/app/src/main/res/drawable-v21/button_small_background.xml b/app/src/main/res/drawable-v21/button_small_background.xml index f2d331711..37a18b689 100644 --- a/app/src/main/res/drawable-v21/button_small_background.xml +++ b/app/src/main/res/drawable-v21/button_small_background.xml @@ -22,7 +22,7 @@ android:right="14dp" android:top="4dp" android:bottom="8dp"/> - + diff --git a/app/src/main/res/drawable-v21/fab_background.xml b/app/src/main/res/drawable-v21/fab_background.xml index 6046e3ac3..2b667d271 100644 --- a/app/src/main/res/drawable-v21/fab_background.xml +++ b/app/src/main/res/drawable-v21/fab_background.xml @@ -8,7 +8,7 @@ android:right="14dp" android:top="14dp" android:bottom="14dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_background.xml b/app/src/main/res/drawable/button_background.xml index a0a1f6eee..ff4f38f9c 100644 --- a/app/src/main/res/drawable/button_background.xml +++ b/app/src/main/res/drawable/button_background.xml @@ -17,7 +17,7 @@ android:right="14dp" android:top="8dp" android:bottom="12dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_small_background.xml b/app/src/main/res/drawable/button_small_background.xml index 022f1e2cc..82ca48c28 100644 --- a/app/src/main/res/drawable/button_small_background.xml +++ b/app/src/main/res/drawable/button_small_background.xml @@ -17,7 +17,7 @@ android:right="14dp" android:top="4dp" android:bottom="8dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/fab_background.xml b/app/src/main/res/drawable/fab_background.xml index 7abc4b0bc..412e6fc31 100644 --- a/app/src/main/res/drawable/fab_background.xml +++ b/app/src/main/res/drawable/fab_background.xml @@ -5,5 +5,5 @@ android:right="14dp" android:top="14dp" android:bottom="14dp"/> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml new file mode 100644 index 000000000..382cffe0b --- /dev/null +++ b/app/src/main/res/layout/activity_toolbar.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/entry_edit.xml b/app/src/main/res/layout/entry_edit.xml index 4166fe5b8..7cf4a64e5 100644 --- a/app/src/main/res/layout/entry_edit.xml +++ b/app/src/main/res/layout/entry_edit.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_toRightOf="@id/entry_save" + android:layout_toEndOf="@id/entry_save" android:text="@string/entry_cancel"/> @@ -115,13 +118,15 @@ android:layout_width="wrap_content" android:text="@string/ellipsis" android:layout_height="wrap_content" - android:layout_alignParentRight="true"/> + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true"/> + style="@style/TinyTextStyle" /> + android:text="@string/protection" /> + android:onClick="deleteAdvancedString" /> + android:hint="@string/field_value" /> + android:src="@android:drawable/divider_horizontal_dark" /> \ No newline at end of file diff --git a/app/src/main/res/layout/entry_view.xml b/app/src/main/res/layout/entry_view.xml index f52f13640..d4bfac1b1 100644 --- a/app/src/main/res/layout/entry_view.xml +++ b/app/src/main/res/layout/entry_view.xml @@ -29,16 +29,16 @@ android:padding="2dp" style="@style/DefaultTextStyle"> @@ -48,6 +48,7 @@ android:layout_width="100sp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true"/> @@ -50,6 +50,7 @@ android:layout_width="100sp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true"/> + - + @@ -56,6 +62,7 @@ android:layout_below="@id/file_filename" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:layout_toLeftOf="@+id/create" android:layout_toStartOf="@+id/create" android:width="100sp"/> @@ -65,6 +72,7 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_below="@id/file_filename" + android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:width="100sp"/> diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml index 9ced334ae..d517c60a3 100644 --- a/app/src/main/res/layout/generate_password.xml +++ b/app/src/main/res/layout/generate_password.xml @@ -33,7 +33,8 @@ android:layout_width="wrap_content" android:text="@string/cancel" android:layout_alignParentBottom="true" - android:layout_toRightOf="@id/accept_button" /> + android:layout_toRightOf="@id/accept_button" + android:layout_toEndOf="@id/accept_button" />