Permalink
Browse files

no comment.

  • Loading branch information...
1 parent 3fdd6b8 commit d01320c9cbb450de57e5c11ade0294043a646992 @mariotaku committed Aug 12, 2012
Showing with 2,045 additions and 1,302 deletions.
  1. +10 −0 AndroidManifest.xml
  2. +3 −0 lint.xml
  3. BIN res/drawable-xhdpi/ic_tab_search.png
  4. +287 −296 res/values-zh-rCN/strings.xml
  5. +0 −20 res/values/plurals.xml
  6. +3 −10 res/values/strings.xml
  7. +45 −256 res/xml/settings.xml
  8. +27 −0 res/xml/settings_api.xml
  9. +48 −0 res/xml/settings_appearance.xml
  10. +43 −0 res/xml/settings_connectivity.xml
  11. +39 −0 res/xml/settings_content.xml
  12. +284 −0 res/xml/settings_orig.xml
  13. +23 −0 res/xml/settings_other.xml
  14. +62 −0 res/xml/settings_refresh_and_notifications.xml
  15. +23 −0 res/xml/settings_storage.xml
  16. +9 −3 src/org/mariotaku/twidere/Constants.java
  17. +13 −10 src/org/mariotaku/twidere/activity/BaseActivity.java
  18. +10 −302 src/org/mariotaku/twidere/activity/CustomTabsActivity.java
  19. +10 −125 src/org/mariotaku/twidere/activity/ExtensionsListActivity.java
  20. +14 −11 src/org/mariotaku/twidere/activity/HomeActivity.java
  21. +25 −7 src/org/mariotaku/twidere/activity/ImageViewerActivity.java
  22. +69 −0 src/org/mariotaku/twidere/activity/InternalSettingsActivity.java
  23. +55 −0 src/org/mariotaku/twidere/activity/InternalSettingsDetailsActivity.java
  24. +119 −41 src/org/mariotaku/twidere/activity/SettingsActivity.java
  25. +31 −0 src/org/mariotaku/twidere/activity/SettingsDetailsActivity.java
  26. +34 −33 src/org/mariotaku/twidere/adapter/CursorStatusesAdapter.java
  27. +2 −2 src/org/mariotaku/twidere/adapter/DirectMessagesEntryAdapter.java
  28. +8 −8 src/org/mariotaku/twidere/adapter/ParcelableStatusesAdapter.java
  29. +6 −2 src/org/mariotaku/twidere/adapter/UsersAdapter.java
  30. +3 −2 src/org/mariotaku/twidere/app/TwidereApplication.java
  31. +1 −0 src/org/mariotaku/twidere/fragment/AccountsFragment.java
  32. +23 −4 src/org/mariotaku/twidere/fragment/ActivityHostFragment.java
  33. +1 −2 src/org/mariotaku/twidere/fragment/BaseUserListsListFragment.java
  34. +3 −3 src/org/mariotaku/twidere/fragment/BaseUsersListFragment.java
  35. +307 −0 src/org/mariotaku/twidere/fragment/CustomTabsFragment.java
  36. +125 −0 src/org/mariotaku/twidere/fragment/ExtensionsListFragment.java
  37. +1 −1 src/org/mariotaku/twidere/fragment/HomeTimelineFragment.java
  38. +2 −1 src/org/mariotaku/twidere/fragment/ImagesPreviewFragment.java
  39. +31 −0 src/org/mariotaku/twidere/fragment/InternalSettingsFragment.java
  40. +1 −1 src/org/mariotaku/twidere/fragment/MentionsFragment.java
  41. +2 −4 src/org/mariotaku/twidere/fragment/NativeMapFragment.java
  42. +32 −0 src/org/mariotaku/twidere/fragment/SettingsDetailsFragment.java
  43. +1 −1 src/org/mariotaku/twidere/fragment/StatusFragment.java
  44. +5 −1 src/org/mariotaku/twidere/fragment/UserListCreatedFragment.java
  45. +1 −0 src/org/mariotaku/twidere/loader/ListMembersLoader.java
  46. +14 −3 src/org/mariotaku/twidere/loader/TweetSearchLoader.java
  47. +6 −6 src/org/mariotaku/twidere/preference/NotificationTypePreference.java
  48. +1 −1 src/org/mariotaku/twidere/provider/TweetStoreProvider.java
  49. +9 −5 src/org/mariotaku/twidere/service/TwidereService.java
  50. +1 −1 src/org/mariotaku/twidere/util/LazyImageLoader.java
  51. +15 −0 src/org/mariotaku/twidere/util/OnBackPressedAccessor.java
  52. +51 −0 src/org/mariotaku/twidere/util/OnPreferenceClickHandler.java
  53. +75 −26 src/org/mariotaku/twidere/util/TwidereLinkify.java
  54. +32 −114 src/org/mariotaku/twidere/util/Utils.java
