removed material dependecy and only use foundation, updated to use co…

…lor.unsecified icon.
Gurupreet · Feb 22, 2021 · 7e046a9 · 7e046a9
1 parent 0b7f52c
commit 7e046a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/FontAwesomeComposeLib/build.gradle b/FontAwesomeComposeLib/build.gradle
@@ -46,7 +46,7 @@ android {
 dependencies {
     implementation "androidx.compose.ui:ui:$compose_version"
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.foundation:foundation:$compose_version"
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

diff --git a/FontAwesomeComposeLib/src/main/java/com/guru/fontawesomecomposelib/FaIcon.kt b/FontAwesomeComposeLib/src/main/java/com/guru/fontawesomecomposelib/FaIcon.kt
@@ -1,7 +1,6 @@
 package com.guru.fontawesomecomposelib
 
 import androidx.compose.foundation.text.BasicText
-import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -30,23 +29,19 @@ fun FaIcon(
     faIcon: FaIconType,
     modifier: Modifier = Modifier,
     size: TextUnit = 24.sp,
-    tint: Color = MaterialTheme.colors.onSurface
+    tint: Color = Color.Unspecified
 ) {
-    val faFont = remember(faIcon) { getFontFamily(faIcon) }
-
     val faTextStyle =
         remember(faIcon) {
             TextStyle(
                 color = tint,
-                fontFamily = faFont,
+                fontFamily = getFontFamily(faIcon),
                 fontSize = size
             )
         }
 
-    val codePoint = remember(faIcon) { faIcon.src.codePointToString() }
-
     BasicText(
-        text = codePoint,
+        text = faIcon.src.codePointToString(),
         modifier = modifier,
         style = faTextStyle,
     )