From d34e7ec56efac024d82615280f4c51bf7201ada4 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 28 Sep 2019 14:31:52 +0100
Subject: [PATCH] Massive refactoring

---
 mobile/src/main/AndroidManifest.xml           |  9 +--
 .../{ => activity}/AboutActivity.java         | 40 +++---------
 .../activity/CtFwSActivityBase.java           | 63 +++++++++++++++++++
 .../{ => activity}/HandbookActivity.java      | 44 +++----------
 .../{ => activity}/MainActivity.java          | 44 +++++--------
 .../MainActivityBuildHooks.java               |  8 ++-
 .../MainActivityCtFwSDisplay.java}            |  7 ++-
 .../{ => utils}/CtFwSDisplayTinyChrono.java   |  5 +-
 .../ctfwstimer/utils/HandbookDownloader.java  |  2 +-
 .../main/res/layout-land/activity_about.xml   |  2 +-
 .../main/res/layout-land/activity_main.xml    |  2 +-
 mobile/src/main/res/layout/activity_about.xml |  2 +-
 mobile/src/main/res/layout/activity_main.xml  |  2 +-
 mobile/src/main/res/values/dimens.xml         |  1 +
 .../MainActivityBuildHooksImpl.java           |  8 ---
 .../activity/MainActivityBuildHooksImpl.java  | 12 ++++
 16 files changed, 128 insertions(+), 123 deletions(-)
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{ => activity}/AboutActivity.java (85%)
 create mode 100644 mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{ => activity}/HandbookActivity.java (79%)
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{ => activity}/MainActivity.java (87%)
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{ => activity}/MainActivityBuildHooks.java (54%)
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{CtFwSDisplayLocal.java => activity/MainActivityCtFwSDisplay.java} (98%)
 rename mobile/src/main/java/com/acmetensortoys/ctfwstimer/{ => utils}/CtFwSDisplayTinyChrono.java (94%)
 delete mode 100644 mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooksImpl.java
 create mode 100644 mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooksImpl.java

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 6ec4315..cd34392 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -20,7 +20,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+
+        <activity android:name=".activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -33,9 +34,8 @@
             </intent-filter>
         </activity>
 
-        <service android:name="org.eclipse.paho.android.service.MqttService" />
 
-        <activity android:name=".AboutActivity" />
+        <activity android:name=".activity.AboutActivity" />
         <activity android:name=".activity.SettingsActivity" />
 
         <service
@@ -43,7 +43,8 @@
             android:enabled="true"
             android:exported="false" />
 
-        <activity android:name=".HandbookActivity"
+        <activity
+            android:name=".activity.HandbookActivity"
             android:icon="@mipmap/ic_shield_1"
             android:label="@string/app_name_hand">
             <!--
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
similarity index 85%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
index 850fc9f..b6068fc 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/AboutActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
@@ -1,15 +1,10 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.activity;
 
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.net.Uri;
 import android.os.Build;
-import android.os.IBinder;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -19,17 +14,20 @@ import android.widget.Chronometer;
 import android.widget.TabHost;
 import android.widget.TextView;
 
+import com.acmetensortoys.ctfwstimer.BuildConfig;
+import com.acmetensortoys.ctfwstimer.utils.CtFwSDisplayTinyChrono;
+import com.acmetensortoys.ctfwstimer.R;
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;
+import com.acmetensortoys.ctfwstimer.service.MainService;
 import com.acmetensortoys.ctfwstimer.utils.CheckedAsyncDownloader;
 
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.SortedSet;
 
-public class AboutActivity extends AppCompatActivity {
+public class AboutActivity extends CtFwSActivityBase {
 
     private static final String TAG = "About";
-    private MainService.LocalBinder mSrvBinder;
     private CtFwSDisplayTinyChrono mTitleChronoObs;
 
     private static final String TAB_PROG  = "TabProg";
@@ -195,7 +193,7 @@ public class AboutActivity extends AppCompatActivity {
         }
     };
 
-    private void doRegisterObservers() {
+    protected void doRegisterObservers() {
         mSrvBinder.registerObserver(mSrvObs);
         mSrvBinder.getGameState().registerObserver(mCtFwSObs);
         if (mTitleChronoObs != null) {
@@ -203,38 +201,16 @@ public class AboutActivity extends AppCompatActivity {
         }
     }
 
-    private final ServiceConnection ctfwssc = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mSrvBinder = (MainService.LocalBinder) service;
-            doRegisterObservers();
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mSrvBinder = null;
-        }
-    };
-
     @Override
     public void onStart() {
         Log.d(TAG, "onStart");
         super.onStart();
-
-        if (mSrvBinder == null) {
-            Intent si = new Intent(this, MainService.class);
-            bindService(si, ctfwssc, Context.BIND_AUTO_CREATE | Context.BIND_ABOVE_CLIENT);
-        }
     }
 
     @Override
     public void onResume() {
         Log.d(TAG, "onResume");
         super.onResume();
-
-        if (mSrvBinder != null) {
-            doRegisterObservers();
-        }
     }
 
     @Override
@@ -252,8 +228,6 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         Log.d(TAG, "onDestroy");
-        unbindService(ctfwssc);
-
         super.onDestroy();
     }
 }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
