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

Merge branch 'AndroidApp' into 'master'

Android app

See merge request ec504/ec504_projects/group6!18
parents c0c571f5 eb334844
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
+3 −0
Original line number Diff line number Diff line
# Default ignored files
/shelf/
/workspace.xml
+1 −0
Original line number Diff line number Diff line
LanguageChecker
 No newline at end of file
+6 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="CompilerConfiguration">
    <bytecodeTargetLevel target="17" />
  </component>
</project>
 No newline at end of file
+13 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="deploymentTargetDropDown">
    <value>
      <entry key="MainActivity">
        <State />
      </entry>
      <entry key="app">
        <State />
      </entry>
    </value>
  </component>
</project>
 No newline at end of file
Loading