Merge branch 'master' of github.com:Determinant/piztor

6 files changed, 144 insertions, 21 deletions

diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml
index 670a3dc..a8cf47f 100644
--- a/client/Piztor/res/layout/activity_login.xml
+++ b/client/Piztor/res/layout/activity_login.xml
@@ -50,7 +50,7 @@
         <EditText 
             android:textSize="16.0sp" 
             android:textColor="@android:color/white" 
-            android:textColorHint="#ff666666" 
+            android:textColorHint="#ff666666"
             android:gravity="center_vertical" 
             android:id="@+id/user_pass" 
             android:background="#00ffffff" 
diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml
index 3bd6fef..49e8dfe 100644
--- a/client/Piztor/res/layout/activity_settings.xml
+++ b/client/Piztor/res/layout/activity_settings.xml
@@ -98,26 +98,6 @@
 	        android:layout_marginLeft="20dip"
 	        android:layout_marginRight="20dip"
 	        android:orientation="horizontal">
-		   	<TextView
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="wrap_content"
-		   	    android:background="#4D4D4D"
-		   	    android:textColor="#FFFFFF"
-		   	    android:textSize="25dip"
-		   	    android:text="company"
-		   	    android:id="@+id/settings_subscribe_company"
-		   	    />
-		   	<TextView
-		   	    android:layout_width="wrap_content"
-		   	    android:layout_height="wrap_content"
-		   	    android:background="#4D4D4D"
-		   	    android:textColor="#FFFFFF"
-		   	    android:textSize="25dip"
-		   	    android:layout_marginLeft="20dip"
-		   	    android:text="section"
-		   	    android:id="@+id/settings_subscribe_section"
-		   	    />
-
 		   	<Button
 		   	    android:id="@+id/settings_btn_subscribe"
 		   	    android:layout_width="wrap_content"
diff --git a/client/Piztor/res/layout/checkindialog.xml b/client/Piztor/res/layout/checkindialog.xml
new file mode 100644
index 0000000..4174deb
--- /dev/null
+++ b/client/Piztor/res/layout/checkindialog.xml
@@ -0,0 +1,20 @@
+<?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" >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="Checking in..."/>
+
+    <ProgressBar
+        android:id="@+id/checkin_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center" />
+
+</LinearLayout>
diff --git a/client/Piztor/res/layout/custom_icon_view.xml b/client/Piztor/res/layout/custom_icon_view.xml
new file mode 100644
index 0000000..857288a
--- /dev/null
+++ b/client/Piztor/res/layout/custom_icon_view.xml
@@ -0,0 +1,21 @@
+<?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"
+ 	android:background="#ffffff" >
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/circle_red"
+        />
+    <TextView
+        android:text=" 11"
+        android:textColor="#000000"
+        android:textSize="7dip"/>
+    </FrameLayout>
+</LinearLayout>
diff --git a/client/Piztor/res/layout/subscribe_item.xml b/client/Piztor/res/layout/subscribe_item.xml
new file mode 100644
index 0000000..902da5a
--- /dev/null
+++ b/client/Piztor/res/layout/subscribe_item.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="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="horizontal">
+  <TextView 
+      android:layout_width="wrap_content" 
+      android:layout_height="wrap_content" 
+      android:id="@+id/textView1" 
+      android:textSize="20dip"
+      android:layout_marginLeft="10dip"
+      android:layout_alignParentLeft="true" 
+      android:text="company section"/>
+  <Button 
+      android:text="remove" 
+      android:layout_width="100dip" 
+      android:layout_height="wrap_content" 
+      android:layout_alignParentRight="true"
+      android:layout_marginRight="10dip"
+      android:textColor="#FFFFFF"
+      android:background="#DB4437"
+      android:id="@+id/button_delete"
+      android:textSize="20dip"
+      />
+  <View
+     	android:layout_width="fill_parent"
+	    android:layout_height="1.0px"
+	    android:layout_below="@+id/button_delete"
+	    android:layout_marginTop="20dip"
+	    android:layout_marginBottom="20dip"
+	    android:layout_marginLeft="20dip"
+	    android:layout_marginRight="20dip"
+	    android:background="#ffc0c3c4" />
+    
+</RelativeLayout>
diff --git a/client/Piztor/res/layout/subscribe_settings.xml b/client/Piztor/res/layout/subscribe_settings.xml
new file mode 100644
index 0000000..c27e3c8
--- /dev/null
+++ b/client/Piztor/res/layout/subscribe_settings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+	<RelativeLayout
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+	    android:layout_gravity="center"
+	    android:gravity="center"
+	    android:orientation="horizontal">
+	    <EditText
+	        android:layout_width="120dip"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentLeft="true"
+	        android:layout_marginLeft="10dip"
+	        android:textSize="20dip"
+	        android:hint="company"
+	        android:phoneNumber="true"
+	 		android:id="@+id/subscribe_company"/>
+	    <EditText
+	        android:layout_width="120dip"
+	        android:layout_height="wrap_content"
+	        android:layout_marginLeft="10dip"
+	        android:layout_toRightOf="@+id/subscribe_company"
+	        android:textSize="20dip"
+	        android:hint="section"
+	        android:phoneNumber="true"
+	        android:id="@+id/subscribe_section"/>
+	    <Button 
+        	android:layout_width="100dip"
+        	android:layout_height="wrap_content"
+			android:layout_alignParentRight="true"
+			android:layout_marginRight="10dip"
+        	android:text="add" 
+        	android:textColor="#FFFFFF"
+        	android:background="#0F9D58"
+        	android:textSize="20dip"
+      		android:padding="10dip"
+        	android:id="@+id/button_add"/>
+	</RelativeLayout>
+    
+    <LinearLayout 
+        android:id="@+id/linearLayout1" 
+        android:orientation="vertical" 
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content" 
+        >
+        <ListView 
+            android:id="@+id/listView1" 
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent" 
+            android:layout_weight="0.69"
+            android:focusable="true">
+        </ListView>
+    </LinearLayout>
+    <TextView 
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content" 
+        android:id="@+id/textView1" 
+        android:text="TextView" 
+        android:layout_alignParentBottom="true" 
+        android:layout_centerHorizontal="true" 
+        android:layout_marginBottom="10dp"/>
+</LinearLayout>