From a8f8db6f57f3d41682802ea7906103ea3805d656 Mon Sep 17 00:00:00 2001
From: tibthink <bent23jam@gmail.com>
Date: Wed, 18 Dec 2019 22:33:24 -0500
Subject: [PATCH] eeeeehhhhhh i treied adding in a menu but said fuck it

---
 app/src/main/AndroidManifest.xml                   |  1 +
 .../com/tibthink/science_thing5/CLocation.java     |  2 +-
 .../com/tibthink/science_thing5/MainActivity.java  | 14 ++------------
 app/src/main/res/menu/creddit_menu.xml             |  4 ----
 app/src/main/res/menu/menu.xml                     | 12 ------------
 app/src/main/res/values/strings.xml                |  4 ++++
 6 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 app/src/main/res/menu/creddit_menu.xml
 delete mode 100644 app/src/main/res/menu/menu.xml

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">
+        <activity android:name=".SecondActivity"></activity>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-</menu>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
-    <item android:id="@+id/item1"
-        android:title="creddits"
-        app:showAsAction="never"
-        />
-
-
-</menu>
\ 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 @@
 <resources>
     <string name="app_name">science_thing5</string>
+
+    <string name="lostpassword">source code <a href="https://github.com/TIBTHINK/science_thing5" target="_top">Github repo page</a></string>
+
+
 </resources>