new file mode 100644
index 0000000..97b5664
--- /dev/null
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
@@ -0,0 +1,63 @@
+package com.acmetensortoys.ctfwstimer.activity;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.support.v7.app.AppCompatActivity;
+
+import com.acmetensortoys.ctfwstimer.service.MainService;
+
+/*
+ * Basically all of our activities bind to the MainService and so
+ * contain code that looks like this.
+ */
+
+public abstract class CtFwSActivityBase extends AppCompatActivity {
+
+    protected MainService.LocalBinder mSrvBinder;
+
+    /*
+     * Register the activity's observer(s).  Unregister in onPause.
+     */
+    abstract protected void doRegisterObservers();
+
+    private final ServiceConnection ctfwssc = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mSrvBinder = (MainService.LocalBinder) service;
+            doRegisterObservers();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mSrvBinder = null;
+        }
+    };
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (mSrvBinder == null) {
+            Intent si = new Intent(this, MainService.class);
+            bindService(si, ctfwssc, Context.BIND_AUTO_CREATE | Context.BIND_ABOVE_CLIENT);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mSrvBinder != null) {
+            doRegisterObservers();
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        unbindService(ctfwssc);
+        super.onDestroy();
+    }
+}
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
similarity index 79%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookActivity.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
index 3652020..f8809e7 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/HandbookActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
@@ -1,12 +1,6 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.activity;
 
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -17,11 +11,14 @@ import android.widget.Chronometer;
 import android.widget.SearchView;
 import android.widget.Toast;
 
+import com.acmetensortoys.ctfwstimer.utils.CtFwSDisplayTinyChrono;
+import com.acmetensortoys.ctfwstimer.R;
+import com.acmetensortoys.ctfwstimer.service.MainService;
 import com.acmetensortoys.ctfwstimer.utils.CheckedAsyncDownloader;
 
 import java.io.File;
 
