no comment.

mariotaku · Jul 26, 2012 · 1da123f · 1da123f
1 parent 5a577b1
commit 1da123f
Show file tree

Hide file tree

Showing 58 changed files with 1,111 additions and 416 deletions.
diff --git a/build.xml b/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="HomeActivity" default="help">
+<project name="twidere" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
@@ -28,6 +28,15 @@
          -->
     <property file="ant.properties" />
 
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
     <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
 
@@ -41,7 +50,7 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
             unless="sdk.dir"
     />
 

diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
diff --git a/res/layout-ar/status_list_item.xml b/res/layout-ar/status_list_item.xml
@@ -15,7 +15,7 @@
 		android:id="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentTop="@+id/profile_image"
+		android:layout_alignParentTop="true"
 		android:layout_alignWithParentIfMissing="true"
 		android:layout_marginRight="6dp"
 		android:layout_toLeftOf="@+id/profile_image"

diff --git a/res/layout-ar/user_list_detail_header.xml b/res/layout-ar/user_list_detail_header.xml
@@ -62,17 +62,16 @@
 		</LinearLayout>
 
 		<FrameLayout
-			android:id="@+id/follow_container"
+			android:id="@+id/follow_more_container"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignBottom="@+id/profile_image_container"
 			android:layout_alignParentLeft="true"
 			android:layout_alignTop="@+id/profile_image_container"
-			android:layout_margin="4dp"
-			android:visibility="gone">
+			android:layout_margin="4dp">
 
 			<Button
-				android:id="@+id/follow"
+				android:id="@+id/follow_more"
 				style="?android:attr/buttonStyleSmall"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"

diff --git a/res/layout-ar/user_list_list_item.xml b/res/layout-ar/user_list_list_item.xml
@@ -0,0 +1,62 @@
+<?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="wrap_content"
+	android:padding="6dp">
+
+	<org.mariotaku.twidere.view.RoundCorneredImageView
+		android:id="@+id/profile_image"
+		android:layout_width="@dimen/profile_image_size"
+		android:layout_height="@dimen/profile_image_size"
+		android:layout_alignParentRight="true"
+		android:scaleType="fitCenter"/>
+
+	<TextView
+		android:id="@+id/name"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentTop="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_marginRight="6dp"
+		android:layout_toLeftOf="@+id/profile_image"
+		android:singleLine="true"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textStyle="bold"/>
+
+	<TextView
+		android:id="@+id/owner"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:layout_alignRight="@+id/name"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_below="@+id/name"
+		android:drawablePadding="3dp"
+		android:gravity="right"
+		android:textColor="?android:attr/textColorSecondary"/>
+
+	<TextView
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentLeft="true"
+		android:layout_alignRight="@+id/name"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_below="@+id/owner"
+		android:gravity="right"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:attr/textColorSecondary"/>
+
+	<TextView
+		android:id="@+id/list_gap_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_centerInParent="true"
+		android:text="@string/tap_to_load_more"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="#606060"
+		android:textStyle="bold"
+		android:visibility="gone"/>
+
+</RelativeLayout>
diff --git a/res/layout/auto_complete_textview_default_style.xml b/res/layout/auto_complete_textview_default_style.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:padding="8dp">
 
 	<AutoCompleteTextView
 		android:id="@+id/edit_text"
 		style="?android:editTextStyle"
-		android:layout_width="match_parent"
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:singleLine="true"/>
 

diff --git a/res/layout/edittext_default_style.xml b/res/layout/edittext_default_style.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:padding="8dp">
 
 	<EditText
 		android:id="@+id/edit_text"
 		style="?android:editTextStyle"
-		android:layout_width="match_parent"
+		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:inputType="textMultiLine"
 		android:singleLine="false"/>

diff --git a/res/layout/file_save_as.xml b/res/layout/file_save_as.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
 
 	<ListView
 		android:id="@android:id/list"

diff --git a/res/layout/simple_dropdown_hint.xml b/res/layout/simple_dropdown_hint.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/text1"
-	android:layout_width="match_parent"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:layout_marginBottom="3dip"
 	android:layout_marginLeft="3dip"

