diff --git a/android/app/build.gradle b/android/app/build.gradle index c2d98ce..43b8d46 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -81,13 +81,13 @@ android { compileSdkVersion rootProject.ext.compileSdkVersion - namespace "com.fitgoat" + namespace 'com.fitGoat' defaultConfig { - applicationId "com.fitgoat" + applicationId 'com.fitGoat' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 - versionName "1.0" + versionName "1.0.0" buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString()) } diff --git a/android/app/src/debug/java/com/fitgoat/ReactNativeFlipper.java b/android/app/src/debug/java/com/fitgoat/ReactNativeFlipper.java index 48d5cae..758705e 100644 --- a/android/app/src/debug/java/com/fitgoat/ReactNativeFlipper.java +++ b/android/app/src/debug/java/com/fitgoat/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.fitgoat; +package com.fitGoat; import android.content.Context; import com.facebook.flipper.android.AndroidFlipperClient; diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 34a7ca8..04bfbf5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,32 +1,36 @@ - + - + + - - - - - - - - + + + - - - - + + + + + + + + + + + + - + \ No newline at end of file diff --git a/android/app/src/main/java/com/fitgoat/MainActivity.java b/android/app/src/main/java/com/fitgoat/MainActivity.java index b365860..c80efa3 100644 --- a/android/app/src/main/java/com/fitgoat/MainActivity.java +++ b/android/app/src/main/java/com/fitgoat/MainActivity.java @@ -1,4 +1,4 @@ -package com.fitgoat; +package com.fitGoat; import android.os.Build; import android.os.Bundle; diff --git a/android/app/src/main/java/com/fitgoat/MainApplication.java b/android/app/src/main/java/com/fitgoat/MainApplication.java index c2a5f9d..3fb1e65 100644 --- a/android/app/src/main/java/com/fitgoat/MainApplication.java +++ b/android/app/src/main/java/com/fitgoat/MainApplication.java @@ -1,4 +1,4 @@ -package com.fitgoat; +package com.fitGoat; import android.app.Application; import android.content.res.Configuration; diff --git a/android/app/src/main/res/drawable-hdpi/splashscreen_image.png b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png new file mode 100644 index 0000000..bd76df0 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-mdpi/splashscreen_image.png b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png new file mode 100644 index 0000000..bd76df0 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png new file mode 100644 index 0000000..bd76df0 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png new file mode 100644 index 0000000..bd76df0 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png new file mode 100644 index 0000000..bd76df0 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splashscreen_image.png differ diff --git a/android/app/src/main/res/drawable/splashscreen.xml b/android/app/src/main/res/drawable/splashscreen.xml index 12f2f76..c8568e1 100644 --- a/android/app/src/main/res/drawable/splashscreen.xml +++ b/android/app/src/main/res/drawable/splashscreen.xml @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/android/app/src/main/res/drawable/splashscreen_image.png b/android/app/src/main/res/drawable/splashscreen_image.png deleted file mode 100644 index cc94f37..0000000 Binary files a/android/app/src/main/res/drawable/splashscreen_image.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f5908..170229f 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..170229f Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd..bcb1841 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..bcb1841 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd8..49a9ee0 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..49a9ee0 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe..5cb9805 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..5cb9805 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebd..d1a02e7 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..d1a02e7 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000..3c05de5 --- /dev/null +++ b/android/app/src/main/res/values-night/colors.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 21cc155..bb2087f 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,4 +1,6 @@ - - #FFFFFF + #ffffff + #FFFFFF + #023c69 + #ffffff \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 050b963..a719410 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ - fitGoat - + fitGoat + contain + false + \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 90bcc87..f03e23f 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,8 +1,10 @@ - + - + \ No newline at end of file diff --git a/android/app/src/release/java/com/fitgoat/ReactNativeFlipper.java b/android/app/src/release/java/com/fitgoat/ReactNativeFlipper.java index 63f459b..2fbc8e5 100644 --- a/android/app/src/release/java/com/fitgoat/ReactNativeFlipper.java +++ b/android/app/src/release/java/com/fitgoat/ReactNativeFlipper.java @@ -4,7 +4,7 @@ *

This source code is licensed under the MIT license found in the LICENSE file in the root * directory of this source tree. */ -package com.fitgoat; +package com.fitGoat; import android.content.Context; import com.facebook.react.ReactInstanceManager; diff --git a/android/build.gradle b/android/build.gradle index bf861db..3871e6a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -38,3 +38,7 @@ allprojects { maven { url 'https://www.jitpack.io' } } } +// @generated begin expo-camera-import - expo prebuild (DO NOT MODIFY) sync-f244f4f3d8bf7229102e8f992b525b8602c74770 +def expoCameraMavenPath = new File(["node", "--print", "require.resolve('expo-camera/package.json')"].execute(null, rootDir).text.trim(), "../android/maven") +allprojects { repositories { maven { url(expoCameraMavenPath) } } } +// @generated end expo-camera-import \ No newline at end of file diff --git a/app.json b/app.json index bd3fa18..c4556d5 100644 --- a/app.json +++ b/app.json @@ -15,6 +15,6 @@ }, "android": { "package": "com.fitGoat" - } + }, } } diff --git a/app/tabs/tab0.tsx b/app/tabs/tab0.tsx index e4df934..7de1db2 100644 --- a/app/tabs/tab0.tsx +++ b/app/tabs/tab0.tsx @@ -83,7 +83,6 @@ export default function Tab1() { > {commonFoods && commonFoods.map((food, index) => { - console.log(food, index); return ( { + (async () => { + const cameraStatus = await Camera.requestPermissionsAsync(); + setHasCameraPermission(cameraStatus.status === "granted"); + const audioStatus = await Camera.requestMicrophonePermissionsAsync(); + setHasAudioPermission(audioStatus.status === "granted"); + })(); + }, []); + + const takeVideo = async () => { + if (camera) { + const data = await camera.recordAsync({ + VideoQuality: ["2160p"], + maxDuration: 10, + maxFileSize: 200, + mute: false, + videoBitrate: 5000000 + }); + setRecord(data.uri); + console.log(data.uri); + } + }; + const stopVideo = async () => { + camera.stopRecording(); + }; + + if (hasCameraPermission === null || hasAudioPermission === null) { + return Waiting for permissions; + } + if (hasCameraPermission === false || hasAudioPermission === false) { + return No access to camera; + } + return ( - - - SubTab 1 - - - SubTab 2 - - - SubTab 3 - - - - -

SubTab 1 Content
- - -
SubTab 2 Content
-
- -
SubTab 3 Content
-
+