fix that shutterbutton did not show correct module state when freedcam is not in mem

Author: KillerInk

app/src/main/java/freed/cam/ui/CameraUiSlidePagerAdapter.java

@@ -31,6 +31,9 @@ public void setCameraFragment(CameraFragmentAbstract cameraFragment)
         this.cameraFragment = cameraFragment;
         settingsMenuFragment.setCameraToUi(cameraFragment);
         cameraUiFragment.setCameraToUi(cameraFragment);
+
+        if (cameraFragment != null)
+            cameraFragment.getModuleHandler().ModuleHasChanged(cameraFragment.getModuleHandler().getCurrentModuleName());
     }
 
     public void updateScreenSlideFile(List<FileHolder> files)

app/src/main/java/freed/cam/ui/themesample/cameraui/ShutterAnimationHandler.java

@@ -86,7 +86,9 @@ public boolean isRunning()
 
     public ShutterAnimationHandler(Looper looper, Resources resources,ShutterButton shutterButton)
     {
+
         super(looper);
+        halfsize = resources.getDimensionPixelSize(R.dimen.cameraui_shuttericon_size) /2;
         uiHandler = new UIHandler(Looper.getMainLooper());
         this.shutterButton = shutterButton;
         //used to draw green timer inside the shutter button
@@ -174,7 +176,6 @@ public void stopShutterTimer() {
     private void run()
     {
         calcstartTime = System.nanoTime();
-        halfsize = shutterButton.getWidth()/2;
         MAX_SHUTTER_OPEN = (shutterButton.getWidth() - 100) / 2;
         SHUTTER_OPEN_STEP = (MAX_SHUTTER_OPEN) / MAXFRAMES;
         MAX_RECORDING_OPEN = shutterButton.getWidth() /4;

app/src/main/java/freed/cam/ui/themesample/cameraui/ShutterButton.java

@@ -31,6 +31,7 @@
 import com.troop.freedcam.R;
 
 import freed.cam.apis.basecamera.CameraWrapperInterface;
+import freed.cam.apis.basecamera.modules.ModuleChangedEvent;
 import freed.cam.apis.basecamera.modules.ModuleHandlerAbstract;
 import freed.cam.apis.basecamera.modules.ModuleHandlerAbstract.CaptureStates;
 import freed.settings.Settings;
@@ -41,7 +42,7 @@
 /**
  * Created by troop on 20.06.2015.
  */
-public class ShutterButton extends android.support.v7.widget.AppCompatButton implements ModuleHandlerAbstract.CaptureStateChanged {
+public class ShutterButton extends android.support.v7.widget.AppCompatButton implements ModuleHandlerAbstract.CaptureStateChanged, ModuleChangedEvent {
     private CameraWrapperInterface cameraUiWrapper;
 
     private final String TAG = ShutterButton.class.getSimpleName();
@@ -53,9 +54,11 @@ public class ShutterButton extends android.support.v7.widget.AppCompatButton imp
      * Starts a background thread and its {@link Handler}.
      */
     private void startBackgroundThread() {
-        mBackgroundThread = new HandlerThread("ShutterDraw");
-        mBackgroundThread.start();
-        animationHandler = new ShutterAnimationHandler(mBackgroundThread.getLooper(),getResources(),this);
+        if (mBackgroundThread ==  null || !mBackgroundThread.isAlive()) {
+            mBackgroundThread = new HandlerThread("ShutterDraw");
+            mBackgroundThread.start();
+            animationHandler = new ShutterAnimationHandler(mBackgroundThread.getLooper(), getResources(), this);
+        }
     }
 
     /**
@@ -103,6 +106,7 @@ protected void onDetachedFromWindow() {
 
     private void init(Context context) {
 
+        startBackgroundThread();
         //set background img that get then overdrawn
         setBackgroundResource(R.drawable.shutter5);
 
@@ -139,9 +143,12 @@ public void SetCameraUIWrapper(CameraWrapperInterface cameraUiWrapper, UserMessa
         if (cameraUiWrapper.getModuleHandler() == null)
             return;
         this.cameraUiWrapper = cameraUiWrapper;
+        cameraUiWrapper.getModuleHandler().addListner(this);
         cameraUiWrapper.getModuleHandler().setWorkListner(this);
-        if(cameraUiWrapper.getModuleHandler().getCurrentModule() != null)
+        if(cameraUiWrapper.getModuleHandler().getCurrentModule() != null) {
             onCaptureStateChanged(cameraUiWrapper.getModuleHandler().getCurrentModule().getCurrentCaptureState());
+
+        }
         Log.d(this.TAG, "Set cameraUiWrapper to ShutterButton");
     }
 
@@ -207,4 +214,10 @@ protected void onDraw(Canvas canvas)
         animationHandler.onDraw(canvas);
     }
 
+    @Override
+    public void onModuleChanged(String module) {
+        if(cameraUiWrapper.getModuleHandler().getCurrentModule() != null) {
+            onCaptureStateChanged(cameraUiWrapper.getModuleHandler().getCurrentModule().getCurrentCaptureState());
+        }
+    }
 }