fix diff

DaiYz · Sep 24, 2020 · e8b044b · e8b044b
1 parent 1cbd06d
commit e8b044b
Show file tree

Hide file tree

Showing 92 changed files with 2 additions and 9,832 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -5,21 +5,6 @@
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-<<<<<<< HEAD
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
-
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
-.*/Libraries/react-native/React.js
-
-; Ignore polyfills
-.*/Libraries/polyfills/.*
-
-; Ignore metro
-.*/node_modules/metro/.*
-=======
 ; Ignore polyfills
 node_modules/react-native/Libraries/polyfills/.*
 
@@ -32,51 +17,18 @@ node_modules/warning/.*
 
 [untyped]
 .*/node_modules/@react-native-community/cli/.*/.*
->>>>>>> develop
-
 [include]
 
 [libs]
-<<<<<<< HEAD
-node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
-node_modules/react-native/flow-github/
-=======
 node_modules/react-native/interface.js
 node_modules/react-native/flow/
->>>>>>> develop
 
 [options]
 emoji=true
 
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
-<<<<<<< HEAD
-module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip .ios suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-
-munge_underscores=true
-
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
-
-module.file_ext=.js
-module.file_ext=.jsx
-module.file_ext=.json
-module.file_ext=.native.js
-=======
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.ios.js
@@ -85,22 +37,12 @@ munge_underscores=true
 
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
 module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
->>>>>>> develop
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
 suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 
-<<<<<<< HEAD
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
-[version]
-^0.86.0
-=======
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)
 suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*react_native\\(_ios\\)?_\\(oss\\|fb\\)[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
@@ -128,4 +70,3 @@ untyped-type-import
 
 [version]
 ^0.122.0
->>>>>>> develop
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # yarn
 yarn.lock
 
@@ -7,9 +7,6 @@ yarn.lock
 Pods/
 ios/build/
 ios/Podfile.lock
-
-=======
->>>>>>> develop
 # OSX
 #
 .DS_Store
@@ -32,10 +29,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
-<<<<<<< HEAD
 project.xcworkspace
-=======
->>>>>>> develop
 
 # Android/IntelliJ
 #
@@ -55,10 +49,7 @@ yarn-error.log
 buck-out/
 \.buckd/
 *.keystore
-<<<<<<< HEAD
-=======
 !debug.keystore
->>>>>>> develop
 
 # fastlane
 #
@@ -73,9 +64,6 @@ buck-out/
 
 # Bundle artifact
 *.jsbundle
-<<<<<<< HEAD
-=======
 
 # CocoaPods
 /ios/Pods/
->>>>>>> develop
diff --git a/App.js b/App.js
@@ -3,53 +3,6 @@
  * https://github.com/facebook/react-native
  *
  * @format
-<<<<<<< HEAD
- * @flow
- * @lint-ignore-every XPLATJSCOPYRIGHT1
- */
-
-import React, {Component} from 'react';
-import {Platform, StyleSheet, Text, View} from 'react-native';
-
-const instructions = Platform.select({
-  ios: 'Press Cmd+R to reload,\n' + 'Cmd+D or shake for dev menu',
-  android:
-    'Double tap R on your keyboard to reload,\n' +
-    'Shake or press menu button for dev menu',
-});
-
-type Props = {};
-export default class App extends Component<Props> {
-  render() {
-    return (
-      <View style={styles.container}>
-        <Text style={styles.welcome}>Welcome to React Native!</Text>
-        <Text style={styles.instructions}>To get started, edit App.js</Text>
-        <Text style={styles.instructions}>{instructions}</Text>
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
-});
-=======
  * @flow strict-local
  */
 
@@ -159,4 +112,3 @@ const styles = StyleSheet.create({
 });
 
 export default App;
->>>>>>> develop
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -15,11 +15,6 @@ import com.android.build.OutputFile
  *   // the name of the generated asset file containing your JS bundle
  *   bundleAssetName: "index.android.bundle",
  *
-<<<<<<< HEAD
- *   // the entry file for bundle generation
- *   entryFile: "index.android.js",
- *
-=======
  *   // the entry file for bundle generation. If none specified and
  *   // "index.android.js" exists, it will be used. Otherwise "index.js" is
  *   // default. Can be overridden with ENTRY_FILE environment variable.
@@ -28,7 +23,6 @@ import com.android.build.OutputFile
  *   // https://reactnative.dev/docs/performance#enable-the-ram-format
  *   bundleCommand: "ram-bundle",
  *
->>>>>>> develop
  *   // whether to bundle JS and assets in debug mode
  *   bundleInDebug: false,
  *
@@ -84,11 +78,7 @@ import com.android.build.OutputFile
  */
 
 project.ext.react = [
-<<<<<<< HEAD
-    entryFile: "index.js"
-=======
     enableHermes: false,  // clean and rebuild if changing
->>>>>>> develop
 ]
 
 apply from: "../../node_modules/react-native/react.gradle"
@@ -108,12 +98,6 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
-<<<<<<< HEAD
-
-android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-=======
 /**
  * The preferred build flavor of JavaScriptCore.
  *
@@ -139,59 +123,23 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
->>>>>>> develop
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-<<<<<<< HEAD
-    defaultConfig {
-        applicationId "com.easymusic"
-=======
 
     defaultConfig {
         applicationId "com.music"
->>>>>>> develop
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-<<<<<<< HEAD
-       // renderscriptTargetApi 23
-       // renderscriptSupportModeEnabled true
-        ndk {
-           abiFilters "armeabi-v7a", "x86"
-       }
-=======
->>>>>>> develop
     }
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-<<<<<<< HEAD
-            include "armeabi-v7a", "x86", "arm64-v8a"
-        }
-    }
-
-    signingConfigs {
-         release {
-             storeFile file(MYAPP_RELEASE_STORE_FILE)
-             storePassword MYAPP_RELEASE_STORE_PASSWORD
-             keyAlias MYAPP_RELEASE_KEY_ALIAS
-             keyPassword MYAPP_RELEASE_KEY_PASSWORD
-         }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled enableProguardInReleaseBuilds
-            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig signingConfigs.release
-        }
-    }
-=======
             include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
@@ -216,49 +164,22 @@ android {
         }
     }
 
->>>>>>> develop
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
-<<<<<<< HEAD
-            // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
-            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3]
-=======
             // https://developer.android.com/studio/build/configure-apk-splits.html
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
->>>>>>> develop
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
                         versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
-<<<<<<< HEAD
-=======
-
->>>>>>> develop
         }
     }
 }
 
 dependencies {
-<<<<<<< HEAD
-    implementation project(':react-native-orientation')
-    implementation project(':react-native-video')
-    implementation project(':react-native-fast-image')
-    implementation project(':react-native-sound')
-    implementation project(':react-native-fs')
-    implementation project(':react-native-audio')
-//    implementation project(':lottie-react-native')
-    implementation project(':react-native-vector-icons')
-    implementation project(':react-native-svg')
-    implementation project(':react-native-splash-screen')
-    implementation project(':react-native-linear-gradient')
-    implementation project(':react-native-gesture-handler')
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-=======
     implementation fileTree(dir: "libs", include: ["*.jar"])
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
@@ -285,7 +206,6 @@ dependencies {
     } else {
         implementation jscFlavor
     }
->>>>>>> develop
 }
 
 // Run this once to be able to run the application with BUCK
@@ -294,8 +214,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
     from configurations.compile
     into 'libs'
 }
-<<<<<<< HEAD
-=======
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
->>>>>>> develop
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -8,13 +8,3 @@
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
 # Add any project specific keep options here:
-<<<<<<< HEAD
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-=======
->>>>>>> develop