シャッターや絞り、露出補正を変更できるようにした。

[gokigen/Gr2Control.git] / app / src / main / res / layout / fragment_live_view.xml

diff --git a/app/src/main/res/layout/fragment_live_view.xml b/app/src/main/res/layout/fragment_live_view.xml
index 0439185..3fd10b4 100644 (file)
--- a/app/src/main/res/layout/fragment_live_view.xml
+++ b/app/src/main/res/layout/fragment_live_view.xml
@@ -4,10 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:ignore="HardcodedText,ContentDescription" >
+
     <LinearLayout
-        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:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -465,6 +463,154 @@
         android:visibility="gone"
         android:background="@color/background_translucent_white" >
 
+        <ImageView
+            android:id="@+id/button_fuji_x_sv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="8pt"
+            android:layout_marginLeft="6pt"
+            android:layout_marginStart="6pt"
+            android:gravity="center" />
+
+        <TextView
+            android:id="@+id/label_fuji_x_sv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_sv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_sv_minus"
+            android:layout_alignTop="@id/button_fuji_x_sv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/shutter_speed"
+            android:textColor="@color/colorBlack"
+            android:textStyle="bold"
+            android:textSize="8pt"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_sv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_sv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_sv_center"
+            android:layout_toRightOf="@id/label_fuji_x_sv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_tv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_sv_minus"
+            android:layout_alignLeft="@id/button_fuji_x_sv_minus"
+            android:layout_alignStart="@id/button_fuji_x_sv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <TextView
+            android:id="@+id/label_fuji_x_tv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_tv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_tv_minus"
+            android:layout_alignTop="@id/button_fuji_x_tv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/aperture"
+            android:textColor="@color/colorBlack"
+            android:textStyle="bold"
+            android:textSize="8pt"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_tv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_tv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_tv_center"
+            android:layout_toRightOf="@id/label_fuji_x_tv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_xv_minus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_below="@id/button_fuji_x_tv_minus"
+            android:layout_alignLeft="@id/button_fuji_x_tv_minus"
+            android:layout_alignStart="@id/button_fuji_x_tv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_remove_circle_outline_black_24dp"
+            android:layout_marginTop="6pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/label_fuji_x_xv_center"
+            android:layout_width="34pt"
+            android:layout_height="14pt"
+            android:layout_toEndOf="@id/button_fuji_x_xv_minus"
+            android:layout_toRightOf="@id/button_fuji_x_xv_minus"
+            android:layout_alignTop="@id/button_fuji_x_xv_minus"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_exposure_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
+
+        <ImageView
+            android:id="@+id/button_fuji_x_xv_plus"
+            android:layout_width="20pt"
+            android:layout_height="14pt"
+            android:layout_alignTop="@id/button_fuji_x_xv_minus"
+            android:layout_toEndOf="@id/label_fuji_x_xv_center"
+            android:layout_toRightOf="@id/label_fuji_x_xv_center"
+            android:scaleType="fitCenter"
+            android:visibility="visible"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_add_circle_outline_black_24dp"
+            android:layout_marginLeft="2pt"
+            android:layout_marginStart="2pt"
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/fuji_x_hideKeyPanelTextView"