From e7022e78a79f04b62d9ec788428b04a01420bb66 Mon Sep 17 00:00:00 2001 From: sjtufs Date: Sun, 1 Sep 2013 16:14:54 +0800 Subject: Piztor rc1 --- client/Piztor/res/drawable/footbar_fetch.png | Bin 4849 -> 742 bytes client/Piztor/res/drawable/footbar_fetch_1.png | Bin 3300 -> 319 bytes client/Piztor/res/drawable/footbar_settings.png | Bin 4340 -> 1051 bytes client/Piztor/res/drawable/footbar_settings0.png | Bin 0 -> 4340 bytes client/Piztor/res/drawable/footbar_settings_1.png | Bin 3205 -> 383 bytes client/Piztor/res/layout/activity_login.xml | 26 +++++--- client/Piztor/res/layout/activity_settings.xml | 56 ++++++++--------- client/Piztor/res/values/strings.xml | 5 +- .../Piztor/src/com/macaroon/piztor/AlertMaker.java | 28 ++++++++- .../Piztor/src/com/macaroon/piztor/EException.java | 9 ++- client/Piztor/src/com/macaroon/piztor/Login.java | 5 ++ client/Piztor/src/com/macaroon/piztor/Main.java | 42 ++++++++++--- client/Piztor/src/com/macaroon/piztor/MapInfo.java | 1 + .../Piztor/src/com/macaroon/piztor/MapMaker.java | 55 ++++++++-------- .../Piztor/src/com/macaroon/piztor/PushClient.java | 24 ++++--- .../Piztor/src/com/macaroon/piztor/Settings.java | 1 + .../src/com/macaroon/piztor/SocketClient.java | 3 + .../src/com/macaroon/piztor/SubscribeSettings.java | 69 +++++++++++++++++---- client/Piztor/src/com/macaroon/piztor/Transam.java | 48 ++++++++++---- .../Piztor/src/com/macaroon/piztor/UpdateInfo.java | 22 +++---- 20 files changed, 270 insertions(+), 124 deletions(-) create mode 100644 client/Piztor/res/drawable/footbar_settings0.png (limited to 'client/Piztor') diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png index 138ef6a..71d1a20 100644 Binary files a/client/Piztor/res/drawable/footbar_fetch.png and b/client/Piztor/res/drawable/footbar_fetch.png differ diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png index 0d098ab..564b1da 100644 Binary files a/client/Piztor/res/drawable/footbar_fetch_1.png and b/client/Piztor/res/drawable/footbar_fetch_1.png differ diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png index a6987f8..7879ceb 100644 Binary files a/client/Piztor/res/drawable/footbar_settings.png and b/client/Piztor/res/drawable/footbar_settings.png differ diff --git a/client/Piztor/res/drawable/footbar_settings0.png b/client/Piztor/res/drawable/footbar_settings0.png new file mode 100644 index 0000000..a6987f8 Binary files /dev/null and b/client/Piztor/res/drawable/footbar_settings0.png differ diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png index 8b61042..b76fe9f 100644 Binary files a/client/Piztor/res/drawable/footbar_settings_1.png and b/client/Piztor/res/drawable/footbar_settings_1.png differ diff --git a/client/Piztor/res/layout/activity_login.xml b/client/Piztor/res/layout/activity_login.xml index c408a1d..cb27495 100644 --- a/client/Piztor/res/layout/activity_login.xml +++ b/client/Piztor/res/layout/activity_login.xml @@ -1,10 +1,12 @@ + + android:layout_height="fill_parent"> + android:orientation="vertical" + android:layout_marginTop="16dip"> + - \ No newline at end of file + + \ No newline at end of file diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml index 36bacf3..ba67683 100644 --- a/client/Piztor/res/layout/activity_settings.xml +++ b/client/Piztor/res/layout/activity_settings.xml @@ -30,16 +30,18 @@ android:layout_gravity="center" android:gravity="center" android:layout_marginTop="10dip" + android:layout_marginBottom="2dip" android:text="@string/GPSrefreshrate" android:textColor="@android:color/white" - android:textSize="20dip" /> + android:textSize="17dip" /> + - - -