diff --git a/ActivityExamples/.idea/codeStyles/Project.xml b/ActivityExamples/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/ActivityExamples/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ActivityExamples/.idea/gradle.xml b/ActivityExamples/.idea/gradle.xml index 7ac24c7..2996d53 100644 --- a/ActivityExamples/.idea/gradle.xml +++ b/ActivityExamples/.idea/gradle.xml @@ -3,14 +3,11 @@ diff --git a/ActivityExamples/.idea/inspectionProfiles/Project_Default.xml b/ActivityExamples/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 44ddf1a..0000000 --- a/ActivityExamples/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/ActivityExamples/.idea/inspectionProfiles/profiles_settings.xml b/ActivityExamples/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/ActivityExamples/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/ActivityExamples/.idea/misc.xml b/ActivityExamples/.idea/misc.xml index ba7052b..af0bbdd 100644 --- a/ActivityExamples/.idea/misc.xml +++ b/ActivityExamples/.idea/misc.xml @@ -1,30 +1,11 @@ - - - + + + + - + diff --git a/ActivityExamples/app/build.gradle b/ActivityExamples/app/build.gradle index 4875273..c001eb0 100644 --- a/ActivityExamples/app/build.gradle +++ b/ActivityExamples/app/build.gradle @@ -16,12 +16,11 @@ repositories { android { - compileSdkVersion 25 - buildToolsVersion "25.0.0" + compileSdkVersion 28 defaultConfig { applicationId "com.example.mahesha.activityexamples" minSdkVersion 18 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 2 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -60,33 +59,38 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - compile('com.crashlytics.sdk.android:crashlytics:2.6.7@aar') { - transitive = true; - } - compile 'com.android.support:appcompat-v7:25.0.1' - compile 'com.google.android.gms:play-services-maps:9.2.1' - compile 'com.android.support:support-v4:25.0.1' - compile 'com.android.support:design:25.0.1' - compile 'com.weiwangcn.betterspinner:library-material:1.1.0' - compile 'com.google.android.gms:play-services-auth:9.2.1' - compile 'com.android.support:cardview-v7:25.0.1' - compile 'com.android.support:recyclerview-v7:25.0.1' - compile 'com.mikhaellopez:circularimageview:3.0.2' - compile 'com.google.android.gms:play-services-appindexing:9.2.1' - compile 'com.google.android.gms:play-services-location:9.2.1' - compile 'com.jakewharton:butterknife:8.5.1' - compile 'com.google.code.gson:gson:2.7' - testCompile 'junit:junit:4.12' - androidTestCompile 'com.android.support.test:runner:0.5' - androidTestCompile 'com.android.support.test:rules:0.5' - androidTestCompile 'org.mockito:mockito-core:1.+' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.google.android.gms:play-services-maps:9.2.1' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.weiwangcn.betterspinner:library-material:1.1.0' + implementation 'com.google.android.gms:play-services-auth:9.2.1' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'com.mikhaellopez:circularimageview:3.0.2' + implementation 'com.google.android.gms:play-services-appindexing:9.2.1' + implementation 'com.google.android.gms:play-services-location:9.2.1' + implementation 'com.jakewharton:butterknife:8.5.1' + implementation 'com.google.code.gson:gson:2.8.5' + + implementation 'com.squareup.retrofit2:retrofit:2.5.0' + implementation 'com.squareup.retrofit2:converter-gson:2.5.0' + + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + def power_mockito_version = "2.0.0-beta.5" + testImplementation 'junit:junit:4.12' + testImplementation 'org.json:json:20171018' + testImplementation 'org.mockito:mockito-core:2.21.0' + testImplementation "org.powermock:powermock-module-junit4:$power_mockito_version" + testImplementation "org.powermock:powermock-module-junit4-rule:$power_mockito_version" + testImplementation "org.powermock:powermock-api-mockito2:$power_mockito_version" + testImplementation "org.powermock:powermock-classloading-xstream:$power_mockito_version" + testImplementation "org.powermock:powermock-core:2.0.0-beta.5$power_mockito_version" + + implementation 'com.android.support.constraint:constraint-layout:1.1.3' } apply plugin: 'com.google.gms.google-services' diff --git a/ActivityExamples/app/src/debug/res/anim/fade.xml b/ActivityExamples/app/src/debug/res/anim/fade.xml index 0ea1764..be378fd 100644 --- a/ActivityExamples/app/src/debug/res/anim/fade.xml +++ b/ActivityExamples/app/src/debug/res/anim/fade.xml @@ -5,9 +5,4 @@ android:fromAlpha="0" android:toAlpha="1"/> - \ No newline at end of file diff --git a/ActivityExamples/app/src/main/AndroidManifest.xml b/ActivityExamples/app/src/main/AndroidManifest.xml index 1e3a0b2..5d41cdc 100644 --- a/ActivityExamples/app/src/main/AndroidManifest.xml +++ b/ActivityExamples/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ - + + + + + + + + + + + + + + + + + +