diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 166c996..b446961 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + diff --git a/app/src/main/java/com/tibthink/science_thing5/CLocation.java b/app/src/main/java/com/tibthink/science_thing5/CLocation.java index 18e638e..39e6689 100644 --- a/app/src/main/java/com/tibthink/science_thing5/CLocation.java +++ b/app/src/main/java/com/tibthink/science_thing5/CLocation.java @@ -57,7 +57,7 @@ public float getSpeed() { if (!this.getUseMetricUnits()) { //covert them meters a secound to them nice miles per syrup - nSpeed = super.getSpeed() * 3.2808398501312f; + nSpeed = super.getSpeed() * 2.23693629f; } return nSpeed; diff --git a/app/src/main/java/com/tibthink/science_thing5/MainActivity.java b/app/src/main/java/com/tibthink/science_thing5/MainActivity.java index ed2e469..0634862 100644 --- a/app/src/main/java/com/tibthink/science_thing5/MainActivity.java +++ b/app/src/main/java/com/tibthink/science_thing5/MainActivity.java @@ -12,8 +12,6 @@ import android.media.MediaPlayer; import android.os.Build; import android.os.Bundle; -import android.view.Menu; -import android.view.MenuInflater; import android.view.View; import android.widget.Button; import android.widget.CompoundButton; @@ -49,8 +47,6 @@ protected void onCreate(Bundle savedInstanceState) { DoShit(); } - - this.updateSpeed(null); sw_metric.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -62,13 +58,6 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) { }); } - public boolean onCreateOptionsMenu(Menu menu){ - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.menu, menu); - return true; - - } - public void playSound(View view) { mp = MediaPlayer.create(this, R.raw.button); @@ -87,6 +76,8 @@ public void onCompletion(MediaPlayer mediaPlayer) { }); } + + @Override public void onLocationChanged(Location location){ if (location != null){ @@ -153,5 +144,4 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis } } - } diff --git a/app/src/main/res/menu/creddit_menu.xml b/app/src/main/res/menu/creddit_menu.xml deleted file mode 100644 index fe187c0..0000000 --- a/app/src/main/res/menu/creddit_menu.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml deleted file mode 100644 index ac41667..0000000 --- a/app/src/main/res/menu/menu.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3f8bff..0428e48 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,7 @@ science_thing5 + + source code Github repo page + +