Permalink
Browse files

no comment.

  • Loading branch information...
1 parent 5a577b1 commit 1da123f3aff9f41362c5eb8512c4291d0abb56d0 @mariotaku committed Jul 26, 2012
Showing with 1,111 additions and 416 deletions.
  1. +11 −2 build.xml
  2. BIN res/drawable-xhdpi/ic_menu_add.png
  3. +1 −1 res/layout-ar/status_list_item.xml
  4. +3 −4 res/layout-ar/user_list_detail_header.xml
  5. +62 −0 res/layout-ar/user_list_list_item.xml
  6. +2 −2 res/layout/auto_complete_textview_default_style.xml
  7. +2 −2 res/layout/edittext_default_style.xml
  8. +2 −2 res/layout/file_save_as.xml
  9. +1 −1 res/layout/simple_dropdown_hint.xml
  10. +1 −1 res/layout/spinner_item.xml
  11. +1 −1 res/layout/spinner_item_white_text.xml
  12. +1 −1 res/layout/status_list_item.xml
  13. +13 −0 res/layout/user_list_created_header.xml
  14. +4 −6 res/layout/user_list_detail_header.xml
  15. +57 −0 res/layout/user_list_list_item.xml
  16. +23 −0 res/menu/action_user_list_details.xml
  17. +7 −0 res/values/strings.xml
  18. +14 −5 res/xml/settings.xml
  19. +2 −0 src/org/mariotaku/twidere/Constants.java
  20. +3 −0 src/org/mariotaku/twidere/ITwidereService.aidl
  21. +3 −1 src/org/mariotaku/twidere/activity/DirectMessagesActivity.java
  22. +7 −6 src/org/mariotaku/twidere/activity/HomeActivity.java
  23. +0 −24 src/org/mariotaku/twidere/activity/SettingsActivity.java
  24. +33 −7 src/org/mariotaku/twidere/activity/TwitterLoginActivity.java
  25. +11 −4 src/org/mariotaku/twidere/adapter/CursorStatusesAdapter.java
  26. +8 −2 src/org/mariotaku/twidere/adapter/DirectMessagesConversationAdapter.java
  27. +9 −2 src/org/mariotaku/twidere/adapter/DirectMessagesEntryAdapter.java
  28. +9 −3 src/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
  29. +9 −2 src/org/mariotaku/twidere/adapter/UserAutoCompleteAdapter.java
  30. +18 −11 src/org/mariotaku/twidere/adapter/UserListsAdapter.java
  31. +10 −4 src/org/mariotaku/twidere/adapter/UsersAdapter.java
  32. +28 −2 src/org/mariotaku/twidere/app/TwidereApplication.java
  33. +4 −2 src/org/mariotaku/twidere/fragment/BaseStatusesListFragment.java
  34. +19 −3 src/org/mariotaku/twidere/fragment/BaseUserListsFragment.java
  35. +4 −2 src/org/mariotaku/twidere/fragment/BaseUsersFragment.java
  36. +3 −1 src/org/mariotaku/twidere/fragment/DirectMessagesConversationFragment.java
  37. +1 −14 src/org/mariotaku/twidere/fragment/ImagesPreviewFragment.java
  38. +36 −1 src/org/mariotaku/twidere/fragment/UserListCreatedFragment.java
  39. +102 −58 src/org/mariotaku/twidere/fragment/UserListDetailsFragment.java
  40. +1 −13 src/org/mariotaku/twidere/fragment/UserListTypesFragment.java
  41. +38 −57 src/org/mariotaku/twidere/fragment/UserProfileFragment.java
  42. +8 −2 src/org/mariotaku/twidere/fragment/ViewConversationFragment.java
  43. +10 −8 src/org/mariotaku/twidere/fragment/ViewStatusFragment.java
  44. +13 −0 src/org/mariotaku/twidere/loader/ParcelableStatusesLoader.java
  45. +1 −1 src/org/mariotaku/twidere/loader/TweetSearchLoader.java
  46. +1 −1 src/org/mariotaku/twidere/loader/Twitter4JStatusLoader.java
  47. +15 −0 src/org/mariotaku/twidere/model/ImageSpec.java
  48. +22 −0 src/org/mariotaku/twidere/model/ListAction.java
  49. +8 −9 src/org/mariotaku/twidere/model/ParcelableStatus.java
  50. +12 −0 src/org/mariotaku/twidere/model/PreviewImage.java
  51. +64 −0 src/org/mariotaku/twidere/model/UserListViewHolder.java
  52. +168 −0 src/org/mariotaku/twidere/service/TwidereService.java
  53. +2 −0 src/org/mariotaku/twidere/util/BaseAdapterInterface.java
  54. +19 −14 src/org/mariotaku/twidere/util/LazyImageLoader.java
  55. +2 −2 src/org/mariotaku/twidere/util/OnLinkClickHandler.java
  56. +30 −0 src/org/mariotaku/twidere/util/ServiceInterface.java
  57. +34 −83 src/org/mariotaku/twidere/util/TwidereLinkify.java
  58. +139 −49 src/org/mariotaku/twidere/util/Utils.java
View
@@ -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"
/>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -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"
@@ -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"
@@ -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>
@@ -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"/>
@@ -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"/>
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"/>
@@ -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>
@@ -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>
@@ -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>
View
@@ -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>
View
@@ -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">
@@ -149,6 +149,7 @@
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 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";
Oops, something went wrong.

0 comments on commit 1da123f

Please sign in to comment.