Skip to content

Commit afa3498

Browse files
committed
Fix many many many broken imports
1 parent 01d4436 commit afa3498

20 files changed

+44
-204
lines changed

BaseGameUtils/src/main/java/com/google/example/games/basegameutils/BaseGameActivity.java

-178
This file was deleted.

Blacksmith/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ android {
77

88
defaultConfig {
99
applicationId "uk.co.jakelee.blacksmith"
10-
minSdkVersion 15
10+
minSdkVersion 16
1111
targetSdkVersion apiVersion
1212
versionCode 80
1313
versionName "2.3.7"
1414
}
1515
buildTypes {
1616
release {
17-
minifyEnabled true
17+
minifyEnabled false
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
1919
}
2020
debug {
@@ -40,7 +40,7 @@ dependencies {
4040
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
4141
implementation "com.android.support:design:$supportLibraryVersion"
4242
implementation "com.android.support:percent:$supportLibraryVersion"
43-
implementation "com.google.android.gms:play-services-ads:$playLibraryVersion"
43+
implementation "com.google.android.gms:play-services-ads:20.0.0"
4444
implementation "com.google.android.gms:play-services-gcm:$playLibraryVersion"
4545
implementation "com.google.android.gms:play-services-games:$playLibraryVersion"
4646
implementation "com.google.android.gms:play-services-drive:$playLibraryVersion"

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/controls/TextViewPixel.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import android.content.Context;
44
import android.graphics.Typeface;
5-
import android.support.v7.widget.AppCompatTextView;
65
import android.util.AttributeSet;
76

7+
import androidx.appcompat.widget.AppCompatTextView;
8+
89
public class TextViewPixel extends AppCompatTextView {
910
private static Typeface mTypeface;
1011

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/DisplayHelper.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.graphics.drawable.Drawable;
1313
import android.os.Build;
1414
import android.os.SystemClock;
15-
import android.support.v4.content.ContextCompat;
1615
import android.util.DisplayMetrics;
1716
import android.view.Gravity;
1817
import android.view.LayoutInflater;
@@ -30,6 +29,8 @@
3029
import android.widget.TextView;
3130
import android.widget.ViewFlipper;
3231

32+
import androidx.core.content.ContextCompat;
33+
3334
import com.orm.query.Condition;
3435
import com.orm.query.Select;
3536
import com.squareup.picasso.Picasso;
@@ -457,6 +458,7 @@ public void onClick(View v) {
457458
final LinearLayout finalTargetContainer = targetContainer;
458459
final ImageView finalImageView = addVisitorButton;
459460
final List<ImageView> finalVisitorImages = visitorImages;
461+
460462
activity.runOnUiThread(new Runnable() {
461463
@Override
462464
public void run() {

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/GooglePlayHelper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import android.graphics.Bitmap;
77
import android.graphics.BitmapFactory;
88
import android.os.AsyncTask;
9-
import android.support.annotation.NonNull;
109
import android.util.Pair;
1110

11+
import androidx.annotation.NonNull;
12+
1213
import com.google.android.gms.common.ConnectionResult;
1314
import com.google.android.gms.common.GoogleApiAvailability;
1415
import com.google.android.gms.common.api.GoogleApiClient;

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/NotificationHelper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
import android.app.Notification;
55
import android.app.NotificationManager;
66
import android.app.PendingIntent;
7+
import android.app.TaskStackBuilder;
78
import android.content.BroadcastReceiver;
89
import android.content.Context;
910
import android.content.Intent;
1011
import android.media.RingtoneManager;
11-
import android.support.v4.app.NotificationCompat;
12-
import android.support.v4.app.TaskStackBuilder;
12+
13+
import androidx.core.app.NotificationCompat;
1314

1415
import com.orm.query.Condition;
1516
import com.orm.query.Select;

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/StorageHelper.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import android.content.Context;
66
import android.content.pm.PackageManager;
77
import android.os.Environment;
8-
import android.support.v4.app.ActivityCompat;
98
import android.util.Log;
109
import android.util.Pair;
1110

11+
import androidx.core.app.ActivityCompat;
12+
1213
import java.io.BufferedReader;
1314
import java.io.File;
1415
import java.io.FileInputStream;

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/helper/ToastHelper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import android.content.Intent;
55
import android.content.res.Resources;
66
import android.graphics.Typeface;
7-
import android.support.design.widget.Snackbar;
87
import android.util.DisplayMetrics;
98
import android.view.Gravity;
109
import android.view.View;
1110
import android.widget.Button;
1211
import android.widget.TextView;
1312

13+
import com.google.android.material.snackbar.Snackbar;
14+
1415
import uk.co.jakelee.blacksmith.R;
1516
import uk.co.jakelee.blacksmith.main.MainActivity;
1617
import uk.co.jakelee.blacksmith.main.MessagesActivity;
@@ -65,7 +66,7 @@ public void onClick(View v) {
6566
convertDpToPixel(context, -18)); // Bottom
6667
snackbarView.setBackgroundResource(color);
6768

68-
TextView snackbarText = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text);
69+
TextView snackbarText = (TextView) snackbarView.findViewById(com.google.android.material.R.id.snackbar_text);
6970
snackbarText.setTypeface(Typeface.createFromAsset(context.getAssets(), "fonts/BetterPixels.ttf"));
7071
snackbarText.setTextSize(20);
7172
snackbarText.setMinLines(2);

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/AnvilActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.os.Handler;
7-
import android.support.percent.PercentRelativeLayout;
87
import android.util.Log;
98
import android.util.Pair;
109
import android.view.GestureDetector;
@@ -16,6 +15,8 @@
1615
import android.widget.TextView;
1716
import android.widget.ViewFlipper;
1817

18+
import androidx.percentlayout.widget.PercentRelativeLayout;
19+
1920
import com.orm.query.Condition;
2021
import com.orm.query.Select;
2122

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/AssistantActivity.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import android.content.Intent;
66
import android.graphics.PorterDuff;
77
import android.os.Bundle;
8-
import android.support.percent.PercentRelativeLayout;
9-
import android.support.v4.view.PagerAdapter;
10-
import android.support.v4.view.ViewPager;
118
import android.view.LayoutInflater;
129
import android.view.View;
1310
import android.view.ViewGroup;
@@ -34,6 +31,10 @@
3431

3532
import static com.orm.query.Select.from;
3633

34+
import androidx.percentlayout.widget.PercentRelativeLayout;
35+
import androidx.viewpager.widget.PagerAdapter;
36+
import androidx.viewpager.widget.ViewPager;
37+
3738
public class AssistantActivity extends Activity {
3839
private DisplayHelper dh;
3940
private ViewPager mViewPager;

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/EnchantingActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.os.Handler;
7-
import android.support.percent.PercentRelativeLayout;
87
import android.view.GestureDetector;
98
import android.view.Gravity;
109
import android.view.MotionEvent;
@@ -17,6 +16,8 @@
1716
import android.widget.TextView;
1817
import android.widget.ViewFlipper;
1918

19+
import androidx.percentlayout.widget.PercentRelativeLayout;
20+
2021
import com.orm.query.Condition;
2122
import com.orm.query.Select;
2223

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/FurnaceActivity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.Intent;
55
import android.os.Bundle;
66
import android.os.Handler;
7-
import android.support.percent.PercentRelativeLayout;
87
import android.util.Log;
98
import android.util.Pair;
109
import android.view.GestureDetector;
@@ -16,6 +15,8 @@
1615
import android.widget.TextView;
1716
import android.widget.ViewFlipper;
1817

18+
import androidx.percentlayout.widget.PercentRelativeLayout;
19+
1920
import com.orm.query.Condition;
2021
import com.orm.query.Select;
2122

Blacksmith/src/main/java/uk/co/jakelee/blacksmith/main/MainActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import android.content.SharedPreferences;
77
import android.os.Bundle;
88
import android.os.Handler;
9-
import android.support.annotation.Nullable;
10-
import android.support.v7.app.AppCompatActivity;
119
import android.util.Log;
1210
import android.view.Gravity;
1311
import android.view.View;
@@ -63,6 +61,9 @@
6361

6462
import static uk.co.jakelee.blacksmith.R.id.mainScroller;
6563

64+
import androidx.annotation.Nullable;
65+
import androidx.appcompat.app.AppCompatActivity;
66+
6667
public class MainActivity extends AppCompatActivity implements
6768
GoogleApiClient.ConnectionCallbacks,
6869
GoogleApiClient.OnConnectionFailedListener {

0 commit comments

Comments
 (0)