Skip to content

Commit

Permalink
Merge pull request #5 from hearsilent/AndroidX
Browse files Browse the repository at this point in the history
Migrate to AndroidX
  • Loading branch information
hearsilent authored Oct 28, 2020
2 parents 1ae8bc0 + 51f099e commit e0cd680
Show file tree
Hide file tree
Showing 17 changed files with 321 additions and 77 deletions.
49 changes: 44 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,19 @@
# generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/
release/

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

# Proguard folder generated by Eclipse
proguard/

# Windows thumbnail db
Thumbs.db

Expand All @@ -25,9 +34,39 @@ Thumbs.db
.classpath
.project

# Android Studio
# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea
#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
.gradle
build/
*/.idea/*
/.idea/*
!/.idea/codeStyles/

# Keystore files
# Uncomment the following line if you do not want to check your keystore files in.
#*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Google Services (e.g. APIs or Firebase)
#google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
199 changes: 199 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Avatars from [maximedegreve/TinyFaces](https://github.com/maximedegreve/TinyFace

## Let me know!

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.
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.

## License

Expand Down
31 changes: 15 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion "27.0.3"
compileSdkVersion 30
defaultConfig {
applicationId "hearsilent.amazingavatar"
minSdkVersion 17
targetSdkVersion 27
versionCode 107
versionName "1.0.7"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
targetSdkVersion 30
versionCode 110
versionName "1.1.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
buildTypes {
release {
Expand All @@ -21,16 +20,16 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:recyclerview-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
implementation 'com.github.bumptech.glide:glide:4.7.1'
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
testImplementation 'junit:junit:4.12'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.squareup.okhttp3:okhttp:4.8.1'
implementation 'com.github.bumptech.glide:glide:4.11.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
testImplementation 'junit:junit:4.13'
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package hearsilent.amazingavatar;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="hearsilent.amazingavatar"
xmlns:android="http://schemas.android.com/apk/res/android">
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="hearsilent.amazingavatar">

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

Expand Down
Loading

0 comments on commit e0cd680

Please sign in to comment.