diff --git a/mobility-track-android/.idea/.name b/mobility-track-android/.idea/.name deleted file mode 100644 index 75ff080..0000000 --- a/mobility-track-android/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -mobility-track-android \ No newline at end of file diff --git a/mobility-track-android/.idea/compiler.xml b/mobility-track-android/.idea/compiler.xml index 96cc43e..9a8b7e5 100644 --- a/mobility-track-android/.idea/compiler.xml +++ b/mobility-track-android/.idea/compiler.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/mobility-track-android/.idea/vcs.xml b/mobility-track-android/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/mobility-track-android/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mobility-track-android/app/app.iml b/mobility-track-android/app/app.iml index 0a7e21a..d862eaa 100644 --- a/mobility-track-android/app/app.iml +++ b/mobility-track-android/app/app.iml @@ -66,14 +66,6 @@ - - - - - - - - @@ -82,24 +74,41 @@ + + + + + + + + - - - + + + + + + + + + + + + @@ -110,13 +119,15 @@ - + + + + - - + \ No newline at end of file diff --git a/mobility-track-android/app/build.gradle b/mobility-track-android/app/build.gradle index a85b351..e6b6546 100644 --- a/mobility-track-android/app/build.gradle +++ b/mobility-track-android/app/build.gradle @@ -21,7 +21,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' + compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:design:23.4.0' compile 'com.google.android.gms:play-services-maps:10.0.1' + compile 'com.android.support:support-v4:23.4.0' } diff --git a/mobility-track-android/app/src/main/AndroidManifest.xml b/mobility-track-android/app/src/main/AndroidManifest.xml index febe064..fe7f675 100644 --- a/mobility-track-android/app/src/main/AndroidManifest.xml +++ b/mobility-track-android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ + + android:value="@string/google_maps_api_key" /> + + + + - - + \ No newline at end of file diff --git a/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/MainActivity.java b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/MainActivity.java index 6828d5d..468c14c 100644 --- a/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/MainActivity.java +++ b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/MainActivity.java @@ -5,6 +5,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.net.ConnectivityManager; +import android.net.NetworkInfo; import android.net.wifi.WifiManager; import android.os.AsyncTask; import android.os.Bundle; @@ -55,6 +57,10 @@ protected void onCreate(Bundle savedInstanceState) { map = ((MapFragment) getFragmentManager().findFragmentById(R.id.map)); map.getMapAsync(this); + if(isNetworkAvailable()==false){ + Toast.makeText(MainActivity.this, "You need to have an active internet connection!", Toast.LENGTH_LONG).show(); + } + getDeviceId(); } @@ -209,4 +215,10 @@ public void onMapReady(GoogleMap googleMap) { } googleMap.setMyLocationEnabled(true); } + + private boolean isNetworkAvailable() { + ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); + NetworkInfo activeNetworkInfo = connectivityManager.getActiveNetworkInfo(); + return activeNetworkInfo != null && activeNetworkInfo.isConnected(); + } } diff --git a/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/SplashActivity.java b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/SplashActivity.java new file mode 100644 index 0000000..5c49acd --- /dev/null +++ b/mobility-track-android/app/src/main/java/ogr/scorelab/ucsc/mobility_track/SplashActivity.java @@ -0,0 +1,36 @@ +package ogr.scorelab.ucsc.mobility_track; + +import android.content.Intent; +import android.os.Handler; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class SplashActivity extends AppCompatActivity { + + private static int SPLASH_TIME_OUT = 3000; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + + new Handler().postDelayed(new Runnable() { + + /* + * Showing splash screen with a timer. This will be useful when you + * want to show case your app logo / company + */ + + @Override + public void run() { + // This method will be executed once the timer is over + // Start your app main activity + Intent i = new Intent(SplashActivity.this, MainActivity.class); + startActivity(i); + + // close this activity + finish(); + } + }, SPLASH_TIME_OUT); + } +} diff --git a/mobility-track-android/app/src/main/res/drawable-hdpi/bg.jpg b/mobility-track-android/app/src/main/res/drawable-hdpi/bg.jpg new file mode 100644 index 0000000..2b161b0 Binary files /dev/null and b/mobility-track-android/app/src/main/res/drawable-hdpi/bg.jpg differ diff --git a/mobility-track-android/app/src/main/res/layout/activity_main.xml b/mobility-track-android/app/src/main/res/layout/activity_main.xml index d6b8d6e..5b5b61a 100644 --- a/mobility-track-android/app/src/main/res/layout/activity_main.xml +++ b/mobility-track-android/app/src/main/res/layout/activity_main.xml @@ -1,58 +1,68 @@ - + android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity" android:orientation="vertical" android:background="@drawable/bg"> +