Skip to content

Commit 46e870d

Browse files
simonebortolinsimonebortolin
authored
Merge pull request #9 from elshaborymohammed/master
Migrate to AndroidX
2 parents 8c36ad4 + 492824c commit 46e870d

14 files changed

Lines changed: 50 additions & 67 deletions

File tree

‎FlowLayoutManager.zip‎

660 KB
Binary file not shown.

‎app/build.gradle‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion androidCompileSdkVersion
5-
65
defaultConfig {
76
applicationId "com.xiaofeng.androidlibs"
87
minSdkVersion androidMinSdkVersion
@@ -18,25 +17,18 @@ android {
1817
}
1918
}
2019
compileOptions {
21-
sourceCompatibility JavaVersion.VERSION_1_7
22-
targetCompatibility JavaVersion.VERSION_1_7
20+
sourceCompatibility JavaVersion.VERSION_1_8
21+
targetCompatibility JavaVersion.VERSION_1_8
2322
}
24-
buildToolsVersion '27.0.3'
2523
}
2624

2725
dependencies {
28-
implementation 'com.android.support:design:27.1.1'
29-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
30-
implementation 'com.android.support:support-vector-drawable:27.1.1'
31-
implementation fileTree(include: ['*.jar'], dir: 'libs')
32-
testImplementation 'junit:junit:4.12'
33-
implementation(group: 'com.android.support', name: 'design', version: supportLibVersion)
34-
implementation(group: 'com.android.support', name: 'appcompat-v7', version: supportLibVersion)
35-
implementation(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
36-
implementation(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
37-
3826
implementation project(":flowlayoutmanager")
3927

40-
implementation 'us.feras.mdv:markdownview:1.1.0'
41-
implementation 'com.android.support:support-v4:27.1.1'
28+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
29+
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
30+
implementation(group: 'com.google.android.material', name: 'material', version: supportLibVersion)
31+
implementation(group: 'androidx.appcompat', name: 'appcompat', version: supportLibVersion)
32+
implementation(group: 'androidx.recyclerview', name: 'recyclerview', version: supportLibVersion)
33+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
4234
}

‎app/src/main/java/com/xiaofeng/androidlibs/DemoAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.xiaofeng.androidlibs;
22

3-
import android.support.annotation.NonNull;
4-
import android.support.v7.widget.RecyclerView;
3+
import androidx.annotation.NonNull;
4+
import androidx.recyclerview.widget.RecyclerView;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

‎app/src/main/java/com/xiaofeng/androidlibs/DemoViewHolder.java‎

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

3-
import android.support.v7.widget.RecyclerView;
3+
import androidx.recyclerview.widget.RecyclerView;
44
import android.view.View;
55
import android.widget.TextView;
66

‎app/src/main/java/com/xiaofeng/androidlibs/MainActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,26 @@
22

33
import android.graphics.Rect;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.design.widget.BottomNavigationView;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.RecyclerView;
95
import android.view.MenuItem;
106
import android.view.View;
117

8+
import androidx.annotation.NonNull;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.recyclerview.widget.RecyclerView;
11+
12+
import com.google.android.material.bottomnavigation.BottomNavigationView;
1213
import com.xiaofeng.flowlayoutmanager.Alignment;
1314
import com.xiaofeng.flowlayoutmanager.FlowLayoutManager;
1415

16+
import java.util.Objects;
17+
1518
public class MainActivity extends AppCompatActivity {
1619

1720
RecyclerView recyclerView;
1821
FlowLayoutManager flowLayoutManager;
1922
RecyclerView.ItemDecoration itemDecoration = new RecyclerView.ItemDecoration() {
2023
@Override
21-
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
24+
public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
2225
super.getItemOffsets(outRect, view, parent, state);
2326
outRect.set(5, 5, 5, 5);
2427
}
@@ -35,7 +38,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
3538
flowLayoutManager.setAutoMeasureEnabled(true);
3639

3740
recyclerView.setLayoutManager(flowLayoutManager);
38-
recyclerView.getAdapter().notifyDataSetChanged();
41+
Objects.requireNonNull(recyclerView.getAdapter()).notifyDataSetChanged();
3942

4043
return true;
4144
case R.id.navigation_center:
@@ -66,7 +69,6 @@ protected void onCreate(Bundle savedInstanceState) {
6669

6770
BottomNavigationView navigation = findViewById(R.id.navigation);
6871
navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
69-
7072
recyclerView = findViewById(R.id.list);
7173
flowLayoutManager = new FlowLayoutManager().setAlignment(Alignment.LEFT);
7274
flowLayoutManager.setAutoMeasureEnabled(true);
@@ -75,7 +77,5 @@ protected void onCreate(Bundle savedInstanceState) {
7577
recyclerView.getAdapter().notifyDataSetChanged();
7678
recyclerView.addItemDecoration(itemDecoration);
7779

78-
7980
}
80-
8181
}

‎app/src/main/res/layout/main_activity.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/container"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
88
tools:context="com.xiaofeng.androidlibs.MainActivity">
99

10-
<android.support.v7.widget.RecyclerView
10+
<androidx.recyclerview.widget.RecyclerView
1111
android:id="@+id/list"
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
2121
android:scrollbarStyle="outsideOverlay"
2222
android:scrollbars="vertical" />
2323

24-
<android.support.design.widget.BottomNavigationView
24+
<com.google.android.material.bottomnavigation.BottomNavigationView
2525
android:id="@+id/navigation"
2626
android:layout_width="0dp"
2727
android:layout_height="wrap_content"
@@ -33,4 +33,4 @@
3333
app:layout_constraintRight_toRightOf="parent"
3434
app:menu="@menu/navigation" />
3535

36-
</android.support.constraint.ConstraintLayout>
36+
</androidx.constraintlayout.widget.ConstraintLayout>

‎build.gradle‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.3'
10-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
11-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
12-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
13-
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
9+
classpath 'com.android.tools.build:gradle:4.0.0-beta04'
10+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
11+
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
1412
// NOTE: Do not place your application dependencies here; they belong
1513
// in the individual module build.gradle files
1614
}
@@ -24,12 +22,10 @@ allprojects {
2422
}
2523

2624
subprojects {
27-
ext.supportLibVersion = "26.1.0"
28-
ext.playServiceVersion = "8.4.0"
29-
ext.androidBuildToolVersion = "26.0.2"
30-
ext.androidCompileSdkVersion = 26
31-
ext.androidMinSdkVersion = 16
32-
ext.androidTargetSdkVersion = 26
25+
ext.supportLibVersion = '1.0.0'
26+
ext.androidCompileSdkVersion = 28
27+
ext.androidMinSdkVersion = 21
28+
ext.androidTargetSdkVersion = 28
3329
}
3430

3531
task clean(type: Delete) {

‎flowlayoutmanager/build.gradle‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ apply plugin: 'com.android.library'
44
apply plugin: 'com.jfrog.bintray'
55

66
project.ext {
7-
libVersion = '1.6'
8-
libVersionCode = 16
7+
libVersion = '0.1'
8+
libVersionCode = 1
99
libGroupId = 'com.xiaofeng.android'
1010
libArtifactId = 'flowlayoutmanager'
1111
gitUrl = 'git@github.com:xiaofeng-han/AndroidLibs.git'
@@ -21,13 +21,12 @@ version = libVersion
2121

2222
android {
2323
compileSdkVersion androidCompileSdkVersion
24-
resourcePrefix "xiaofeng__"
2524
defaultConfig {
2625
minSdkVersion androidMinSdkVersion
2726
targetSdkVersion androidTargetSdkVersion
2827
versionCode libVersionCode
2928
versionName libVersion
30-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
3130
}
3231
testOptions {
3332
unitTests.returnDefaultValues = false
@@ -39,20 +38,14 @@ android {
3938
}
4039
}
4140
compileOptions {
42-
sourceCompatibility JavaVersion.VERSION_1_7
43-
targetCompatibility JavaVersion.VERSION_1_7
41+
sourceCompatibility JavaVersion.VERSION_1_8
42+
targetCompatibility JavaVersion.VERSION_1_8
4443
}
45-
buildToolsVersion '27.0.3'
4644
}
4745

4846
dependencies {
49-
implementation fileTree(include: ['*.jar'], dir: 'libs')
50-
androidTestImplementation 'junit:junit:4.12'
51-
implementation(group: 'com.android.support', name: 'appcompat-v7', version: supportLibVersion)
52-
implementation(group: 'com.android.support', name: 'recyclerview-v7', version: supportLibVersion)
53-
androidTestImplementation 'com.android.support:support-annotations:27.1.1'
54-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
55-
47+
implementation(group: 'androidx.appcompat', name: 'appcompat', version: supportLibVersion)
48+
implementation(group: 'androidx.recyclerview', name: 'recyclerview', version: supportLibVersion)
5649
}
5750

5851
Properties properties = new Properties()

‎flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/FlowLayoutManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.graphics.Point;
44
import android.graphics.PointF;
55
import android.graphics.Rect;
6-
import android.support.annotation.Nullable;
7-
import android.support.v7.widget.LinearSmoothScroller;
8-
import android.support.v7.widget.RecyclerView;
6+
import androidx.annotation.Nullable;
7+
import androidx.recyclerview.widget.LinearSmoothScroller;
8+
import androidx.recyclerview.widget.RecyclerView;
99
import android.view.View;
1010
import android.view.ViewGroup;
1111
import android.view.ViewTreeObserver;

‎flowlayoutmanager/src/main/java/com/xiaofeng/flowlayoutmanager/LayoutHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.xiaofeng.flowlayoutmanager;
22

33
import android.graphics.Point;
4-
import android.support.v7.widget.RecyclerView;
4+
import androidx.recyclerview.widget.RecyclerView;
55

66
/**
77
* Created by xhan on 4/11/16.

0 commit comments

Comments
 (0)