diff --git a/res/layout/spinner_item.xml b/res/layout/spinner_item.xml
@@ -1,7 +1,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/text1"
 	style="?android:attr/spinnerItemStyle"
-	android:layout_width="match_parent"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:ellipsize="marquee"
 	android:singleLine="true"

diff --git a/res/layout/spinner_item_white_text.xml b/res/layout/spinner_item_white_text.xml
@@ -1,7 +1,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@android:id/text1"
 	style="?android:attr/spinnerItemStyle"
-	android:layout_width="match_parent"
+	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
 	android:ellipsize="marquee"
 	android:singleLine="true"

diff --git a/res/layout/status_list_item.xml b/res/layout/status_list_item.xml
@@ -14,7 +14,7 @@
 		android:id="@+id/name"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_alignParentTop="@+id/profile_image"
+		android:layout_alignParentTop="true"
 		android:layout_alignWithParentIfMissing="true"
 		android:layout_marginLeft="6dp"
 		android:layout_toLeftOf="@+id/time"

diff --git a/res/layout/user_list_created_header.xml b/res/layout/user_list_created_header.xml
@@ -0,0 +1,13 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/add"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:background="@drawable/item_background_holo_light"
+	android:drawableLeft="@drawable/ic_menu_add"
+	android:gravity="center"
+	android:minHeight="?android:attr/listPreferredItemHeight"
+	android:paddingLeft="8dp"
+	android:paddingRight="8dp"
+	android:singleLine="true"
+	android:text="@string/new_user_list"
+	android:textAppearance="?android:attr/textAppearanceMedium"/>
diff --git a/res/layout/user_list_detail_header.xml b/res/layout/user_list_detail_header.xml
@@ -61,22 +61,20 @@
 		</LinearLayout>
 
 		<FrameLayout
-			android:id="@+id/follow_container"
+			android:id="@+id/follow_more_container"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignBottom="@+id/profile_image_container"
 			android:layout_alignParentRight="true"
 			android:layout_alignTop="@+id/profile_image_container"
-			android:layout_margin="4dp"
-			android:visibility="gone">
+			android:layout_margin="4dp">
 
 			<Button
-				android:id="@+id/follow"
+				android:id="@+id/follow_more"
 				style="?android:attr/buttonStyleSmall"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_gravity="center"
-				android:text="@string/follow"/>
+				android:layout_gravity="center"/>
 		</FrameLayout>
 	</RelativeLayout>
 

diff --git a/res/layout/user_list_list_item.xml b/res/layout/user_list_list_item.xml
@@ -0,0 +1,57 @@
+<?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="wrap_content"
+	android:padding="6dp">
+
+	<org.mariotaku.twidere.view.RoundCorneredImageView
+		android:id="@+id/profile_image"
+		android:layout_width="@dimen/profile_image_size"
+		android:layout_height="@dimen/profile_image_size"
+		android:scaleType="fitCenter"/>
+
+	<TextView
+		android:id="@+id/name"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentTop="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_marginLeft="6dp"
+		android:layout_toRightOf="@+id/profile_image"
+		android:singleLine="true"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textStyle="bold"/><TextView
+		android:id="@+id/owner"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignLeft="@+id/name"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_below="@+id/name"
+		android:layout_marginRight="6dp"
+		android:drawablePadding="3dp"
+		android:textColor="?android:attr/textColorSecondary"/>
+
+	<TextView
+		android:id="@+id/description"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignLeft="@+id/name"
+		android:layout_alignParentRight="true"
+		android:layout_alignWithParentIfMissing="true"
+		android:layout_below="@+id/owner"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textColor="?android:attr/textColorSecondary"/>
+
+	<TextView
+		android:id="@+id/list_gap_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_centerInParent="true"
+		android:text="@string/tap_to_load_more"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textColor="#606060"
+		android:textStyle="bold"
+		android:visibility="gone"/>
+
+</RelativeLayout>
diff --git a/res/menu/action_user_list_details.xml b/res/menu/action_user_list_details.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item
+		android:id="@id/add"
+		android:icon="@drawable/ic_menu_add"
+		android:title="@string/add_member"/>
+	<item
+		android:id="@+id/delete_submenu"
+		android:icon="@drawable/ic_menu_delete"
+		android:title="@string/delete">
+		<menu>
+			<item
+				android:icon="@drawable/ic_menu_close_clear_cancel"
+				android:title="@android:string/cancel"/>
+			<item
+				android:id="@id/delete"
+				android:icon="@drawable/ic_menu_delete"
+				android:title="@string/delete"/>
+		</menu>
+	</item>
+
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -261,5 +261,12 @@
 	<string name="accounts">Accounts</string>
 	<string name="hires_profile_image">Hi-res profile image</string>
 	<string name="mention_this_user">Mention this user</string>
