diff --git a/mediapipe/examples/android/solutions/gradle.properties b/mediapipe/examples/android/solutions/gradle.properties index c09e1e3b0..394ef2aca 100644 --- a/mediapipe/examples/android/solutions/gradle.properties +++ b/mediapipe/examples/android/solutions/gradle.properties @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true +android.enableJetifier=true diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/build.gradle b/mediapipe/examples/android/solutions/posetracking-lindera/build.gradle index 06b947995..f21a510d2 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/build.gradle +++ b/mediapipe/examples/android/solutions/posetracking-lindera/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.google.mediapipe.apps.posetracking_lindera" - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion 30 versionCode 1 versionName "1.0" @@ -38,6 +38,8 @@ dependencies { testImplementation 'junit:junit:4.+' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + implementation 'com.afollestad.material-dialogs:core:0.9.6.0' + // Mediapipe dependencies implementation 'com.google.protobuf:protobuf-javalite:3.19.1' diff --git a/mediapipe/examples/android/solutions/posetracking-lindera/build_aar.sh b/mediapipe/examples/android/solutions/posetracking-lindera/build_aar.sh index 8f33f2a20..291caee6f 100644 --- a/mediapipe/examples/android/solutions/posetracking-lindera/build_aar.sh +++ b/mediapipe/examples/android/solutions/posetracking-lindera/build_aar.sh @@ -1,4 +1,4 @@ -POSE_TRACKING_OUTPUT_DIR=bazel-bin/mediapipe/java/com/google/mediapipe/solutions/posetracking +POSE_TRACKING_OUTPUT_DIR=bazel-bin/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api GRADLE_LIBS_DIR=mediapipe/examples/android/solutions/posetracking-lindera/libs # bazel build -c opt --strip=ALWAYS\ @@ -14,12 +14,12 @@ bazel build -c opt --strip=ALWAYS\ --copt=-fomit-frame-pointer \ --copt=-DABSL_MIN_LOG_LEVEL=2 \ --linkopt=-Wl,--gc-sections,--strip-all \ - //mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-api.aar \ - //mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-landmark.aar \ - //mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-detection.aar \ - //mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-graph.aar \ - //mediapipe/java/com/google/mediapipe/solutions/lindera:copperlabs-lindera.aar \ - //mediapipe/java/com/google/mediapipe/solutioncore:copperlabs-mediapipe + //mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera:copperlabs-lindera.aar \ + //mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api:copperlabs-pose-api.aar \ + //mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api:copperlabs-pose-detection.aar \ + //mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api:copperlabs-pose-graph.aar \ + //mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api:copperlabs-pose-landmark.aar \ +# //mediapipe/java/com/google/mediapipe/solutioncore:copperlabs-mediapipe @@ -30,6 +30,6 @@ rm -f $GRADLE_LIBS_DIR/copperlabs-*.aar \cp $POSE_TRACKING_OUTPUT_DIR/copperlabs-pose-detection.aar $GRADLE_LIBS_DIR \cp $POSE_TRACKING_OUTPUT_DIR/copperlabs-pose-graph.aar $GRADLE_LIBS_DIR \cp $POSE_TRACKING_OUTPUT_DIR/copperlabs-pose-landmark.aar $GRADLE_LIBS_DIR -\cp bazel-bin/mediapipe/java/com/google/mediapipe/solutions/lindera/copperlabs-lindera.aar $GRADLE_LIBS_DIR +\cp bazel-bin/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/copperlabs-lindera.aar $GRADLE_LIBS_DIR \cp bazel-bin/mediapipe/java/com/google/mediapipe/solutioncore/copperlabs-mediapipe.aar $GRADLE_LIBS_DIR diff --git a/mediapipe/examples/android/solutions/settings.gradle b/mediapipe/examples/android/solutions/settings.gradle index 8bfb5e319..7b33c73ae 100644 --- a/mediapipe/examples/android/solutions/settings.gradle +++ b/mediapipe/examples/android/solutions/settings.gradle @@ -3,4 +3,5 @@ include ':facedetection' include ':facemesh' include ':posetracking' include ':hands' -include ':posetracking-camera' \ No newline at end of file +include ':posetracking-camera' +include ':posetracking-lindera' \ No newline at end of file diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel index 989c84938..c7adf09ed 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/BUILD.bazel @@ -1,6 +1,7 @@ android_library( name = "copperlabs-lindera", srcs = glob(["src/main/**/*.java"]), + custom_package = "com.google.mediapipe.solutions", manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [ @@ -10,7 +11,7 @@ android_library( "//mediapipe/java/com/google/mediapipe/solutioncore:camera_input", "//mediapipe/java/com/google/mediapipe/solutioncore:solution_base", "//mediapipe/java/com/google/mediapipe/solutioncore:solution_rendering", - "//mediapipe/java/com/google/mediapipe/solutions/posetracking:copperlabs-pose-api", + "//mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api", "//third_party:androidx_appcompat", "//third_party:autovalue", "@com_google_protobuf//:protobuf_javalite", diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml index a5918e68a..c05b2368e 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/AndroidManifest.xml @@ -1,4 +1,7 @@ - + + \ No newline at end of file diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java index b90a442b5..3dcd05c7c 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-lindera/src/main/java/com/google/mediapipe/solutions/lindera/CameraRotation.java @@ -4,15 +4,6 @@ package com.google.mediapipe.solutions.lindera; import android.view.Surface; -//public class CameraRotation { -// -// public static final int FIXED_0_DEG = Surface.ROTATION_0; -// public static final int FIXED_180_DEG = Surface.ROTATION_180; -// public static final int FIXED_270_DEG = Surface.ROTATION_270; -// public static final int FIXED_90_DEG = Surface.ROTATION_90; -// public static final int AUTOMATIC = -1; -// -//} public enum CameraRotation { FIXED_0_DEG(Surface.ROTATION_0),FIXED_90_DEG(Surface.ROTATION_90),FIXED_180_DEG(Surface.ROTATION_180),FIXED_270_DEG(Surface.ROTATION_270),AUTOMATIC(-1); private final int value; diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel index 7078addf0..788140e2a 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/BUILD.bazel @@ -17,6 +17,7 @@ licenses(["notice"]) android_library( name = "copperlabs-pose-api", srcs = glob(["src/main/**/*.java"]), + custom_package = "com.google.mediapipe.solutions", javacopts = ["-Acom.google.auto.value.AutoBuilderIsUnstable"], manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], @@ -51,7 +52,8 @@ android_library( "//mediapipe/modules/pose_landmark:pose_landmark_lite.tflite", ], assets_dir = "", - manifest = ":AndroidManifest.xml", + custom_package = "com.google.mediapipe.solutions", + manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [], ) @@ -63,7 +65,8 @@ android_library( "//mediapipe/modules/pose_detection:pose_detection.tflite", ], assets_dir = "", - manifest = ":AndroidManifest.xml", + custom_package = "com.google.mediapipe.solutions", + manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [], ) @@ -75,7 +78,8 @@ android_library( "//mediapipe/graphs/pose_tracking:pose_tracking_gpu_image.binarypb", ], assets_dir = "", - manifest = ":AndroidManifest.xml", + custom_package = "com.google.mediapipe.solutions", + manifest = "src/main/AndroidManifest.xml", visibility = ["//visibility:public"], deps = [], ) diff --git a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml index a5918e68a..f873d63f2 100644 --- a/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml +++ b/mediapipe/java/com/google/mediapipe/solutions/copperlabs/copperlabs-pose-api/src/main/AndroidManifest.xml @@ -1,4 +1,6 @@ - - + + \ No newline at end of file