From 13dea4b5674f4111028a1242e2723e02572b2252 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Mon, 9 Apr 2018 21:35:07 +0200 Subject: [PATCH] New icon pack importer --- app/build.gradle | 3 +- .../keepass/activities/EntryActivity.java | 2 +- .../keepass/activities/EntryEditActivity.java | 6 +- .../keepass/activities/GroupActivity.java | 2 +- .../keepass/adapters/NodeAdapter.java | 3 +- .../java/com/kunzisoft/keepass/app/App.java | 2 +- .../dialogs/GroupEditDialogFragment.java | 4 +- .../dialogs/IconPickerDialogFragment.java | 10 ++- .../keepass/icons/DrawableFactory.java | 24 +++--- .../com/kunzisoft/keepass/icons/IconPack.java | 65 +++++++++++++++ .../keepass/icons/IconPackChooser.java | 61 +++++++++++++++ .../icons/IconPackUnknownException.java | 8 ++ classiciconpack/.gitignore | 1 - classiciconpack/build.gradle | 36 --------- classiciconpack/proguard-rules.pro | 21 ----- .../icon/classic/ExampleInstrumentedTest.java | 26 ------ .../kunzisoft/keepass/icon/classic/Icons.java | 74 ------------------ .../src/main/res/values/strings.xml | 3 - .../keepass/icon/classic/ExampleUnitTest.java | 17 ---- icon-pack-classic/build.gradle | 21 +++++ .../src/main/AndroidManifest.xml | 0 .../src/main/res/drawable-hdpi/ic00.png | Bin .../src/main/res/drawable-hdpi/ic01.png | Bin .../src/main/res/drawable-hdpi/ic02.png | Bin .../src/main/res/drawable-hdpi/ic03.png | Bin .../src/main/res/drawable-hdpi/ic04.png | Bin .../src/main/res/drawable-hdpi/ic05.png | Bin .../src/main/res/drawable-hdpi/ic06.png | Bin .../src/main/res/drawable-hdpi/ic07.png | Bin .../src/main/res/drawable-hdpi/ic08.png | Bin .../src/main/res/drawable-hdpi/ic09.png | Bin .../src/main/res/drawable-hdpi/ic10.png | Bin .../src/main/res/drawable-hdpi/ic11.png | Bin .../src/main/res/drawable-hdpi/ic12.png | Bin .../src/main/res/drawable-hdpi/ic13.png | Bin .../src/main/res/drawable-hdpi/ic14.png | Bin .../src/main/res/drawable-hdpi/ic15.png | Bin .../src/main/res/drawable-hdpi/ic16.png | Bin .../src/main/res/drawable-hdpi/ic17.png | Bin .../src/main/res/drawable-hdpi/ic18.png | Bin .../src/main/res/drawable-hdpi/ic19.png | Bin .../src/main/res/drawable-hdpi/ic20.png | Bin .../src/main/res/drawable-hdpi/ic21.png | Bin .../src/main/res/drawable-hdpi/ic22.png | Bin .../src/main/res/drawable-hdpi/ic23.png | Bin .../src/main/res/drawable-hdpi/ic24.png | Bin .../src/main/res/drawable-hdpi/ic25.png | Bin .../src/main/res/drawable-hdpi/ic26.png | Bin .../src/main/res/drawable-hdpi/ic27.png | Bin .../src/main/res/drawable-hdpi/ic28.png | Bin .../src/main/res/drawable-hdpi/ic29.png | Bin .../src/main/res/drawable-hdpi/ic30.png | Bin .../src/main/res/drawable-hdpi/ic31.png | Bin .../src/main/res/drawable-hdpi/ic32.png | Bin .../src/main/res/drawable-hdpi/ic33.png | Bin .../src/main/res/drawable-hdpi/ic34.png | Bin .../src/main/res/drawable-hdpi/ic35.png | Bin .../src/main/res/drawable-hdpi/ic36.png | Bin .../src/main/res/drawable-hdpi/ic37.png | Bin .../src/main/res/drawable-hdpi/ic38.png | Bin .../src/main/res/drawable-hdpi/ic39.png | Bin .../src/main/res/drawable-hdpi/ic40.png | Bin .../src/main/res/drawable-hdpi/ic41.png | Bin .../src/main/res/drawable-hdpi/ic42.png | Bin .../src/main/res/drawable-hdpi/ic43.png | Bin .../src/main/res/drawable-hdpi/ic44.png | Bin .../src/main/res/drawable-hdpi/ic45.png | Bin .../src/main/res/drawable-hdpi/ic46.png | Bin .../src/main/res/drawable-hdpi/ic47.png | Bin .../src/main/res/drawable-hdpi/ic48.png | Bin .../src/main/res/drawable-hdpi/ic49.png | Bin .../src/main/res/drawable-hdpi/ic50.png | Bin .../src/main/res/drawable-hdpi/ic51.png | Bin .../src/main/res/drawable-hdpi/ic52.png | Bin .../src/main/res/drawable-hdpi/ic53.png | Bin .../src/main/res/drawable-hdpi/ic54.png | Bin .../src/main/res/drawable-hdpi/ic55.png | Bin .../src/main/res/drawable-hdpi/ic56.png | Bin .../src/main/res/drawable-hdpi/ic57.png | Bin .../src/main/res/drawable-hdpi/ic58.png | Bin .../src/main/res/drawable-hdpi/ic59.png | Bin .../src/main/res/drawable-hdpi/ic60.png | Bin .../src/main/res/drawable-hdpi/ic61.png | Bin .../src/main/res/drawable-hdpi/ic62.png | Bin .../src/main/res/drawable-hdpi/ic63.png | Bin .../src/main/res/drawable-hdpi/ic64.png | Bin .../src/main/res/drawable-hdpi/ic65.png | Bin .../src/main/res/drawable-hdpi/ic66.png | Bin .../src/main/res/drawable-hdpi/ic67.png | Bin .../src/main/res/drawable-hdpi/ic68.png | Bin .../src/main/res/drawable-hdpi/ic99_blank.png | Bin .../src/main/res/drawable-ldpi/ic00.png | Bin .../src/main/res/drawable-ldpi/ic01.png | Bin .../src/main/res/drawable-ldpi/ic02.png | Bin .../src/main/res/drawable-ldpi/ic03.png | Bin .../src/main/res/drawable-ldpi/ic04.png | Bin .../src/main/res/drawable-ldpi/ic05.png | Bin .../src/main/res/drawable-ldpi/ic06.png | Bin .../src/main/res/drawable-ldpi/ic07.png | Bin .../src/main/res/drawable-ldpi/ic08.png | Bin .../src/main/res/drawable-ldpi/ic09.png | Bin .../src/main/res/drawable-ldpi/ic10.png | Bin .../src/main/res/drawable-ldpi/ic11.png | Bin .../src/main/res/drawable-ldpi/ic12.png | Bin .../src/main/res/drawable-ldpi/ic13.png | Bin .../src/main/res/drawable-ldpi/ic14.png | Bin .../src/main/res/drawable-ldpi/ic15.png | Bin .../src/main/res/drawable-ldpi/ic16.png | Bin .../src/main/res/drawable-ldpi/ic17.png | Bin .../src/main/res/drawable-ldpi/ic18.png | Bin .../src/main/res/drawable-ldpi/ic19.png | Bin .../src/main/res/drawable-ldpi/ic20.png | Bin .../src/main/res/drawable-ldpi/ic21.png | Bin .../src/main/res/drawable-ldpi/ic22.png | Bin .../src/main/res/drawable-ldpi/ic23.png | Bin .../src/main/res/drawable-ldpi/ic24.png | Bin .../src/main/res/drawable-ldpi/ic25.png | Bin .../src/main/res/drawable-ldpi/ic26.png | Bin .../src/main/res/drawable-ldpi/ic27.png | Bin .../src/main/res/drawable-ldpi/ic28.png | Bin .../src/main/res/drawable-ldpi/ic29.png | Bin .../src/main/res/drawable-ldpi/ic30.png | Bin .../src/main/res/drawable-ldpi/ic31.png | Bin .../src/main/res/drawable-ldpi/ic32.png | Bin .../src/main/res/drawable-ldpi/ic33.png | Bin .../src/main/res/drawable-ldpi/ic34.png | Bin .../src/main/res/drawable-ldpi/ic35.png | Bin .../src/main/res/drawable-ldpi/ic36.png | Bin .../src/main/res/drawable-ldpi/ic37.png | Bin .../src/main/res/drawable-ldpi/ic38.png | Bin .../src/main/res/drawable-ldpi/ic39.png | Bin .../src/main/res/drawable-ldpi/ic40.png | Bin .../src/main/res/drawable-ldpi/ic41.png | Bin .../src/main/res/drawable-ldpi/ic42.png | Bin .../src/main/res/drawable-ldpi/ic43.png | Bin .../src/main/res/drawable-ldpi/ic44.png | Bin .../src/main/res/drawable-ldpi/ic45.png | Bin .../src/main/res/drawable-ldpi/ic46.png | Bin .../src/main/res/drawable-ldpi/ic47.png | Bin .../src/main/res/drawable-ldpi/ic48.png | Bin .../src/main/res/drawable-ldpi/ic49.png | Bin .../src/main/res/drawable-ldpi/ic50.png | Bin .../src/main/res/drawable-ldpi/ic51.png | Bin .../src/main/res/drawable-ldpi/ic52.png | Bin .../src/main/res/drawable-ldpi/ic53.png | Bin .../src/main/res/drawable-ldpi/ic54.png | Bin .../src/main/res/drawable-ldpi/ic55.png | Bin .../src/main/res/drawable-ldpi/ic56.png | Bin .../src/main/res/drawable-ldpi/ic57.png | Bin .../src/main/res/drawable-ldpi/ic58.png | Bin .../src/main/res/drawable-ldpi/ic59.png | Bin .../src/main/res/drawable-ldpi/ic60.png | Bin .../src/main/res/drawable-ldpi/ic61.png | Bin .../src/main/res/drawable-ldpi/ic62.png | Bin .../src/main/res/drawable-ldpi/ic63.png | Bin .../src/main/res/drawable-ldpi/ic64.png | Bin .../src/main/res/drawable-ldpi/ic65.png | Bin .../src/main/res/drawable-ldpi/ic66.png | Bin .../src/main/res/drawable-ldpi/ic67.png | Bin .../src/main/res/drawable-ldpi/ic68.png | Bin .../src/main/res/drawable-ldpi/ic99_blank.png | Bin .../src/main/res/drawable/ic00.png | Bin .../src/main/res/drawable/ic01.png | Bin .../src/main/res/drawable/ic02.png | Bin .../src/main/res/drawable/ic03.png | Bin .../src/main/res/drawable/ic04.png | Bin .../src/main/res/drawable/ic05.png | Bin .../src/main/res/drawable/ic06.png | Bin .../src/main/res/drawable/ic07.png | Bin .../src/main/res/drawable/ic08.png | Bin .../src/main/res/drawable/ic09.png | Bin .../src/main/res/drawable/ic10.png | Bin .../src/main/res/drawable/ic11.png | Bin .../src/main/res/drawable/ic12.png | Bin .../src/main/res/drawable/ic13.png | Bin .../src/main/res/drawable/ic14.png | Bin .../src/main/res/drawable/ic15.png | Bin .../src/main/res/drawable/ic16.png | Bin .../src/main/res/drawable/ic17.png | Bin .../src/main/res/drawable/ic18.png | Bin .../src/main/res/drawable/ic19.png | Bin .../src/main/res/drawable/ic20.png | Bin .../src/main/res/drawable/ic21.png | Bin .../src/main/res/drawable/ic22.png | Bin .../src/main/res/drawable/ic23.png | Bin .../src/main/res/drawable/ic24.png | Bin .../src/main/res/drawable/ic25.png | Bin .../src/main/res/drawable/ic26.png | Bin .../src/main/res/drawable/ic27.png | Bin .../src/main/res/drawable/ic28.png | Bin .../src/main/res/drawable/ic29.png | Bin .../src/main/res/drawable/ic30.png | Bin .../src/main/res/drawable/ic31.png | Bin .../src/main/res/drawable/ic32.png | Bin .../src/main/res/drawable/ic33.png | Bin .../src/main/res/drawable/ic34.png | Bin .../src/main/res/drawable/ic35.png | Bin .../src/main/res/drawable/ic36.png | Bin .../src/main/res/drawable/ic37.png | Bin .../src/main/res/drawable/ic38.png | Bin .../src/main/res/drawable/ic39.png | Bin .../src/main/res/drawable/ic40.png | Bin .../src/main/res/drawable/ic41.png | Bin .../src/main/res/drawable/ic42.png | Bin .../src/main/res/drawable/ic43.png | Bin .../src/main/res/drawable/ic44.png | Bin .../src/main/res/drawable/ic45.png | Bin .../src/main/res/drawable/ic46.png | Bin .../src/main/res/drawable/ic47.png | Bin .../src/main/res/drawable/ic48.png | Bin .../src/main/res/drawable/ic49.png | Bin .../src/main/res/drawable/ic50.png | Bin .../src/main/res/drawable/ic51.png | Bin .../src/main/res/drawable/ic52.png | Bin .../src/main/res/drawable/ic53.png | Bin .../src/main/res/drawable/ic54.png | Bin .../src/main/res/drawable/ic55.png | Bin .../src/main/res/drawable/ic56.png | Bin .../src/main/res/drawable/ic57.png | Bin .../src/main/res/drawable/ic58.png | Bin .../src/main/res/drawable/ic59.png | Bin .../src/main/res/drawable/ic60.png | Bin .../src/main/res/drawable/ic61.png | Bin .../src/main/res/drawable/ic62.png | Bin .../src/main/res/drawable/ic63.png | Bin .../src/main/res/drawable/ic64.png | Bin .../src/main/res/drawable/ic65.png | Bin .../src/main/res/drawable/ic66.png | Bin .../src/main/res/drawable/ic67.png | Bin .../src/main/res/drawable/ic68.png | Bin .../src/main/res/drawable/ic99_blank.png | Bin settings.gradle | 2 +- 232 files changed, 186 insertions(+), 205 deletions(-) create mode 100644 app/src/main/java/com/kunzisoft/keepass/icons/IconPack.java create mode 100644 app/src/main/java/com/kunzisoft/keepass/icons/IconPackChooser.java create mode 100644 app/src/main/java/com/kunzisoft/keepass/icons/IconPackUnknownException.java delete mode 100644 classiciconpack/.gitignore delete mode 100644 classiciconpack/build.gradle delete mode 100644 classiciconpack/proguard-rules.pro delete mode 100644 classiciconpack/src/androidTest/java/com/kunzisoft/keepass/icon/classic/ExampleInstrumentedTest.java delete mode 100644 classiciconpack/src/main/java/com/kunzisoft/keepass/icon/classic/Icons.java delete mode 100644 classiciconpack/src/main/res/values/strings.xml delete mode 100644 classiciconpack/src/test/java/com/kunzisoft/keepass/icon/classic/ExampleUnitTest.java create mode 100644 icon-pack-classic/build.gradle rename {classiciconpack => icon-pack-classic}/src/main/AndroidManifest.xml (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic00.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic01.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic02.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic03.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic04.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic05.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic06.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic07.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic08.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic09.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic10.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic11.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic12.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic13.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic14.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic15.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic16.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic17.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic18.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic19.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic20.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic21.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic22.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic23.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic24.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic25.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic26.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic27.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic28.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic29.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic30.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic31.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic32.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic33.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic34.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic35.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic36.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic37.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic38.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic39.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic40.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic41.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic42.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic43.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic44.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic45.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic46.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic47.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic48.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic49.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic50.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic51.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic52.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic53.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic54.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic55.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic56.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic57.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic58.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic59.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic60.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic61.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic62.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic63.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic64.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic65.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic66.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic67.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic68.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-hdpi/ic99_blank.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic00.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic01.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic02.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic03.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic04.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic05.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic06.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic07.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic08.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic09.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic10.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic11.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic12.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic13.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic14.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic15.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic16.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic17.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic18.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic19.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic20.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic21.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic22.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic23.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic24.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic25.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic26.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic27.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic28.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic29.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic30.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic31.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic32.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic33.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic34.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic35.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic36.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic37.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic38.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic39.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic40.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic41.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic42.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic43.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic44.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic45.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic46.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic47.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic48.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic49.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic50.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic51.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic52.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic53.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic54.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic55.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic56.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic57.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic58.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic59.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic60.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic61.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic62.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic63.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic64.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic65.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic66.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic67.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic68.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable-ldpi/ic99_blank.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic00.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic01.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic02.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic03.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic04.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic05.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic06.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic07.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic08.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic09.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic10.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic11.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic12.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic13.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic14.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic15.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic16.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic17.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic18.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic19.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic20.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic21.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic22.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic23.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic24.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic25.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic26.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic27.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic28.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic29.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic30.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic31.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic32.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic33.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic34.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic35.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic36.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic37.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic38.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic39.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic40.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic41.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic42.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic43.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic44.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic45.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic46.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic47.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic48.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic49.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic50.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic51.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic52.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic53.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic54.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic55.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic56.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic57.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic58.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic59.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic60.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic61.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic62.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic63.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic64.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic65.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic66.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic67.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic68.png (100%) rename {classiciconpack => icon-pack-classic}/src/main/res/drawable/ic99_blank.png (100%) diff --git a/app/build.gradle b/app/build.gradle index 933b2d284..6d9e8ccd1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,5 +93,6 @@ 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') + // Icon pack + implementation project(path: ':icon-pack-classic') } diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java index 414fa468d..92d4c3159 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.java @@ -214,7 +214,7 @@ public class EntryActivity extends LockingHideActivity { mEntry.startToManageFieldReferences(pm); // Assign title - populateTitle(db.getDrawFactory().getIconDrawable(getResources(), mEntry.getIcon()), + populateTitle(db.getDrawFactory().getIconDrawable(this, mEntry.getIcon()), mEntry.getTitle()); // Assign basic fields diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java index d253f6501..8776479c5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.java +++ b/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.icon.classic.Icons; +import com.kunzisoft.keepass.icons.IconPackChooser; import com.kunzisoft.keepass.settings.PreferencesUtil; import com.kunzisoft.keepass.tasks.ProgressTask; import com.kunzisoft.keepass.utils.MenuUtil; @@ -315,7 +315,7 @@ public class EntryEditActivity extends LockingHideActivity protected void fillData() { ImageButton currIconButton = findViewById(R.id.icon_button); - App.getDB().getDrawFactory().assignDrawableTo(currIconButton, getResources(), mEntry.getIcon()); + App.getDB().getDrawFactory().assignDrawableTo(this, currIconButton, mEntry.getIcon()); // Don't start the field reference manager, we want to see the raw ref mEntry.endToManageFieldReferences(); @@ -351,7 +351,7 @@ public class EntryEditActivity extends LockingHideActivity public void iconPicked(Bundle bundle) { mSelectedIconID = bundle.getInt(IconPickerDialogFragment.KEY_ICON_ID); ImageButton currIconButton = findViewById(R.id.icon_button); - currIconButton.setImageResource(Icons.iconToResId(mSelectedIconID)); + currIconButton.setImageResource(IconPackChooser.getDefaultIconPack(this).iconToResId(mSelectedIconID)); } @Override diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java index a4221108d..971fcfd4d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.java @@ -275,7 +275,7 @@ public class GroupActivity extends ListNodesActivity protected void setGroupIcon() { if (mCurrentGroup != null) { ImageView iv = findViewById(R.id.icon); - App.getDB().getDrawFactory().assignDrawableTo(iv, getResources(), mCurrentGroup.getIcon()); + App.getDB().getDrawFactory().assignDrawableTo(this, iv, mCurrentGroup.getIcon()); } } diff --git a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java index 8d5a86e2c..a48dbb16d 100644 --- a/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java +++ b/app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.java @@ -175,8 +175,7 @@ public class NodeAdapter extends RecyclerView.Adapter { public void onBindViewHolder(BasicViewHolder holder, int position) { PwNode subNode = nodeSortedList.get(position); // Assign image - App.getDB().getDrawFactory().assignDrawableTo(holder.icon, - context.getResources(), subNode.getIcon()); + App.getDB().getDrawFactory().assignDrawableTo(context, holder.icon, subNode.getIcon()); // Assign text holder.text.setText(subNode.getDisplayTitle()); // Assign click diff --git a/app/src/main/java/com/kunzisoft/keepass/app/App.java b/app/src/main/java/com/kunzisoft/keepass/app/App.java index 5544f7ae4..6a861dcde 100644 --- a/app/src/main/java/com/kunzisoft/keepass/app/App.java +++ b/app/src/main/java/com/kunzisoft/keepass/app/App.java @@ -41,7 +41,7 @@ public class App extends MultiDexApplication { } return db; } - + public static RecentFileHistory getFileHistory() { return fileHistory; } diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java index 8de137887..4e77f21c5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/dialogs/GroupEditDialogFragment.java +++ b/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.icon.classic.Icons; +import com.kunzisoft.keepass.icons.IconPackChooser; public class GroupEditDialogFragment extends DialogFragment implements IconPickerDialogFragment.IconPickerListener { @@ -131,7 +131,7 @@ public class GroupEditDialogFragment extends DialogFragment } private void populateIcon(int iconId) { - iconButton.setImageResource(Icons.iconToResId(iconId)); + iconButton.setImageResource(IconPackChooser.getDefaultIconPack(getContext()).iconToResId(iconId)); } @Override diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java index 3dcb51cf7..81775d711 100644 --- a/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java @@ -33,13 +33,15 @@ import android.widget.GridView; import android.widget.ImageView; import com.kunzisoft.keepass.R; -import com.kunzisoft.keepass.icon.classic.Icons; +import com.kunzisoft.keepass.icons.IconPack; +import com.kunzisoft.keepass.icons.IconPackChooser; import com.kunzisoft.keepass.stylish.StylishActivity; public class IconPickerDialogFragment extends DialogFragment { public static final String KEY_ICON_ID = "icon_id"; private IconPickerListener iconPickerListener; + private IconPack iconPack; public static void launch(StylishActivity activity) { // Create an instance of the dialog fragment and show it @@ -66,6 +68,8 @@ public class IconPickerDialogFragment extends DialogFragment { // Get the layout inflater LayoutInflater inflater = getActivity().getLayoutInflater(); + iconPack = IconPackChooser.getDefaultIconPack(getContext()); + // Inflate and set the layout for the dialog // Pass null as the parent view because its going in the dialog layout View root = inflater.inflate(R.layout.icon_picker, null); @@ -96,7 +100,7 @@ public class IconPickerDialogFragment extends DialogFragment { public int getCount() { /* Return number of KeePass icons */ - return Icons.count(); + return iconPack.numberOfIcons(); } public Object getItem(int position) { @@ -118,7 +122,7 @@ public class IconPickerDialogFragment extends DialogFragment { currView = convertView; } ImageView iv = currView.findViewById(R.id.icon_image); - iv.setImageResource(Icons.iconToResId(position)); + iv.setImageResource(iconPack.iconToResId(position)); return currView; } diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java b/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java index 2067182fc..9cec54ec2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java +++ b/app/src/main/java/com/kunzisoft/keepass/icons/DrawableFactory.java @@ -19,6 +19,7 @@ */ package com.kunzisoft.keepass.icons; +import android.content.Context; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -32,7 +33,6 @@ 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; @@ -54,17 +54,17 @@ public class DrawableFactory { */ private ReferenceMap standardIconMap = new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.WEAK); - public void assignDrawableTo(ImageView iv, Resources res, PwIcon icon) { - Drawable draw = getIconDrawable(res, icon); + public void assignDrawableTo(Context context, ImageView iv, PwIcon icon) { + Drawable draw = getIconDrawable(context, icon); if (iv != null && draw != null) iv.setImageDrawable(draw); } - public Drawable getIconDrawable(Resources res, PwIcon icon) { + public Drawable getIconDrawable(Context context, PwIcon icon) { if (icon instanceof PwIconStandard) { - return getIconDrawable(res, (PwIconStandard) icon); + return getIconDrawable(context, (PwIconStandard) icon); } else { - return getIconDrawable(res, (PwIconCustom) icon); + return getIconDrawable(context, (PwIconCustom) icon); } } @@ -77,20 +77,20 @@ public class DrawableFactory { } } - public Drawable getIconDrawable(Resources res, PwIconStandard icon) { - int resId = Icons.iconToResId(icon.iconId); + private Drawable getIconDrawable(Context context, PwIconStandard icon) { + int resId = IconPackChooser.getDefaultIconPack(context).iconToResId(icon.iconId); Drawable draw = (Drawable) standardIconMap.get(resId); if (draw == null) { - draw = res.getDrawable(resId); + draw = context.getResources().getDrawable(resId); standardIconMap.put(resId, draw); } return draw; } - public Drawable getIconDrawable(Resources res, PwIconCustom icon) { - initBlank(res); + private Drawable getIconDrawable(Context context, PwIconCustom icon) { + initBlank(context.getResources()); if (icon == null) { return blank; } @@ -111,7 +111,7 @@ public class DrawableFactory { bitmap = resize(bitmap); - draw = BitmapDrawableCompat.getBitmapDrawable(res, bitmap); + draw = BitmapDrawableCompat.getBitmapDrawable(context.getResources(), bitmap); customIconMap.put(icon.uuid, draw); } diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.java b/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.java new file mode 100644 index 000000000..6d7733c5a --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconPack.java @@ -0,0 +1,65 @@ +/* + * 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 3 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.kunzisoft.keepass.icons; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; +import android.support.v4.content.ContextCompat; +import android.util.SparseIntArray; + +import com.kunzisoft.keepass.R; + +import java.text.DecimalFormat; + +public class IconPack { + + private static final int NB_ICONS = 68; + + private static SparseIntArray icons = null; + + private Resources resources; + + IconPack(Context context) { + + resources = context.getResources(); + int num = 0; + icons = new SparseIntArray(); + while(num < NB_ICONS) { + String drawableId = "ic" + new DecimalFormat("00").format(num); + int resId = resources.getIdentifier(drawableId, "drawable", context.getPackageName()); + icons.put(num, resId); + num++; + } +} + + public int numberOfIcons() { + return icons.size(); + } + + public int iconToResId(int iconId) { + return icons.get(iconId, com.kunzisoft.keepass.icon.classic.R.drawable.ic99_blank); // TODO change + } + + public Drawable getDrawable(int iconId) { + return resources.getDrawable(iconId); + } +} diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconPackChooser.java b/app/src/main/java/com/kunzisoft/keepass/icons/IconPackChooser.java new file mode 100644 index 000000000..67640f05c --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconPackChooser.java @@ -0,0 +1,61 @@ +package com.kunzisoft.keepass.icons; + +import android.content.Context; +import android.content.pm.PackageManager; +import android.util.Log; + +import com.kunzisoft.keepass.BuildConfig; +import com.kunzisoft.keepass.R; + +import java.util.ArrayList; +import java.util.List; + +/** + * Utility class to select an IconPack + */ +public class IconPackChooser { + + private static final String TAG = IconPackChooser.class.getName(); + + private static List iconPackList = new ArrayList<>(); + + private static volatile IconPackChooser sIconPackBuilder; + + private IconPackChooser(){ + if (sIconPackBuilder != null){ + throw new RuntimeException("Use build() method to get the single instance of this class."); + } + } + + public static IconPackChooser build(Context context) { + if (sIconPackBuilder == null) { //if there is no instance available... create new one + synchronized (IconPackChooser.class) { + if (sIconPackBuilder == null) { + sIconPackBuilder = new IconPackChooser(); + if (BuildConfig.FULL_VERSION) + try { + iconPackList.add(new IconPack(context)); + // Do something + } catch (Exception e) { + Log.e(TAG, "Icon pack can't be load", e); + System.exit(0); + } + } + } + } + + return sIconPackBuilder; + } + + public static IconPack getDefaultIconPack(Context context) { + build(context); + return iconPackList.get(0); + /* + try { + return iconPackList.get(0); + } catch (IndexOutOfBoundsException e) { + //throw new IconPackUnknownException(); TODO exception + } + */ + } +} diff --git a/app/src/main/java/com/kunzisoft/keepass/icons/IconPackUnknownException.java b/app/src/main/java/com/kunzisoft/keepass/icons/IconPackUnknownException.java new file mode 100644 index 000000000..15bd56c6b --- /dev/null +++ b/app/src/main/java/com/kunzisoft/keepass/icons/IconPackUnknownException.java @@ -0,0 +1,8 @@ +package com.kunzisoft.keepass.icons; + +public class IconPackUnknownException extends Exception{ + + IconPackUnknownException() { + super("Icon pack isn't defined"); + } +} diff --git a/classiciconpack/.gitignore b/classiciconpack/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/classiciconpack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/classiciconpack/build.gradle b/classiciconpack/build.gradle deleted file mode 100644 index c6effd350..000000000 --- a/classiciconpack/build.gradle +++ /dev/null @@ -1,36 +0,0 @@ -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' -} diff --git a/classiciconpack/proguard-rules.pro b/classiciconpack/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/classiciconpack/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# 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 diff --git a/classiciconpack/src/androidTest/java/com/kunzisoft/keepass/icon/classic/ExampleInstrumentedTest.java b/classiciconpack/src/androidTest/java/com/kunzisoft/keepass/icon/classic/ExampleInstrumentedTest.java deleted file mode 100644 index 21e71b9b8..000000000 --- a/classiciconpack/src/androidTest/java/com/kunzisoft/keepass/icon/classic/ExampleInstrumentedTest.java +++ /dev/null @@ -1,26 +0,0 @@ -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 Testing documentation - */ -@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()); - } -} diff --git a/classiciconpack/src/main/java/com/kunzisoft/keepass/icon/classic/Icons.java b/classiciconpack/src/main/java/com/kunzisoft/keepass/icon/classic/Icons.java deleted file mode 100644 index 0c08e4b1e..000000000 --- a/classiciconpack/src/main/java/com/kunzisoft/keepass/icon/classic/Icons.java +++ /dev/null @@ -1,74 +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 3 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.kunzisoft.keepass.icon.classic; - -import android.util.SparseIntArray; - -import com.kunzisoft.keepass.icon.classic.R; - -import java.lang.reflect.Field; - - -public class Icons { - private static SparseIntArray icons = null; - - private static void buildList() { - if (icons == null) { - icons = new SparseIntArray(); - - Class c = com.kunzisoft.keepass.icon.classic.R.drawable.class; - - Field[] fields = c.getFields(); - - for (Field field : fields) { - String fieldName = field.getName(); - if (fieldName.matches("ic\\d{2}.*")) { - String sNum = fieldName.substring(2, 4); - int num = Integer.parseInt(sNum); - if (num > 69) { - continue; - } - - int resId; - try { - resId = field.getInt(null); - } catch (Exception e) { - continue; - } - - icons.put(num, resId); - } - } - } - } - - public static int iconToResId(int iconId) { - buildList(); - - return icons.get(iconId, R.drawable.ic99_blank); - } - - public static int count() { - buildList(); - - return icons.size(); - } - -} diff --git a/classiciconpack/src/main/res/values/strings.xml b/classiciconpack/src/main/res/values/strings.xml deleted file mode 100644 index c92f09959..000000000 --- a/classiciconpack/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Classic Icon Pack - diff --git a/classiciconpack/src/test/java/com/kunzisoft/keepass/icon/classic/ExampleUnitTest.java b/classiciconpack/src/test/java/com/kunzisoft/keepass/icon/classic/ExampleUnitTest.java deleted file mode 100644 index 91d3bf763..000000000 --- a/classiciconpack/src/test/java/com/kunzisoft/keepass/icon/classic/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.kunzisoft.keepass.icon.classic; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file diff --git a/icon-pack-classic/build.gradle b/icon-pack-classic/build.gradle new file mode 100644 index 000000000..7557fb4ac --- /dev/null +++ b/icon-pack-classic/build.gradle @@ -0,0 +1,21 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + } + + buildTypes { + release { + minifyEnabled false + } + } + + resourcePrefix 'classic_' + +} diff --git a/classiciconpack/src/main/AndroidManifest.xml b/icon-pack-classic/src/main/AndroidManifest.xml similarity index 100% rename from classiciconpack/src/main/AndroidManifest.xml rename to icon-pack-classic/src/main/AndroidManifest.xml diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic00.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic00.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic00.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic00.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic01.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic01.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic01.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic01.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic02.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic02.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic02.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic02.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic03.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic03.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic03.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic03.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic04.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic04.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic04.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic04.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic05.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic05.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic05.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic05.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic06.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic06.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic06.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic06.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic07.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic07.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic07.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic07.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic08.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic08.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic08.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic08.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic09.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic09.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic09.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic09.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic10.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic10.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic10.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic10.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic11.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic11.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic11.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic11.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic12.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic12.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic12.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic12.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic13.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic13.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic13.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic13.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic14.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic14.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic14.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic14.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic15.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic15.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic15.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic15.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic16.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic16.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic16.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic16.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic17.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic17.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic17.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic17.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic18.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic18.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic18.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic18.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic19.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic19.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic19.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic19.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic20.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic20.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic20.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic20.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic21.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic21.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic21.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic21.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic22.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic22.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic22.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic22.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic23.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic23.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic23.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic23.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic24.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic24.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic24.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic24.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic25.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic25.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic25.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic25.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic26.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic26.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic26.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic26.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic27.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic27.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic27.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic27.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic28.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic28.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic28.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic28.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic29.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic29.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic29.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic29.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic30.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic30.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic30.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic30.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic31.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic31.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic31.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic31.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic32.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic32.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic32.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic32.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic33.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic33.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic33.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic33.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic34.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic34.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic34.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic34.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic35.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic35.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic35.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic35.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic36.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic36.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic36.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic36.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic37.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic37.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic37.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic37.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic38.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic38.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic38.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic38.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic39.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic39.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic39.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic39.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic40.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic40.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic40.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic40.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic41.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic41.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic41.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic41.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic42.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic42.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic42.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic42.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic43.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic43.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic43.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic43.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic44.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic44.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic44.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic44.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic45.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic45.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic45.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic45.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic46.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic46.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic46.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic46.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic47.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic47.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic47.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic47.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic48.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic48.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic48.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic48.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic49.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic49.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic49.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic49.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic50.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic50.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic50.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic50.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic51.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic51.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic51.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic51.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic52.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic52.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic52.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic52.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic53.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic53.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic53.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic53.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic54.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic54.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic54.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic54.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic55.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic55.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic55.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic55.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic56.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic56.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic56.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic56.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic57.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic57.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic57.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic57.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic58.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic58.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic58.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic58.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic59.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic59.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic59.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic59.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic60.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic60.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic60.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic60.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic61.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic61.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic61.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic61.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic62.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic62.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic62.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic62.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic63.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic63.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic63.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic63.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic64.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic64.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic64.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic64.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic65.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic65.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic65.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic65.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic66.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic66.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic66.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic66.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic67.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic67.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic67.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic67.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic68.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic68.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic68.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic68.png diff --git a/classiciconpack/src/main/res/drawable-hdpi/ic99_blank.png b/icon-pack-classic/src/main/res/drawable-hdpi/ic99_blank.png similarity index 100% rename from classiciconpack/src/main/res/drawable-hdpi/ic99_blank.png rename to icon-pack-classic/src/main/res/drawable-hdpi/ic99_blank.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic00.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic00.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic00.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic00.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic01.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic01.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic01.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic01.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic02.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic02.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic02.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic02.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic03.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic03.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic03.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic03.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic04.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic04.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic04.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic04.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic05.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic05.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic05.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic05.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic06.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic06.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic06.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic06.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic07.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic07.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic07.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic07.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic08.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic08.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic08.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic08.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic09.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic09.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic09.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic09.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic10.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic10.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic10.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic10.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic11.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic11.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic11.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic11.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic12.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic12.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic12.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic12.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic13.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic13.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic13.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic13.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic14.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic14.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic14.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic14.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic15.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic15.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic15.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic15.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic16.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic16.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic16.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic16.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic17.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic17.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic17.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic17.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic18.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic18.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic18.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic18.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic19.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic19.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic19.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic19.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic20.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic20.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic20.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic20.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic21.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic21.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic21.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic21.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic22.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic22.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic22.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic22.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic23.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic23.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic23.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic23.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic24.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic24.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic24.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic24.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic25.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic25.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic25.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic25.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic26.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic26.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic26.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic26.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic27.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic27.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic27.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic27.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic28.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic28.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic28.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic28.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic29.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic29.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic29.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic29.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic30.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic30.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic30.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic30.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic31.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic31.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic31.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic31.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic32.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic32.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic32.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic32.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic33.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic33.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic33.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic33.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic34.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic34.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic34.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic34.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic35.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic35.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic35.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic35.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic36.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic36.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic36.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic36.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic37.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic37.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic37.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic37.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic38.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic38.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic38.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic38.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic39.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic39.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic39.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic39.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic40.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic40.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic40.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic40.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic41.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic41.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic41.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic41.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic42.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic42.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic42.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic42.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic43.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic43.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic43.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic43.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic44.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic44.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic44.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic44.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic45.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic45.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic45.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic45.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic46.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic46.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic46.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic46.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic47.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic47.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic47.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic47.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic48.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic48.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic48.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic48.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic49.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic49.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic49.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic49.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic50.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic50.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic50.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic50.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic51.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic51.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic51.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic51.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic52.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic52.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic52.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic52.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic53.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic53.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic53.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic53.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic54.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic54.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic54.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic54.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic55.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic55.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic55.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic55.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic56.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic56.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic56.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic56.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic57.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic57.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic57.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic57.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic58.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic58.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic58.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic58.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic59.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic59.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic59.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic59.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic60.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic60.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic60.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic60.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic61.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic61.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic61.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic61.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic62.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic62.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic62.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic62.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic63.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic63.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic63.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic63.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic64.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic64.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic64.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic64.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic65.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic65.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic65.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic65.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic66.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic66.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic66.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic66.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic67.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic67.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic67.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic67.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic68.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic68.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic68.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic68.png diff --git a/classiciconpack/src/main/res/drawable-ldpi/ic99_blank.png b/icon-pack-classic/src/main/res/drawable-ldpi/ic99_blank.png similarity index 100% rename from classiciconpack/src/main/res/drawable-ldpi/ic99_blank.png rename to icon-pack-classic/src/main/res/drawable-ldpi/ic99_blank.png diff --git a/classiciconpack/src/main/res/drawable/ic00.png b/icon-pack-classic/src/main/res/drawable/ic00.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic00.png rename to icon-pack-classic/src/main/res/drawable/ic00.png diff --git a/classiciconpack/src/main/res/drawable/ic01.png b/icon-pack-classic/src/main/res/drawable/ic01.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic01.png rename to icon-pack-classic/src/main/res/drawable/ic01.png diff --git a/classiciconpack/src/main/res/drawable/ic02.png b/icon-pack-classic/src/main/res/drawable/ic02.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic02.png rename to icon-pack-classic/src/main/res/drawable/ic02.png diff --git a/classiciconpack/src/main/res/drawable/ic03.png b/icon-pack-classic/src/main/res/drawable/ic03.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic03.png rename to icon-pack-classic/src/main/res/drawable/ic03.png diff --git a/classiciconpack/src/main/res/drawable/ic04.png b/icon-pack-classic/src/main/res/drawable/ic04.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic04.png rename to icon-pack-classic/src/main/res/drawable/ic04.png diff --git a/classiciconpack/src/main/res/drawable/ic05.png b/icon-pack-classic/src/main/res/drawable/ic05.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic05.png rename to icon-pack-classic/src/main/res/drawable/ic05.png diff --git a/classiciconpack/src/main/res/drawable/ic06.png b/icon-pack-classic/src/main/res/drawable/ic06.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic06.png rename to icon-pack-classic/src/main/res/drawable/ic06.png diff --git a/classiciconpack/src/main/res/drawable/ic07.png b/icon-pack-classic/src/main/res/drawable/ic07.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic07.png rename to icon-pack-classic/src/main/res/drawable/ic07.png diff --git a/classiciconpack/src/main/res/drawable/ic08.png b/icon-pack-classic/src/main/res/drawable/ic08.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic08.png rename to icon-pack-classic/src/main/res/drawable/ic08.png diff --git a/classiciconpack/src/main/res/drawable/ic09.png b/icon-pack-classic/src/main/res/drawable/ic09.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic09.png rename to icon-pack-classic/src/main/res/drawable/ic09.png diff --git a/classiciconpack/src/main/res/drawable/ic10.png b/icon-pack-classic/src/main/res/drawable/ic10.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic10.png rename to icon-pack-classic/src/main/res/drawable/ic10.png diff --git a/classiciconpack/src/main/res/drawable/ic11.png b/icon-pack-classic/src/main/res/drawable/ic11.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic11.png rename to icon-pack-classic/src/main/res/drawable/ic11.png diff --git a/classiciconpack/src/main/res/drawable/ic12.png b/icon-pack-classic/src/main/res/drawable/ic12.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic12.png rename to icon-pack-classic/src/main/res/drawable/ic12.png diff --git a/classiciconpack/src/main/res/drawable/ic13.png b/icon-pack-classic/src/main/res/drawable/ic13.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic13.png rename to icon-pack-classic/src/main/res/drawable/ic13.png diff --git a/classiciconpack/src/main/res/drawable/ic14.png b/icon-pack-classic/src/main/res/drawable/ic14.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic14.png rename to icon-pack-classic/src/main/res/drawable/ic14.png diff --git a/classiciconpack/src/main/res/drawable/ic15.png b/icon-pack-classic/src/main/res/drawable/ic15.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic15.png rename to icon-pack-classic/src/main/res/drawable/ic15.png diff --git a/classiciconpack/src/main/res/drawable/ic16.png b/icon-pack-classic/src/main/res/drawable/ic16.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic16.png rename to icon-pack-classic/src/main/res/drawable/ic16.png diff --git a/classiciconpack/src/main/res/drawable/ic17.png b/icon-pack-classic/src/main/res/drawable/ic17.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic17.png rename to icon-pack-classic/src/main/res/drawable/ic17.png diff --git a/classiciconpack/src/main/res/drawable/ic18.png b/icon-pack-classic/src/main/res/drawable/ic18.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic18.png rename to icon-pack-classic/src/main/res/drawable/ic18.png diff --git a/classiciconpack/src/main/res/drawable/ic19.png b/icon-pack-classic/src/main/res/drawable/ic19.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic19.png rename to icon-pack-classic/src/main/res/drawable/ic19.png diff --git a/classiciconpack/src/main/res/drawable/ic20.png b/icon-pack-classic/src/main/res/drawable/ic20.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic20.png rename to icon-pack-classic/src/main/res/drawable/ic20.png diff --git a/classiciconpack/src/main/res/drawable/ic21.png b/icon-pack-classic/src/main/res/drawable/ic21.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic21.png rename to icon-pack-classic/src/main/res/drawable/ic21.png diff --git a/classiciconpack/src/main/res/drawable/ic22.png b/icon-pack-classic/src/main/res/drawable/ic22.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic22.png rename to icon-pack-classic/src/main/res/drawable/ic22.png diff --git a/classiciconpack/src/main/res/drawable/ic23.png b/icon-pack-classic/src/main/res/drawable/ic23.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic23.png rename to icon-pack-classic/src/main/res/drawable/ic23.png diff --git a/classiciconpack/src/main/res/drawable/ic24.png b/icon-pack-classic/src/main/res/drawable/ic24.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic24.png rename to icon-pack-classic/src/main/res/drawable/ic24.png diff --git a/classiciconpack/src/main/res/drawable/ic25.png b/icon-pack-classic/src/main/res/drawable/ic25.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic25.png rename to icon-pack-classic/src/main/res/drawable/ic25.png diff --git a/classiciconpack/src/main/res/drawable/ic26.png b/icon-pack-classic/src/main/res/drawable/ic26.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic26.png rename to icon-pack-classic/src/main/res/drawable/ic26.png diff --git a/classiciconpack/src/main/res/drawable/ic27.png b/icon-pack-classic/src/main/res/drawable/ic27.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic27.png rename to icon-pack-classic/src/main/res/drawable/ic27.png diff --git a/classiciconpack/src/main/res/drawable/ic28.png b/icon-pack-classic/src/main/res/drawable/ic28.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic28.png rename to icon-pack-classic/src/main/res/drawable/ic28.png diff --git a/classiciconpack/src/main/res/drawable/ic29.png b/icon-pack-classic/src/main/res/drawable/ic29.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic29.png rename to icon-pack-classic/src/main/res/drawable/ic29.png diff --git a/classiciconpack/src/main/res/drawable/ic30.png b/icon-pack-classic/src/main/res/drawable/ic30.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic30.png rename to icon-pack-classic/src/main/res/drawable/ic30.png diff --git a/classiciconpack/src/main/res/drawable/ic31.png b/icon-pack-classic/src/main/res/drawable/ic31.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic31.png rename to icon-pack-classic/src/main/res/drawable/ic31.png diff --git a/classiciconpack/src/main/res/drawable/ic32.png b/icon-pack-classic/src/main/res/drawable/ic32.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic32.png rename to icon-pack-classic/src/main/res/drawable/ic32.png diff --git a/classiciconpack/src/main/res/drawable/ic33.png b/icon-pack-classic/src/main/res/drawable/ic33.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic33.png rename to icon-pack-classic/src/main/res/drawable/ic33.png diff --git a/classiciconpack/src/main/res/drawable/ic34.png b/icon-pack-classic/src/main/res/drawable/ic34.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic34.png rename to icon-pack-classic/src/main/res/drawable/ic34.png diff --git a/classiciconpack/src/main/res/drawable/ic35.png b/icon-pack-classic/src/main/res/drawable/ic35.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic35.png rename to icon-pack-classic/src/main/res/drawable/ic35.png diff --git a/classiciconpack/src/main/res/drawable/ic36.png b/icon-pack-classic/src/main/res/drawable/ic36.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic36.png rename to icon-pack-classic/src/main/res/drawable/ic36.png diff --git a/classiciconpack/src/main/res/drawable/ic37.png b/icon-pack-classic/src/main/res/drawable/ic37.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic37.png rename to icon-pack-classic/src/main/res/drawable/ic37.png diff --git a/classiciconpack/src/main/res/drawable/ic38.png b/icon-pack-classic/src/main/res/drawable/ic38.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic38.png rename to icon-pack-classic/src/main/res/drawable/ic38.png diff --git a/classiciconpack/src/main/res/drawable/ic39.png b/icon-pack-classic/src/main/res/drawable/ic39.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic39.png rename to icon-pack-classic/src/main/res/drawable/ic39.png diff --git a/classiciconpack/src/main/res/drawable/ic40.png b/icon-pack-classic/src/main/res/drawable/ic40.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic40.png rename to icon-pack-classic/src/main/res/drawable/ic40.png diff --git a/classiciconpack/src/main/res/drawable/ic41.png b/icon-pack-classic/src/main/res/drawable/ic41.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic41.png rename to icon-pack-classic/src/main/res/drawable/ic41.png diff --git a/classiciconpack/src/main/res/drawable/ic42.png b/icon-pack-classic/src/main/res/drawable/ic42.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic42.png rename to icon-pack-classic/src/main/res/drawable/ic42.png diff --git a/classiciconpack/src/main/res/drawable/ic43.png b/icon-pack-classic/src/main/res/drawable/ic43.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic43.png rename to icon-pack-classic/src/main/res/drawable/ic43.png diff --git a/classiciconpack/src/main/res/drawable/ic44.png b/icon-pack-classic/src/main/res/drawable/ic44.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic44.png rename to icon-pack-classic/src/main/res/drawable/ic44.png diff --git a/classiciconpack/src/main/res/drawable/ic45.png b/icon-pack-classic/src/main/res/drawable/ic45.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic45.png rename to icon-pack-classic/src/main/res/drawable/ic45.png diff --git a/classiciconpack/src/main/res/drawable/ic46.png b/icon-pack-classic/src/main/res/drawable/ic46.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic46.png rename to icon-pack-classic/src/main/res/drawable/ic46.png diff --git a/classiciconpack/src/main/res/drawable/ic47.png b/icon-pack-classic/src/main/res/drawable/ic47.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic47.png rename to icon-pack-classic/src/main/res/drawable/ic47.png diff --git a/classiciconpack/src/main/res/drawable/ic48.png b/icon-pack-classic/src/main/res/drawable/ic48.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic48.png rename to icon-pack-classic/src/main/res/drawable/ic48.png diff --git a/classiciconpack/src/main/res/drawable/ic49.png b/icon-pack-classic/src/main/res/drawable/ic49.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic49.png rename to icon-pack-classic/src/main/res/drawable/ic49.png diff --git a/classiciconpack/src/main/res/drawable/ic50.png b/icon-pack-classic/src/main/res/drawable/ic50.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic50.png rename to icon-pack-classic/src/main/res/drawable/ic50.png diff --git a/classiciconpack/src/main/res/drawable/ic51.png b/icon-pack-classic/src/main/res/drawable/ic51.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic51.png rename to icon-pack-classic/src/main/res/drawable/ic51.png diff --git a/classiciconpack/src/main/res/drawable/ic52.png b/icon-pack-classic/src/main/res/drawable/ic52.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic52.png rename to icon-pack-classic/src/main/res/drawable/ic52.png diff --git a/classiciconpack/src/main/res/drawable/ic53.png b/icon-pack-classic/src/main/res/drawable/ic53.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic53.png rename to icon-pack-classic/src/main/res/drawable/ic53.png diff --git a/classiciconpack/src/main/res/drawable/ic54.png b/icon-pack-classic/src/main/res/drawable/ic54.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic54.png rename to icon-pack-classic/src/main/res/drawable/ic54.png diff --git a/classiciconpack/src/main/res/drawable/ic55.png b/icon-pack-classic/src/main/res/drawable/ic55.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic55.png rename to icon-pack-classic/src/main/res/drawable/ic55.png diff --git a/classiciconpack/src/main/res/drawable/ic56.png b/icon-pack-classic/src/main/res/drawable/ic56.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic56.png rename to icon-pack-classic/src/main/res/drawable/ic56.png diff --git a/classiciconpack/src/main/res/drawable/ic57.png b/icon-pack-classic/src/main/res/drawable/ic57.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic57.png rename to icon-pack-classic/src/main/res/drawable/ic57.png diff --git a/classiciconpack/src/main/res/drawable/ic58.png b/icon-pack-classic/src/main/res/drawable/ic58.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic58.png rename to icon-pack-classic/src/main/res/drawable/ic58.png diff --git a/classiciconpack/src/main/res/drawable/ic59.png b/icon-pack-classic/src/main/res/drawable/ic59.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic59.png rename to icon-pack-classic/src/main/res/drawable/ic59.png diff --git a/classiciconpack/src/main/res/drawable/ic60.png b/icon-pack-classic/src/main/res/drawable/ic60.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic60.png rename to icon-pack-classic/src/main/res/drawable/ic60.png diff --git a/classiciconpack/src/main/res/drawable/ic61.png b/icon-pack-classic/src/main/res/drawable/ic61.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic61.png rename to icon-pack-classic/src/main/res/drawable/ic61.png diff --git a/classiciconpack/src/main/res/drawable/ic62.png b/icon-pack-classic/src/main/res/drawable/ic62.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic62.png rename to icon-pack-classic/src/main/res/drawable/ic62.png diff --git a/classiciconpack/src/main/res/drawable/ic63.png b/icon-pack-classic/src/main/res/drawable/ic63.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic63.png rename to icon-pack-classic/src/main/res/drawable/ic63.png diff --git a/classiciconpack/src/main/res/drawable/ic64.png b/icon-pack-classic/src/main/res/drawable/ic64.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic64.png rename to icon-pack-classic/src/main/res/drawable/ic64.png diff --git a/classiciconpack/src/main/res/drawable/ic65.png b/icon-pack-classic/src/main/res/drawable/ic65.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic65.png rename to icon-pack-classic/src/main/res/drawable/ic65.png diff --git a/classiciconpack/src/main/res/drawable/ic66.png b/icon-pack-classic/src/main/res/drawable/ic66.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic66.png rename to icon-pack-classic/src/main/res/drawable/ic66.png diff --git a/classiciconpack/src/main/res/drawable/ic67.png b/icon-pack-classic/src/main/res/drawable/ic67.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic67.png rename to icon-pack-classic/src/main/res/drawable/ic67.png diff --git a/classiciconpack/src/main/res/drawable/ic68.png b/icon-pack-classic/src/main/res/drawable/ic68.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic68.png rename to icon-pack-classic/src/main/res/drawable/ic68.png diff --git a/classiciconpack/src/main/res/drawable/ic99_blank.png b/icon-pack-classic/src/main/res/drawable/ic99_blank.png similarity index 100% rename from classiciconpack/src/main/res/drawable/ic99_blank.png rename to icon-pack-classic/src/main/res/drawable/ic99_blank.png diff --git a/settings.gradle b/settings.gradle index 4f1f494ec..48a1ac76b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':classiciconpack' +include ':app', ':icon-pack-classic', ':icon-pack-material'