Skip to content

Commit

Permalink
use menu instead of header in UserListCreatedFragment
Browse files Browse the repository at this point in the history
fixed IME full screen edit mode doesn't close in Compose screen issue.
"pull up to load more" finished
bug fixes.
  • Loading branch information
mariotaku committed Aug 19, 2012
1 parent 12861a1 commit 6c2174d
Show file tree
Hide file tree
Showing 51 changed files with 724 additions and 507 deletions.
26 changes: 26 additions & 0 deletions res/drawable/image_preview_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:drawable="@drawable/gallery_selected_pressed" android:state_pressed="true" android:state_selected="true"/>
<item android:drawable="@drawable/gallery_selected_focused" android:state_focused="true" android:state_selected="true"/>
<item android:drawable="@drawable/gallery_selected_default" android:state_selected="true"/>
<item android:drawable="@drawable/gallery_selected_pressed" android:state_pressed="true" android:state_selected="false"/>
<item android:drawable="@drawable/gallery_selected_default"/>

</selector>
6 changes: 5 additions & 1 deletion res/layout-ar/compose.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
android:layout_height="match_parent"
android:completionThreshold="1"
android:gravity="top|right"
android:hint="@string/tweet_hint"/>
android:hint="@string/tweet_hint"
android:imeOptions="actionDone">

<requestFocus/>
</org.mariotaku.twidere.view.StatusComposeEditText>

<FrameLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion res/layout-ar/status_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
android:layout_marginRight="16dp"
android:layout_marginTop="3dp"
android:layout_toLeftOf="@+id/profile_image"
android:background="@drawable/gallery_selected_default"
android:background="@drawable/image_preview_background"
android:drawablePadding="3dp"
android:maxHeight="@dimen/image_preview_height"
android:maxWidth="@dimen/image_preview_width"
Expand Down
6 changes: 5 additions & 1 deletion res/layout/compose.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
android:layout_height="match_parent"
android:completionThreshold="1"
android:gravity="top"
android:hint="@string/tweet_hint"/>
android:hint="@string/tweet_hint"
android:imeOptions="actionDone">

<requestFocus/>
</org.mariotaku.twidere.view.StatusComposeEditText>

<FrameLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion res/layout/status_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="3dp"
android:layout_toRightOf="@+id/profile_image"
android:background="@drawable/gallery_selected_default"
android:background="@drawable/image_preview_background"
android:drawablePadding="3dp"
android:maxHeight="@dimen/image_preview_height"
android:maxWidth="@dimen/image_preview_width"
Expand Down
13 changes: 0 additions & 13 deletions res/layout/user_list_created_header.xml

This file was deleted.

1 change: 1 addition & 0 deletions res/layout/user_list_detail_dialog_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/name"
android:gravity="top"
android:hint="@string/description"
android:inputType="textMultiLine"
android:maxLength="160"
Expand Down
10 changes: 10 additions & 0 deletions res/menu/menu_user_list_created.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">

<item
android:id="@+id/new_user_list"
android:icon="@drawable/ic_menu_add"
android:showAsAction="ifRoom"
android:title="@string/new_user_list"/>

</menu>
3 changes: 3 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -291,5 +291,8 @@
<string name="share_format">Share format</string>
<string name="share_format_summary">\"[TITLE]\" = Content title\n\"[TEXT]\" = Content text</string>
<string name="network">Network</string>
<string name="content_and_storage">Content &amp; Storage</string>
<string name="default_provider">Default</string>
<string name="image_uploader">Image uploader</string>

</resources>
11 changes: 4 additions & 7 deletions res/xml/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:title="@string/solid_color_background"/>

<PreferenceCategory
android:key="cat_settings"
android:key="category_settings"
android:title="@string/settings">
<Preference
android:key="custom_tabs"
Expand All @@ -34,11 +34,8 @@
android:key="settings_appearance"
android:title="@string/look_and_feel"/>
<Preference
android:key="settings_content"
android:title="@string/content"/>
<Preference
android:key="settings_storage"
android:title="@string/storage"/>
android:key="settings_content_and_storage"
android:title="@string/content_and_storage"/>
<Preference
android:key="settings_network"
android:title="@string/network"/>
Expand All @@ -50,7 +47,7 @@
android:title="@string/other_settings"/>
</PreferenceCategory>
<PreferenceCategory
android:key="cat_about"
android:key="category_about"
android:title="@string/about">
<Preference
android:key="about"
Expand Down
32 changes: 1 addition & 31 deletions res/xml/settings_appearance.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="cat_appearance"
android:key="category_appearance"
android:title="@string/look_and_feel">

<org.mariotaku.preference.TextSizePreference
Expand All @@ -11,36 +11,6 @@
android:summary="@string/text_size_summary"
android:title="@string/text_size"/>

<CheckBoxPreference
android:defaultValue="true"
android:key="display_profile_image"
android:summary="@string/image_load_summary"
android:title="@string/display_profile_image"/>
<CheckBoxPreference
android:defaultValue="false"
android:dependency="display_profile_image"
android:key="hires_profile_image"
android:summary="@string/image_load_summary"
android:title="@string/hires_profile_image"/>
<CheckBoxPreference
android:defaultValue="false"
android:disableDependentsState="true"
android:key="skip_image_preview_processing"
android:summary="@string/skip_image_preview_processing_summary"
android:title="@string/skip_image_preview_processing"/>

<CheckBoxPreference
android:defaultValue="false"
android:dependency="skip_image_preview_processing"
android:key="inline_image_preview"
android:summary="@string/image_load_summary"
android:title="@string/inline_image_preview"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="display_name"
android:summaryOff="@string/display_name_summaryoff"
android:summaryOn="@string/display_name_summaryon"
android:title="@string/display_name"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="bottom_compose_button"
Expand Down
46 changes: 0 additions & 46 deletions res/xml/settings_content.xml

This file was deleted.

104 changes: 104 additions & 0 deletions res/xml/settings_content_and_storage.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="settings_content_and_storage"
android:title="@string/content_and_storage">

<PreferenceCategory
android:key="category_content"
android:title="@string/content">
<org.mariotaku.twidere.preference.ImageUploaderPickerPreference
android:key="image_uploader"
android:title="@string/image_uploader"/>

<CheckBoxPreference
android:defaultValue="true"
android:key="display_profile_image"
android:summary="@string/image_load_summary"
android:title="@string/display_profile_image"/>
<CheckBoxPreference
android:defaultValue="false"
android:dependency="display_profile_image"
android:key="hires_profile_image"
android:summary="@string/image_load_summary"
android:title="@string/hires_profile_image"/>
<CheckBoxPreference
android:defaultValue="false"
android:disableDependentsState="true"
android:key="skip_image_preview_processing"
android:summary="@string/skip_image_preview_processing_summary"
android:title="@string/skip_image_preview_processing"/>
<CheckBoxPreference
android:defaultValue="false"
android:dependency="skip_image_preview_processing"
android:key="inline_image_preview"
android:summary="@string/image_load_summary"
android:title="@string/inline_image_preview"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="display_name"
android:summaryOff="@string/display_name_summaryoff"
android:summaryOn="@string/display_name_summaryon"
android:title="@string/display_name"/>

<EditTextPreference
android:defaultValue="RT @[NAME]: [TEXT]"
android:dialogTitle="@string/quote_format"
android:key="quote_format"
android:singleLine="true"
android:summary="@string/quote_format_summary"
android:title="@string/quote_format"/>
<EditTextPreference
android:defaultValue="[TITLE] - [TEXT]"
android:dialogTitle="@string/share_format"
android:key="share_format"
android:singleLine="true"
android:summary="@string/share_format_summary"
android:title="@string/share_format"/>

<CheckBoxPreference
android:defaultValue="false"
android:key="load_more_automatically"
android:summary="@string/load_more_automatically_summary"
android:title="@string/load_more_automatically"/>

<org.mariotaku.preference.SeekBarPreference
maxValue="200"
minValue="10"
android:defaultValue="20"
android:key="load_item_limit"
android:summary="@string/load_item_limit_summary"
android:title="@string/load_item_limit"/>

<CheckBoxPreference
android:defaultValue="true"
android:key="remember_position"
android:summary="@string/remember_position_summary"
android:title="@string/remember_position"/>

<org.mariotaku.twidere.preference.TrendsLocationPreference
android:key="trends_location"
android:summary="@string/trends_location_summary"
android:title="@string/trends_location"/>
</PreferenceCategory>
<PreferenceCategory
android:key="category_storage"
android:title="@string/storage">
<org.mariotaku.preference.SeekBarPreference
maxValue="300"
minValue="50"
android:defaultValue="100"
android:key="database_item_limit"
android:summary="@string/database_item_limit_summary"
android:title="@string/database_item_limit"/>

<Preference
android:key="clear_cache"
android:summary="@string/clear_cache_summary"
android:title="@string/clear_cache"/>
<Preference
android:key="clear_databases"
android:summary="@string/clear_databases_summary"
android:title="@string/clear_databases"/>
</PreferenceCategory>

</PreferenceScreen>
6 changes: 3 additions & 3 deletions res/xml/settings_network.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
android:title="@string/network">

<PreferenceCategory
android:key="cat_api"
android:key="category_api"
android:title="@string/api">
<CheckBoxPreference
android:defaultValue="true"
Expand All @@ -28,7 +28,7 @@
android:title="@string/consumer_secret"/>
</PreferenceCategory>
<PreferenceCategory
android:key="cat_connectivity"
android:key="category_connectivity"
android:title="@string/connectivity">
<CheckBoxPreference
android:defaultValue="false"
Expand All @@ -42,7 +42,7 @@
android:title="@string/ignore_ssl_error"/>
</PreferenceCategory>
<PreferenceCategory
android:key="cat_proxy"
android:key="category_proxy"
android:title="@string/proxy">
<CheckBoxPreference
android:defaultValue="false"
Expand Down
Loading

0 comments on commit 6c2174d

Please sign in to comment.