Skip to content

Commit 8e5bf3f

Browse files
authored
Merge pull request #2 from hearsilent/AndroidX
Migration to AndroidX
2 parents 3f1c9af + ba098ca commit 8e5bf3f

33 files changed

+551
-136
lines changed

.gitignore

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,19 @@
1111
# generated files
1212
bin/
1313
gen/
14+
out/
15+
16+
# Gradle files
17+
.gradle/
18+
build/
19+
release/
1420

1521
# Local configuration file (sdk path, etc)
1622
local.properties
1723

24+
# Proguard folder generated by Eclipse
25+
proguard/
26+
1827
# Windows thumbnail db
1928
Thumbs.db
2029

@@ -25,9 +34,39 @@ Thumbs.db
2534
.classpath
2635
.project
2736

28-
# Android Studio
37+
# Log Files
38+
*.log
39+
40+
# Android Studio Navigation editor temp files
41+
.navigation/
42+
43+
# Android Studio captures folder
44+
captures/
45+
46+
# IntelliJ
2947
*.iml
30-
.idea
31-
#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
32-
.gradle
33-
build/
48+
*/.idea/*
49+
/.idea/*
50+
!/.idea/codeStyles/
51+
52+
# Keystore files
53+
# Uncomment the following line if you do not want to check your keystore files in.
54+
#*.jks
55+
56+
# External native build folder generated in Android Studio 2.2 and later
57+
.externalNativeBuild
58+
59+
# Google Services (e.g. APIs or Firebase)
60+
#google-services.json
61+
62+
# Freeline
63+
freeline.py
64+
freeline/
65+
freeline_project_description.json
66+
67+
# fastlane
68+
fastlane/report.xml
69+
fastlane/Preview.html
70+
fastlane/screenshots
71+
fastlane/test_output
72+
fastlane/readme.md

.idea/codeStyles/Project.xml

Lines changed: 199 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ You can change your view into container view.
3838

3939
## Compatibility
4040

41-
Android GINGERBREAD 2.3+
41+
Android ICE CREAM SANDWICH 4.0+
4242

4343
## Known issues
4444
- [x] ~~Android Support Library 24.2.0 doesn't work successful ( You can downgrade to 24.1.1 ) : http://goo.gl/FMWs37~~
4545

4646
## Let me know!
4747

48-
I'd be really happy if you sent me links to your projects where you use my component. Just send an email to [email protected] And do let me know if you have any questions or suggestion regarding the example.
48+
I'd be really happy if you sent me links to your projects where you use my component. Just send an email to hear.silent1995+github@gmail.com And do let me know if you have any questions or suggestion regarding the example.
4949

5050
## License
5151

app/build.gradle

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.2"
4+
compileSdkVersion 30
65

76
defaultConfig {
87
applicationId "hearsilent.universalcollapsingtoolbarlayouttablayoutexample"
9-
minSdkVersion 9
10-
targetSdkVersion 24
11-
versionCode 101
12-
versionName "1.0.1"
8+
minSdkVersion 14
9+
targetSdkVersion 30
10+
versionCode 110
11+
versionName "1.1.0"
1312
}
1413
buildTypes {
1514
release {
@@ -20,12 +19,11 @@ android {
2019
}
2120

2221
dependencies {
23-
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
testCompile 'junit:junit:4.12'
25-
compile 'com.android.support:appcompat-v7:24.2.0'
26-
compile 'com.android.support:recyclerview-v7:24.2.0'
27-
compile 'com.android.support:design:24.2.0'
28-
compile 'com.flaviofaria:kenburnsview:1.0.7'
29-
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
30-
compile 'com.nineoldandroids:library:2.4.0'
22+
implementation fileTree(include: ['*.jar'], dir: 'libs')
23+
implementation 'androidx.appcompat:appcompat:1.2.0'
24+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
25+
implementation 'com.google.android.material:material:1.2.1'
26+
implementation 'com.flaviofaria:kenburnsview:1.0.7'
27+
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
28+
testImplementation 'junit:junit:4.13'
3129
}

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="hearsilent.universalcollapsingtoolbarlayouttablayoutexample"
3-
xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="hearsilent.universalcollapsingtoolbarlayouttablayoutexample">
44

55
<uses-permission android:name="android.permission.INTERNET"/>
66

77
<application
88
android:name=".base.BaseApplication"
9-
android:allowBackup="true"
9+
android:allowBackup="false"
1010
android:icon="@mipmap/ic_launcher"
1111
android:label="@string/app_name"
12+
android:roundIcon="@mipmap/ic_launcher_round"
1213
android:supportsRtl="true"
1314
android:theme="@style/AppTheme">
1415
<activity android:name=".MainActivity">
26.9 KB
Loading

0 commit comments

Comments
 (0)