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

Conflicts:
	client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
	client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
	client/Piztor/gen/com/macaroon/piztor/R.java
	client/Piztor/res/values/strings.xml
	client/bin/classes/com/macaroon/piztor/ActStatus.class
	client/bin/classes/com/macaroon/piztor/EmptyStatus.class
	client/bin/classes/com/macaroon/piztor/Setting.class
	client/src/com/macaroon/piztor/AppMgr.java
	client/src/com/macaroon/piztor/Setting.java

24 files changed, 31 insertions, 0 deletions

diff --git a/client/res/drawable/bottom_img.png b/client/res/drawable/bottom_img.png
new file mode 100644
index 0000000..2725ea8
--- /dev/null
+++ b/client/res/drawable/bottom_img.png
diff --git a/client/res/drawable/footbar_background.png b/client/res/drawable/footbar_background.png
new file mode 100644
index 0000000..488e8f2
--- /dev/null
+++ b/client/res/drawable/footbar_background.png
diff --git a/client/res/drawable/footbar_btn_checkin_style.xml b/client/res/drawable/footbar_btn_checkin_style.xml
new file mode 100644
index 0000000..6dbeb21
--- /dev/null
+++ b/client/res/drawable/footbar_btn_checkin_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_checkin_1"></item>
+	<item android:state_pressed="false" android:drawable="@drawable/footbar_checkin"></item>
+
+</selector>
diff --git a/client/res/drawable/footbar_btn_fetch_style.xml b/client/res/drawable/footbar_btn_fetch_style.xml
new file mode 100644
index 0000000..379d526
--- /dev/null
+++ b/client/res/drawable/footbar_btn_fetch_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_fetch_1"></item>
+    <item android:state_pressed="false" android:drawable="@drawable/footbar_fetch"></item>   
+</selector>
diff --git a/client/res/drawable/footbar_btn_focus_style.xml b/client/res/drawable/footbar_btn_focus_style.xml
new file mode 100644
index 0000000..5932f2f
--- /dev/null
+++ b/client/res/drawable/footbar_btn_focus_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_marker_1"></item>
+	<item android:state_pressed="false" android:drawable="@drawable/footbar_marker"></item>   
+</selector>
diff --git a/client/res/drawable/footbar_btn_search_style.xml b/client/res/drawable/footbar_btn_search_style.xml
new file mode 100644
index 0000000..ac786ef
--- /dev/null
+++ b/client/res/drawable/footbar_btn_search_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_search_1"></item>
+    <item android:state_pressed="false" android:drawable="@drawable/footbar_search"></item>   
+</selector>
diff --git a/client/res/drawable/footbar_btn_settings_style.xml b/client/res/drawable/footbar_btn_settings_style.xml
new file mode 100644
index 0000000..fca6230
--- /dev/null
+++ b/client/res/drawable/footbar_btn_settings_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:state_pressed="true" android:drawable="@drawable/footbar_settings_1"></item>
+    <item android:state_pressed="false" android:drawable="@drawable/footbar_settings"></item>   
+</selector>
diff --git a/client/res/drawable/footbar_checkin.png b/client/res/drawable/footbar_checkin.png
new file mode 100644
index 0000000..90afba7
--- /dev/null
+++ b/client/res/drawable/footbar_checkin.png
diff --git a/client/res/drawable/footbar_checkin_1.png b/client/res/drawable/footbar_checkin_1.png
new file mode 100644
index 0000000..a478d36
--- /dev/null
+++ b/client/res/drawable/footbar_checkin_1.png
diff --git a/client/res/drawable/footbar_fetch.png b/client/res/drawable/footbar_fetch.png
new file mode 100644
index 0000000..32d24d2
--- /dev/null
+++ b/client/res/drawable/footbar_fetch.png
diff --git a/client/res/drawable/footbar_fetch_1.png b/client/res/drawable/footbar_fetch_1.png
new file mode 100644
index 0000000..208094f
--- /dev/null
+++ b/client/res/drawable/footbar_fetch_1.png
diff --git a/client/res/drawable/footbar_marker.png b/client/res/drawable/footbar_marker.png
new file mode 100644
index 0000000..3de909f
--- /dev/null
+++ b/client/res/drawable/footbar_marker.png
diff --git a/client/res/drawable/footbar_marker_1.png b/client/res/drawable/footbar_marker_1.png
new file mode 100644
index 0000000..08c8715
--- /dev/null
+++ b/client/res/drawable/footbar_marker_1.png
diff --git a/client/res/drawable/footbar_search.png b/client/res/drawable/footbar_search.png
new file mode 100644
index 0000000..3549f84
--- /dev/null
+++ b/client/res/drawable/footbar_search.png
diff --git a/client/res/drawable/footbar_search_1.png b/client/res/drawable/footbar_search_1.png
new file mode 100644
index 0000000..1e6ac28
--- /dev/null
+++ b/client/res/drawable/footbar_search_1.png
diff --git a/client/res/drawable/footbar_select_bg.png b/client/res/drawable/footbar_select_bg.png
new file mode 100644
index 0000000..9d7e5af
--- /dev/null
+++ b/client/res/drawable/footbar_select_bg.png
diff --git a/client/res/drawable/footbar_settings.png b/client/res/drawable/footbar_settings.png
new file mode 100644
index 0000000..455bd0b
--- /dev/null
+++ b/client/res/drawable/footbar_settings.png
diff --git a/client/res/drawable/footbar_settings_1.png b/client/res/drawable/footbar_settings_1.png
new file mode 100644
index 0000000..6b0a2ab
--- /dev/null
+++ b/client/res/drawable/footbar_settings_1.png
diff --git a/client/res/drawable/footbar_unselect_bg.png b/client/res/drawable/footbar_unselect_bg.png
new file mode 100644
index 0000000..3e1e65e
--- /dev/null
+++ b/client/res/drawable/footbar_unselect_bg.png
diff --git a/client/res/drawable/horizontal_line.png b/client/res/drawable/horizontal_line.png
new file mode 100644
index 0000000..ccd6aa2
--- /dev/null
+++ b/client/res/drawable/horizontal_line.png
diff --git a/client/res/drawable/navigation_back.png b/client/res/drawable/navigation_back.png
new file mode 100644
index 0000000..3bdda98
--- /dev/null
+++ b/client/res/drawable/navigation_back.png
diff --git a/client/res/drawable/navigation_back_1.png b/client/res/drawable/navigation_back_1.png
new file mode 100644
index 0000000..a20b4ef
--- /dev/null
+++ b/client/res/drawable/navigation_back_1.png
diff --git a/client/res/drawable/title_logo.png b/client/res/drawable/title_logo.png
new file mode 100644
index 0000000..224040c
--- /dev/null
+++ b/client/res/drawable/title_logo.png
diff --git a/client/res/drawable/topbar_background.png b/client/res/drawable/topbar_background.png
new file mode 100644
index 0000000..9f0291e
--- /dev/null
+++ b/client/res/drawable/topbar_background.png