Card: ripple design fix

Paraboly · Jan 3, 2020 · 690b1ec · 690b1ec
1 parent c927de5
commit 690b1ec
Show file tree

Hide file tree

Showing 28 changed files with 186 additions and 13 deletions.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -179,6 +179,7 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-vector-icons')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
 

diff --git a/example/android/app/src/main/assets/fonts/AntDesign.ttf b/example/android/app/src/main/assets/fonts/AntDesign.ttf
diff --git a/example/android/app/src/main/assets/fonts/Entypo.ttf b/example/android/app/src/main/assets/fonts/Entypo.ttf
diff --git a/example/android/app/src/main/assets/fonts/EvilIcons.ttf b/example/android/app/src/main/assets/fonts/EvilIcons.ttf
diff --git a/example/android/app/src/main/assets/fonts/Feather.ttf b/example/android/app/src/main/assets/fonts/Feather.ttf
diff --git a/example/android/app/src/main/assets/fonts/FontAwesome.ttf b/example/android/app/src/main/assets/fonts/FontAwesome.ttf
diff --git a/example/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf b/example/android/app/src/main/assets/fonts/FontAwesome5_Brands.ttf
diff --git a/example/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf b/example/android/app/src/main/assets/fonts/FontAwesome5_Regular.ttf
diff --git a/example/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf b/example/android/app/src/main/assets/fonts/FontAwesome5_Solid.ttf
diff --git a/example/android/app/src/main/assets/fonts/Fontisto.ttf b/example/android/app/src/main/assets/fonts/Fontisto.ttf
diff --git a/example/android/app/src/main/assets/fonts/Foundation.ttf b/example/android/app/src/main/assets/fonts/Foundation.ttf
diff --git a/example/android/app/src/main/assets/fonts/Ionicons.ttf b/example/android/app/src/main/assets/fonts/Ionicons.ttf
diff --git a/example/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/example/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf
diff --git a/example/android/app/src/main/assets/fonts/MaterialIcons.ttf b/example/android/app/src/main/assets/fonts/MaterialIcons.ttf
diff --git a/example/android/app/src/main/assets/fonts/Octicons.ttf b/example/android/app/src/main/assets/fonts/Octicons.ttf
diff --git a/example/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/example/android/app/src/main/assets/fonts/SimpleLineIcons.ttf
diff --git a/example/android/app/src/main/assets/fonts/Zocial.ttf b/example/android/app/src/main/assets/fonts/Zocial.ttf
diff --git a/example/android/app/src/main/java/com/example/MainApplication.java b/example/android/app/src/main/java/com/example/MainApplication.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
+import com.oblador.vectoricons.VectorIconsPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;

diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -1,3 +1,5 @@
 rootProject.name = 'example'
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -34,6 +34,8 @@ target 'example' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
+  pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
+
   target 'exampleTests' do
     inherit! :search_paths
     # Pods for testing

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -217,6 +217,8 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
     - ReactCommon/jscallinvoker (= 0.61.5)
+  - RNVectorIcons (6.6.0):
+    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -247,6 +249,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNVectorIcons (from `../node_modules/react-native-vector-icons`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -302,6 +305,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Vibration"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNVectorIcons:
+    :path: "../node_modules/react-native-vector-icons"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -331,8 +336,9 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
+  RNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: 79310af6b976c356911a8a833e9b99c3399fdda3
+PODFILE CHECKSUM: d23a5cf6688d0a66901281104c0cbaf60cb974a1
 
 COCOAPODS: 1.7.4
diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
diff --git a/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/example/ios/example.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/ios/example.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Original</string>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
+</plist>
diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
@@ -38,7 +38,7 @@
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -53,5 +53,24 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>AntDesign.ttf</string>
+		<string>Entypo.ttf</string>
+		<string>EvilIcons.ttf</string>
+		<string>Feather.ttf</string>
+		<string>FontAwesome.ttf</string>
+		<string>FontAwesome5_Brands.ttf</string>
+		<string>FontAwesome5_Regular.ttf</string>
+		<string>FontAwesome5_Solid.ttf</string>
+		<string>Fontisto.ttf</string>
+		<string>Foundation.ttf</string>
+		<string>Ionicons.ttf</string>
+		<string>MaterialCommunityIcons.ttf</string>
+		<string>MaterialIcons.ttf</string>
+		<string>Octicons.ttf</string>
+		<string>SimpleLineIcons.ttf</string>
+		<string>Zocial.ttf</string>
+	</array>
 </dict>
 </plist>
diff --git a/example/package.json b/example/package.json
@@ -10,12 +10,13 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "react": "16.9.0",
-    "react-native": "0.61.5",
     "@freakycoder/react-native-helpers": "0.1.2",
     "@paraboly/react-native-card": "^0.2.12",
+    "react": "16.9.0",
+    "react-native": "0.61.5",
     "react-native-dynamic-vector-icons": "0.0.3",
-    "react-native-material-ripple": "^0.8.0"
+    "react-native-material-ripple": "^0.8.0",
+    "react-native-vector-icons": "^6.6.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.7",
@@ -29,5 +30,10 @@
   },
   "jest": {
     "preset": "react-native"
+  },
+  "rnpm": {
+    "assets": [
+      "./src/assets/fonts"
+    ]
   }
 }
diff --git a/lib/src/components/Card/Card.js b/lib/src/components/Card/Card.js
@@ -32,13 +32,9 @@ const Card = props => {
     bottomRightComponent
   } = props;
   return (
-    <View
-      style={[
-        shadowStyle || _shadowStyle,
-        style || container(containerHeight, iconDisable, borderRadius)
-      ]}
-    >
+    <View style={[shadowStyle || _shadowStyle]}>
       <Ripple
+        style={style || container(containerHeight, iconDisable, borderRadius)}
         onPress={onPress}
         rippleColor={colors.theme.light.primary}
         rippleContainerBorderRadius={borderRadius}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraboly/react-native-card",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "description": "Fully customizable Card View for React Native.",
   "keywords": [
     "react-native",