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 list_entries

Browse Source
This commit is contained in:
J-Jamet
2017-10-25 19:47:59 +02:00
parent 7f206c6a1d
commit 0230295782
10 changed files with 116 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.iml
View File

@@ -146,6 +146,7 @@
<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" />

2
app/src/main/java/com/keepassdroid/view/PwEntryView.java
View File

@@ -56,7 +56,7 @@ public class PwEntryView extends ClickView {
super(act);
mAct = act;
View ev = View.inflate(mAct, R.layout.entry_list_entry, null);
View ev = View.inflate(mAct, R.layout.list_entries_entry, null);
mTv = (TextView) ev.findViewById(R.id.entry_text);
mTv.setTextSize(PrefsUtil.getListTextSize(act));

2
app/src/main/java/com/keepassdroid/view/PwGroupView.java
View File

@@ -57,7 +57,7 @@ public class PwGroupView extends ClickView {
super(act);
mAct = act;
View gv = View.inflate(act, R.layout.group_list_entry, null);
View gv = View.inflate(act, R.layout.list_entries_group, null);
mTv = (TextView) gv.findViewById(R.id.group_text);
float size = PrefsUtil.getListTextSize(act);

40
app/src/main/res/layout/entry_list_entry.xml
View File

@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
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/>.
-->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1">
<TableRow android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical">
<ImageView android:id="@+id/entry_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"/>
<TextView
android:id="@+id/entry_text"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@style/DefaultTextStyle"/>
<View/>
</TableRow>
</TableLayout>

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

@@ -18,9 +18,9 @@
along with KeePassDroid. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_margin="@dimen/list_margin"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/green_transparent"
android:orientation="vertical">
<TextView android:id="@+id/read_only"
android:layout_width="fill_parent"
@@ -32,21 +32,23 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginStart="@dimen/list_margin"
android:layout_marginEnd="@dimen/list_margin"
android:padding="2sp"
style="@style/DefaultTextStyle">
<TextView android:id="@+id/group_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:layout_weight="1"
android:text="@string/root"
style="@style/DefaultTextStyle" />
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"
style="@style/DefaultTextStyle" />
<TextView android:id="@+id/group_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="left|center_vertical"
android:layout_weight="1"
android:text="@string/root"
style="@style/DefaultTextStyle" />
<ImageView android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"
style="@style/DefaultTextStyle" />
</LinearLayout>
</LinearLayout>

46
app/src/main/res/layout/group_list_entry.xml
View File

@@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
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/>.
-->
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:stretchColumns="1">
<TableRow android:layout_width="fill_parent"
android:gravity="center_vertical"
android:layout_height="wrap_content">
<ImageView android:id="@+id/group_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"/>
<TextView android:id="@+id/group_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="2dp"
android:paddingBottom="2dp"
style="@style/DefaultTextStyle"/>
<View/>
<TextView android:id="@+id/group_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/SecondaryText"
android:text="@string/group"/>
</TableRow>
</TableLayout>

40
app/src/main/res/layout/list_entries_entry.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
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/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical">
<ImageView android:id="@+id/entry_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/default_margin"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true" />
<TextView
android:id="@+id/entry_text"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
style="@style/DefaultTextStyle"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_toRightOf="@+id/entry_icon" />
</RelativeLayout>

51
app/src/main/res/layout/list_entries_group.xml Normal file
View File

@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 Brian Pellin, Jeremy Jamet / Kunzisoft.
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/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_vertical">
<ImageView android:id="@+id/group_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/default_margin"
android:scaleType="fitXY"
android:src="@drawable/ic99_blank"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true" />
<TextView android:id="@+id/group_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingTop="2dp"
android:paddingBottom="2dp"
style="@style/DefaultTextStyle"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/group_label"
android:layout_toRightOf="@+id/group_icon" />
<TextView android:id="@+id/group_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/group"
android:layout_margin="@dimen/default_margin"
style="@style/SecondaryText"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
</RelativeLayout>

1
app/src/main/res/values/colors.xml
View File

@@ -22,6 +22,7 @@
<color name="white">#ffffff</color>
<color name="green">#43a047</color>
<color name="green_dark">#388e3c</color>
<color name="green_transparent">#50388e3c</color>
<color name="blue_highlight">#0000dd</color>
<color name="background">#303030</color>
<color name="icon_background">#555555</color>

8
app/src/main/res/values/donottranslate.xml
View File

@@ -65,10 +65,10 @@
<item>300000</item>
<item>-1</item>
</string-array>
<string name="list_size_default">28</string>
<string name="list_size_default">18</string>
<string-array name="list_size_values">
<item>15</item>
<item>20</item>
<item>28</item>
<item>14</item>
<item>18</item>
<item>26</item>
</string-array>
</resources>