github/NavLib
1
0
Fork 0
mirror of https://github.com/kuba2k2/NavLib.git synced 2024-09-19 13:39:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set all icon sizes to 24dp

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2021-03-29 21:44:28 +02:00
parent 8f10321820
commit 60cc1171f9
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import android.view.Gravity
import android.view.View import android.view.View
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.mikepenz.iconics.Iconics
import com.mikepenz.iconics.IconicsDrawable import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.utils.actionBar import com.mikepenz.iconics.utils.actionBar
@ -42,6 +43,8 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
Iconics.respectFontBoundsDefault = true
if (darkTheme == null) if (darkTheme == null)
darkTheme = getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("darkTheme", false) darkTheme = getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("darkTheme", false)

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

@ -14,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources
import com.mikepenz.iconics.IconicsDrawable import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.typeface.IIcon import com.mikepenz.iconics.typeface.IIcon
import com.mikepenz.iconics.utils.actionBar import com.mikepenz.iconics.utils.actionBar
import com.mikepenz.iconics.utils.paddingDp
import com.mikepenz.iconics.utils.sizeDp import com.mikepenz.iconics.utils.sizeDp
import com.mikepenz.materialdrawer.util.DrawerImageLoader import com.mikepenz.materialdrawer.util.DrawerImageLoader
import pl.droidsonroids.gif.GifDrawable import pl.droidsonroids.gif.GifDrawable
@ -103,7 +102,6 @@ open class ImageHolder : com.mikepenz.materialdrawer.holder.ImageHolder {
this.icon = ii this.icon = ii
colorList = iconColor colorList = iconColor
sizeDp = 24 sizeDp = 24
this.paddingDp = paddingDp
} }
iconRes != -1 -> icon = AppCompatResources.getDrawable(ctx, iconRes) iconRes != -1 -> icon = AppCompatResources.getDrawable(ctx, iconRes)
uri != null -> try { uri != null -> try {

4
navlib/src/main/java/pl/szczodrzynski/navlib/NavBottomBar.kt
View File

@ -136,7 +136,7 @@ class NavBottomBar : BottomAppBar {
mutate() mutate()
setDrawableByLayerId(R.id.ic_menu, IconicsDrawable(context).apply { setDrawableByLayerId(R.id.ic_menu, IconicsDrawable(context).apply {
this.icon = NavLibFont.Icon.nav_menu this.icon = NavLibFont.Icon.nav_menu
sizeDp = 20 sizeDp = 24
colorAttr(context, R.attr.colorOnPrimary) colorAttr(context, R.attr.colorOnPrimary)
}) })
setDrawableByLayerId(R.id.ic_badge, BadgeDrawable(context)) setDrawableByLayerId(R.id.ic_badge, BadgeDrawable(context))
@ -146,7 +146,7 @@ class NavBottomBar : BottomAppBar {
menu.add(0, -1, 0, "Menu") menu.add(0, -1, 0, "Menu")
.setIcon(IconicsDrawable(context).apply { .setIcon(IconicsDrawable(context).apply {
this.icon = NavLibFont.Icon.nav_dots_vertical this.icon = NavLibFont.Icon.nav_dots_vertical
sizeDp = 20 sizeDp = 24
colorAttr(context, R.attr.colorOnPrimary) colorAttr(context, R.attr.colorOnPrimary)
}) })
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)

3
navlib/src/main/java/pl/szczodrzynski/navlib/bottomsheet/NavBottomSheet.kt
View File

@ -280,7 +280,6 @@ class NavBottomSheet : CoordinatorLayout {
return null return null
return IconicsDrawable(context, icon).apply { return IconicsDrawable(context, icon).apply {
sizeDp = 24 sizeDp = 24
paddingDp = 4
} }
} }
@ -389,7 +388,7 @@ class NavBottomSheet : CoordinatorLayout {
is Drawable -> value is Drawable -> value
is IIcon -> IconicsDrawable(context).apply { is IIcon -> IconicsDrawable(context).apply {
icon = value icon = value
sizeDp = 34 sizeDp = 24
// colorInt = Color.BLACK // colorInt = Color.BLACK
} }
is Int -> context.getDrawableFromRes(value) is Int -> context.getDrawableFromRes(value)

5
navlib/src/main/res/layout/nav_bottom_sheet.xml
View File

@ -32,8 +32,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bottom_sheet_background" android:background="@drawable/bottom_sheet_background"
android:paddingStart="8dp" android:paddingHorizontal="8dp"
android:paddingEnd="8dp"
tools:paddingBottom="48dp" tools:paddingBottom="48dp"
android:orientation="vertical"> android:orientation="vertical">
@ -107,4 +106,4 @@
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout> </layout>