Merge pull request #31 from maximesahagian/feat/app_echography_v2

[FEAT] Fixes echographs view and adds features

android-app/app/src/main/java/com/echopen/asso/echopen/fragments/EchoFragment.java

@@ -5,10 +5,12 @@
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Point;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.util.Log;
 import android.view.Display;
 import android.view.LayoutInflater;
@@ -98,13 +100,14 @@ public void onClick(View v) {
                         if (mHandler != null) return true;
                         mHandler = new android.os.Handler();
                         mHandler.postDelayed(mAction, 250);
+                        btn_capture.setBackgroundResource(R.drawable.capture_video);
                         break;
                     case MotionEvent.ACTION_UP:
                         if (mHandler == null) return true;
                         mHandler.removeCallbacks(mAction);
                         mHandler = null;
                         burstFireFolderCreated = false;
-
+                        btn_capture.setBackgroundResource(R.drawable.capture);
                         break;
                 }
                 return false;
@@ -173,7 +176,7 @@ public void setPresenter(EchographyImageVisualisationContract.Presenter presente
 
             }
         });
-        EchographyImageStreamingMode mode = new EchographyImageStreamingTCPMode("10.6.36.77", 7538);
+        EchographyImageStreamingMode mode = new EchographyImageStreamingTCPMode("192.168.1.41", 7538);
 
         stream.connect(mode,activity);
         presenter.start();

android-app/app/src/main/res/layout/fragment_echo.xml

@@ -1,24 +1,47 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/background"
     android:visibility="visible"
     tools:context="com.echopen.asso.echopen.fragments.EchoFragment">
 
-    <include layout="@layout/header"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black"
+        android:orientation="horizontal">
 
-    <!-- TODO: Update blank fragment layout -->
-    <Button
-        android:id="@+id/button_capture"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center"
-        android:text="Capture"/>
+        <ImageView
+            android:id="@+id/echography"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <include
+        layout="@layout/header"
+        android:layout_weight="0.02" />
 
-    <ImageView
-        android:id="@+id/echography"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/white"
+        android:layout_gravity="bottom"
+        android:gravity="center"
+        android:weightSum="1">
+
+        <Button
+            android:id="@+id/button_capture"
+            android:layout_width="50dp"
+            android:layout_height="56dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/capture"
+            android:layout_weight="0.02" />
+
+    </LinearLayout>
 
 </FrameLayout>

android-app/app/src/main/res/layout/fragment_help.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#39DC62"
+    android:background="@drawable/background_help"
     android:visibility="visible"
     tools:context="com.echopen.asso.echopen.fragments.HelpFragment">
 
@@ -233,6 +233,15 @@
 
     </RelativeLayout>
 
+    <!--
+    <ImageView
+        android:id="@+id/imageView3"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_weight="1"
+        android:scaleType="fitStart"
+        app:srcCompat="@drawable/ic_people_black_24px" />-->
+
     <TextView
         android:id="@+id/settings_title"
         android:layout_width="wrap_content"
@@ -265,7 +274,4 @@
         android:layout_alignTop="@+id/settings_title"
         android:layout_marginStart="25dp"
         app:srcCompat="@drawable/ic_help_outline_black_24px" />
-
-    <!-- TODO: Update blank fragment layout -->
-
 </RelativeLayout>

android-app/app/src/main/res/layout/fragment_settings.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/holo_orange_light"
+    android:background="@drawable/background_settings"
     android:visibility="visible"
     android:id="@+id/settings_layer"
     tools:context="com.echopen.asso.echopen.fragments.SettingsFragment">