View
@@ -122,6 +122,7 @@
<activity
android:name=".activity.SettingsActivity"
android:label="@string/settings"
+ android:launchMode="singleTask"
android:theme="@style/Theme.Twidere.Light">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -354,6 +355,15 @@
android:name=".activity.NativeMapActivity"
android:label="@string/view_map"/>
<activity
+ android:name=".activity.SettingsDetailsActivity"
+ android:label="@string/settings"/>
+ <activity
+ android:name=".activity.InternalSettingsActivity"
+ android:label="@string/settings"/>
+ <activity
+ android:name=".activity.InternalSettingsDetailsActivity"
+ android:label="@string/settings"/>
+ <activity
android:name=".activity.FileSaveAsActivity"
android:label="@string/save_as">
<intent-filter>
View
@@ -9,6 +9,9 @@
<issue id="MissingTranslation" severity="informational" />
<issue id="NamespaceTypo" severity="error" />
<issue id="NestedScrolling" severity="error" />
+ <issue id="NewApi">
+ <ignore path="src/org/mariotaku/twidere/activity/SettingsDetailsActivity.java" />
+ </issue>
<issue id="PxUsage" severity="error" />
<issue id="ScrollViewCount" severity="error" />
<issue id="SdCardPath" severity="error" />
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
View
@@ -2,26 +2,6 @@
<!-- Generated by crowdin.net -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <plurals name="Nminutes">
- <item quantity="one">@string/Nminutes_quantity_one</item>
- <item quantity="other">@string/Nminutes_quantity_other</item>
- </plurals>
- <plurals name="Nhours">
- <item quantity="one">@string/Nhours_quantity_one</item>
- <item quantity="other">@string/Nhours_quantity_other</item>
- </plurals>
- <plurals name="Ndays">
- <item quantity="one">@string/Ndays_quantity_one</item>
- <item quantity="other">@string/Ndays_quantity_other</item>
- </plurals>
- <plurals name="Nmonths">
- <item quantity="one">@string/Nmonths_quantity_one</item>
- <item quantity="other">@string/Nmonths_quantity_other</item>
- </plurals>
- <plurals name="Nyears">
- <item quantity="one">@string/Nyears_quantity_one</item>
- <item quantity="other">@string/Nyears_quantity_other</item>
- </plurals>
<plurals name="Ntweets">
<item quantity="one">@string/Ntweets_quantity_one</item>
<item quantity="other">@string/Ntweets_quantity_other</item>
View
@@ -226,16 +226,6 @@
<string name="list_created_by_user">List created by this user</string>
<string name="report_errors_automatically">Report errors automatically</string>
<string name="report_errors_automatically_summary">Report errors automatically, it will not collect your personal data.</string>
- <string name="Nminutes_quantity_one">1 min</string>
- <string name="Nminutes_quantity_other"><xliff:g id="minutes">%d</xliff:g> min</string>
- <string name="Nhours_quantity_one">1 hr</string>
- <string name="Nhours_quantity_other"><xliff:g id="hours">%d</xliff:g> hrs</string>
- <string name="Ndays_quantity_one">1 day</string>
- <string name="Ndays_quantity_other"><xliff:g id="days">%d</xliff:g> days</string>
- <string name="Nmonths_quantity_one">1 month</string>
- <string name="Nmonths_quantity_other"><xliff:g id="months">%d</xliff:g> months</string>
- <string name="Nyears_quantity_one">1 year</string>
- <string name="Nyears_quantity_other"><xliff:g id="years">%d</xliff:g> years</string>
<string name="Ntweets_quantity_one">You have a new tweet.</string>
<string name="Ntweets_quantity_other">You have <xliff:g id="items">%d</xliff:g>+ new tweets.</string>
<string name="Nmentions_quantity_one">Someone mentioned you.</string>
@@ -294,5 +284,8 @@
<string name="icon">Icon</string>
<string name="pick_file">Pick file</string>
<string name="user_timeline">User timeline</string>
+ <string name="notification_ringtone">Ringtone</string>
+ <string name="notification_light_color">Light Color</string>
+ <string name="invalid_image">Invalid image.</string>
</resources>
Oops, something went wrong.

0 comments on commit d01320c

Please sign in to comment.