rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change toolbar text

Browse Source
This commit is contained in:
Jeremy
2017-10-29 15:49:35 +01:00
parent 2d4d5fc9b0
commit 73a7a5240b
10 changed files with 62 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -2,8 +2,8 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/KeePassDX.iml" filepath="$PROJECT_DIR$/KeePassDX.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/keepassdroid.iml" filepath="$PROJECT_DIR$/keepassdroid.iml" />
</modules>
</component>
</project>

2
app/app.iml
View File

@@ -122,12 +122,12 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="com.madgag.spongycastle:core:1.54.0.0@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-25.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="__local_jars__:/home/joker/Projects/KeePassDX/app/libs/junit4.jar:unspecified@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:design-25.4.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:transition-25.4.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-core-ui-25.4.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-25.4.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-compat-25.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="__local_jars__:/home/joker/Projects/keepassdroid/app/libs/junit4.jar:unspecified@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:preference-v7-25.4.0" level="project" />
<orderEntry type="library" exported="" name="joda-time:joda-time:2.9.9@jar" level="project" />
<orderEntry type="library" exported="" name="com.madgag.spongycastle:prov:1.54.0.0@jar" level="project" />

1
app/src/main/java/com/keepassdroid/EntryActivity.java
View File

@@ -135,6 +135,7 @@ public class EntryActivity extends LockCloseHideActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
assert getSupportActionBar() != null;
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);

5
app/src/main/java/com/keepassdroid/GroupActivity.java
View File

@@ -147,11 +147,8 @@ public abstract class GroupActivity extends GroupBaseActivity {
}
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
toolbar.setTitle(getString(R.string.app_name));
toolbar.setTitle("");
setSupportActionBar(toolbar);
assert getSupportActionBar() != null;
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
Log.w(TAG, "Set view");

1
app/src/main/java/com/keepassdroid/view/GroupHeaderView.java
View File

@@ -51,5 +51,4 @@ public class GroupHeaderView extends RelativeLayout {
}
}

2
app/src/main/res/layout/entry_view.xml
View File

@@ -50,7 +50,7 @@
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_gravity="start|center_vertical"
style="@style/KeepassoidStyle.TextAppearance.Inverse" />
style="@style/KeepassoidStyle.TextAppearance.DefaultTextOnPrimary" />
</LinearLayout>
</android.support.v7.widget.Toolbar>

15
app/src/main/res/layout/group_header.xml
View File

@@ -18,35 +18,34 @@
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView android:id="@+id/read_only"
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/read_only"
android:visibility="gone"
style="@style/WarningTextStyle" />
<LinearLayout
android:layout_width="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/list_margin"
android:layout_marginEnd="@dimen/list_margin"
style="@style/DefaultTextStyle">
<ImageView android:id="@+id/icon"
android:layout_marginEnd="@dimen/list_margin">
<android.support.v7.widget.AppCompatImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"
style="@style/DefaultTextStyle" />
android:visibility="gone"/>
<TextView android:id="@+id/group_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_weight="1"
android:text="@string/root"
style="@style/DefaultTextStyle" />
style="@style/KeepassoidStyle.TextAppearance.DefaultTextOnPrimary" />
</LinearLayout>
</LinearLayout>

97
app/src/main/res/layout/password.xml
View File

@@ -23,83 +23,75 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/default_margin">
<include
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
layout="@layout/toolbar_default" />
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:theme="?attr/toolbarDark"
android:elevation="4dp"
tools:targetApi="lollipop" >
<TextView
android:id="@+id/filename"
style="@style/KeepassoidStyle.TextAppearance.DefaultTextOnPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true" />
</android.support.v7.widget.Toolbar>
<ScrollView
android:id="@+id/scroll_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/pass_ok"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
android:layout_alignParentStart="true"
android:layout_below="@+id/toolbar">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/default_margin"
android:layout_height="wrap_content">
<TextView
android:id="@+id/filename_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pass_filename"
style="@style/TitleTextStyle" />
<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" />
<TextView
android:id="@+id/filename"
style="@style/DefaultTextStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:ellipsize="marquee"
android:marqueeRepeatLimit ="marquee_forever"
android:singleLine="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:scrollHorizontally="true" />
android:layout_marginStart="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin">
<RelativeLayout
android:id="@+id/password_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/filename"
android:layout_marginTop="20dp">
android:layout_height="wrap_content">
<TextView
android:id="@+id/password_label"
style="@style/TitleTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/entry_and_or"
style="@style/TitleTextStyle" />
android:text="@string/entry_and_or" />
<!-- TODO Add checkbox -->
<CheckBox
android:visibility="gone"
android:id="@+id/password_checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/pass_keyfile"
android:layout_below="@id/password_label" />
android:layout_below="@id/password_label"
android:visibility="gone" />
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password_label"
android:layout_toRightOf="@+id/password_checkBox"
android:layout_toEndOf="@+id/password_checkBox"
android:layout_toRightOf="@+id/password_checkBox"
android:hint="@string/hint_login_pass"
android:inputType="textPassword"
android:maxLines="1" />
@@ -109,8 +101,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/browse_button"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/password_label"
android:src="@drawable/ic_visibility_white_24dp"
android:tint="@android:color/darker_gray" />
@@ -120,40 +112,39 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/password"
android:padding="6dp"
android:src="@drawable/ic_folder_white_24dp"
android:tint="?attr/colorAccentCompat"
/>
android:tint="?attr/colorAccentCompat" />
<CheckBox
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/browse_button"
android:layout_below="@id/password" />
android:layout_below="@id/password"
android:visibility="gone" />
<EditText
android:id="@+id/pass_keyfile"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/password"
android:layout_toLeftOf="@id/browse_button"
android:layout_toStartOf="@id/browse_button"
android:layout_toRightOf="@+id/password_checkBox"
android:layout_toEndOf="@+id/password_checkBox"
android:layout_toLeftOf="@id/browse_button"
android:layout_toRightOf="@+id/password_checkBox"
android:layout_toStartOf="@id/browse_button"
android:hint="@string/entry_keyfile"
android:maxLines="1" />
</RelativeLayout>
<CheckBox
android:id="@+id/default_database"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/password_container"
android:layout_marginTop="20dp"
android:text="@string/default_checkbox" />
</RelativeLayout>

2
app/src/main/res/menu/group.xml
View File

@@ -22,7 +22,7 @@
<item android:id="@+id/menu_search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/menu_search"
android:showAsAction="ifRoom"
android:showAsAction="always"
tools:ignore="UnusedAttribute"
/>
<item android:id="@+id/menu_lock"

6
app/src/main/res/values/styles.xml
View File

@@ -36,7 +36,7 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="colorAccentCompat">@color/colorAccent</item>
<item name="colorControlNormal">@android:color/white</item>
<item name="colorControlNormal">@color/white</item>
<item name="android:textAppearance">@style/KeepassoidStyle.TextAppearance</item>
<item name="android:textAppearanceMedium">@style/KeepassoidStyle.TextAppearance</item>
@@ -72,6 +72,10 @@
<style name="KeepassoidStyle.TextAppearance.Inverse" parent="@android:style/TextAppearance">
<item name="android:textColor">@color/colorTextInverse</item>
</style>
<style name="KeepassoidStyle.TextAppearance.DefaultTextOnPrimary" parent="@android:style/TextAppearance">
<item name="android:textColor">@color/white</item>
</style>
<style name="ElementTextTitle" parent="android:TextAppearance">
<item name="@android:textColor">@color/colorText</item>
</style>