github/NavLib
1
0
Fork 0
mirror of https://github.com/kuba2k2/NavLib.git synced 2025-01-18 06:16:43 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert 'Update Community Material font to 5.0.45.' because I'm dumb.

Browse Source
This commit is contained in:
kuba2k2 2020-03-23 22:33:43 +01:00
parent 3873fa4b04
commit 1d0e98a90e
8 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/gradle.xml generated
View File

@ -1,22 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/community-material-typeface" />
<option value="$PROJECT_DIR$/navlib" />
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="testRunner" value="PLATFORM" />
</GradleProjectSettings>
</option>
</component>

2
app/build.gradle
View File

@ -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}"

8
app/src/main/java/pl/szczodrzynski/navigation/MainActivity.kt
View File

@ -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 ->

2
community-material-typeface/build.gradle
View File

@ -1,2 +0,0 @@
configurations.maybeCreate("default")
artifacts.add("default", file('community-material-typeface-library-release.aar'))

BIN
community-material-typeface/community-material-typeface-library-release.aar
View File

Binary file not shown.

5
navlib/build.gradle
View File

@ -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}"

2
navlib/src/main/java/pl/szczodrzynski/navlib/drawer/NavDrawer.kt
View File

@ -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 {

1
settings.gradle
View File

@ -1,2 +1 @@
include ':community-material-typeface'
include ':app', ':navlib'