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

2 files changed, 170 insertions, 0 deletions

diff --git a/client/gen/com/macaroon/piztor/BuildConfig.java b/client/gen/com/macaroon/piztor/BuildConfig.java
new file mode 100644
index 0000000..833e650
--- /dev/null
+++ b/client/gen/com/macaroon/piztor/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.macaroon.piztor;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/client/gen/com/macaroon/piztor/R.java b/client/gen/com/macaroon/piztor/R.java
new file mode 100644
index 0000000..3d07e1d
--- /dev/null
+++ b/client/gen/com/macaroon/piztor/R.java
@@ -0,0 +1,164 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.macaroon.piztor;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class dimen {
+        /**  Default screen margins, per the Android Design guidelines. 
+
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
+    
+         */
+        public static final int activity_horizontal_margin=0x7f040000;
+        public static final int activity_vertical_margin=0x7f040001;
+    }
+    public static final class drawable {
+        public static final int bottom_img=0x7f020000;
+        public static final int footbar_background=0x7f020001;
+        public static final int footbar_btn_checkin_style=0x7f020002;
+        public static final int footbar_btn_fetch_style=0x7f020003;
+        public static final int footbar_btn_focus_style=0x7f020004;
+        public static final int footbar_btn_search_style=0x7f020005;
+        public static final int footbar_btn_settings_style=0x7f020006;
+        public static final int footbar_checkin=0x7f020007;
+        public static final int footbar_checkin_1=0x7f020008;
+        public static final int footbar_fetch=0x7f020009;
+        public static final int footbar_fetch_1=0x7f02000a;
+        public static final int footbar_marker=0x7f02000b;
+        public static final int footbar_marker_1=0x7f02000c;
+        public static final int footbar_search=0x7f02000d;
+        public static final int footbar_search_1=0x7f02000e;
+        public static final int footbar_select_bg=0x7f02000f;
+        public static final int footbar_settings=0x7f020010;
+        public static final int footbar_settings_1=0x7f020011;
+        public static final int footbar_unselect_bg=0x7f020012;
+        public static final int horizontal_line=0x7f020013;
+        public static final int ic_launcher=0x7f020014;
+        public static final int navigation_back=0x7f020015;
+        public static final int navigation_back_1=0x7f020016;
+        public static final int title_logo=0x7f020017;
+        public static final int topbar_background=0x7f020018;
+    }
+    public static final class id {
+        public static final int action_settings=0x7f08002c;
+        public static final int footbar_btn_checkin=0x7f08001f;
+        public static final int footbar_btn_checkin_layout=0x7f08001e;
+        public static final int footbar_btn_checkin_text=0x7f080020;
+        public static final int footbar_btn_fetch=0x7f08001c;
+        public static final int footbar_btn_fetch_layout=0x7f08001b;
+        public static final int footbar_btn_fetch_text=0x7f08001d;
+        public static final int footbar_btn_focus=0x7f080022;
+        public static final int footbar_btn_focus_layout=0x7f080021;
+        public static final int footbar_btn_focus_text=0x7f080023;
+        public static final int footbar_btn_search=0x7f080019;
+        public static final int footbar_btn_search_layout=0x7f080018;
+        public static final int footbar_btn_search_text=0x7f08001a;
+        public static final int footbar_btn_settings=0x7f080025;
+        public static final int footbar_btn_settings_layout=0x7f080024;
+        public static final int footbar_btn_settings_text=0x7f080027;
+        public static final int gather_footbar_layout=0x7f080001;
+        public static final int gather_timer=0x7f080026;
+        public static final int gather_timer_layout=0x7f080000;
+        public static final int headbar_appname=0x7f080029;
+        public static final int headbar_logo=0x7f080028;
+        public static final int login_btn_login=0x7f080007;
+        public static final int main_footbar_layout=0x7f080009;
+        public static final int main_headbar_img=0x7f080002;
+        public static final int main_headbar_layout=0x7f080008;
+        public static final int settings_GPSrefreshrate=0x7f08000c;
+        public static final int settings_GPSrefreshrate_text=0x7f08000b;
+        public static final int settings_btn_back=0x7f08002a;
+        public static final int settings_headbar_layout=0x7f08000a;
+        public static final int settings_headbar_text=0x7f08002b;
+        public static final int settings_seperator1=0x7f08000d;
+        public static final int settings_seperator2=0x7f080012;
+        public static final int settings_seperator3=0x7f080017;
+        public static final int settings_sex_layout=0x7f08000e;
+        public static final int settings_sex_text=0x7f08000f;
+        public static final int settings_show_female=0x7f080011;
+        public static final int settings_show_male=0x7f080010;
+        public static final int settings_team_all=0x7f080016;
+        public static final int settings_team_layout=0x7f080013;
+        public static final int settings_team_mine=0x7f080015;
+        public static final int settings_team_text=0x7f080014;
+        public static final int user_id=0x7f080004;
+        public static final int user_id_text=0x7f080003;
+        public static final int user_pass=0x7f080006;
+        public static final int user_pass_text=0x7f080005;
+    }
+    public static final class layout {
+        public static final int activity_gather=0x7f030000;
+        public static final int activity_init=0x7f030001;
+        public static final int activity_login=0x7f030002;
+        public static final int activity_main=0x7f030003;
+        public static final int activity_setting=0x7f030004;
+        public static final int activity_settings=0x7f030005;
+        public static final int gather_footbar=0x7f030006;
+        public static final int gather_timer=0x7f030007;
+        public static final int login_bottom=0x7f030008;
+        public static final int main_footbar=0x7f030009;
+        public static final int main_headbar=0x7f03000a;
+        public static final int settings_headbar=0x7f03000b;
+    }
+    public static final class menu {
+        public static final int init=0x7f070000;
+        public static final int login=0x7f070001;
+        public static final int main=0x7f070002;
+        public static final int setting=0x7f070003;
+    }
+    public static final class string {
+        public static final int action_settings=0x7f050001;
+        public static final int all=0x7f05000c;
+        public static final int app_name=0x7f050000;
+        public static final int checkin=0x7f050006;
+        public static final int female=0x7f05000a;
+        public static final int fetch=0x7f050005;
+        public static final int focus=0x7f050007;
+        public static final int hello_world=0x7f050002;
+        public static final int male=0x7f050009;
+        public static final int mine=0x7f05000d;
+        public static final int search=0x7f050004;
+        public static final int settings=0x7f050003;
+        public static final int show_sex=0x7f050008;
+        public static final int show_team=0x7f05000b;
+        public static final int title_activity_login=0x7f05000e;
+        public static final int title_activity_main=0x7f05000f;
+        public static final int title_activity_setting=0x7f050010;
+    }
+    public static final class style {
+        /** 
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    
+ API 11 theme customizations can go here. 
+
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    
+ API 14 theme customizations can go here. 
+         */
+        public static final int AppBaseTheme=0x7f060000;
+        /**  Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+         */
+        public static final int AppTheme=0x7f060001;
+    }
+}