Skip to content

Commit 8a3ddd8

Browse files
committed
feat: SVG icons
1 parent 738a199 commit 8a3ddd8

File tree

188 files changed

+2347
-863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+2347
-863
lines changed

android/app/proguard-rules.pro

+3
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@
8383
-dontwarn javax.servlet.**
8484

8585
# ^^^ We added the above when we switched minifyEnabled on.
86+
87+
# Rule to avoid build errors related to SVGs.
88+
-keep public class com.horcrux.svg.** {*;}

android/sdk/build.gradle

+1-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependencies {
6262
implementation project(':react-native-keep-awake')
6363
implementation project(':react-native-linear-gradient')
6464
implementation project(':react-native-sound')
65-
implementation project(':react-native-vector-icons')
65+
implementation project(':react-native-svg')
6666
implementation project(':react-native-webrtc')
6767
implementation project(':react-native-webview')
6868

@@ -140,13 +140,6 @@ android.libraryVariants.all { def variant ->
140140
mergeAssetsTask.doLast {
141141
def assetsDir = mergeAssetsTask.outputDir
142142

143-
// Bundle fonts
144-
//
145-
copy {
146-
from("${projectDir}/../../fonts/jitsi.ttf")
147-
into("${assetsDir}/fonts")
148-
}
149-
150143
// Bundle sounds
151144
//
152145
copy {

android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static void initReactInstanceManager(Activity activity) {
192192
new com.calendarevents.CalendarEventsPackage(),
193193
new com.corbt.keepawake.KCKeepAwakePackage(),
194194
new com.facebook.react.shell.MainReactPackage(),
195-
new com.oblador.vectoricons.VectorIconsPackage(),
195+
new com.horcrux.svg.SvgPackage(),
196196
new com.ocetnik.timer.BackgroundTimerPackage(),
197197
new com.reactnativecommunity.asyncstorage.AsyncStoragePackage(),
198198
new com.reactnativecommunity.netinfo.NetInfoPackage(),

android/settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ include ':react-native-linear-gradient'
1919
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
2020
include ':react-native-sound'
2121
project(':react-native-sound').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sound/android')
22-
include ':react-native-vector-icons'
23-
project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
22+
include ':react-native-svg'
23+
project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android')
2424
include ':react-native-webrtc'
2525
project(':react-native-webrtc').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
2626
include ':react-native-webview'

css/_base.scss

+4
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ body {
3333
}
3434
}
3535

36+
svg {
37+
fill: white;
38+
}
39+
3640
/**
3741
* AtlasKitThemeProvider sets a background color on an app-wrapping div, thereby
3842
* preventing transparency in filmstrip-only mode. The selector chosen to

css/_font.scss

-235
This file was deleted.

0 commit comments

Comments
 (0)