Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/src/main/java/com/mikepenz/iconics/sample/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import android.app.Activity
import android.content.Intent
import android.content.res.ColorStateList
import android.content.res.Configuration
import android.graphics.Color
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
Expand All @@ -34,6 +33,8 @@ import com.mikepenz.aboutlibraries.LibsBuilder
import com.mikepenz.iconics.Iconics
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.sample.databinding.ActivityMainBinding
import androidx.activity.enableEdgeToEdge
import com.mikepenz.iconics.sample.utils.applyEdgeToEdgeInsets
import com.mikepenz.iconics.sample.utils.getThemeColor
import com.mikepenz.iconics.typeface.IIcon
import com.mikepenz.iconics.typeface.ITypeface
Expand Down Expand Up @@ -64,10 +65,12 @@ class MainActivity : AppCompatActivity() {
private var currentSearch: String? = null

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater).also {
setContentView(it.root)
}
applyEdgeToEdgeInsets(binding.insetsRoot, binding.toolbar, binding.content)

// Handle Toolbar
setSupportActionBar(binding.toolbar)
Expand Down Expand Up @@ -142,7 +145,7 @@ class MainActivity : AppCompatActivity() {

//
menu.findItem(R.id.search).icon = IconicsDrawable(this, MaterialDesignIconic.Icon.gmi_search).apply {
colorInt = Color.WHITE
colorInt = getThemeColor(android.R.attr.textColorPrimary)
sizeDp = 24
respectFontBounds = true
}
Expand Down Expand Up @@ -176,7 +179,7 @@ class MainActivity : AppCompatActivity() {
val menuItem = menu.findItem(R.id.action_opensource)
menuItem.icon = IconicsDrawable(this, FontAwesomeBrand.Icon.fab_github).apply {
actionBar()
colorInt = Color.WHITE
colorInt = getThemeColor(android.R.attr.textColorPrimary)
}

menu.findItem(R.id.action_respect_bounds).isChecked = Iconics.respectFontBoundsDefault
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import com.mikepenz.iconics.IconicsArrayBuilder
import com.mikepenz.iconics.IconicsDrawable
import com.mikepenz.iconics.IconicsSize
import com.mikepenz.iconics.sample.databinding.ActivityPlaygroundBinding
import androidx.activity.enableEdgeToEdge
import com.mikepenz.iconics.sample.utils.applyEdgeToEdgeInsets
import com.mikepenz.iconics.sample.utils.getThemeColor
import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome
Expand All @@ -66,10 +68,12 @@ import com.mikepenz.iconics.utils.sizeY
class PlaygroundActivity : AppCompatActivity() {

override fun onCreate(savedInstanceState: Bundle?) {
enableEdgeToEdge()
super.onCreate(savedInstanceState)

val binding: ActivityPlaygroundBinding =
DataBindingUtil.setContentView(this, R.layout.activity_playground)
applyEdgeToEdgeInsets(binding.root, binding.toolbar, binding.list)

// Handle Toolbar
setSupportActionBar(binding.toolbar)
Expand Down
38 changes: 38 additions & 0 deletions app/src/main/java/com/mikepenz/iconics/sample/utils/Insets.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/*
* Copyright (c) 2026 Mike Penz
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.mikepenz.iconics.sample.utils

import android.view.View
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updatePadding

/**
* Applies edge-to-edge insets: [topView] takes the status bar, [bottomView] the navigation bar,
* both take the horizontal cutout/bar insets. Listener is installed on [root] so it also survives
* `DrawerLayout` consuming the insets for its slider.
*/
fun applyEdgeToEdgeInsets(root: View, topView: View, bottomView: View) {
ViewCompat.setOnApplyWindowInsetsListener(root) { _, windowInsets ->
val insets = windowInsets.getInsets(
WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.displayCutout()
)
topView.updatePadding(left = insets.left, top = insets.top, right = insets.right)
bottomView.updatePadding(left = insets.left, right = insets.right, bottom = insets.bottom)
windowInsets
}
}
2 changes: 2 additions & 0 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
android:fitsSystemWindows="true">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/insetsRoot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center">

<androidx.appcompat.widget.Toolbar
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/layout/activity_playground.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
android:id="@+id/toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.MaterialComponents.Dark"
android:elevation="4dp"
android:fitsSystemWindows="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand Down Expand Up @@ -612,6 +609,7 @@
android:id="@+id/list"
android:layout_width="0dp"
android:layout_height="112dp"
android:clipToPadding="false"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/content"
Expand Down
32 changes: 0 additions & 32 deletions app/src/main/res/values-v21/themes.xml

This file was deleted.

18 changes: 1 addition & 17 deletions app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,6 @@
<!-- CAB :D -->
<item name="windowActionModeOverlay">true</item>

<item name="toolbarStyle">@style/CustomToolbarStyle</item>
<item name="colorControlNormal">@android:color/white</item>
</style>

<style name="CustomToolbarStyle" parent="Widget.AppCompat.Toolbar">
<item name="android:background">?colorPrimary</item>
<item name="titleTextAppearance">@style/CustomTitleTextAppearance</item>
<item name="subtitleTextAppearance">@style/CustomSubTitleTextAppearance</item>
</style>

<style name="CustomTitleTextAppearance" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
<item name="android:textColor">@android:color/white</item>
</style>

<style name="CustomSubTitleTextAppearance"
parent="TextAppearance.Widget.AppCompat.Toolbar.Subtitle">
<item name="android:textColor">@android:color/white</item>
<item name="toolbarStyle">@style/Widget.Material3.Toolbar.Surface</item>
</style>
</resources>
Loading