Permalink
Browse files

Cleanups, refactorings, bugfixes, feature enhancements.

  • Loading branch information...
1 parent 5d1c22f commit abc9231a25bcdda858a32a17dc2ac6365f2df416 @hdweiss hdweiss committed Sep 28, 2012
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical" >
-
- <EditText
- android:id="@+id/agenda_block_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:hint="Title"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="5dp"
- android:orientation="horizontal" >
-
- <ImageView
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
- android:contentDescription="Todo"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_menu_agenda" />
-
- <EditText
- android:id="@+id/agenda_block_todo"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="Todo" >
- </EditText>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="5dp"
- android:orientation="horizontal" >
-
- <ImageView
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
- android:layout_marginLeft="5dp"
- android:contentDescription="@string/tags"
- android:src="@drawable/ic_menu_tag" />
-
- <EditText
- android:id="@+id/agenda_block_tag"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="Tags" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="5dp"
- android:orientation="horizontal" >
-
- <ImageView
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
- android:contentDescription="Priority"
- android:scaleType="fitCenter"
- android:src="@drawable/ic_menu_star" />
-
- <EditText
- android:id="@+id/agenda_block_priority"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="Priority" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="5dp"
- android:orientation="horizontal" >
-
- <ImageView
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:layout_gravity="center_vertical"
- android:contentDescription="Priority"
- android:scaleType="fitCenter" />
-
- <EditText
- android:id="@+id/agenda_block_payload"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:hint="Payload" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_margin="5dp"
- android:orientation="horizontal" >
-
- <CheckBox
- android:id="@+id/agenda_block_habits"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Filter habits" />
- </LinearLayout>
- </LinearLayout>
-
-</ScrollView>
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip" >
+
+ <EditText
+ android:id="@+id/agenda_entry_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:hint="Title"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="3dip" >
+
+ <CheckBox
+ android:id="@+id/agenda_entry_active_todos"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Only active todos" />
+
+ <CheckBox
+ android:id="@+id/agenda_entry_habits"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Filter habits" />
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="3dip" >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_margin="5dp"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_gravity="center_vertical"
+ android:contentDescription="Todo"
+ android:scaleType="fitCenter"
+ android:src="@drawable/ic_menu_agenda" />
+
+ <EditText
+ android:id="@+id/agenda_entry_todo"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:hint="TODO:DONE..." >
+ </EditText>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_margin="5dp"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="5dp"
+ android:contentDescription="@string/tags"
+ android:src="@drawable/ic_menu_tag" />
+
+ <EditText
+ android:id="@+id/agenda_entry_tag"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:hint="Tag1:Tag2..." />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_margin="5dp"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_gravity="center_vertical"
+ android:contentDescription="Priority"
+ android:scaleType="fitCenter"
+ android:src="@drawable/ic_menu_star" />
+
+ <EditText
+ android:id="@+id/agenda_entry_priority"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:hint="A:B..." />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_margin="5dp"
+ android:orientation="horizontal" >
+
+ <ImageView
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:layout_gravity="center_vertical"
+ android:contentDescription="Priority"
+ android:scaleType="fitCenter" />
+
+ <EditText
+ android:id="@+id/agenda_entry_payload"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:hint="Payload1:Payload2..." />
+ </LinearLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="3dip" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:text="Files"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <LinearLayout
+ android:id="@+id/agenda_entry_files"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical" />
+ </LinearLayout>
+ </LinearLayout>
+
+</ScrollView>
@@ -4,21 +4,52 @@
android:layout_height="match_parent"
android:orientation="vertical" >
- <EditText
- android:id="@+id/agenda_title"
- android:layout_width="match_parent"
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
- android:ems="10"
- android:hint="Title" >
-
- <requestFocus />
- </EditText>
-
- <ListView
- android:id="@+id/agenda_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
- </ListView>
+ android:paddingTop="3dip" >
+
+ <EditText
+ android:id="@+id/agenda_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dp"
+ android:ems="10"
+ android:hint="Title" >
+
+ <requestFocus />
+ </EditText>
+ </LinearLayout>
+
+ <LinearLayout
+ style="@style/EditBorders"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="3dip"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center"
+ android:text="Entries"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <ListView
+ android:id="@+id/agenda_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="5dp" >
+ </ListView>
+
+ <Button
+ android:id="@+id/agenda_create"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Add entry" />
+ </LinearLayout>
</LinearLayout>
Oops, something went wrong.

0 comments on commit abc9231

Please sign in to comment.