mirror of
https://github.com/kuba2k2/NavLib.git
synced 2025-01-18 06:16:43 -06:00
Revert 'Update Community Material font to 5.0.45.' because I'm dumb.
This commit is contained in:
parent
3873fa4b04
commit
1d0e98a90e
5
.idea/gradle.xml
generated
5
.idea/gradle.xml
generated
@ -1,22 +1,19 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
|
||||||
<component name="GradleSettings">
|
<component name="GradleSettings">
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="delegatedBuild" value="false" />
|
|
||||||
<option name="testRunner" value="PLATFORM" />
|
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
<option value="$PROJECT_DIR$/app" />
|
<option value="$PROJECT_DIR$/app" />
|
||||||
<option value="$PROJECT_DIR$/community-material-typeface" />
|
|
||||||
<option value="$PROJECT_DIR$/navlib" />
|
<option value="$PROJECT_DIR$/navlib" />
|
||||||
</set>
|
</set>
|
||||||
</option>
|
</option>
|
||||||
<option name="resolveModulePerSourceSet" value="false" />
|
<option name="resolveModulePerSourceSet" value="false" />
|
||||||
|
<option name="testRunner" value="PLATFORM" />
|
||||||
</GradleProjectSettings>
|
</GradleProjectSettings>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
|
@ -39,7 +39,7 @@ dependencies {
|
|||||||
implementation "com.mikepenz:materialdrawer:${versions.materialdrawer}"
|
implementation "com.mikepenz:materialdrawer:${versions.materialdrawer}"
|
||||||
implementation "com.mikepenz:iconics-core:${versions.iconics}"
|
implementation "com.mikepenz:iconics-core:${versions.iconics}"
|
||||||
implementation "com.mikepenz:iconics-views:${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.core:core-ktx:${versions.ktx}"
|
||||||
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
|
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
|
||||||
implementation "com.google.android.material:material:${versions.material}"
|
implementation "com.google.android.material:material:${versions.material}"
|
||||||
|
@ -245,7 +245,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
.withIdentifier(2)
|
.withIdentifier(2)
|
||||||
.withName("Settings")
|
.withName("Settings")
|
||||||
.withBadgeStyle(badgeStyle)
|
.withBadgeStyle(badgeStyle)
|
||||||
.withIcon(CommunityMaterial.Icon.cmd_cog),
|
.withIcon(CommunityMaterial.Icon2.cmd_settings),
|
||||||
|
|
||||||
DrawerPrimaryItem().withName("iOS")
|
DrawerPrimaryItem().withName("iOS")
|
||||||
.withIdentifier(60)
|
.withIdentifier(60)
|
||||||
@ -276,12 +276,12 @@ class MainActivity : AppCompatActivity() {
|
|||||||
.withDescription("Because we all hate ads")
|
.withDescription("Because we all hate ads")
|
||||||
.withIdentifier(64)
|
.withIdentifier(64)
|
||||||
.withBadgeStyle(badgeStyle)
|
.withBadgeStyle(badgeStyle)
|
||||||
.withIcon(CommunityMaterial.Icon.cmd_google_ads),
|
.withIcon(CommunityMaterial.Icon.cmd_adchoices),
|
||||||
|
|
||||||
DrawerPrimaryItem().withName("Wonderful browsing experience and this is a long string")
|
DrawerPrimaryItem().withName("Wonderful browsing experience and this is a long string")
|
||||||
.withIdentifier(65)
|
.withIdentifier(65)
|
||||||
.withBadgeStyle(badgeStyle)
|
.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"
|
setUnreadCount(2, 20, 30) // phil swift has 30 unreads on "Settings item"
|
||||||
@ -314,7 +314,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
},
|
},
|
||||||
ProfileSettingDrawerItem()
|
ProfileSettingDrawerItem()
|
||||||
.withName("Manage Account")
|
.withName("Manage Account")
|
||||||
.withIcon(CommunityMaterial.Icon.cmd_cog)
|
.withIcon(CommunityMaterial.Icon2.cmd_settings)
|
||||||
)
|
)
|
||||||
|
|
||||||
drawerItemSelectedListener = { id, position, drawerItem ->
|
drawerItemSelectedListener = { id, position, drawerItem ->
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
configurations.maybeCreate("default")
|
|
||||||
artifacts.add("default", file('community-material-typeface-library-release.aar'))
|
|
Binary file not shown.
@ -46,10 +46,9 @@ dependencies {
|
|||||||
implementation "com.google.android.material:material:${versions.material}"
|
implementation "com.google.android.material:material:${versions.material}"
|
||||||
|
|
||||||
api "com.mikepenz:materialdrawer:${versions.materialdrawer}"
|
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:iconics-core:${versions.iconics}"
|
||||||
api "com.mikepenz:materialize:1.2.1"
|
implementation "com.mikepenz:materialize:1.2.1"
|
||||||
api project(":community-material-typeface")
|
|
||||||
implementation "com.mikepenz:itemanimators:1.1.0"
|
implementation "com.mikepenz:itemanimators:1.1.0"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
|
||||||
implementation "pl.droidsonroids.gif:android-gif-drawable:${versions.gifdrawable}"
|
implementation "pl.droidsonroids.gif:android-gif-drawable:${versions.gifdrawable}"
|
||||||
|
@ -82,7 +82,7 @@ class NavDrawer(
|
|||||||
|
|
||||||
badgeStyle = BadgeStyle().apply {
|
badgeStyle = BadgeStyle().apply {
|
||||||
textColor = ColorHolder.fromColor(Color.WHITE)
|
textColor = ColorHolder.fromColor(Color.WHITE)
|
||||||
color = ColorHolder.fromColorRes(R.color.md_red_700)
|
color = ColorHolder.fromColor(0xffd32f2f.toInt())
|
||||||
}
|
}
|
||||||
|
|
||||||
drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
|
drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener {
|
||||||
|
@ -1,2 +1 @@
|
|||||||
include ':community-material-typeface'
|
include ':app', ':navlib'
|
||||||
include ':app', ':navlib'
|
|
Loading…
x
Reference in New Issue
Block a user