feat: SVG icons

poshest · Sep 13, 2019 · 8a3ddd8 · 8a3ddd8
1 parent 738a199
commit 8a3ddd8
Show file tree

Hide file tree

Showing 188 changed files with 2,347 additions and 863 deletions.
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -83,3 +83,6 @@
 -dontwarn javax.servlet.**
 
 # ^^^ We added the above when we switched minifyEnabled on.
+
+# Rule to avoid build errors related to SVGs.
+-keep public class com.horcrux.svg.** {*;}
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation project(':react-native-keep-awake')
     implementation project(':react-native-linear-gradient')
     implementation project(':react-native-sound')
-    implementation project(':react-native-vector-icons')
+    implementation project(':react-native-svg')
     implementation project(':react-native-webrtc')
     implementation project(':react-native-webview')
 
@@ -140,13 +140,6 @@ android.libraryVariants.all { def variant ->
     mergeAssetsTask.doLast {
         def assetsDir = mergeAssetsTask.outputDir
 
-        // Bundle fonts
-        //
-        copy {
-            from("${projectDir}/../../fonts/jitsi.ttf")
-            into("${assetsDir}/fonts")
-        }
-
         // Bundle sounds
         //
         copy {

diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java
@@ -192,7 +192,7 @@ static void initReactInstanceManager(Activity activity) {
                 new com.calendarevents.CalendarEventsPackage(),
                 new com.corbt.keepawake.KCKeepAwakePackage(),
                 new com.facebook.react.shell.MainReactPackage(),
-                new com.oblador.vectoricons.VectorIconsPackage(),
+                new com.horcrux.svg.SvgPackage(),
                 new com.ocetnik.timer.BackgroundTimerPackage(),
                 new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
                 new com.reactnativecommunity.netinfo.NetInfoPackage(),

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -19,8 +19,8 @@ include ':react-native-linear-gradient'
 project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
 include ':react-native-sound'
 project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
-include ':react-native-vector-icons'
-project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
+include ':react-native-svg'
+project(':react-native-svg').projectDir = new File(rootProject.projectDir, 	'../node_modules/react-native-svg/android')
 include ':react-native-webrtc'
 project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
 include ':react-native-webview'

diff --git a/css/_base.scss b/css/_base.scss
@@ -33,6 +33,10 @@ body {
     }
 }
 
+svg {
+    fill: white;
+}
+
 /**
  * AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
  * preventing transparency in filmstrip-only mode. The selector chosen to

diff --git a/css/_font.scss b/css/_font.scss
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,10 @@ body { @@
         }
     }
+    svg {
+        fill: white;
+    }
     /**
      * AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
      * preventing transparency in filmstrip-only mode. The selector chosen to
@@ Expand Down @@