create Classic Icon Pack

app/build.gradle

@@ -93,4 +93,5 @@ dependencies {
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionDispatcherVersion"
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.1'
     implementation group: 'com.google.guava', name: 'guava', version: '23.0-android'
+    compile project(path: ':classiciconpack')
 }

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java

@@ -52,7 +52,7 @@ import com.kunzisoft.keepass.database.edit.UpdateEntry;
 import com.kunzisoft.keepass.database.security.ProtectedString;
 import com.kunzisoft.keepass.dialogs.GeneratePasswordDialogFragment;
 import com.kunzisoft.keepass.dialogs.IconPickerDialogFragment;
-import com.kunzisoft.keepass.icons.Icons;
+import com.kunzisoft.keepass.icon.classic.Icons;
 import com.kunzisoft.keepass.settings.PreferencesUtil;
 import com.kunzisoft.keepass.tasks.ProgressTask;
 import com.kunzisoft.keepass.utils.MenuUtil;

app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java

@@ -34,7 +34,7 @@ import android.widget.Toast;
 
 import com.kunzisoft.keepass.R;
 import com.kunzisoft.keepass.database.PwNode;
-import com.kunzisoft.keepass.icons.Icons;
+import com.kunzisoft.keepass.icon.classic.Icons;
 
 public class GroupEditDialogFragment extends DialogFragment
         implements IconPickerDialogFragment.IconPickerListener {

app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java

@@ -33,7 +33,7 @@ import android.widget.GridView;
 import android.widget.ImageView;
 
 import com.kunzisoft.keepass.R;
-import com.kunzisoft.keepass.icons.Icons;
+import com.kunzisoft.keepass.icon.classic.Icons;
 import com.kunzisoft.keepass.stylish.StylishActivity;
 
 

app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java

@@ -22,6 +22,8 @@ package com.kunzisoft.keepass.icons;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 
@@ -30,6 +32,7 @@ import com.kunzisoft.keepass.compat.BitmapDrawableCompat;
 import com.kunzisoft.keepass.database.PwIcon;
 import com.kunzisoft.keepass.database.PwIconCustom;
 import com.kunzisoft.keepass.database.PwIconStandard;
+import com.kunzisoft.keepass.icon.classic.Icons;
 
 import org.apache.commons.collections.map.AbstractReferenceMap;
 import org.apache.commons.collections.map.ReferenceMap;
@@ -67,9 +70,10 @@ public class DrawableFactory {
 
 	private static void initBlank(Resources res) {
 		if (blank==null) {
-			blank = res.getDrawable(R.drawable.ic99_blank);
+			blankWidth = (int) res.getDimension(R.dimen.icon_size);
-			blankWidth = blank.getIntrinsicWidth();
+			blankHeight = (int) res.getDimension(R.dimen.icon_size);
-			blankHeight = blank.getIntrinsicHeight();
+			blank = new ColorDrawable(Color.TRANSPARENT);
+			blank.setBounds(0, 0, blankWidth, blankHeight);
 		}
 	}
 	

app/src/main/res/layout/entry_edit.xml

@@ -67,7 +67,6 @@
                 <android.support.v7.widget.AppCompatImageButton android:id="@+id/icon_button"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:src="@drawable/ic00"
                     android:layout_margin="8dp"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"/>

app/src/main/res/layout/entry_view.xml

@@ -43,8 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center_vertical"
-                android:scaleType="fitXY"
+                android:scaleType="fitXY"/>
-                android:src="@drawable/ic99_blank"/>
             <android.support.v7.widget.AppCompatTextView android:id="@+id/entry_title"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"

app/src/main/res/layout/group_edit.xml

@@ -27,7 +27,6 @@
 	<android.support.v7.widget.AppCompatImageButton 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_alignParentEnd="true"
 		android:layout_alignParentTop="true"/>

app/src/main/res/layout/group_header.xml

@@ -39,8 +39,7 @@
             android:layout_gravity="end|center_vertical"
             android:layout_marginRight="8dp"
             android:layout_marginEnd="8dp"
-            android:scaleType="fitXY"
+            android:scaleType="fitXY" />
-            android:src="@drawable/ic99_blank" />
         <android.support.v7.widget.AppCompatTextView android:id="@+id/group_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

app/src/main/res/layout/icon.xml

@@ -23,6 +23,5 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:layout_margin="32dp"
+    android:layout_margin="32dp">
-    android:src="@drawable/ic99_blank">
 </android.support.v7.widget.AppCompatImageView>

app/src/main/res/layout/list_nodes_entry.xml

@@ -33,7 +33,6 @@
         android:layout_marginRight="@dimen/default_margin"
         android:layout_marginEnd="@dimen/default_margin"
         android:scaleType="fitXY"
-        android:src="@drawable/ic99_blank"
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true" />

app/src/main/res/layout/list_nodes_group.xml

@@ -46,7 +46,6 @@
         android:layout_marginRight="@dimen/default_margin"
         android:layout_marginEnd="@dimen/default_margin"
         android:scaleType="fitXY"
-        android:src="@drawable/ic99_blank"
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/group_arrow"
         android:layout_toEndOf="@+id/group_arrow" />

app/src/main/res/values/dimens.xml

@@ -24,4 +24,6 @@
     <dimen name="margin_medium">16dp</dimen>
     <dimen name="margin_large">32dp</dimen>
     <dimen name="margin_huge">64dp</dimen>
+
+    <dimen name="icon_size">32dp</dimen>
 </resources>

classiciconpack/.gitignore

@@ -0,0 +1 @@
+/build

classiciconpack/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 27
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 27
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    android {
+        resourcePrefix 'kunzisoft_keepass_icon'
+    }
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'com.android.support:appcompat-v7:27.1.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+}

classiciconpack/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

classiciconpack/src/androidTest/java/com/kunzisoft/keepass/icon/classic/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.kunzisoft.keepass.icon.classic;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.kunzisoft.keepass.icon.classic.test", appContext.getPackageName());
+    }
+}

classiciconpack/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kunzisoft.keepass.icon.classic" />

classiciconpack/src/main/java/com/kunzisoft/keepass/icon/classic/Icons.java

@@ -17,11 +17,11 @@
  *  along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.keepass.icons;
+package com.kunzisoft.keepass.icon.classic;
 
 import android.util.SparseIntArray;
 
-import com.kunzisoft.keepass.R;
+import com.kunzisoft.keepass.icon.classic.R;
 
 import java.lang.reflect.Field;
 
@@ -33,12 +33,12 @@ public class Icons {
 		if (icons == null) {
 			icons = new SparseIntArray();
 			
-			Class<com.kunzisoft.keepass.R.drawable> c = com.kunzisoft.keepass.R.drawable.class;
+			Class<com.kunzisoft.keepass.icon.classic.R.drawable> c = com.kunzisoft.keepass.icon.classic.R.drawable.class;
 			
 			Field[] fields = c.getFields();
 
-			for (int i = 0; i < fields.length; i++) {
+			for (Field field : fields) {
-				String fieldName = fields[i].getName();
+				String fieldName = field.getName();
 				if (fieldName.matches("ic\\d{2}.*")) {
 					String sNum = fieldName.substring(2, 4);
 					int num = Integer.parseInt(sNum);
@@ -48,7 +48,7 @@ public class Icons {
 
 					int resId;
 					try {
-						resId = fields[i].getInt(null);
+						resId = field.getInt(null);
 					} catch (Exception e) {
 						continue;
 					}