Skip to content

Stability and UI improvements #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tabinfl merged 5 commits into from
Sep 10, 2018
Merged

Stability and UI improvements #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ac1cce
- TorgiService created to handle receiving and processing the GNSS in…
scottlandis Sep 7, 2018
0c8421c
- Beginning to implement basseline collection against GNNS C/N0 and A…
scottlandis Sep 8, 2018
480af9d
- Google Maps replaced with Open Street Map to address API key issue
scottlandis Sep 10, 2018
6bee10b
- limited EWDetection arraylist size to reduce ever expanding mememor…
scottlandis Sep 10, 2018
efeb8ea
- added real-time monitoring activity for viewing C/N0 and AGC (Servi…
scottlandis Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ buildscript {
repositories {
google()
jcenter()
mavenLocal()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
Expand All @@ -19,6 +20,7 @@ allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' } //for charts
}
}

Expand Down
20 changes: 14 additions & 6 deletions torgi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android {
applicationId "org.sofwerx.torgi"
minSdkVersion 24
targetSdkVersion 27
versionCode 1
versionName "1.0"
versionCode 2
versionName "0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
Expand All @@ -26,16 +26,24 @@ android {
// path "CMakeLists.txt"
// }
// }
compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':geopackage-sdk')
//implementation fileTree(include: ['*.jar'], dir: 'libs')
//implementation project(':geopackage-sdk')

implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3' //for charts
implementation 'org.osmdroid:osmdroid-android:6.0.2'
implementation 'mil.nga.geopackage:geopackage-android:3.0.2'
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
//implementation 'com.google.android.gms:play-services-maps:15.0.1'
implementation 'com.android.support:design:27.1.1'
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'
}
}
46 changes: 21 additions & 25 deletions torgi/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,40 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.sofwerx.torgi">
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />

<uses-feature android:name="android.hardware.location.gps" />

<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">

<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key" />

<service android:name="org.sofwerx.torgi.service.TorgiService"/>

<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
android:name=".ui.MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="vnd.android-dir/mms-sms" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.SENDTO" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="sms" />
<data android:scheme="smsto" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/plain" />
</intent-filter>
<!--android:theme="@style/AppTheme.NoActionBar">-->
</activity>
<activity
android:name=".ui.MonitorActivity"
android:label="TORGI Monitor">
</activity>
<activity
android:name=".ui.AboutActivity"
android:label="@string/about">
</activity>

</application>

</manifest>
Loading