From 2fcce91b0580f67e871eb0194c97f0ae2c549706 Mon Sep 17 00:00:00 2001 From: avenmia Date: Mon, 9 May 2022 19:45:50 -1000 Subject: [PATCH 1/2] Adding missing jcenter dependency --- KukaApp/android/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/KukaApp/android/build.gradle b/KukaApp/android/build.gradle index 85520f8..3aa330e 100644 --- a/KukaApp/android/build.gradle +++ b/KukaApp/android/build.gradle @@ -38,5 +38,10 @@ allprojects { } google() maven { url 'https://www.jitpack.io' } + jcenter() { + content { + includeModule("com.yqritc", "android-scalablevideoview") + } + } } } \ No newline at end of file From 202b866f2351869ecd07b5a8049b7316a6f7a082 Mon Sep 17 00:00:00 2001 From: avenmia Date: Thu, 2 Jun 2022 18:57:04 -1000 Subject: [PATCH 2/2] Fixing build files and adding google-services.json so that it builds on android --- KukaApp/android/app/build.gradle | 9 +++- KukaApp/android/app/google-services.json | 47 +++++++++++++++++++ .../android/app/src/main/AndroidManifest.xml | 39 ++++++++------- KukaApp/android/build.gradle | 3 +- 4 files changed, 78 insertions(+), 20 deletions(-) create mode 100644 KukaApp/android/app/google-services.json diff --git a/KukaApp/android/app/build.gradle b/KukaApp/android/app/build.gradle index bab57b9..cd65e45 100755 --- a/KukaApp/android/app/build.gradle +++ b/KukaApp/android/app/build.gradle @@ -1,4 +1,5 @@ apply plugin: "com.android.application" +apply plugin: 'com.google.gms.google-services' import com.android.build.OutputFile @@ -78,7 +79,7 @@ import com.android.build.OutputFile */ project.ext.react = [ - enableHermes: false, // clean and rebuild if changing + enableHermes: false, // clean and rebuild if changing ] apply from: "../../node_modules/react-native/react.gradle" @@ -195,6 +196,12 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" + implementation 'com.facebook.android:facebook-android-sdk:latest.release' + + implementation platform('com.google.firebase:firebase-bom:29.3.1') + + implementation 'com.google.firebase:firebase-analytics' + debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { exclude group:'com.facebook.fbjni' } diff --git a/KukaApp/android/app/google-services.json b/KukaApp/android/app/google-services.json new file mode 100644 index 0000000..1f6171a --- /dev/null +++ b/KukaApp/android/app/google-services.json @@ -0,0 +1,47 @@ +{ + "project_info": { + "project_number": "921635578637", + "firebase_url": "https://kuka-dev.firebaseio.com", + "project_id": "kuka-dev", + "storage_bucket": "kuka-dev.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:921635578637:android:d82bcf3f83f333bf7ac644", + "android_client_info": { + "package_name": "org.codeforhawaii.kuka" + } + }, + "oauth_client": [ + { + "client_id": "921635578637-6ougl5t2glp64h5jumno7bmjj51525dc.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDrMDFsj8HtsCJ3bLar5sVgRrtB7QT1-ZM" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "921635578637-6ougl5t2glp64h5jumno7bmjj51525dc.apps.googleusercontent.com", + "client_type": 3 + }, + { + "client_id": "921635578637-ma0i915tikp1q0v9q9gmfuefvd8grom6.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "org.codeforhawaii.kukadev" + } + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/KukaApp/android/app/src/main/AndroidManifest.xml b/KukaApp/android/app/src/main/AndroidManifest.xml index 4ff472a..0d3e800 100755 --- a/KukaApp/android/app/src/main/AndroidManifest.xml +++ b/KukaApp/android/app/src/main/AndroidManifest.xml @@ -1,27 +1,30 @@ + package="org.codeforhawaii.kuka"> - - - - - - - + android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_round" + android:allowBackup="false" + android:theme="@style/AppTheme"> + + + + + + + + + + diff --git a/KukaApp/android/build.gradle b/KukaApp/android/build.gradle index 3aa330e..60cf23c 100644 --- a/KukaApp/android/build.gradle +++ b/KukaApp/android/build.gradle @@ -14,6 +14,7 @@ buildscript { } dependencies { classpath("com.android.tools.build:gradle:4.2.2") + classpath 'com.google.gms:google-services:4.3.10' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -38,7 +39,7 @@ allprojects { } google() maven { url 'https://www.jitpack.io' } - jcenter() { + jcenter(){ content { includeModule("com.yqritc", "android-scalablevideoview") }