Added option to get font by name instead of font family

nihad92 · Feb 12, 2020 · 6788ede · 6788ede
1 parent 257d1a5
commit 6788ede
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
     classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
     classpath 'org.ajoberstar:grgit:1.9.3'
     classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.6"
+    classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
   }
 }
 

diff --git a/lottie/build.gradle b/lottie/build.gradle
@@ -1,9 +1,13 @@
 import net.ltgt.gradle.errorprone.CheckSeverity
+apply plugin: 'com.github.dcendents.android-maven'
 
 apply from: 'gradle-maven-push.gradle'
 apply plugin: 'com.android.library'
 apply plugin: 'net.ltgt.errorprone'
 
+group='com.github.nihad92'
+
+
 android {
   compileSdkVersion 29
   resourcePrefix 'lottie_'

diff --git a/lottie/src/main/java/com/airbnb/lottie/FontAssetDelegate.java b/lottie/src/main/java/com/airbnb/lottie/FontAssetDelegate.java
@@ -17,6 +17,10 @@ public Typeface fetchFont(String fontFamily) {
     return null;
   }
 
+  public Typeface getFontByName(String fontName) {
+    return null;
+  }
+
   /**
    * Override this if you want to specify the asset path for a given font family.
    */

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java b/lottie/src/main/java/com/airbnb/lottie/LottieDrawable.java
@@ -25,6 +25,7 @@
 
 import com.airbnb.lottie.manager.FontAssetManager;
 import com.airbnb.lottie.manager.ImageAssetManager;
+import com.airbnb.lottie.model.Font;
 import com.airbnb.lottie.model.KeyPath;
 import com.airbnb.lottie.model.Marker;
 import com.airbnb.lottie.model.layer.CompositionLayer;
@@ -1050,10 +1051,10 @@ private ImageAssetManager getImageAssetManager() {
   }
 
   @Nullable
-  public Typeface getTypeface(String fontFamily, String style) {
+  public Typeface getTypeface(Font font) {
     FontAssetManager assetManager = getFontAssetManager();
     if (assetManager != null) {
-      return assetManager.getTypeface(fontFamily, style);
+      return assetManager.getTypeface(font);
     }
     return null;
   }

diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/FontAssetManager.java
@@ -9,6 +9,7 @@
 
 import com.airbnb.lottie.FontAssetDelegate;
 import com.airbnb.lottie.L;
+import com.airbnb.lottie.model.Font;
 import com.airbnb.lottie.model.MutablePair;
 import com.airbnb.lottie.utils.Logger;
 
@@ -52,42 +53,46 @@ public void setDelegate(@Nullable FontAssetDelegate assetDelegate) {
     this.defaultFontFileExtension = defaultFontFileExtension;
   }
 
-  public Typeface getTypeface(String fontFamily, String style) {
-    tempPair.set(fontFamily, style);
+  public Typeface getTypeface(Font font) {
+    tempPair.set(font.getFamily(), font.getStyle());
     Typeface typeface = fontMap.get(tempPair);
     if (typeface != null) {
       return typeface;
     }
-    Typeface typefaceWithDefaultStyle = getFontFamily(fontFamily);
-    typeface = typefaceForStyle(typefaceWithDefaultStyle, style);
+    Typeface typefaceWithDefaultStyle = getFontFamily(font);
+    typeface = typefaceForStyle(typefaceWithDefaultStyle, font.getStyle());
     fontMap.put(tempPair, typeface);
     return typeface;
   }
 
-  private Typeface getFontFamily(String fontFamily) {
-    Typeface defaultTypeface = fontFamilies.get(fontFamily);
+  private Typeface getFontFamily(Font font) {
+    Typeface defaultTypeface = fontFamilies.get(font.getFamily());
     if (defaultTypeface != null) {
       return defaultTypeface;
     }
 
     Typeface typeface = null;
     if (delegate != null) {
-      typeface = delegate.fetchFont(fontFamily);
+      typeface = delegate.getFontByName(font.getName());
     }
 
     if (delegate != null && typeface == null) {
-      String path = delegate.getFontPath(fontFamily);
+      typeface = delegate.fetchFont(font.getFamily());
+    }
+
+    if (delegate != null && typeface == null) {
+      String path = delegate.getFontPath(font.getFamily());
       if (path != null) {
         typeface = Typeface.createFromAsset(assetManager, path);
       }
     }
 
     if (typeface == null) {
-      String path = "fonts/" + fontFamily + defaultFontFileExtension;
+      String path = "fonts/" + font.getFamily() + defaultFontFileExtension;
       typeface = Typeface.createFromAsset(assetManager, path);
     }
 
-    fontFamilies.put(fontFamily, typeface);
+    fontFamilies.put(font.getFamily(), typeface);
     return typeface;
   }
 

diff --git a/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java b/lottie/src/main/java/com/airbnb/lottie/model/layer/TextLayer.java
@@ -235,7 +235,7 @@ private void drawGlyphTextLine(String text, DocumentData documentData, Matrix pa
   private void drawTextWithFont(
       DocumentData documentData, Font font, Matrix parentMatrix, Canvas canvas) {
     float parentScale = Utils.getScale(parentMatrix);
-    Typeface typeface = lottieDrawable.getTypeface(font.getFamily(), font.getStyle());
+    Typeface typeface = lottieDrawable.getTypeface(font);
     if (typeface == null) {
       return;
     }