Commit 2a900c37 authored by Craig Earley's avatar Craig Earley
Browse files

fixes inconsistent portrait and landscape layouts for some screens

parent 8bb842a9
......@@ -30,9 +30,6 @@ public class SampleButtonsFragment extends Fragment {
Activity a;
if (context instanceof Activity){
}
}
}
\ No newline at end of file
......@@ -140,8 +140,28 @@
android:id="@+id/lastClean"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textColor="@color/dark_gray_blue"
android:layout_alignParentBottom="true"
android:layout_alignStart="@+id/lastDownload"
android:layout_marginBottom="47dp" />
android:layout_above="@+id/databaseSize"
android:layout_alignStart="@+id/lastDownload" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/databaseSize"
android:id="@+id/databaseSize"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:textColor="@color/dark_gray_blue"
android:layout_above="@+id/databaseStatus"
android:layout_alignStart="@id/lastUpload" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/databaseStatus"
android:id="@+id/databaseStatus"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:textColor="@color/dark_gray_blue"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/lastUpload"
android:layout_marginBottom="25dp" />
</RelativeLayout>
\ No newline at end of file
......@@ -111,19 +111,26 @@
android:id="@+id/wipeDatabase"
android:layout_alignTop="@+id/setupDbButton"
android:layout_toEndOf="@+id/lastUpload" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Clean field data"
android:id="@+id/wipeFieldData"
android:layout_below="@id/wipeDatabase"
android:layout_alignParentStart="true"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Clean readings table"
android:id="@+id/wipeReadingsTable"
android:layout_below="@id/wipeDatabase"
android:layout_below="@id/wipeFieldData"
android:layout_alignParentStart="true"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Clean streaming table"
android:id="@+id/wipeStreamingTable"
android:layout_below="@id/wipeDatabase"
android:layout_below="@id/wipeFieldData"
android:layout_alignParentEnd="true"/>
<TextView
android:layout_width="wrap_content"
......@@ -133,8 +140,7 @@
android:layout_alignStart="@id/setupDbButton"
android:textColor="@color/dark_gray_blue"
android:textAppearance="@android:style/TextAppearance.Medium"
android:layout_below="@id/wipeDatabase"
android:layout_marginTop="25dp" />
android:layout_below="@id/wipeStreamingTable"/>
<TextView
android:layout_width="wrap_content"
......@@ -153,8 +159,28 @@
android:id="@+id/lastClean"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textColor="@color/dark_gray_blue"
android:layout_alignParentBottom="true"
android:layout_alignStart="@+id/lastDownload"
android:layout_marginBottom="47dp" />
android:layout_above="@id/databaseSize"
android:layout_alignStart="@+id/lastDownload"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/databaseSize"
android:id="@+id/databaseSize"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:textColor="@color/dark_gray_blue"
android:layout_above="@+id/databaseStatus"
android:layout_alignStart="@id/lastUpload" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/databaseStatus"
android:id="@+id/databaseStatus"
android:textAppearance="@android:style/TextAppearance.Medium"
android:textStyle="bold"
android:textColor="@color/dark_gray_blue"
android:layout_alignParentBottom="true"
android:layout_alignStart="@id/lastUpload"
android:layout_marginBottom="25dp" />
</RelativeLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:focusableInTouchMode="true"
android:background="@drawable/take_a_sample_landscape">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textStyle="bold"
android:text=""
android:id="@+id/tripNameText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -88,6 +95,19 @@
android:layout_marginTop="0dp"
android:layout_centerInParent="true"
android:id="@+id/interval">
<RadioButton
android:id="@+id/oneSecond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/intervalbuttonselector"
android:button="@android:color/transparent"
android:checked="true"
android:onClick="changeInterval"
android:padding="10dp"
android:text="@string/oneSecond"
android:textColor="#FFFFFF"
android:visibility="invisible"
tools:visibility="visible" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -178,5 +198,46 @@
android:layout_alignParentBottom="true"
android:layout_toEndOf="@+id/exportDbButton"
android:layout_marginStart="23dp" />
<Button
android:id="@+id/addPictureButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/streamButton"
android:layout_margin="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:layout_toStartOf="@+id/addNotesButton"
android:background="#E6FFFFFF"
android:backgroundTint="#FFFFFF"
android:onClick="takePicture"
android:padding="5dp"
android:text="Add Picture" />
<Button
android:id="@+id/addNotesButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/streamButton"
android:layout_alignEnd="@+id/satellites"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:background="#E6FFFFFF"
android:onClick="addNotes"
android:padding="5dp"
android:text="Add Notes" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/calibrateSensorButton"
android:onClick="calibrateSensor"
android:visibility="invisible"
android:text="Calibrate Sensor"
android:layout_above="@+id/sampleButton"
android:layout_toEndOf="@+id/addNotesButton"
android:layout_alignTop="@+id/addNotesButton" />
</RelativeLayout>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment