Skip to content

Commit f04fb18

Browse files
olehkuznetsovolehkuznetsov
authored
Revert "Add Friends Functionality"
1 parent e6d79de commit f04fb18

File tree

31 files changed

+82
-441
lines changed

31 files changed

+82
-441
lines changed

‎ButtonClicker/build.gradle‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,18 @@ android {
2222
minifyEnabled true
2323
proguardFiles getDefaultProguardFile('proguard-android.txt')
2424
}
25-
compileOptions {
26-
sourceCompatibility JavaVersion.VERSION_1_8
27-
targetCompatibility JavaVersion.VERSION_1_8
28-
}
2925
}
3026
}
3127

3228
dependencies {
33-
implementation 'androidx.appcompat:appcompat:1.0.0'
34-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
35-
implementation "com.google.android.gms:play-services-games:20.0.1"
29+
implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
30+
implementation "com.android.support:support-v4:${support_library_version}"
31+
implementation "com.google.android.gms:play-services-games:${gms_library_version}"
3632
implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
3733
}
3834

3935
buildscript {
4036
repositories {
4137
jcenter()
4238
}
43-
}
39+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import android.content.Intent;
2121
import android.os.Bundle;
2222
import android.os.Handler;
23-
import androidx.annotation.NonNull;
23+
import android.support.annotation.NonNull;
2424
import android.util.Log;
2525
import android.view.KeyEvent;
2626
import android.view.View;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
-->
1717

1818
<resources>
19-
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
19+
<style name="AppTheme" parent="android:Theme.Holo.Light.NoActionBar" />
2020
</resources>

‎CollectAllTheStars2/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ android {
2626
}
2727

2828
dependencies {
29-
implementation 'androidx.appcompat:appcompat:1.0.0'
30-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
29+
implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
30+
implementation "com.android.support:support-v4:${support_library_version}"
3131
implementation "com.google.android.gms:play-services-games:${gms_library_version}"
3232
implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
3333
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515

1616
package com.google.example.games.catt2;
1717

18+
import android.app.Activity;
19+
import android.app.AlertDialog;
1820
import android.app.ProgressDialog;
1921
import android.content.Intent;
2022
import android.graphics.Bitmap;
2123
import android.os.Bundle;
24+
import android.support.annotation.NonNull;
2225
import android.util.Log;
2326
import android.view.Menu;
2427
import android.view.MenuItem;
@@ -29,10 +32,6 @@
2932
import android.widget.TextView;
3033
import android.widget.Toast;
3134

32-
import androidx.annotation.NonNull;
33-
import androidx.appcompat.app.AlertDialog;
34-
import androidx.appcompat.app.AppCompatActivity;
35-
3635
import com.google.android.gms.auth.api.signin.GoogleSignIn;
3736
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
3837
import com.google.android.gms.auth.api.signin.GoogleSignInClient;
@@ -73,7 +72,7 @@
7372
*
7473
* @author Bruno Oliveira (Google)
7574
*/
76-
public class MainActivity extends AppCompatActivity implements
75+
public class MainActivity extends Activity implements
7776
View.OnClickListener,
7877
OnRatingBarChangeListener {
7978

@@ -394,7 +393,7 @@ protected void onStart() {
394393
checkPlaceholderIds();
395394
}
396395

397-
public static boolean verifySampleSetup(AppCompatActivity activity, int... resIds) {
396+
public static boolean verifySampleSetup(Activity activity, int... resIds) {
398397
StringBuilder problems = new StringBuilder();
399398
boolean problemFound = false;
400399
problems.append("The following set up problems were found:\n\n");

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515
package com.google.example.games.catt2;
1616

17+
import android.app.Activity;
1718
import android.content.Context;
1819
import android.content.Intent;
1920
import android.os.Bundle;
@@ -27,8 +28,6 @@
2728
import android.widget.ListView;
2829
import android.widget.TextView;
2930

30-
import androidx.appcompat.app.AppCompatActivity;
31-
3231
import com.google.android.gms.common.images.ImageManager;
3332
import com.google.android.gms.games.snapshot.Snapshot;
3433
import com.google.android.gms.games.snapshot.SnapshotMetadata;
@@ -45,7 +44,7 @@
4544
*
4645
* @author Clayton Wilkinson (Google)
4746
*/
48-
public class SelectSnapshotActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
47+
public class SelectSnapshotActivity extends Activity implements AdapterView.OnItemClickListener {
4948

5049
private static final String TAG = "SelSnapshotActivity";
5150
// intent data which is a snapshot metadata
@@ -117,7 +116,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
117116
static class SnapshotListAdapter<T> extends ArrayAdapter<T> {
118117

119118

120-
public SnapshotListAdapter(AppCompatActivity activity, ArrayList<T> data) {
119+
public SnapshotListAdapter(Activity activity, ArrayList<T> data) {
121120
super(activity, R.layout.snapshotlayout, data);
122121
}
123122

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import android.content.Intent;
1717
import android.os.AsyncTask;
1818
import android.os.Bundle;
19-
import androidx.annotation.NonNull;
19+
import android.support.annotation.NonNull;
2020
import android.util.Log;
2121

2222
import com.google.android.gms.common.api.CommonStatusCodes;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Base application theme for API 11+. This theme completely replaces
2222
AppBaseTheme from res/values/styles.xml on API 11+ devices.
2323
-->
24-
<style name="AppBaseTheme" parent="Theme.AppCompat.Light">
24+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
2525
<!-- API 11 theme customizations can go here. -->
2626
</style>
2727

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
AppBaseTheme from BOTH res/values/styles.xml and
2323
res/values-v11/styles.xml on API 14+ devices.
2424
-->
25-
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
25+
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
2626
<!-- API 14 theme customizations can go here. -->
2727
</style>
2828

‎SkeletonTbmp/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
}
2626

2727
dependencies {
28-
implementation 'androidx.appcompat:appcompat:1.0.0'
29-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
28+
implementation "com.android.support:appcompat-v7:${appcompat_library_version}"
29+
implementation "com.android.support:support-v4:${support_library_version}"
3030
implementation "com.google.android.gms:play-services-games:${gms_library_version}"
3131
implementation "com.google.android.gms:play-services-auth:${gms_library_version}"
3232
}

0 commit comments

Comments
 (0)