clean up

app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
         android:theme="@style/AppTheme"
         tools:replace="android:allowBackup">
         <activity
-            android:name=".V5MainActivity"
+            android:name=".MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -25,7 +25,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".V5ScoutingActivity"
+            android:name=".ScoutingActivity"
             android:screenOrientation="portrait"/>
         <activity android:name=".SettingsActivity"/>
         <activity android:name=".LicensesActivity"/>

app/src/main/java/ca/warp7/android/scouting/LicensesActivity.kt

@@ -16,7 +16,7 @@ class LicensesActivity : AppCompatActivity() {
             setDisplayHomeAsUpEnabled(true)
             setTitle(R.string.open_source_licenses)
         }
-        text.text = AppResources.getHTML(this, R.raw.licenses)
+        text.text = getHTMLFromContext(this, R.raw.licenses)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/ca/warp7/android/scouting/V5MainActivity.kt → app/src/main/java/ca/warp7/android/scouting/MainActivity.kt

@@ -20,8 +20,6 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
 import android.widget.*
-import ca.warp7.android.scouting.R
-import ca.warp7.android.scouting.SettingsActivity
 import ca.warp7.android.scouting.boardfile.exampleBoardfile
 import ca.warp7.android.scouting.entry.*
 import ca.warp7.android.scouting.entry.Board.*
@@ -30,7 +28,7 @@ import ca.warp7.android.scouting.ui.createQRBitmap
 import com.google.zxing.WriterException
 
 
-class V5MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity() {
 
     private lateinit var boardTextView: TextView
     private lateinit var scoutTextView: TextView
@@ -350,7 +348,7 @@ class V5MainActivity : AppCompatActivity() {
     }
 
     private fun startScouting(match: String, team: String, scout: String, board: Board) {
-        startActivityForResult(Intent(this, V5ScoutingActivity::class.java).apply {
+        startActivityForResult(Intent(this, ScoutingActivity::class.java).apply {
             putExtra(ScoutingIntentKey.kMatch, match)
             putExtra(ScoutingIntentKey.kBoard, board)
             putExtra(ScoutingIntentKey.kTeam, team)

app/src/main/java/ca/warp7/android/scouting/V5ScoutingActivity.kt → app/src/main/java/ca/warp7/android/scouting/ScoutingActivity.kt

@@ -15,7 +15,7 @@ import android.view.WindowManager
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.widget.*
-import ca.warp7.android.scouting.ScoutingActivityState.*
+import ca.warp7.android.scouting.ScoutingActivity.State.*
 import ca.warp7.android.scouting.boardfile.Boardfile
 import ca.warp7.android.scouting.boardfile.ScoutTemplate
 import ca.warp7.android.scouting.boardfile.exampleBoardfile
@@ -35,7 +35,11 @@ import ca.warp7.android.scouting.ui.V5TabsPagerAdapter
  * @author Team 865
  * @since v0.2
  */
-class V5ScoutingActivity : AppCompatActivity(), BaseScoutingActivity {
+class ScoutingActivity : AppCompatActivity(), BaseScoutingActivity {
+
+    enum class State {
+        WaitingToStart, TimedScouting, Pausing
+    }
 
     override fun updateTabStates() {
         if (currentTab != 0) pagerAdapter[currentTab - 1].updateTabState()
@@ -277,7 +281,7 @@ class V5ScoutingActivity : AppCompatActivity(), BaseScoutingActivity {
         }
     }
 
-    private fun startActivityState(state: ScoutingActivityState) {
+    private fun startActivityState(state: State) {
         if (state == TimedScouting && (timerIsRunning || relativeTime >= kTimerLimit)) return
         activityState = state
         when (activityState) {

app/src/main/java/ca/warp7/android/scouting/Util.kt

@@ -0,0 +1,66 @@
+package ca.warp7.android.scouting
+
+import android.content.Context
+import android.preference.PreferenceManager
+import android.text.Html
+import android.text.Spanned
+import android.view.View
+
+fun View.show(){
+    visibility = View.VISIBLE
+}
+
+fun View.hide(){
+    visibility = View.GONE
+}
+
+
+private fun getRaw(context: Context, id: Int): String {
+    val resources = context.resources
+    return try {
+        resources.openRawResource(id).bufferedReader().readText()
+    } catch (e: Exception) {
+        e.printStackTrace()
+        ""
+    }
+}
+
+@Suppress("DEPRECATION")
+fun getHTMLFromContext(context: Context, id: Int): Spanned {
+    return Html.fromHtml(getRaw(context, id))
+}
+
+const val kTimerLimit = 150
+const val kAutonomousTime = 15
+const val kFadeDuration = 100
+const val kTotalTimerDigits = 3
+
+
+object ScoutingIntentKey {
+
+    private const val v5Root = "ca.warp7.android.scouting.intent"
+
+    const val kMatch = "$v5Root.match"
+    const val kTeam = "$v5Root.team"
+    const val kScout = "$v5Root.scout"
+    const val kBoard = "$v5Root.board"
+
+    const val kResult = "$v5Root.result"
+}
+
+object MainSettingsKey {
+
+    private const val kMainSettingsRoot = "ca.warp7.android.scouting.main"
+
+    const val kBoard = "$kMainSettingsRoot.board"
+    const val kScout = "$kMainSettingsRoot.scout"
+}
+
+class ManagedPreferences(context: Context) {
+
+    private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+
+    val vibrator: AbstractActionVibrator = ActionVibrator(
+        context, sharedPreferences.getBoolean(context.getString(R.string.pref_use_vibration_key), true)
+    )
+}

app/src/main/res/layout/activity_v5_main.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".V5MainActivity">
+    tools:context=".MainActivity">
 
     <android.support.v7.widget.Toolbar
         android:layout_width="match_parent"

app/src/main/res/layout/activity_v5_scouting.xml

@@ -4,7 +4,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical"
-              tools:context="ca.warp7.android.scouting.V5ScoutingActivity">
+              tools:context="ca.warp7.android.scouting.ScoutingActivity">
 
     <LinearLayout
         android:id="@+id/highlight_bar"