Merge pull request #4 from ahahn61/multi_device_aha

Multi device aha

app/build.gradle

@@ -2,19 +2,16 @@ apply plugin: 'com.android.application'
 
 android {
     defaultConfig {
-        versionCode 3
-        versionName "1.3"
-    }
-    compileSdkVersion 30
-    buildToolsVersion "30.0.0"
-    defaultConfig {
+        versionCode 4
+        versionName "1.4"
+        resValue "string", "app_version", "$versionName"
         applicationId "com.pitchgauge.j9pr.pitchgauge"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileSdkVersion 30
+    buildToolsVersion "30.0.0"
     buildTypes {
         release {
             minifyEnabled false

app/src/main/AndroidManifest.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.pitchgauge.j9pr.pitchgauge">
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".MainSettings"></activity>
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
@@ -20,10 +23,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.pitchgauge.j9pr.pitchgauge.ThrowActivity" />
-        <activity android:name="com.pitchgauge.j9pr.pitchgauge.DeviceListActivity" />
+        <activity android:name=".ThrowActivity" />
+        <activity android:name=".DeviceListActivity" />
+
         <service
             android:name=".BluetoothService"
             android:enabled="true" />
     </application>
+
 </manifest>