From ec0ae231f90736567325f9ff9c01fbc8af33b2bc Mon Sep 17 00:00:00 2001
From: Dominique Blouin <dominique.blouin@telecom-paristech.fr>
Date: Mon, 23 Apr 2012 12:26:32 +0000
Subject: [PATCH] add new layouts
---
src/android/res/layout/avatarbdblock.xml | 13 ++++
src/android/res/layout/avatarbdtoolbar.xml | 63 +++++++++++++++++++
src/android/res/layout/avatarblock.xml | 9 +++
src/android/res/layout/block.xml | 59 +++++++----------
src/android/res/layout/blocknamealert.xml | 36 +++++++++++
.../res/layout/editattributesalert.xml | 51 +++++++++++++++
6 files changed, 194 insertions(+), 37 deletions(-)
create mode 100644 src/android/res/layout/avatarbdblock.xml
create mode 100644 src/android/res/layout/avatarbdtoolbar.xml
create mode 100644 src/android/res/layout/avatarblock.xml
create mode 100644 src/android/res/layout/blocknamealert.xml
create mode 100644 src/android/res/layout/editattributesalert.xml
diff --git a/src/android/res/layout/avatarbdblock.xml b/src/android/res/layout/avatarbdblock.xml
new file mode 100644
index 0000000000..cc50add14f
--- /dev/null
+++ b/src/android/res/layout/avatarbdblock.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <project.alwaystry.Blockrectangle
+ android:id="@+id/myblockrectangle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/android/res/layout/avatarbdtoolbar.xml b/src/android/res/layout/avatarbdtoolbar.xml
new file mode 100644
index 0000000000..12ea10279e
--- /dev/null
+++ b/src/android/res/layout/avatarbdtoolbar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+
+ <ImageButton
+ android:id="@+id/property"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/properties16"
+ android:onClick="clickbutton"/>
+
+ <ImageButton
+ android:id="@+id/edit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/edit16"
+ android:onClick="clickbutton"/>
+
+ <ImageButton
+ android:id="@+id/concomment"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/concomment"
+ android:onClick="clickbutton" />
+
+ <ImageButton
+ android:id="@+id/block"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/avatarblock"
+ android:onClick="clickbutton" />
+
+ <ImageButton
+ android:id="@+id/cryptoblock"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/avatarblock"
+ android:onClick="clickbutton"/>
+
+ <ImageButton
+ android:id="@+id/datatype"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/avatardatatype"
+ android:onClick="clickbutton" />
+
+ <ImageButton
+ android:id="@+id/comp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/avatarbdcomp"
+ android:onClick="clickbutton" />
+
+ <ImageButton
+ android:id="@+id/link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:src="@drawable/avatarbdlink"
+ android:onClick="clickbutton" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/android/res/layout/avatarblock.xml b/src/android/res/layout/avatarblock.xml
new file mode 100644
index 0000000000..ed69a32804
--- /dev/null
+++ b/src/android/res/layout/avatarblock.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/src/android/res/layout/block.xml b/src/android/res/layout/block.xml
index 9037a2b294..d68e987dcb 100644
--- a/src/android/res/layout/block.xml
+++ b/src/android/res/layout/block.xml
@@ -1,51 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
- <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/relativeLayout1"
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/linearLayout1"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="#FFFFFF" >
+ android:background="#FFFFFF"
+ android:orientation="vertical" >
- <project.alwaystry.Blockrectangle
- android:id="@+id/blockrectangle1"
+ <project.alwaystry.AvatarbdToolbarAndroid
+ android:id="@+id/avatarbdToolbarAndroid1"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="65dp"
- android:layout_marginTop="75dp" />
+ android:layout_height="wrap_content" >
+ </project.alwaystry.AvatarbdToolbarAndroid>
- <LinearLayout
- android:id="@+id/linearLayout1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true" >
-
- <ImageButton
- android:id="@+id/imageButton1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/avatarblock" />
-
- <ImageButton
- android:id="@+id/imageButton2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/avatarbdcomp" />
+ <RelativeLayout
+ android:id="@+id/relativeLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
- <ImageButton
- android:id="@+id/imageButton3"
+ <project.alwaystry.Blockrectangle
+ android:id="@+id/blockrectangle1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/avatarbdlink" />
+ android:layout_marginLeft="46dp"
+ android:layout_marginTop="129dp" />
- <ImageButton
- android:id="@+id/imageButton4"
+ <project.alwaystry.Blockrectangle
+ android:id="@+id/blockrectangle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/avatardatatype" />
+ android:layout_marginLeft="50dp"
+ android:layout_marginTop="23dp" />
- </LinearLayout>
+ </RelativeLayout>
- </RelativeLayout>
+ </LinearLayout>
diff --git a/src/android/res/layout/blocknamealert.xml b/src/android/res/layout/blocknamealert.xml
new file mode 100644
index 0000000000..7363e0a995
--- /dev/null
+++ b/src/android/res/layout/blocknamealert.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <ImageView
+ android:id="@+id/imageView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="26dp"
+ android:layout_marginTop="29dp"
+ android:src="@drawable/ic_launcher" />
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@+id/imageView1"
+ android:layout_centerHorizontal="true"
+ android:text="TextView" />
+
+ <EditText
+ android:id="@+id/editText1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignRight="@+id/textView1"
+ android:layout_below="@+id/textView1" >
+
+ <requestFocus />
+ </EditText>
+
+</RelativeLayout>
+
diff --git a/src/android/res/layout/editattributesalert.xml b/src/android/res/layout/editattributesalert.xml
new file mode 100644
index 0000000000..53c6f06bc7
--- /dev/null
+++ b/src/android/res/layout/editattributesalert.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/tabhost1"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <RelativeLayout
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:padding="5dp">
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
+
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="fill_parent"
+ android:layout_height="337dp"
+ android:padding="5dp" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="TextView" />
+
+ </FrameLayout>
+
+ <Button
+ android:id="@+id/button1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignLeft="@android:id/tabcontent"
+ android:layout_alignParentBottom="true"
+ android:layout_marginBottom="21dp"
+ android:text="Button" />
+
+ <Button
+ android:id="@+id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@+id/button1"
+ android:layout_alignBottom="@+id/button1"
+ android:layout_alignRight="@android:id/tabcontent"
+ android:layout_marginRight="37dp"
+ android:text="Button" />
+
+ </RelativeLayout>
+</TabHost>
\ No newline at end of file
--
GitLab