summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-04 13:00:22 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-04 13:00:22 +0000
commitc18a56debd8df68c5bd823576346e048fc8788ef (patch)
tree25187709f012e97dea65dbdbe9ccec6e4758ee2d
parent4a3d1a8cbbb8c4356398cb2b019695430fd3ea9f (diff)
text overlay and layout reorganised
-rw-r--r--bin/classes/com/example/rotorm/R$id.classbin524 -> 624 bytes
-rw-r--r--bin/classes/com/example/rotorm/R$layout.classbin394 -> 394 bytes
-rw-r--r--bin/classes/com/example/rotorm/R$menu.classbin388 -> 388 bytes
-rw-r--r--bin/classes/com/example/rotorm/R$string.classbin472 -> 472 bytes
-rw-r--r--bin/classes/com/example/rotorm/R$style.classbin431 -> 431 bytes
-rw-r--r--gen/com/example/rotorm/R.java7
-rw-r--r--res/layout/main.xml29
7 files changed, 30 insertions, 6 deletions
diff --git a/bin/classes/com/example/rotorm/R$id.class b/bin/classes/com/example/rotorm/R$id.class
index 3a3dc17..9f7c352 100644
--- a/bin/classes/com/example/rotorm/R$id.class
+++ b/bin/classes/com/example/rotorm/R$id.class
Binary files differ
diff --git a/bin/classes/com/example/rotorm/R$layout.class b/bin/classes/com/example/rotorm/R$layout.class
index d5f016a..ca72178 100644
--- a/bin/classes/com/example/rotorm/R$layout.class
+++ b/bin/classes/com/example/rotorm/R$layout.class
Binary files differ
diff --git a/bin/classes/com/example/rotorm/R$menu.class b/bin/classes/com/example/rotorm/R$menu.class
index 88bf13a..c610fe8 100644
--- a/bin/classes/com/example/rotorm/R$menu.class
+++ b/bin/classes/com/example/rotorm/R$menu.class
Binary files differ
diff --git a/bin/classes/com/example/rotorm/R$string.class b/bin/classes/com/example/rotorm/R$string.class
index bff6cf5..d961e03 100644
--- a/bin/classes/com/example/rotorm/R$string.class
+++ b/bin/classes/com/example/rotorm/R$string.class
Binary files differ
diff --git a/bin/classes/com/example/rotorm/R$style.class b/bin/classes/com/example/rotorm/R$style.class
index 54c540c..e690261 100644
--- a/bin/classes/com/example/rotorm/R$style.class
+++ b/bin/classes/com/example/rotorm/R$style.class
Binary files differ
diff --git a/gen/com/example/rotorm/R.java b/gen/com/example/rotorm/R.java
index 3371583..db9d489 100644
--- a/gen/com/example/rotorm/R.java
+++ b/gen/com/example/rotorm/R.java
@@ -24,11 +24,14 @@ public final class R {
public static final int ic_launcher=0x7f020000;
}
public static final class id {
- public static final int action_settings=0x7f080004;
- public static final int buttonClick=0x7f080003;
+ public static final int action_settings=0x7f080007;
+ public static final int buttonClick=0x7f080006;
+ public static final int buttonholder=0x7f080005;
public static final int layout=0x7f080000;
public static final int preview=0x7f080001;
public static final int surfaceView=0x7f080002;
+ public static final int textView=0x7f080004;
+ public static final int timecode=0x7f080003;
}
public static final class layout {
public static final int main=0x7f030000;
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 2041418..63b569b 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -17,10 +17,31 @@
android:layout_height="wrap_content" />
</FrameLayout>
- <Button
- android:id="@+id/buttonClick"
+ <FrameLayout
+ android:id="@+id/timecode"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:layout_centerInParent="true">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#FF2222"
+ android:textSize="32dp"
+ android:text=""
+ android:id="@+id/textView"/>
+ </FrameLayout>
+ <FrameLayout
+ android:id="@+id/buttonholder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:text="Capture" />
+ android:orientation="vertical"
+ android:layout_alignParentBottom="true"
+ android:layout_centerInParent="true">
+ <Button
+ android:id="@+id/buttonClick"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Capture" />
+ </FrameLayout>
</RelativeLayout> \ No newline at end of file