Merge pull request #310 from playgameservices/revert-309-friends

Revert "Add Friends Functionality"

Author: olehkuznetsov

ButtonClicker/build.gradle

@@ -22,22 +22,18 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "com.google.android.gms:play-services-games:20.0.1"
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
+    implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }
 
 buildscript {
     repositories {
         jcenter()
     }
-}
+}

ButtonClicker/src/main/java/com/google/example/games/bc/MainActivity.java

@@ -20,7 +20,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;

ButtonClicker/src/main/res/values-v13/styles.xml

@@ -16,5 +16,5 @@
 -->
 
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
+    <style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar" />
 </resources>

CollectAllTheStars2/build.gradle

@@ -26,8 +26,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
     implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }

CollectAllTheStars2/src/main/java/com/google/example/games/catt2/MainActivity.java

@@ -15,10 +15,13 @@
 
 package com.google.example.games.catt2;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,10 +32,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -73,7 +72,7 @@
  *
  * @author Bruno Oliveira (Google)
  */
-public class MainActivity extends AppCompatActivity implements
+public class MainActivity extends Activity implements
     View.OnClickListener,
     OnRatingBarChangeListener {
 
@@ -394,7 +393,7 @@ protected void onStart() {
     checkPlaceholderIds();
   }
 
-  public static boolean verifySampleSetup(AppCompatActivity activity, int... resIds) {
+  public static boolean verifySampleSetup(Activity activity, int... resIds) {
     StringBuilder problems = new StringBuilder();
     boolean problemFound = false;
     problems.append("The following set up problems were found:\n\n");

CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SelectSnapshotActivity.java

@@ -14,6 +14,7 @@
  */
 package com.google.example.games.catt2;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -27,8 +28,6 @@
 import android.widget.ListView;
 import android.widget.TextView;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.google.android.gms.common.images.ImageManager;
 import com.google.android.gms.games.snapshot.Snapshot;
 import com.google.android.gms.games.snapshot.SnapshotMetadata;
@@ -45,7 +44,7 @@
  *
  * @author Clayton Wilkinson (Google)
  */
-public class SelectSnapshotActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public class SelectSnapshotActivity extends Activity implements AdapterView.OnItemClickListener {
 
   private static final String TAG = "SelSnapshotActivity";
   // intent data which is a snapshot metadata
@@ -117,7 +116,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
   static class SnapshotListAdapter<T> extends ArrayAdapter<T> {
 
 
-    public SnapshotListAdapter(AppCompatActivity activity, ArrayList<T> data) {
+    public SnapshotListAdapter(Activity activity, ArrayList<T> data) {
       super(activity, R.layout.snapshotlayout, data);
     }
 

CollectAllTheStars2/src/main/java/com/google/example/games/catt2/SnapshotCoordinator.java

@@ -16,7 +16,7 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.common.api.CommonStatusCodes;

CollectAllTheStars2/src/main/res/values-v11/styles.xml

@@ -21,7 +21,7 @@
         Base application theme for API 11+. This theme completely replaces
         AppBaseTheme from res/values/styles.xml on API 11+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
         <!-- API 11 theme customizations can go here. -->
     </style>
 

CollectAllTheStars2/src/main/res/values-v14/styles.xml

@@ -22,7 +22,7 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
         <!-- API 14 theme customizations can go here. -->
     </style>
 

SkeletonTbmp/build.gradle

@@ -25,8 +25,8 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
+    implementation "com.android.support:support-v4:${support_library_version}"
     implementation "com.google.android.gms:play-services-games:${gms_library_version}"
     implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
 }