-public class HandbookActivity extends AppCompatActivity {
+public class HandbookActivity extends CtFwSActivityBase {
 
     public static final String HAND_FILE_NAME = "handbook.html";
     private static final String TAG = "CtFwSHandbook";
@@ -54,7 +51,7 @@ public class HandbookActivity extends AppCompatActivity {
         @Override
         public void onHandbookFetch(MainService.LocalBinder b, CheckedAsyncDownloader.DL dl) {
             display();
-            if (dl.getResult() == CheckedAsyncDownloader.Result.RES_OK) {
+            if (dl != null && dl.getResult() == CheckedAsyncDownloader.Result.RES_OK) {
                 Toast.makeText(HandbookActivity.this,
                                 R.string.hand_new,
                                 Toast.LENGTH_SHORT)
@@ -63,29 +60,13 @@ public class HandbookActivity extends AppCompatActivity {
         }
     };
 
-    private MainService.LocalBinder mSrvBinder;
-
-    private void doRegisterObservers() {
+    protected void doRegisterObservers() {
         mSrvBinder.registerObserver(mSrvObs);
         if (mTitleChronoObs != null) {
             mSrvBinder.getGameState().registerObserver(mTitleChronoObs);
         }
     }
 
-    private final ServiceConnection ctfwssc = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mSrvBinder = (MainService.LocalBinder) service;
-            doRegisterObservers();
-            mSrvBinder.connect(false);
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mSrvBinder = null;
-        }
-    };
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.d(TAG, "onCreate");
@@ -172,21 +153,12 @@ public class HandbookActivity extends AppCompatActivity {
     public void onStart() {
         Log.d(TAG, "onStart");
         super.onStart();
-
-        if (mSrvBinder == null) {
-            Intent si = new Intent(this, MainService.class);
-            bindService(si, ctfwssc, Context.BIND_AUTO_CREATE | Context.BIND_ABOVE_CLIENT);
-        }
     }
 
     @Override
     public void onResume() {
         Log.d(TAG, "onResume");
         super.onResume();
-
-        if (mSrvBinder != null) {
-            doRegisterObservers();
-        }
     }
 
     @Override
@@ -203,8 +175,6 @@ public class HandbookActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         Log.d(TAG, "onDestroy");
-        unbindService(ctfwssc);
-
         super.onDestroy();
     }
 }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
similarity index 87%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
index 32c9609..be9eb55 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.activity;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -20,15 +20,18 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
 
+import com.acmetensortoys.ctfwstimer.BuildConfig;
+import com.acmetensortoys.ctfwstimer.R;
+import com.acmetensortoys.ctfwstimer.service.MainService;
 import com.acmetensortoys.ctfwstimer.utils.AndroidResourceUtils;
+import com.acmetensortoys.ctfwstimer.utils.CheckedAsyncDownloader;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends CtFwSActivityBase {
 
     private static final String TAG = "CtFwS";
 
     private final MainActivityBuildHooks mabh = new MainActivityBuildHooksImpl();
 
-    private MainService.LocalBinder mSrvBinder; // set once connection completed
     private MainService.MqttServerEvent mLastMSE;
     private final MainService.Observer mSrvObs = new MainService.Observer() {
         @Override
@@ -77,7 +80,7 @@ public class MainActivity extends AppCompatActivity {
 
     private MenuItem mMenuReconn;
 
-    private CtFwSDisplayLocal mCdl; // set in onStart
+    private MainActivityCtFwSDisplay mCdl; // set in onStart
     private TextView mTvSU; // set in onStart
     private TextView mTvSS; // set in onStart
     private void setServerStateText(@StringRes final int resid, Object... args) {
@@ -120,35 +123,19 @@ public class MainActivity extends AppCompatActivity {
         mTvSU = findViewById(R.id.tv_mqtt_server_uri);
         mTvSS = findViewById(R.id.tv_mqtt_state);
 
-        mCdl = new CtFwSDisplayLocal(this);
+        mCdl = new MainActivityCtFwSDisplay(this);
     }
 
-    private final ServiceConnection ctfwssc = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mSrvBinder = (MainService.LocalBinder) service;
-            mSrvBinder.getGameState().registerObserver(mCdl);
-            mSrvBinder.registerObserver(mSrvObs);
-            mabh.onStart(MainActivity.this, mSrvBinder);
-            mSrvBinder.connect(false);
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mSrvBinder = null;
-            mLastMSE = MainService.MqttServerEvent.MSE_DISCONN; /* sort of, anyway */
-        }
-    };
+    protected void doRegisterObservers(){
+        mSrvBinder.getGameState().registerObserver(mCdl);
+        mSrvBinder.registerObserver(mSrvObs);
+        mabh.onRegisterObservers(MainActivity.this, mSrvBinder);
+    }
 
     @Override
     public void onStart() {
         Log.d(TAG, "onStart");
         super.onStart();
-
-        if (mSrvBinder == null) {
-            Intent si = new Intent(this, MainService.class);
-            bindService(si, ctfwssc, Context.BIND_AUTO_CREATE | Context.BIND_ABOVE_CLIENT);
-        }
     }
 
     @Override
@@ -196,8 +183,6 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onDestroy() {
         Log.d(TAG, "onDestroy");
-        unbindService(ctfwssc);
-
         super.onDestroy();
     }
 
@@ -235,6 +220,9 @@ public class MainActivity extends AppCompatActivity {
             case R.id.mainmenu_hand:
                 startActivity(new Intent(this, HandbookActivity.class));
                 return true;
+            case R.id.mainmenu_judge:
+                startActivity(new Intent(this, JudgeActivity.class));
+                return true;
             case R.id.mainmenu_screenwake:
                 boolean checked = mi.isChecked();
                 if (checked) {
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooks.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooks.java
similarity index 54%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooks.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooks.java
index 6f381f4..62372ce 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooks.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooks.java
@@ -1,8 +1,10 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.activity;
+
+import com.acmetensortoys.ctfwstimer.service.MainService;
 
 // The MainActivity expects a "MainActivityBuildHooksImpl" class that ascribes to this interface
 // per build flavor.  This will be used when, for example, we kick on Google Play for Wear
 // interaction and want to push messages out to the wearable data network.
-interface MainActivityBuildHooks {
-    void onStart(MainActivity ma, MainService.LocalBinder b);
+public interface MainActivityBuildHooks {
+    void onRegisterObservers(MainActivity ma, MainService.LocalBinder b);
 }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
similarity index 98%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
index 7b37665..cb14738 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivityCtFwSDisplay.java
@@ -1,4 +1,4 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.activity;
 
 import android.app.Activity;
 import android.content.res.Resources;
@@ -14,6 +14,7 @@ import android.widget.Chronometer;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.acmetensortoys.ctfwstimer.R;
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;
 import com.acmetensortoys.ctfwstimer.utils.AndroidResourceUtils;
 
@@ -23,13 +24,13 @@ import java.util.SortedSet;
 import static android.view.View.INVISIBLE;
 
 // TODO nwf is bad at UI design; someone who isn't him should improve this
-class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
+class MainActivityCtFwSDisplay implements CtFwSGameStateManager.Observer {
     final private Activity mAct;
     String gameStateLabelText;
 
     private final StunTimer stun_short, stun_long;
 
-    CtFwSDisplayLocal(Activity a) {
+    MainActivityCtFwSDisplay(Activity a) {
         mAct = a;
         gameStateLabelText = mAct.getResources().getString(R.string.header_gamestate0);
 
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
similarity index 94%
rename from mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java
rename to mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
index a4802b3..0ea1ece 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayTinyChrono.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/CtFwSDisplayTinyChrono.java
@@ -1,9 +1,10 @@
-package com.acmetensortoys.ctfwstimer;
+package com.acmetensortoys.ctfwstimer.utils;
 
 import android.content.res.Resources;
 import android.os.SystemClock;
 import android.widget.Chronometer;
 
+import com.acmetensortoys.ctfwstimer.R;
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;
 
 import java.util.SortedSet;
@@ -13,7 +14,7 @@ import java.util.SortedSet;
  * in the headers.  This provides that for us.
  */
 
-class CtFwSDisplayTinyChrono implements CtFwSGameStateManager.Observer {
+public class CtFwSDisplayTinyChrono implements CtFwSGameStateManager.Observer {
 
     private final Chronometer mCh;
     private final Resources mRes;
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
index 04f9407..e081cf0 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
@@ -5,7 +5,7 @@ import android.os.Handler;
 import android.support.v4.util.Consumer;
 import android.util.Log;
 
-import com.acmetensortoys.ctfwstimer.HandbookActivity;
+import com.acmetensortoys.ctfwstimer.activity.HandbookActivity;
 
 import org.eclipse.paho.client.mqttv3.IMqttAsyncClient;
 import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
diff --git a/mobile/src/main/res/layout-land/activity_about.xml b/mobile/src/main/res/layout-land/activity_about.xml
index 7f409c0..3df64dd 100644
--- a/mobile/src/main/res/layout-land/activity_about.xml
+++ b/mobile/src/main/res/layout-land/activity_about.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.acmetensortoys.ctfwstimer.AboutActivity">
+    tools:context="com.acmetensortoys.ctfwstimer.activity.AboutActivity">
 
     <TabHost
         android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout-land/activity_main.xml b/mobile/src/main/res/layout-land/activity_main.xml
index 97007b3..38910de 100644
--- a/mobile/src/main/res/layout-land/activity_main.xml
+++ b/mobile/src/main/res/layout-land/activity_main.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.acmetensortoys.ctfwstimer.MainActivity">
+    tools:context="com.acmetensortoys.ctfwstimer.activity.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/activity_about.xml b/mobile/src/main/res/layout/activity_about.xml
index 3ae3d29..1833991 100644
--- a/mobile/src/main/res/layout/activity_about.xml
+++ b/mobile/src/main/res/layout/activity_about.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.acmetensortoys.ctfwstimer.AboutActivity">
+    tools:context="com.acmetensortoys.ctfwstimer.activity.AboutActivity">
 
     <TabHost
         android:layout_width="match_parent"
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index 735ee3f..d308df2 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.acmetensortoys.ctfwstimer.MainActivity">
+    tools:context="com.acmetensortoys.ctfwstimer.activity.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml
index 974ec00..c32f8e3 100644
--- a/mobile/src/main/res/values/dimens.xml
+++ b/mobile/src/main/res/values/dimens.xml
@@ -4,4 +4,5 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
 
     <dimen name="hand_tab_div_size">4dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooksImpl.java b/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooksImpl.java
deleted file mode 100644
index 6fe3d90..0000000
--- a/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/MainActivityBuildHooksImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.acmetensortoys.ctfwstimer;
-
-class MainActivityBuildHooksImpl implements MainActivityBuildHooks {
-    @Override
-    public void onStart(MainActivity ma, MainService.LocalBinder b) {
-        // NOP
-    }
-}
diff --git a/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooksImpl.java b/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooksImpl.java
new file mode 100644
index 0000000..7ea9ef6
--- /dev/null
+++ b/mobile/src/noplay/java/com/acmetensortoys/ctfwstimer/activity/MainActivityBuildHooksImpl.java
@@ -0,0 +1,12 @@
+package com.acmetensortoys.ctfwstimer.activity;
+
+import com.acmetensortoys.ctfwstimer.activity.MainActivity;
+import com.acmetensortoys.ctfwstimer.activity.MainActivityBuildHooks;
+import com.acmetensortoys.ctfwstimer.service.MainService;
+
+class MainActivityBuildHooksImpl implements MainActivityBuildHooks {
+    @Override
+    public void onRegisterObservers(MainActivity ma, MainService.LocalBinder b) {
+        // NOP
+    }
+}
-- 
2.50.1