Skip to content

Commit

Permalink
Gradle Update, Google Maps API v2 & Database Export
Browse files Browse the repository at this point in the history
Project changed to gradle build system as I have switched to Android Studio for my main IDE,
this change is quite significant in terms of layout of the application source code and the
abilities provided by gradle.

Google Maps API v2 support added to enable use of new features and gain an API Key for the
application as API v1 keys are no longer available, signal strength data is now correctly
overlayed on the map as well. Minor tweaks are required but currently everything is functioning
correctly, the next items to add could include markers to identify tracked CellID's and user
options to modify map preferences.

Database export corrected and changed to use the OpenCV library to produce CSV copies of the database tables.
  • Loading branch information
xLaMbChOpSx committed Apr 11, 2014
1 parent 5e1660e commit 67c6965
Show file tree
Hide file tree
Showing 103 changed files with 892 additions and 881 deletions.
62 changes: 43 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# FILES TO BE IGNORED #
#######################

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
.directory
ehthumbs.db
Thumbs.db

# built application files
*.apk
*.ap_
Expand All @@ -22,16 +8,54 @@ Thumbs.db
# Java class files
*.class

# built native files
*.o

# generated files
bin/
gen/
out/

# Ignore gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Eclipse project files
.classpath
.project
# Proguard folder generated by Eclipse
proguard/

# Eclipse Metadata
.metadata/

# Mac OS X clutter
*.DS_Store

# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067)
.idea/workspace.xml
.idea/tasks.xml
.idea/datasources.xml
.idea/dataSources.ids

# OS Generated files
._*
.Spotlight-V100
.Trashes
.directory
ehthumbs.db
Thumbs.db

# Android Studio
.idea
*.iml
#.idea/workspace.xml - uncomment this and comment/delete .idea if it better suit your needs
.gradle
/*/local.properties
/*/out
/*/*/build
/*/*/production
*.iml
*.iws
*.ipr
*~
*.swp
/*/build
9 changes: 9 additions & 0 deletions .idea/libraries/opencsv_2_3.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 0 additions & 37 deletions Android.mk

This file was deleted.

27 changes: 27 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion '19.0.3'
defaultConfig {
minSdkVersion 9
targetSdkVersion 19
}
buildTypes {
release {
runProguard false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
signingConfigs {
debug {
keyAlias 'androiddebugkey'
}
}
}

dependencies {
compile 'com.android.support:appcompat-v7:19.1.+'
compile 'com.google.android.gms:play-services:4.3.23'
compile files('libs/opencsv-2.3.jar')
}
File renamed without changes.
Binary file added app/libs/opencsv-2.3.jar
Binary file not shown.
22 changes: 16 additions & 6 deletions AndroidManifest.xml → app/src/main/AndroidManifest.xml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.SecUpwN.AIMSICD"
android:versionName="0.1.5"
android:versionCode="5">
android:versionName="0.1.6"
android:versionCode="6">

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="19"/>
<uses-feature
android:glEsVersion="0x00020000"
android:required="true"/>

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
Expand All @@ -15,13 +15,19 @@
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>

<application
android:icon="@drawable/sense_alarm"
android:label="@string/app_name"
android:theme="@style/AppTheme"
android:allowBackup="false">
<uses-library android:name="com.google.android.maps"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />


<activity
android:name=".AIMSICD"
Expand Down Expand Up @@ -51,7 +57,7 @@

<activity
android:name=".MapViewer"
android:label="@string/app_name"
android:label="@string/map_view"
android:parentActivityName=".AIMSICD"
android:exported="true">
<meta-data
Expand All @@ -70,5 +76,9 @@
</intent-filter>
</activity>

<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyDI1lvgpBmNhQS33JfJA4w8GAmrtFeg078"/>

</application>
</manifest>
Loading

0 comments on commit 67c6965

Please sign in to comment.