Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eb983ae authored by Gokul Swaminathan's avatar Gokul Swaminathan
Browse files

migrated to androidX and changed intro lib

parent c92d11e3

.idea/copyright/MIT_License.xml

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
<component name="CopyrightManager">

  <copyright>

    <option name="myName" value="MIT License" />

    <option name="notice" value="MIT License&#10;&#10;Copyright (c) 2018 Gokul Swaminathan&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in all&#10;copies or substantial portions of the Software.&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE&#10;SOFTWARE." />

  </copyright>

</component>
 
 No newline at end of file

.idea/copyright/profiles_settings.xml

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
<component name="CopyrightManager">

  <settings>

    <module2copyright>

      <element module="All" copyright="MIT License" />

    </module2copyright>

  </settings>

</component>
 
 No newline at end of file

app/build.gradle

+10 −15
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ android { 
        targetSdkVersion 28

        versionCode 11

        versionName "2.0"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

        vectorDrawables.useSupportLibrary = true



        javaCompileOptions {
@@ -40,11 +40,6 @@ android { 
                includeCompileClasspath = true

            }

        }



        dataBinding {

            enabled = true

        }



    }

    buildTypes {

        release {
@@ -64,19 +59,19 @@ android { 


dependencies {

    implementation fileTree(dir: 'libs', include: ['*.jar'])

    implementation 'com.android.support:appcompat-v7:28.0.0'

    implementation 'com.android.support:design:28.0.0'

    implementation 'com.android.support.constraint:constraint-layout:1.1.3'

    implementation 'com.android.support:support-v4:28.0.0'

    implementation 'androidx.appcompat:appcompat:1.0.2'

    implementation 'com.google.android.material:material:1.1.0-alpha01'

    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

    implementation 'androidx.legacy:legacy-support-v4:1.0.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'

    androidTestImplementation 'androidx.test:runner:1.1.0'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'



    //Intro Library (Proguard config not needed)

    implementation 'com.heinrichreimersoftware:material-intro:1.6.2'

    //Intro Library

    implementation 'com.github.paolorotolo:appintro:v5.1.0'



    //Library for Card View Layout

    implementation 'com.android.support:cardview-v7:28.0.0'

    implementation 'androidx.cardview:cardview:1.0.0'



    //Ripple Effect Library

    implementation 'com.balysv:material-ripple:1.0.2'

app/src/androidTest/java/com/gsnathan/pdfviewer/ExampleInstrumentedTest.java

+2 −2
Original line number Diff line number Diff line 
package com.gsnathan.pdfviewer;



import android.content.Context;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;