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

Fix number of icons

Browse Source
This commit is contained in:
J-Jamet
2021-02-25 15:44:23 +01:00
parent 80521f8ec2
commit b609ed3ad4
5 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/kunzisoft/keepass/database/element/icon/IconImageStandard.kt
View File

@@ -32,7 +32,7 @@ class IconImageStandard : Parcelable {
}
constructor(iconId: Int) {
if (iconId < 0 || iconId > NB_ICONS)
if (iconId < 0 || iconId >= NB_ICONS)
this.id = KEY_ID
else
this.id = iconId

4
app/src/main/java/com/kunzisoft/keepass/icons/IconPack.kt
View File

@@ -78,7 +78,7 @@ class IconPack(packageName: String, resources: Resources, resourceId: Int) {
// Build the list of icons
var num = 0
while (num <= NB_ICONS) {
while (num < NB_ICONS) {
// To construct the id with name_ic_XX_32dp (ex : classic_ic_08_32dp )
val resId = resources.getIdentifier(
id + "_" + String.format(Locale.ENGLISH, "%02d", num) + "_32dp",
@@ -134,6 +134,6 @@ class IconPack(packageName: String, resources: Resources, resourceId: Int) {
}
companion object {
const val NB_ICONS = 68
const val NB_ICONS = 69
}
}

10
app/src/main/res/layout/fragment_icon_custom_picker.xml
View File

@@ -24,12 +24,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2"
android:verticalSpacing="32dp"
android:paddingTop="20dp"
android:gravity="center"
android:layout_gravity="center"
android:columnWidth="64dp"
android:numColumns="auto_fit"
android:stretchMode="spacingWidthUniform">
</androidx.recyclerview.widget.RecyclerView>
app:spanCount="4" />

10
app/src/main/res/layout/fragment_icon_standard_picker.xml
View File

@@ -24,12 +24,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:spanCount="2"
android:verticalSpacing="32dp"
android:paddingTop="20dp"
android:gravity="center"
android:layout_gravity="center"
android:columnWidth="64dp"
android:numColumns="auto_fit"
android:stretchMode="spacingWidthUniform">
</androidx.recyclerview.widget.RecyclerView>
app:spanCount="4" />

10
app/src/main/res/layout/item_icon.xml
View File

@@ -17,11 +17,15 @@
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.appcompat.widget.AppCompatImageView
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="32dp">
</androidx.appcompat.widget.AppCompatImageView>
android:layout_margin="16dp">
</androidx.appcompat.widget.AppCompatImageView>
</FrameLayout>