+	<string name="signing_in_please_wait">Signing in, please wait or press BACK again to quit.</string>
+	<string name="force_ssl_connection">Force SSL connection</string>
+	<string name="force_ssl_connection_summary">Force using SSL in API and some other requests.</string>
+	<string name="connectivity">Connectivity</string>
+	<string name="add_member">Add member</string>
+	<string name="add_success">Add success</string>
+	<string name="new_user_list">New user list</string>
 
 </resources>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
@@ -132,11 +132,6 @@
 			android:key="gzip_compressing"
 			android:summary="@string/gzip_compressing_summary"
 			android:title="@string/gzip_compressing"/>
-		<CheckBoxPreference
-			android:defaultValue="false"
-			android:key="ignore_ssl_error"
-			android:summary="@string/ignore_ssl_error_summary"
-			android:title="@string/ignore_ssl_error"/>
 
 		<EditTextPreference
 			android:dialogMessage="@string/warn_expert_only"
@@ -153,6 +148,20 @@
 			android:summary="@string/consumer_secret_summary"
 			android:title="@string/consumer_secret"/>
 	</PreferenceCategory>
+	<PreferenceCategory
+		android:key="cat_connectivity"
+		android:title="@string/connectivity">
+		<CheckBoxPreference
+			android:defaultValue="false"
+			android:key="force_ssl_connection"
+			android:summary="@string/force_ssl_connection_summary"
+			android:title="@string/force_ssl_connection"/>
+		<CheckBoxPreference
+			android:defaultValue="false"
+			android:key="ignore_ssl_error"
+			android:summary="@string/ignore_ssl_error_summary"
+			android:title="@string/ignore_ssl_error"/>
+	</PreferenceCategory>
 	<PreferenceCategory
 		android:key="cat_proxy"
 		android:title="@string/proxy">

diff --git a/src/org/mariotaku/twidere/Constants.java b/src/org/mariotaku/twidere/Constants.java
@@ -149,6 +149,7 @@ public interface Constants extends TwitterConstants {
 	public static final String PREFERENCE_KEY_REPORT_ERRORS_AUTOMATICALLY = "report_errors_automatically";
 	public static final String PREFERENCE_KEY_LOCAL_TRENDS_WOEID = "local_trends_woeid";
 	public static final String PREFERENCE_KEY_HIRES_PROFILE_IMAGE = "hires_profile_image";
+	public static final String PREFERENCE_KEY_FORCE_SSL_CONNECTION = "force_ssl_connection";
 
 	public static final String PREFERENCE_DEFAULT_QUOTE_FORMAT = "RT [TEXT]";
 	public static final int PREFERENCE_DEFAULT_DATABASE_ITEM_LIMIT = 100;
@@ -209,6 +210,7 @@ public interface Constants extends TwitterConstants {
 	public static final String BROADCAST_STATUS_DESTROYED = INTENT_PACKAGE_PREFIX + "STATUS_DESTROYED";
 	public static final String BROADCAST_TRENDS_UPDATED = INTENT_PACKAGE_PREFIX + "TRENDS_UPDATED";
 	public static final String BROADCAST_USER_LIST_MEMBER_DELETED = INTENT_PACKAGE_PREFIX + "USER_LIST_MEMBER_DELETED";
+	public static final String BROADCAST_USER_LIST_SUBSCRIPTION_CHANGED = INTENT_PACKAGE_PREFIX + "USER_LIST_SUBSCRIPTION_CHANGED";
 
 	public static final String INTENT_KEY_LATITUDE = "latitude";
 	public static final String INTENT_KEY_LONGITUDE = "longitude";