Skip to content

Commit

Permalink
Merge pull request #1671 from myxmaster/replace-qr-scanner
Browse files Browse the repository at this point in the history
deps: Replace `react-native-camera-kit` with `react-native-vision-camera`
  • Loading branch information
kaloudis authored May 22, 2024
2 parents 98576da + e54ddb1 commit 0beba2b
Show file tree
Hide file tree
Showing 15 changed files with 322 additions and 379 deletions.
1 change: 0 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ android {
versionCode 84
versionName "0.9.0-alpha4"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}
signingConfigs {
release {
Expand Down
4 changes: 1 addition & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ buildscript {
classpath("com.android.tools.build:gradle")
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")

// Needed for react-native-camera-kit
classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.3")
classpath("com.google.protobuf:protobuf-gradle-plugin:0.9.4")

// LN address notifications
classpath("com.google.gms:google-services:4.3.15")
Expand Down
4 changes: 2 additions & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ newArchEnabled=false
# If set to false, you will be using JSC instead.
hermesEnabled=true

# Necessary for react-native-camera-kit
kotlin_version=1.8.0
# Necessary for react-native-vision-camera QR code scanning
VisionCamera_enableCodeScanner=true
15 changes: 10 additions & 5 deletions assets/images/SVG/Flash Off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 7 additions & 5 deletions assets/images/SVG/Flash On.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 11 additions & 3 deletions assets/images/SVG/Gallery.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions components/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as React from 'react';
import { Button as ElementsButton } from 'react-native-elements';
import { themeColor } from './../utils/ThemeUtils';
import { StyleProp, ViewStyle } from 'react-native';
import { StyleProp, TextStyle, ViewStyle } from 'react-native';

interface ButtonProps {
title?: string;
icon?: any;
titleStyle?: any;
titleStyle?: TextStyle;
onPress?: any;
secondary?: boolean;
tertiary?: boolean;
Expand Down
Loading

0 comments on commit 0beba2b

Please sign in to comment.