Update Android PartySample

Author: SahilAshar

.gitignore

@@ -5,11 +5,9 @@
 xcuserdata/
 
 # Generated by Android Studio
+.cxx/
 .gradle/
 build/
-gradle/
-gradlew
-gradlew.bat
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -58,3 +56,24 @@ fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
+
+#
+## Visual Studio cache/options directory
+.vs/
+.vscode/
+
+## User-added PlayFab Party Binaries
+# Debug
+android/bin/debug/arm64-v8a
+android/bin/debug/x86_64
+android/bin/debug/*.aar
+android/bin/debug/*.fpie
+# Release
+android/bin/release/arm64-v8a
+android/bin/release/x86_64
+android/bin/release/*.aar
+android/bin/release/*.fpie
+
+## Output Binaries
+output/
+output_int/

README.md

@@ -6,7 +6,7 @@ The compiled PlayFab Party library binaries are attached as zip assets to each t
 
 Please download, unzip, and copy the corresponding asset folder for your platform:
 
-* iOS - `/iOS/bin/Release`
-* Android - `/android/bin`
+* iOS - `/iOS/bin/Release/`
+* Android - `/android/bin/release/`
 * Win32 - The win32 binaries are not included in the zip assets. They are available on download on [nuget](https://www.nuget.org/packages/Microsoft.PlayFab.PlayFabParty.Cpp.Windows).
 * Linux - `/x64/Release/libparty.so`

android/PartySample/README.md

@@ -1,23 +1,53 @@
 # PartySample
 
-PartySample is a sample Android application with the PlayFabParty library integrated into it. Its purpose is to demonstrate the main functional capabilities provided by PlayFabParty API.
+PartySample is a sample Android application with the PlayFabParty library integrated into it. Its purpose is to demonstrate the main functional capabilities provided by the PlayFabParty API.
 
 _Note: a registered PlayFab title is required to use PartySample app. Please refer to corresponding documentation._
 
 ## Building and Deploying to Device
-Please use the latest Android Studio.
+Please use the latest Android Studio. If you run into any issues, please refer to the [FAQ](#faq) before filing a GitHub Issue.
 
-1. Download `libparty_a-for-Android-Release.zip` from one of the PlayFabParty GitHub repository releases.
+1. Download `PlayFabParty.Android.Release.zip` (previously `libparty-android-release.zip`) from one of the PlayFab Party GitHub [repository releases](https://github.com/PlayFab/PlayFabParty/releases).
 2. Unzip the contents of the downloaded archive directly into `<REPO ROOT>/android/bin/release/`.
-3. In Android Studio, open a project, navigate to your cloned repository and select `<REPO ROOT>/android/PartySample/`
-4. Once the project has opened and gradle has synced, in Android Studio select `Run->Run 'demo'`
-5. Select your destination device and press `OK`
+3. In Android Studio, open a project, navigate to your cloned repository and select `<REPO ROOT>/android/PartySample/`.
+4. After the project has opened, run `Gradle Sync` in Android Studio.
+5. Navigate to `Build > Select Build Variant`. In the sidebar that opens, change the `Active Build Variant` for `:demo` to `fullRelease`.
+6. Navigate to `Build > Make Project`. You should see both the Java and C++ builds kickoff. You should see the following text if the build was successful.
+    ```
+    BUILD SUCCESSFUL in xm xxs
+    29 actionable tasks: 29 executed
+    ```
+7. In the top right, select the device you wish to deploy the `PartySample` app to. Navigate to `Run > Run 'demo'`.
+
+    a. You may run into the following error:
+    ```
+    Error: The apk for your currently selected variant cannot be signed. Please specify a signing configuration for this variant (<build-variant>).
+    ```
+    If you have a `signingConfig` you'd like to use, you may do so. Otherwise, you can just select the `Fix` button. That will add a `signingConfig` line to your `build.gradle` that looks like this: `signingConfig signingConfigs.debug`. **DO NOT CHECK THIS LINE INTO YOUR PRODUCTION APPLICATIONS.**
+
+    After you're clicked `Fix` and you've confirmed the line has been added, you can run the application again.
+5. If everything has gone well, you should see the application pop up on your device asking for permissions!
 
 ## Running
-As the PartySample app starts on your Android device it will show a screen asking you to provide a PlayFab title ID and select a sample user. Please provide the required information and tap "Login". 
+As the PartySample app starts on your Android device it will show a screen asking you to provide a PlayFab title ID and select a sample user. Please provide the required information and tap "Login".
 
 On the subsequent screen, you can choose your desired room number, language, and then `Create`, `Join` or `Leave` to get in and out of party rooms with other users.
 
-The application is designed to demo PlayFabParty's voice, transcription and translation capabilities.  Chat with your friends and then dig into the code to see how it's done!
+The application is designed to demo PlayFabParty's voice, transcription and translation capabilities. Chat with your friends and then dig into the code to see how it's done!
 
-Good luck!
+Good luck!
+
+## FAQ
+1. If you see an error similar to this:
+
+    ```
+    Unsupported Java. 
+    Your build is currently configured to use Java 17.0.6 and Gradle 6.6.
+
+    Possible solution:
+    - Upgrade Gradle wrapper to 7.2 version and re-import the project
+    ```
+
+    Navigate to `Android Studio > Settings > Build, Execution, Deployment > Build Tools > Gradle` and change the Gradle JDK to version 1.8. You may need to download it.
+
+    After you have changed the Gradle JDK to version 1.8, run `Gradle Sync` again and verify that the error has disappeared.

android/PartySample/build.gradle

@@ -1,10 +1,16 @@
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.2'
@@ -18,10 +24,25 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
 
+ext.getTaskFlavorName = { taskPrefix, task ->
+
+    Pattern pattern
+    pattern = Pattern.compile(taskPrefix + "(\\w+)(Release|Debug)")
+
+    Matcher matcher = pattern.matcher( task.name )
+    if( matcher.find() )
+        return matcher.group(1)
+
+    return ""
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

android/PartySample/demo/AndroidManifest.xml

@@ -11,6 +11,11 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+    <!-- Needed only if your app looks for Bluetooth devices. -->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
 
     <application
         android:allowBackup="true"
@@ -19,14 +24,14 @@
         android:roundIcon="@drawable/playfab_logo"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:screenOrientation="landscape"
+        <activity android:screenOrientation="portrait"
             android:name=".ChatActivity">
         </activity>
-        <activity android:screenOrientation="landscape"
-            android:name=".MainActivity">
+        <activity android:screenOrientation="portrait"
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

android/PartySample/demo/build.gradle

@@ -2,18 +2,19 @@ apply plugin: 'com.android.application'
 def libType
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 34
+    ndkVersion "21.1.6352462"
+
     defaultConfig {
         applicationId "com.microsoft.playfab.partysample"
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++14 -fexceptions -Wall -Wextra -Werror"
-                abiFilters "arm64-v8a","armeabi-v7a","x86","x86_64"
             }
         }
     }
@@ -27,36 +28,63 @@ android {
             libType = 'debug'
         }
     }
+    flavorDimensions "ABI"
+    productFlavors {
+        full {
+            dimension "ABI"
+            externalNativeBuild {
+                cmake {
+                    abiFilters "arm64-v8a", "x86_64"
+                }
+            }
+        }
+        arm8 {
+            dimension "ABI"
+            externalNativeBuild {
+                cmake {
+                    abiFilters "arm64-v8a"
+                }
+            }
+        }
+        x86_64 {
+            dimension "ABI"
+            externalNativeBuild {
+                cmake {
+                    abiFilters "x86_64"
+                }
+            }
+        }
+    }
     externalNativeBuild {
         cmake {
-            path file('./src/main/cpp/CMakeLists.txt')
+            path file('src/main/cpp/CMakeLists.txt')
         }
     }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDir '.src/main/java'
-            res.srcDir './src/main/res'
+            java.srcDir 'src/main/java'
+            res.srcDir 'src/main/res'
         }
     }
     repositories {
         flatDir {
-            dirs = ['../../../../output/android/debug', '../../../../output/android/release']
+            dirs = ['../../../../output/android/party/PlayFabParty/debug', '../../../../output/android/party/PlayFabParty/release']
         }
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.playfab:client-sdk:0.82.181218'
-    implementation 'com.squareup.okhttp3:okhttp:4.0.0-alpha02'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     releaseImplementation fileTree(include: ['*.aar'], dir: '../../bin/release')
-    debugImplementation fileTree(include: ['*.aar'], dir: '../../bin/release')
+    debugImplementation fileTree(include: ['*.aar'], dir: '../../bin/debug')
 }