Commit afb565a2 authored by Michael D Harkess's avatar Michael D Harkess
Browse files

Merge branch 'AndroidApp' into 'master' 

Merge Android app Update

See merge request ec504/ec504_projects/group6!77
parents 07c8d5f7 bc658007

.vscode/settings.json

+2 −1
Original line number Diff line number Diff line 
{

    "java.compile.nullAnalysis.mode": "automatic",

    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable"

    "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx2G -Xms100m -Xlog:disable",

    "java.configuration.updateBuildConfiguration": "interactive"

}
 
 No newline at end of file

AndroidApp/LanguageChecker4.zip

0 → 100644
+194 MiB

File added.

No diff preview for this file type.

View file

AndroidApp/LanguageChecker4/.idea/misc.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ExternalStorageConfigurationManager" enabled="true" />

  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">

AndroidApp/LanguageChecker4/.idea/vcs.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="VcsDirectoryMappings">

    <mapping directory="$PROJECT_DIR$" vcs="Git" />

  </component>

</project>
 
 No newline at end of file

AndroidApp/LanguageChecker4/app/build.gradle.kts

+8 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ android { 
        versionName = "1.0"



        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"



    }



    buildTypes {
@@ -29,6 +30,9 @@ android { 
        sourceCompatibility = JavaVersion.VERSION_1_8

        targetCompatibility = JavaVersion.VERSION_1_8

    }

    dependenciesInfo {

        includeInBundle = false

    }

}



dependencies {
@@ -37,7 +41,10 @@ dependencies { 
    implementation(libs.material)

    implementation(libs.activity)

    implementation(libs.constraintlayout)

    implementation(files("src\\main\\java\\com\\example\\languagechecker\\checker.jar"))

    implementation(files("libs\\slf4j-api-1.7.36.jar"))

    implementation(files("libs\\slf4j-jdk14-1.7.36.jar"))

    implementation(files("libs\\sqlite-jdbc-3.45.2.0.jar"))

    implementation(files("libs\\checker.jar"))

    testImplementation(libs.junit)

    androidTestImplementation(libs.ext.junit)

    androidTestImplementation(libs.espresso.core)