ki9
/
tracman-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor formatting changes

master
Keith Irwin 2017-05-23 14:31:49 -04:00
parent 0b59da214a
commit 406707e7c8
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/AndroidManifest.xml
View File

@ -16,6 +16,8 @@
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<!-- Login Activity -->
<activity android:name=".LoginActivity"> <activity android:name=".LoginActivity">
<intent-filter android:label="@string/app_name"> <intent-filter android:label="@string/app_name">
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
@ -23,8 +25,9 @@
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".SettingsActivity" <!-- Settings Activity -->
<activity android:name=".SettingsActivity"
android:label="@string/settings_name" android:label="@string/settings_name"
android:parentActivityName=".LoginActivity"> android:parentActivityName=".LoginActivity">
@ -34,14 +37,13 @@
android:value=".LoginActivity"/> android:value=".LoginActivity"/>
</activity> </activity>
<service <!-- Location Service -->
android:name=".LocationService" <service android:name=".LocationService"
android:exported="false"> android:exported="false">
</service> </service>
<!--Startup on boot--> <!-- Startup on boot -->
<receiver <receiver android:name=".BootReceiver"
android:name=".BootReceiver"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:permission="android.permission.RECEIVE_BOOT_COMPLETED"> android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
@ -53,9 +55,8 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<!--Check for Disconnection--> <!-- Check for Disconnection -->
<receiver <receiver android:name=".ConnectionReceiver"
android:name=".ConnectionReceiver"
android:enabled="true" android:enabled="true"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>

4
app/src/main/java/us/keithirwin/tracman/LocationService.java
View File

@ -44,8 +44,8 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
public LocationService() {} public LocationService() {}
private String TAG = "LocationService"; private String TAG = "LocationService";
final static private int ICON_ON = 2; final static private int ICON_ON = 2;
final int ICON_HALF = 1; final static private int ICON_HALF = 1;
final int ICON_OFF = 0; final static private int ICON_OFF = 0;
// Development // Development
final String SERVER_ADDRESS = "https://dev.tracman.org"; final String SERVER_ADDRESS = "https://dev.tracman.org";
// Production // Production

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.android.tools.build:gradle:2.3.2'
classpath 'com.google.gms:google-services:3.0.0' classpath 'com.google.gms:google-services:3.0.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong