Skip to content

Commit

Permalink
ActionMode compat implemented, but not yet finished.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mariotaku
mariotaku committed Aug 30, 2012
1 parent 7ec3ed5 commit 7541711
Show file tree
Hide file tree
Showing 80 changed files with 1,799 additions and 833 deletions.
Binary file added res/drawable-hdpi/cab_background_top_holo_dark.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/cab_background_top_holo_light.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_label_account.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_label_account_nopadding.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_label_user.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/cab_background_top_holo_dark.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/cab_background_top_holo_light.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_label_account_nopadding.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions res/layout-ar/status_list_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">

<org.mariotaku.twidere.view.ColorView
android:id="@+id/status_background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/ic_label_user"/>

<RelativeLayout
android:id="@+id/status_content"
android:layout_width="match_parent"
Expand Down
49 changes: 49 additions & 0 deletions res/layout/action_mode.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_mode_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?actionModeBackground"
android:orientation="horizontal"
android:visibility="gone">

<ImageButton
android:id="@+id/action_mode_cancel"
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="@drawable/list_selector_holo_dark"
android:src="@drawable/ic_menu_close_clear_cancel"/>

<LinearLayout
android:id="@+id/action_mode_title_view"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">

<TextView
android:id="@+id/action_mode_title"
style="?attr/actionBarTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>

<TextView
android:id="@+id/action_mode_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"/>
</LinearLayout>

<org.mariotaku.menubar.MenuBar
android:id="@+id/action_mode_menu"
android:layout_width="wrap_content"
android:layout_height="fill_parent"/>

</LinearLayout>
144 changes: 76 additions & 68 deletions res/layout/actionbar.xml
View file
Original file line number Diff line number Diff line change
@@ -1,87 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@id/actionbar"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:gravity="center_vertical"
android:orientation="horizontal">
android:layout_height="match_parent">

<LinearLayout
android:id="@id/actionbar_home"
style="?actionBarItemHomeStyle"
android:layout_width="wrap_content"
android:id="@id/actionbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0">
android:baselineAligned="false"
android:gravity="center_vertical"
android:orientation="horizontal">

<ImageView
android:id="@id/actionbar_home_as_up_indicator"
<LinearLayout
android:id="@id/actionbar_home"
style="?actionBarItemHomeStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:scaleType="fitCenter"
android:src="?actionBarHomeAsUpIndicator"
android:visibility="invisible"/>
android:layout_weight="0">

<ImageView
android:id="@id/actionbar_home_as_up_indicator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:scaleType="fitCenter"
android:src="?actionBarHomeAsUpIndicator"
android:visibility="invisible"/>

<ImageView
android:id="@id/actionbar_icon"
android:layout_width="32dp"
<ImageView
android:id="@id/actionbar_icon"
android:layout_width="32dp"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:scaleType="fitCenter"/>
</LinearLayout>

<LinearLayout
android:id="@id/actionbar_title_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical|left"
android:scaleType="fitCenter"/>
</LinearLayout>
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">

<LinearLayout
android:id="@id/actionbar_title_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@id/actionbar_title"
style="?attr/actionBarTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>

<TextView
android:id="@id/actionbar_title"
style="?attr/actionBarTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<TextView
android:id="@id/actionbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"/>
</LinearLayout>

<FrameLayout
android:id="@id/actionbar_custom_view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"/>

<TextView
android:id="@id/actionbar_subtitle"
<ProgressBar
android:id="@id/actionbar_progress_indeterminate"
style="?actionBarIndeterminateProgressStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="center_vertical"
android:layout_weight="0"
android:indeterminateOnly="true"
android:visibility="gone"/>
</LinearLayout>

<FrameLayout
android:id="@id/actionbar_custom_view_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"/>

<ProgressBar
android:id="@id/actionbar_progress_indeterminate"
style="?actionBarIndeterminateProgressStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="0"
android:indeterminateOnly="true"
android:visibility="gone"/>
<LinearLayout
android:id="@id/actionbar_menu_buttons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:orientation="horizontal"/>
</LinearLayout>

<LinearLayout
android:id="@id/actionbar_menu_buttons"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:orientation="horizontal"/>
<include layout="@layout/action_mode">
</include>

</LinearLayout>
</FrameLayout>
2 changes: 0 additions & 2 deletions res/layout/base_multi_select.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>

<include layout="@layout/multi_select_bar"/>

</merge>
2 changes: 0 additions & 2 deletions res/layout/base_multi_select_dual_pane.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
android:id="@+id/left_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

<include layout="@layout/multi_select_bar"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout>

<View
Expand Down
2 changes: 0 additions & 2 deletions res/layout/home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@
android:onClick="onClick"
android:src="@drawable/ic_menu_tweet"/>

<include layout="@layout/multi_select_bar"/>

</merge>
2 changes: 0 additions & 2 deletions res/layout/home_dual_pane.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
android:id="@+id/left_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

<include layout="@layout/multi_select_bar"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout>

<View
Expand Down
39 changes: 22 additions & 17 deletions res/layout/home_tabs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,30 @@
** limitations under the License.
*/
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
android:layout_height="match_parent">

<view
android:id="@android:id/tabs"
android:layout_width="0dp"
<LinearLayout
android:id="@+id/tab_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
class="org.mariotaku.twidere.view.TabPageIndicator"/>
android:orientation="horizontal">

<view
android:id="@android:id/tabs"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
class="org.mariotaku.twidere.view.TabPageIndicator"/>

<ProgressBar
android:id="@android:id/progress"
style="@style/Widget.Holo.ProgressBar.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="0"/>
<ProgressBar
android:id="@android:id/progress"
style="@style/Widget.Holo.ProgressBar.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="0"/>
</LinearLayout>

</LinearLayout>
</FrameLayout>
4 changes: 2 additions & 2 deletions res/layout/menu_list_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_height="48dp"
android:drawablePadding="4dp"
android:ellipsize="marquee"
android:gravity="center_vertical"
android:padding="4dp"
android:padding="8dp"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>
37 changes: 0 additions & 37 deletions res/layout/multi_select_bar.xml
View file

This file was deleted.

Loading

0 comments on commit 7541711

Please sign in to comment.