Skip to content

Commit 98a8c68

Browse files
Migrate to AndroidX
- Migrate to AndroidX - Fix code style indents
1 parent 093265f commit 98a8c68

24 files changed

+168
-158
lines changed

demo/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ dependencies {
2626
implementation project(':library')
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

29-
implementation 'com.android.support:appcompat-v7:23.1.1'
30-
implementation 'com.android.support:design:23.1.1'
31-
implementation 'com.android.support:recyclerview-v7:23.1.1'
32-
implementation 'com.android.support:percent:23.1.1'
29+
implementation 'androidx.appcompat:appcompat:1.5.1'
30+
implementation 'com.google.android.material:material:1.6.1'
31+
implementation 'androidx.recyclerview:recyclerview:1.2.1'
32+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3333

3434
implementation "com.jakewharton.timber:timber:4.7.1"
3535
testImplementation 'junit:junit:4.13.2'

demo/src/main/java/com/yalantis/starwarsdemo/App.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import android.app.Application;
44
import android.content.Context;
5+
56
import timber.log.Timber;
67

78
/**
89
* Created by Artem Kholodnyi on 11/2/15.
910
*/
10-
public class App extends Application{
11+
public class App extends Application {
1112
private static App app;
1213

1314
@Override

demo/src/main/java/com/yalantis/starwarsdemo/adapter/ProfileAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.yalantis.starwarsdemo.adapter;
22

33
import android.content.Context;
4-
import android.support.annotation.Nullable;
5-
import android.support.v7.widget.RecyclerView;
64
import android.view.LayoutInflater;
75
import android.view.ViewGroup;
86
import android.widget.CompoundButton;
97
import android.widget.TextView;
108

9+
import androidx.annotation.Nullable;
10+
import androidx.recyclerview.widget.RecyclerView;
1111
import androidx.viewbinding.ViewBinding;
1212

1313
import com.yalantis.starwarsdemo.R;

demo/src/main/java/com/yalantis/starwarsdemo/interfaces/ProfileAdapterListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.yalantis.starwarsdemo.interfaces;
22

3-
import android.support.v7.widget.SwitchCompat;
3+
import androidx.appcompat.widget.SwitchCompat;
44

55
/**
66
* Created by Artem Kholodnyi on 11/17/15.

demo/src/main/java/com/yalantis/starwarsdemo/model/User.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.yalantis.starwarsdemo.model;
22

3-
import android.support.annotation.DrawableRes;
4-
import android.support.annotation.StringRes;
3+
import androidx.annotation.DrawableRes;
4+
import androidx.annotation.StringRes;
55

66
import com.yalantis.starwarsdemo.R;
77

@@ -21,7 +21,8 @@ public User(boolean darkSide, String fullName, String homeworld, String birthday
2121
mBirthday = birthday;
2222
}
2323

24-
public @DrawableRes int getPhotoRes() {
24+
public @DrawableRes
25+
int getPhotoRes() {
2526
return mDarkSide ? R.drawable.darth : R.drawable.anakin;
2627
}
2728

@@ -41,7 +42,8 @@ public String getBirthday() {
4142
return mBirthday;
4243
}
4344

44-
public @StringRes int getSideText() {
45+
public @StringRes
46+
int getSideText() {
4547
return isDarkSide() ? R.string.dark_side_label : R.string.light_side_label;
4648
}
4749
}

demo/src/main/java/com/yalantis/starwarsdemo/view/DemoActivity.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
import android.opengl.GLSurfaceView;
77
import android.os.Bundle;
88
import android.os.Handler;
9-
import android.support.annotation.Nullable;
10-
import android.support.v4.app.Fragment;
11-
import android.support.v4.app.FragmentTransaction;
12-
import android.support.v7.app.AppCompatActivity;
9+
10+
import androidx.annotation.Nullable;
11+
import androidx.appcompat.app.AppCompatActivity;
12+
import androidx.fragment.app.Fragment;
13+
import androidx.fragment.app.FragmentTransaction;
1314

1415
import com.yalantis.starwarsdemo.R;
1516
import com.yalantis.starwarsdemo.databinding.ActivityDemoBinding;

demo/src/main/java/com/yalantis/starwarsdemo/view/GreetingsFragment.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.yalantis.starwarsdemo.view;
22

33
import android.os.Bundle;
4-
import android.support.annotation.Nullable;
5-
import android.support.v4.app.Fragment;
64
import android.view.LayoutInflater;
75
import android.view.View;
86
import android.view.ViewGroup;
97

8+
import androidx.annotation.Nullable;
9+
import androidx.fragment.app.Fragment;
10+
1011
import com.yalantis.starwarsdemo.R;
1112
import com.yalantis.starwarsdemo.databinding.FragmentGreetingsBinding;
1213
import com.yalantis.starwarsdemo.interfaces.GreetingFragmentInterface;
@@ -33,7 +34,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
3334
@Nullable
3435
@Override
3536
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
36-
binding = FragmentGreetingsBinding.inflate(getLayoutInflater(savedInstanceState), container, false);
37+
binding = FragmentGreetingsBinding.inflate(onGetLayoutInflater(savedInstanceState), container, false);
3738
return binding.getRoot();
3839
}
3940

demo/src/main/java/com/yalantis/starwarsdemo/view/SideFragment.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66
import android.graphics.Rect;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.StyleRes;
10-
import android.support.v4.app.Fragment;
11-
import android.support.v7.view.ContextThemeWrapper;
12-
import android.support.v7.widget.LinearLayoutManager;
13-
import android.support.v7.widget.SwitchCompat;
14-
import android.support.v7.widget.Toolbar;
159
import android.view.LayoutInflater;
1610
import android.view.View;
1711
import android.view.ViewAnimationUtils;
1812
import android.view.ViewGroup;
1913
import android.view.animation.AccelerateInterpolator;
2014

15+
import androidx.annotation.NonNull;
16+
import androidx.annotation.StyleRes;
17+
import androidx.appcompat.view.ContextThemeWrapper;
18+
import androidx.appcompat.widget.SwitchCompat;
19+
import androidx.appcompat.widget.Toolbar;
20+
import androidx.fragment.app.Fragment;
21+
import androidx.recyclerview.widget.LinearLayoutManager;
22+
2123
import com.yalantis.starwars.interfaces.TilesFrameLayoutListener;
2224
import com.yalantis.starwarsdemo.R;
2325
import com.yalantis.starwarsdemo.adapter.ProfileAdapter;
@@ -124,8 +126,8 @@ private void removeOldSideFragment() {
124126
}
125127

126128
@Override
127-
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
128-
binding = FragmentSideBinding.inflate(getLayoutInflater(savedInstanceState).cloneInContext(new ContextThemeWrapper(getContext(), getTheme())), container, false);
129+
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
130+
binding = FragmentSideBinding.inflate(onGetLayoutInflater(savedInstanceState).cloneInContext(new ContextThemeWrapper(getContext(), getTheme())), container, false);
129131

130132
final Bundle args = getArguments();
131133
if (args != null) {

demo/src/main/java/com/yalantis/starwarsdemo/widget/BackgroundDrawableSwitchCompat.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
package com.yalantis.starwarsdemo.widget;
22

3+
import static android.graphics.PixelFormat.UNKNOWN;
4+
35
import android.animation.ValueAnimator;
46
import android.content.Context;
57
import android.graphics.Canvas;
68
import android.graphics.ColorFilter;
79
import android.graphics.Rect;
810
import android.graphics.drawable.Drawable;
911
import android.graphics.drawable.LevelListDrawable;
10-
import android.support.annotation.IntRange;
11-
import android.support.v4.content.ContextCompat;
12-
import android.support.v7.widget.SwitchCompat;
1312
import android.util.AttributeSet;
1413
import android.view.animation.Animation;
1514
import android.view.animation.LinearInterpolator;
1615

16+
import androidx.annotation.IntRange;
17+
import androidx.appcompat.widget.SwitchCompat;
18+
import androidx.core.content.ContextCompat;
19+
1720
import com.yalantis.starwarsdemo.R;
1821

1922
/**
@@ -103,7 +106,7 @@ public void setColorFilter(ColorFilter colorFilter) {
103106

104107
@Override
105108
public int getOpacity() {
106-
return 0;
109+
return UNKNOWN;
107110
}
108111

109112
private void setBlend(@IntRange(from = TRANSPARENT, to = OPAQUE) int k) {

demo/src/main/java/com/yalantis/starwarsdemo/widget/CenterTopImageView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private void init() {
3333
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
3434
super.onLayout(changed, left, top, right, bottom);
3535
if (getDrawable() != null) {
36-
float k = (right - left) / (float)getDrawable().getIntrinsicWidth();
36+
float k = (right - left) / (float) getDrawable().getIntrinsicWidth();
3737
matrix.setScale(k, k);
3838
setImageMatrix(matrix);
3939
}

0 commit comments

Comments
 (0)