Skip to content

Commit f1a4fff

Browse files
AKPWebDesignAKPWebDesign
committed
fix: attempt to update libraries
1 parent fe6abae commit f1a4fff

File tree

21 files changed

+123
-173
lines changed

21 files changed

+123
-173
lines changed

‎app/build.gradle‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
apply plugin: 'com.android.application'
6-
apply plugin: 'com.google.firebase.firebase-perf'
7-
apply plugin: 'io.fabric'
86

97
androidGitVersion {
108
baseCode 1900000000
@@ -21,13 +19,14 @@ println 'VersionName: ' + VERSION_NAME
2119
println 'VersionCode: ' + VERSION_CODE
2220

2321
repositories {
24-
maven { url 'https://maven.fabric.io/public' }
25-
maven { url 'https://maven.google.com' }
22+
jcenter()
23+
google()
24+
mavenCentral()
2625
}
2726

2827
android {
29-
compileSdkVersion 26
30-
buildToolsVersion "26.0.1"
28+
namespace "tech.akpmakes.android.taskkeeper"
29+
compileSdk 33
3130
signingConfigs {
3231
debugApp {
3332
if(project.hasProperty('ANDROID_SIGNING_KEY')) {
@@ -41,13 +40,12 @@ android {
4140
defaultConfig {
4241
applicationId "tech.akpmakes.android.taskkeeper"
4342
minSdkVersion 15
44-
targetSdkVersion 26
43+
targetSdkVersion 33
4544
versionName "Debug"
4645
versionCode 1
47-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
4846
vectorDrawables.useSupportLibrary = true
4947
}
50-
applicationVariants.all { variant ->
48+
applicationVariants.configureEach { variant ->
5149
variant.resValue "string", "versionName", variant.versionName
5250
}
5351
buildTypes {
@@ -63,13 +61,15 @@ android {
6361
ext.enableCrashlytics = false
6462
}
6563
}
64+
flavorDimensions "buildType"
6665
productFlavors {
6766
dev {
68-
minSdkVersion 21
67+
dimension "buildType"
6968
applicationIdSuffix ".debug"
7069
resConfigs "en", "xxhdpi"
7170
}
7271
prod {
72+
dimension "buildType"
7373
versionName VERSION_NAME
7474
versionCode VERSION_CODE
7575
}
@@ -78,31 +78,26 @@ android {
7878
lintOptions {
7979
abortOnError false
8080
}
81+
82+
buildFeatures {
83+
buildConfig = true
84+
}
8185
}
8286

8387
dependencies {
84-
compile fileTree(include: ['*.jar'], dir: 'libs')
85-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
86-
exclude group: 'com.android.support', module: 'support-annotations'
87-
})
88-
compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
89-
transitive = true
90-
}
91-
compile 'com.android.support:appcompat-v7:26.0.1'
92-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
93-
compile 'com.google.firebase:firebase-perf:11.2.0'
94-
compile 'com.google.firebase:firebase-auth:11.2.0'
95-
compile 'com.google.firebase:firebase-database:11.2.0'
96-
compile 'com.google.firebase:firebase-messaging:11.2.0'
97-
compile 'com.google.firebase:firebase-config:11.2.0'
98-
compile 'com.firebaseui:firebase-ui-database:2.2.0'
99-
compile 'com.google.android.gms:play-services-auth:11.2.0'
100-
compile 'com.android.support:design:26.0.1'
101-
compile 'com.android.support:support-v4:26.0.1'
102-
compile 'com.android.support:support-vector-drawable:26.0.1'
103-
compile 'com.android.support:preference-v7:26.0.1'
104-
compile 'com.android.support:preference-v14:26.0.1'
105-
testCompile 'junit:junit:4.12'
88+
implementation fileTree(include: ['*.jar'], dir: 'libs')
89+
implementation 'androidx.appcompat:appcompat:1.0.0'
90+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
91+
implementation 'com.google.firebase:firebase-auth:11.2.0'
92+
implementation 'com.google.firebase:firebase-database:11.2.0'
93+
implementation 'com.google.firebase:firebase-config:11.2.0'
94+
implementation 'com.firebaseui:firebase-ui-database:2.2.0'
95+
implementation 'com.google.android.gms:play-services-auth:11.2.0'
96+
implementation 'com.google.android.material:material:1.0.0'
97+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
98+
implementation 'androidx.vectordrawable:vectordrawable:1.0.0'
99+
implementation 'androidx.preference:preference:1.0.0'
100+
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
106101
}
107102

108103
apply plugin: 'com.google.gms.google-services'

‎app/src/androidTest/java/tech/akpmakes/android/taskkeeper/ExampleInstrumentedTest.java‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
android:parentActivityName=".MainActivity" />
2828
<activity
2929
android:name=".WelcomeActivity"
30-
android:theme="@style/AppTheme.NoActionBar">
30+
android:theme="@style/AppTheme.NoActionBar"
31+
android:exported="true">
3132
<intent-filter>
3233
<action android:name="android.intent.action.MAIN" />
3334

‎app/src/main/java/tech/akpmakes/android/taskkeeper/AppCompatPreferenceActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import android.content.res.Configuration;
44
import android.os.Bundle;
55
import android.preference.PreferenceActivity;
6-
import android.support.annotation.LayoutRes;
7-
import android.support.annotation.Nullable;
8-
import android.support.v7.app.ActionBar;
9-
import android.support.v7.app.AppCompatDelegate;
10-
import android.support.v7.widget.Toolbar;
6+
import androidx.annotation.LayoutRes;
7+
import androidx.annotation.Nullable;
8+
import androidx.appcompat.app.ActionBar;
9+
import androidx.appcompat.app.AppCompatDelegate;
10+
import androidx.appcompat.widget.Toolbar;
1111
import android.view.MenuInflater;
1212
import android.view.View;
1313
import android.view.ViewGroup;

‎app/src/main/java/tech/akpmakes/android/taskkeeper/MainActivity.java‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,18 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.design.widget.Snackbar;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.DividerItemDecoration;
9-
import android.support.v7.widget.LinearLayoutManager;
10-
import android.support.v7.widget.RecyclerView;
11-
import android.support.v7.widget.helper.ItemTouchHelper;
5+
import androidx.annotation.NonNull;
6+
import com.google.android.material.snackbar.Snackbar;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.recyclerview.widget.DividerItemDecoration;
9+
import androidx.recyclerview.widget.LinearLayoutManager;
10+
import androidx.recyclerview.widget.RecyclerView;
11+
import androidx.recyclerview.widget.ItemTouchHelper;
1212
import android.util.Log;
1313
import android.view.Menu;
1414
import android.view.MenuInflater;
1515
import android.view.MenuItem;
1616

17-
import com.crashlytics.android.Crashlytics;
18-
import com.crashlytics.android.core.CrashlyticsCore;
1917
import com.firebase.ui.database.FirebaseRecyclerAdapter;
2018
import com.google.android.gms.common.GoogleApiAvailability;
2119
import com.google.android.gms.tasks.OnCompleteListener;
@@ -34,9 +32,9 @@
3432

3533
import java.util.Map;
3634

37-
import io.fabric.sdk.android.Fabric;
3835
import tech.akpmakes.android.taskkeeper.firebase.WhenAdapter;
3936
import tech.akpmakes.android.taskkeeper.models.WhenEvent;
37+
import tech.akpmakes.android.taskkeeper.BuildConfig;
4038

4139
public class MainActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener {
4240
public static final int WHEN_EVENT_REQUEST = 6900;
@@ -51,8 +49,6 @@ public class MainActivity extends AppCompatActivity implements FirebaseAuth.Auth
5149

5250
protected void onCreate(Bundle savedInstanceState) {
5351
super.onCreate(savedInstanceState);
54-
CrashlyticsCore core = new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build();
55-
Fabric.with(this, new Crashlytics.Builder().core(core).build());
5652
mAuth = FirebaseAuth.getInstance();
5753
mAuth.addAuthStateListener(this);
5854

@@ -186,16 +182,15 @@ public boolean onCreateOptionsMenu(Menu menu) {
186182

187183
@Override
188184
public boolean onOptionsItemSelected(MenuItem item) {
189-
switch (item.getItemId()) {
190-
case R.id.settings:
191-
startActivity(new Intent(this, SettingsActivity.class));
192-
return super.onOptionsItemSelected(item);
193-
case R.id.add_item:
194-
startActivityForResult(new Intent(this, TaskViewActivity.class), WHEN_EVENT_REQUEST);
195-
return super.onOptionsItemSelected(item);
196-
default:
197-
return super.onOptionsItemSelected(item);
185+
int itemId = item.getItemId();
186+
if (itemId == R.id.settings) {
187+
startActivity(new Intent(this, SettingsActivity.class));
188+
return super.onOptionsItemSelected(item);
189+
} else if (itemId == R.id.add_item) {
190+
startActivityForResult(new Intent(this, TaskViewActivity.class), WHEN_EVENT_REQUEST);
191+
return super.onOptionsItemSelected(item);
198192
}
193+
return super.onOptionsItemSelected(item);
199194
}
200195

201196
@Override

‎app/src/main/java/tech/akpmakes/android/taskkeeper/SettingsActivity.java‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,22 @@
55
import android.net.Uri;
66
import android.os.Build;
77
import android.os.Bundle;
8-
import android.preference.DialogPreference;
9-
import android.support.annotation.NonNull;
10-
import android.support.design.widget.Snackbar;
11-
import android.support.design.widget.TabLayout;
12-
import android.support.v4.app.Fragment;
13-
import android.support.v4.app.FragmentManager;
14-
import android.support.v4.app.FragmentPagerAdapter;
15-
import android.support.v4.view.ViewPager;
16-
import android.support.v7.app.ActionBar;
17-
import android.support.v7.app.AlertDialog;
18-
import android.support.v7.app.AppCompatActivity;
19-
import android.support.v7.preference.Preference;
20-
import android.support.v7.preference.PreferenceFragmentCompat;
21-
import android.support.v7.widget.Toolbar;
8+
9+
import androidx.annotation.NonNull;
10+
import com.google.android.material.snackbar.Snackbar;
11+
import com.google.android.material.tabs.TabLayout;
12+
import androidx.fragment.app.Fragment;
13+
import androidx.fragment.app.FragmentManager;
14+
import androidx.fragment.app.FragmentPagerAdapter;
15+
import androidx.fragment.app.FragmentStatePagerAdapter;
16+
import androidx.viewpager.widget.PagerAdapter;
17+
import androidx.viewpager.widget.ViewPager;
18+
import androidx.appcompat.app.ActionBar;
19+
import androidx.appcompat.app.AlertDialog;
20+
import androidx.appcompat.app.AppCompatActivity;
21+
import androidx.preference.Preference;
22+
import androidx.preference.PreferenceFragmentCompat;
23+
import androidx.appcompat.widget.Toolbar;
2224
import android.util.Log;
2325
import android.view.MenuItem;
2426

@@ -44,12 +46,12 @@
4446
public class SettingsActivity extends AppCompatActivity {
4547

4648
/**
47-
* The {@link android.support.v4.view.PagerAdapter} that will provide
49+
* The {@link PagerAdapter} that will provide
4850
* fragments for each of the sections. We use a
4951
* {@link FragmentPagerAdapter} derivative, which will keep every
5052
* loaded fragment in memory. If this becomes too memory intensive, it
5153
* may be best to switch to a
52-
* {@link android.support.v4.app.FragmentStatePagerAdapter}.
54+
* {@link FragmentStatePagerAdapter}.
5355
*/
5456
private SectionsPagerAdapter mSectionsPagerAdapter;
5557

@@ -234,20 +236,20 @@ public boolean onPreferenceClick(Preference preference) {
234236
}
235237

236238
// We only want this setting if we can support using it
237-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
238-
addPreferencesFromResource(R.xml.pref_day_of_week);
239-
final Preference dayOfWeek = findPreference("dayOfWeek_preference");
240-
updateDayOfWeek(dayOfWeek);
241-
dayOfWeek.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
242-
@Override
243-
public boolean onPreferenceClick(Preference preference) {
244-
new AlertDialog.Builder(GeneralPreferenceFragment.this.getContext())
245-
.setTitle("Test")
246-
.show();
247-
return true;
248-
}
249-
});
250-
}
239+
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
240+
// addPreferencesFromResource(R.xml.pref_day_of_week);
241+
// final Preference dayOfWeek = findPreference("dayOfWeek_preference");
242+
// updateDayOfWeek(dayOfWeek);
243+
// dayOfWeek.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
244+
// @Override
245+
// public boolean onPreferenceClick(Preference preference) {
246+
// new AlertDialog.Builder(GeneralPreferenceFragment.this.getContext())
247+
// .setTitle("Test")
248+
// .show();
249+
// return true;
250+
// }
251+
// });
252+
// }
251253

252254
String package_name = this.getActivity().getApplicationContext().getPackageName();
253255
final Uri uri = Uri.parse("market://details?id=" + (!package_name.endsWith(".debug") ? package_name : package_name.substring(0, package_name.length() - 6)));

‎app/src/main/java/tech/akpmakes/android/taskkeeper/SwipeHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import android.graphics.drawable.ColorDrawable;
55
import android.graphics.drawable.Drawable;
66
import android.os.Handler;
7-
import android.support.design.widget.Snackbar;
8-
import android.support.v4.content.ContextCompat;
9-
import android.support.v7.widget.RecyclerView;
10-
import android.support.v7.widget.helper.ItemTouchHelper;
7+
import com.google.android.material.snackbar.Snackbar;
8+
import androidx.core.content.ContextCompat;
9+
import androidx.recyclerview.widget.RecyclerView;
10+
import androidx.recyclerview.widget.ItemTouchHelper;
1111
import android.view.View;
1212

1313
import com.google.firebase.database.DatabaseReference;

‎app/src/main/java/tech/akpmakes/android/taskkeeper/TaskViewActivity.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import android.os.Bundle;
99
import android.os.Handler;
1010
import android.os.SystemClock;
11-
import android.support.v7.app.AppCompatActivity;
11+
import androidx.appcompat.app.AppCompatActivity;
1212
import android.view.Menu;
1313
import android.view.MenuInflater;
1414
import android.view.MenuItem;
@@ -143,12 +143,10 @@ public boolean onCreateOptionsMenu(Menu menu) {
143143

144144
@Override
145145
public boolean onOptionsItemSelected(MenuItem item) {
146-
switch (item.getItemId()) {
147-
case R.id.save_task:
148-
saveTask();
149-
default:
150-
return super.onOptionsItemSelected(item);
146+
if (item.getItemId() == R.id.save_task) {
147+
saveTask();
151148
}
149+
return super.onOptionsItemSelected(item);
152150
}
153151

154152

‎app/src/main/java/tech/akpmakes/android/taskkeeper/WelcomeActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import android.content.Intent;
55
import android.graphics.Color;
66
import android.os.Build;
7-
import android.support.v4.view.PagerAdapter;
8-
import android.support.v4.view.ViewPager;
9-
import android.support.v7.app.AppCompatActivity;
7+
import androidx.viewpager.widget.PagerAdapter;
8+
import androidx.viewpager.widget.ViewPager;
9+
import androidx.appcompat.app.AppCompatActivity;
1010
import android.os.Bundle;
11-
import android.support.v7.widget.LinearLayoutCompat;
11+
import androidx.appcompat.widget.LinearLayoutCompat;
1212
import android.text.Html;
1313
import android.view.LayoutInflater;
1414
import android.view.View;

‎app/src/main/java/tech/akpmakes/android/taskkeeper/WhenApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.app.Application;
44
import android.provider.Settings;
5-
import android.support.v7.app.AppCompatDelegate;
5+
import androidx.appcompat.app.AppCompatDelegate;
66

77
import com.google.firebase.database.FirebaseDatabase;
88

0 commit comments

Comments
 (0)