diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ba6a1c6..c843860 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,22 +1,19 @@ - diff --git a/app/build.gradle b/app/build.gradle index f03eda4..c25babb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation "com.mikepenz:materialdrawer:${versions.materialdrawer}" implementation "com.mikepenz:iconics-core:${versions.iconics}" implementation "com.mikepenz:iconics-views:${versions.iconics}" - //implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar" + implementation "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar" implementation "androidx.core:core-ktx:${versions.ktx}" implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}" implementation "com.google.android.material:material:${versions.material}" diff --git a/app/src/main/java/pl/szczodrzynski/navigation/MainActivity.kt b/app/src/main/java/pl/szczodrzynski/navigation/MainActivity.kt index 3cd5870..d550fb4 100644 --- a/app/src/main/java/pl/szczodrzynski/navigation/MainActivity.kt +++ b/app/src/main/java/pl/szczodrzynski/navigation/MainActivity.kt @@ -245,7 +245,7 @@ class MainActivity : AppCompatActivity() { .withIdentifier(2) .withName("Settings") .withBadgeStyle(badgeStyle) - .withIcon(CommunityMaterial.Icon.cmd_cog), + .withIcon(CommunityMaterial.Icon2.cmd_settings), DrawerPrimaryItem().withName("iOS") .withIdentifier(60) @@ -276,12 +276,12 @@ class MainActivity : AppCompatActivity() { .withDescription("Because we all hate ads") .withIdentifier(64) .withBadgeStyle(badgeStyle) - .withIcon(CommunityMaterial.Icon.cmd_google_ads), + .withIcon(CommunityMaterial.Icon.cmd_adchoices), DrawerPrimaryItem().withName("Wonderful browsing experience and this is a long string") .withIdentifier(65) .withBadgeStyle(badgeStyle) - .withIcon(CommunityMaterial.Icon2.cmd_microsoft_internet_explorer) + .withIcon(CommunityMaterial.Icon2.cmd_internet_explorer) ) setUnreadCount(2, 20, 30) // phil swift has 30 unreads on "Settings item" @@ -314,7 +314,7 @@ class MainActivity : AppCompatActivity() { }, ProfileSettingDrawerItem() .withName("Manage Account") - .withIcon(CommunityMaterial.Icon.cmd_cog) + .withIcon(CommunityMaterial.Icon2.cmd_settings) ) drawerItemSelectedListener = { id, position, drawerItem -> diff --git a/community-material-typeface/build.gradle b/community-material-typeface/build.gradle deleted file mode 100644 index f8405ba..0000000 --- a/community-material-typeface/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('community-material-typeface-library-release.aar')) \ No newline at end of file diff --git a/community-material-typeface/community-material-typeface-library-release.aar b/community-material-typeface/community-material-typeface-library-release.aar deleted file mode 100644 index ce1fbba..0000000 Binary files a/community-material-typeface/community-material-typeface-library-release.aar and /dev/null differ diff --git a/navlib/build.gradle b/navlib/build.gradle index 0de4f59..cdc06cd 100644 --- a/navlib/build.gradle +++ b/navlib/build.gradle @@ -46,10 +46,9 @@ dependencies { implementation "com.google.android.material:material:${versions.material}" api "com.mikepenz:materialdrawer:${versions.materialdrawer}" - //api "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar" + api "com.mikepenz:community-material-typeface:${versions.font_cmd}@aar" api "com.mikepenz:iconics-core:${versions.iconics}" - api "com.mikepenz:materialize:1.2.1" - api project(":community-material-typeface") + implementation "com.mikepenz:materialize:1.2.1" implementation "com.mikepenz:itemanimators:1.1.0" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" implementation "pl.droidsonroids.gif:android-gif-drawable:${versions.gifdrawable}" diff --git a/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt b/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt index 289eedc..6922313 100644 --- a/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt +++ b/navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt @@ -82,7 +82,7 @@ class NavDrawer( badgeStyle = BadgeStyle().apply { textColor = ColorHolder.fromColor(Color.WHITE) - color = ColorHolder.fromColorRes(R.color.md_red_700) + color = ColorHolder.fromColor(0xffd32f2f.toInt()) } drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener { diff --git a/settings.gradle b/settings.gradle index 7d3893a..4ba776f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ -include ':community-material-typeface' -include ':app', ':navlib' +include ':app', ':navlib' \ No newline at end of file