Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

Commit

Permalink
refactor(*) : major update on project structure
Browse files Browse the repository at this point in the history
new MainActivity to prepare multiple sensor management
ioio activity moved into ioio fragment to prepare multiple sensore management
rename of layout file for better understanding
  • Loading branch information
kaal-dam committed Oct 13, 2017
1 parent 012cfb7 commit 4197d14
Show file tree
Hide file tree
Showing 28 changed files with 1,297 additions and 781 deletions.
18 changes: 5 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,16 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:26.+'
testCompile 'junit:junit:4.12'

// testCompile "org.robolectric:robolectric:3.4.2"

// influxDB
compile 'org.influxdb:influxdb-java:2.7'
// https://mvnrepository.com/artifact/com.google.code.gson/gson
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'

// IOIO card
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.github.ytai.ioio:IOIOLibAndroid:5.07'
compile 'com.github.ytai.ioio:IOIOLibAndroidBluetooth:5.07'
compile 'com.github.ytai.ioio:IOIOLibAndroidAccessory:5.07'
compile 'com.github.ytai.ioio:IOIOLibAndroidDevice:5.07'
// compile files('libs/GraphView-4.2.1.jar')
compile 'com.jjoe64:graphview:4.2.1'
compile 'com.google.android.gms:play-services-maps:11.0.4'


compile 'com.android.support:design:26.+'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:support-v4:26.+'
testCompile 'junit:junit:4.12'
}
69 changes: 34 additions & 35 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,80 +27,79 @@
android:roundIcon="@drawable/logoandroidpng"
android:supportsRtl="true"
android:theme="@style/AppTheme">



android:icon="@drawable/logoandroidpng"
android:allowBackup="true"
android:hardwareAccelerated="true"
android:label="@string/app_name">
<uses-library android:name="com.android.future.usb.accessory"
<uses-library
android:name="com.android.future.usb.accessory"
android:required="false" />
<uses-library
android:name="com.google.android.maps"
android:required="false" />

<service android:name="science.apolline.ioio.IOIOService" />
<service android:name=".ioio.IOIOService" />

<activity
android:label="@string/app_name"
android:name="science.apolline.MainActivity"
android:name=".ioio.ioioActivity"
android:configChanges="orientation|screenSize"
android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
</intent-filter>
<meta-data android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
<meta-data
android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"
android:resource="@xml/accessory_filter" />
</activity>

<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:windowSoftInputMode="stateHidden"
android:name=".options"
android:label="options"
android:name="science.apolline.options"
android:theme="@style/Theme.AppCompat"
android:parentActivityName="science.apolline.MainActivity">
android:parentActivityName=".MainActivity"
android:theme="@style/Theme.AppCompat">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="science.apolline.MainActivity" />
</activity>

<activity
android:name=".informations"
android:label="informations"
android:name="science.apolline.informations"
android:theme="@style/Theme.AppCompat"
android:parentActivityName="science.apolline.MainActivity">
android:parentActivityName=".MainActivity"
android:theme="@style/Theme.AppCompat">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="science.apolline.MainActivity" />

</activity>

<activity
android:name=".contact"
android:label="contact"
android:name="science.apolline.contact"
android:theme="@style/Theme.AppCompat"
android:parentActivityName="science.apolline.MainActivity">
android:parentActivityName=".MainActivity"
android:theme="@style/Theme.AppCompat">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="science.apolline.MainActivity" />

</activity>




<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="@string/mapKey" /><!-- ATTENTION: This was auto-generated to add Google Play services to your project for
App Indexing. See https://g.co/AppIndexing/AndroidStudio for more information. -->
android:value="@string/mapKey" />
<!--
ATTENTION: This was auto-generated to add Google Play services to your project for
App Indexing. See https://g.co/AppIndexing/AndroidStudio for more activity_information.
-->
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />


</application>

</manifest>
</manifest>
90 changes: 0 additions & 90 deletions app/src/main/java/science/apolline/InfluxDBManager.java

This file was deleted.

Loading

0 comments on commit 4197d14

Please sign in to comment.