Skip to content

Commit 7d63805

Browse files
fennifithfennifith
committed
migrate to AndroidX, upgrade Aesthetic lib
1 parent 654ddaa commit 7d63805

File tree

61 files changed

+151
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+151
-147
lines changed

‎app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
targetSdkVersion 28
1010
versionCode 3
1111
versionName "0.3"
12-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
vectorDrawables.useSupportLibrary = true
1414
}
1515
buildTypes {
@@ -26,12 +26,12 @@ android {
2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
testImplementation 'junit:junit:4.12'
29-
implementation 'com.android.support:support-v4:28.0.0-rc01'
30-
implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
31-
implementation 'com.android.support:design:28.0.0-rc01'
32-
implementation 'com.android.support:gridlayout-v7:28.0.0-rc01'
33-
implementation 'com.android.support:cardview-v7:28.0.0-rc01'
34-
implementation 'com.afollestad:aesthetic:0.5.3'
29+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
30+
implementation 'androidx.appcompat:appcompat:1.0.0'
31+
implementation 'com.google.android.material:material:1.0.0'
32+
implementation 'androidx.gridlayout:gridlayout:1.0.0'
33+
implementation 'androidx.cardview:cardview:1.0.0'
34+
implementation 'com.afollestad:aesthetic:0.7.2'
3535
implementation 'me.jahirfiquitiva:FABsMenu:1.1.4'
3636
implementation 'com.luckycatlabs:SunriseSunsetCalculator:1.2'
3737
implementation 'com.google.android.exoplayer:exoplayer-core:2.8.2'

‎app/src/main/java/james/alarmio/Alarmio.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import android.net.Uri;
1313
import android.os.Build;
1414
import android.preference.PreferenceManager;
15-
import android.support.v4.app.FragmentManager;
16-
import android.support.v4.content.ContextCompat;
1715
import android.widget.Toast;
1816

1917
import com.afollestad.aesthetic.Aesthetic;
@@ -39,6 +37,8 @@
3937
import java.util.List;
4038
import java.util.TimeZone;
4139

40+
import androidx.core.content.ContextCompat;
41+
import androidx.fragment.app.FragmentManager;
4242
import io.reactivex.annotations.Nullable;
4343
import james.alarmio.data.AlarmData;
4444
import james.alarmio.data.PreferenceData;

‎app/src/main/java/james/alarmio/activities/AlarmActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
import android.os.PowerManager;
1111
import android.os.VibrationEffect;
1212
import android.os.Vibrator;
13-
import android.support.annotation.Nullable;
14-
import android.support.design.widget.FloatingActionButton;
15-
import android.support.v7.app.AlertDialog;
1613
import android.view.HapticFeedbackConstants;
1714
import android.view.MotionEvent;
1815
import android.view.View;
@@ -23,10 +20,13 @@
2320

2421
import com.afollestad.aesthetic.Aesthetic;
2522
import com.afollestad.aesthetic.AestheticActivity;
23+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
2624

2725
import java.util.Date;
2826
import java.util.concurrent.TimeUnit;
2927

28+
import androidx.annotation.Nullable;
29+
import androidx.appcompat.app.AlertDialog;
3030
import io.reactivex.disposables.Disposable;
3131
import io.reactivex.functions.Consumer;
3232
import james.alarmio.Alarmio;

‎app/src/main/java/james/alarmio/activities/FileChooserActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import android.database.Cursor;
77
import android.os.Bundle;
88
import android.provider.MediaStore;
9-
import android.support.annotation.NonNull;
10-
import android.support.annotation.Nullable;
11-
import android.support.v4.app.ActivityCompat;
12-
import android.support.v4.content.ContextCompat;
13-
import android.support.v7.app.AppCompatActivity;
149

10+
import androidx.annotation.NonNull;
11+
import androidx.annotation.Nullable;
12+
import androidx.appcompat.app.AppCompatActivity;
13+
import androidx.core.app.ActivityCompat;
14+
import androidx.core.content.ContextCompat;
1515
import james.alarmio.data.PreferenceData;
1616

1717
public class FileChooserActivity extends AppCompatActivity {

‎app/src/main/java/james/alarmio/activities/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v4.app.ActivityCompat;
6-
import android.support.v4.app.FragmentManager;
7-
import android.support.v4.app.FragmentTransaction;
85

96
import com.afollestad.aesthetic.AestheticActivity;
107

8+
import androidx.core.app.ActivityCompat;
9+
import androidx.fragment.app.FragmentManager;
10+
import androidx.fragment.app.FragmentTransaction;
1111
import james.alarmio.Alarmio;
1212
import james.alarmio.R;
1313
import james.alarmio.fragments.BaseFragment;

‎app/src/main/java/james/alarmio/adapters/AlarmsAdapter.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@
99
import android.content.SharedPreferences;
1010
import android.graphics.Color;
1111
import android.os.Handler;
12-
import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
13-
import android.support.transition.AutoTransition;
14-
import android.support.transition.Transition;
15-
import android.support.transition.TransitionManager;
16-
import android.support.v4.app.FragmentManager;
17-
import android.support.v4.view.ViewCompat;
18-
import android.support.v7.widget.AppCompatCheckBox;
19-
import android.support.v7.widget.RecyclerView;
20-
import android.support.v7.widget.SwitchCompat;
2112
import android.text.Editable;
2213
import android.text.TextWatcher;
2314
import android.view.HapticFeedbackConstants;
@@ -34,6 +25,15 @@
3425
import java.util.Calendar;
3526
import java.util.List;
3627

28+
import androidx.appcompat.widget.AppCompatCheckBox;
29+
import androidx.appcompat.widget.SwitchCompat;
30+
import androidx.core.view.ViewCompat;
31+
import androidx.fragment.app.FragmentManager;
32+
import androidx.recyclerview.widget.RecyclerView;
33+
import androidx.transition.AutoTransition;
34+
import androidx.transition.Transition;
35+
import androidx.transition.TransitionManager;
36+
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
3737
import io.reactivex.functions.Consumer;
3838
import james.alarmio.Alarmio;
3939
import james.alarmio.R;

‎app/src/main/java/james/alarmio/adapters/PreferenceAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package james.alarmio.adapters;
22

3-
import android.support.v7.widget.RecyclerView;
43
import android.view.LayoutInflater;
54
import android.view.ViewGroup;
65

76
import java.util.List;
87

8+
import androidx.recyclerview.widget.RecyclerView;
99
import james.alarmio.data.preference.BasePreferenceData;
1010

1111
public class PreferenceAdapter extends RecyclerView.Adapter<BasePreferenceData.ViewHolder> {

‎app/src/main/java/james/alarmio/adapters/SimplePagerAdapter.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package james.alarmio.adapters;
22

3-
import android.support.v4.app.FragmentManager;
4-
import android.support.v4.app.FragmentStatePagerAdapter;
5-
3+
import androidx.fragment.app.FragmentManager;
4+
import androidx.fragment.app.FragmentStatePagerAdapter;
65
import james.alarmio.fragments.BasePagerFragment;
76

87
public class SimplePagerAdapter extends FragmentStatePagerAdapter {

‎app/src/main/java/james/alarmio/adapters/SoundsAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import android.animation.ArgbEvaluator;
44
import android.animation.ValueAnimator;
55
import android.graphics.Color;
6-
import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
7-
import android.support.v7.widget.RecyclerView;
86
import android.view.LayoutInflater;
97
import android.view.View;
108
import android.view.ViewGroup;
@@ -15,6 +13,8 @@
1513

1614
import java.util.List;
1715

16+
import androidx.recyclerview.widget.RecyclerView;
17+
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
1818
import io.reactivex.functions.Consumer;
1919
import james.alarmio.Alarmio;
2020
import james.alarmio.R;

‎app/src/main/java/james/alarmio/adapters/TimeZonesAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package james.alarmio.adapters;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.v7.widget.RecyclerView;
53
import android.view.LayoutInflater;
64
import android.view.View;
75
import android.view.ViewGroup;
@@ -12,6 +10,8 @@
1210
import java.util.TimeZone;
1311
import java.util.concurrent.TimeUnit;
1412

13+
import androidx.annotation.NonNull;
14+
import androidx.recyclerview.widget.RecyclerView;
1515
import james.alarmio.R;
1616

1717
public class TimeZonesAdapter extends RecyclerView.Adapter<TimeZonesAdapter.ViewHolder> {

0 commit comments

Comments
 (0)