eeeeehhhhhh i treied adding in a menu but said fuck it

TIBTHINK · Dec 19, 2019 · a8f8db6 · a8f8db6
1 parent 23b0718
commit a8f8db6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
diff --git 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>