Skip to content

Commit

Permalink
configurable dual pane layout
Browse files Browse the repository at this point in the history
save accounts preference for sending tweets
confirm when discarding a tweet
bug fixes
  • Loading branch information
mariotaku committed Aug 29, 2012
1 parent ac33b33 commit 71d4399
Show file tree
Hide file tree
Showing 67 changed files with 708 additions and 565 deletions.
Binary file removed res/drawable-hdpi/spinner_16_inner_holo.png
Binary file not shown.
Binary file removed res/drawable-hdpi/spinner_16_outer_holo.png
Binary file not shown.
Binary file removed res/drawable-hdpi/spinner_48_inner_holo.png
Binary file not shown.
Binary file removed res/drawable-hdpi/spinner_48_outer_holo.png
Binary file not shown.
Binary file removed res/drawable-hdpi/spinner_76_inner_holo.png
Binary file not shown.
Binary file removed res/drawable-hdpi/spinner_76_outer_holo.png
Binary file not shown.
Binary file added res/drawable-hdpi/spinner_black_16.png
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/spinner_black_48.png
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/spinner_black_76.png
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_menu_add_list.png
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_menu_clear_list.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_menu_tweet.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 6 additions & 20 deletions res/drawable/progress_large_holo.xml
@@ -1,21 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item>
<rotate
android:drawable="@drawable/spinner_76_outer_holo"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
</item>
<item>
<rotate
android:drawable="@drawable/spinner_76_inner_holo"
android:fromDegrees="720"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="0"/>
</item>

</layer-list>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/spinner_black_76"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
26 changes: 6 additions & 20 deletions res/drawable/progress_medium_holo.xml
@@ -1,21 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item>
<rotate
android:drawable="@drawable/spinner_48_outer_holo"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
</item>
<item>
<rotate
android:drawable="@drawable/spinner_48_inner_holo"
android:fromDegrees="720"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="0"/>
</item>

</layer-list>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/spinner_black_48"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
26 changes: 6 additions & 20 deletions res/drawable/progress_small_holo.xml
@@ -1,21 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item>
<rotate
android:drawable="@drawable/spinner_16_outer_holo"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
</item>
<item>
<rotate
android:drawable="@drawable/spinner_16_inner_holo"
android:fromDegrees="720"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="0"/>
</item>

</layer-list>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/spinner_black_16"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:toDegrees="1080"/>
5 changes: 3 additions & 2 deletions res/layout-ar/view_status.xml
Expand Up @@ -125,7 +125,8 @@
android:padding="8dp"
android:singleLine="true"
android:text="@string/users_retweeted_this"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"/>

<TextView
android:id="@+id/location_view"
Expand Down Expand Up @@ -167,4 +168,4 @@
android:layout_gravity="center"
android:visibility="gone"/>

</FrameLayout>
</FrameLayout>
70 changes: 0 additions & 70 deletions res/layout-large/base_dual_pane.xml

This file was deleted.

9 changes: 9 additions & 0 deletions res/layout/base.xml
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">

<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"/>

</merge>
71 changes: 66 additions & 5 deletions res/layout/base_dual_pane.xml
@@ -1,9 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_container"
android:layout_width="match_parent"
android:layout_height="match_parent">

<FrameLayout
android:id="@+id/content"
<LinearLayout
android:id="@+id/left_pane_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal">

</merge>
<org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/left_pane_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/pane_left_content_weight">

<FrameLayout
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent">

<FrameLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>

<FrameLayout
android:id="@+id/left_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout>

<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/pane_left_shadow_weight"
android:background="@drawable/two_panes_shadow_left"/>
</LinearLayout>

<LinearLayout
android:id="@+id/right_pane_layer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:baselineAligned="false"
android:orientation="horizontal">

<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/pane_right_shadow_weight"
android:background="@drawable/two_panes_shadow_right"/>

<org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/right_pane_container"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@integer/pane_right_content_weight">

<FrameLayout
android:id="@+id/right_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout>
</LinearLayout>

</FrameLayout>
File renamed without changes.
File renamed without changes.
27 changes: 4 additions & 23 deletions res/layout/select_account.xml
@@ -1,30 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<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="wrap_content"
android:orientation="vertical">
android:layout_height="wrap_content">

<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_height="wrap_content"/>

<View
android:layout_width="match_parent"
android:layout_height="0.2dp"
android:background="#40808080"/>

<Button
android:id="@+id/add"
style="?android:attr/buttonStyleSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/item_background_holo_light"
android:gravity="center"
android:minHeight="48dp"
android:onClick="onClick"
android:text="@string/add_account"/>

</LinearLayout>
</FrameLayout>
7 changes: 4 additions & 3 deletions res/layout/view_status.xml
Expand Up @@ -104,7 +104,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:singleLine="false"
android:singleLine="false"
android:textAppearance="?android:attr/textAppearanceMedium"/>

<FrameLayout
Expand All @@ -123,7 +123,8 @@
android:padding="8dp"
android:singleLine="true"
android:text="@string/users_retweeted_this"
android:textAppearance="?android:attr/textAppearanceSmall"/>
android:textAppearance="?android:attr/textAppearanceSmall"
android:visibility="gone"/>

<TextView
android:id="@+id/location_view"
Expand Down Expand Up @@ -164,4 +165,4 @@
android:layout_gravity="center"
android:visibility="gone"/>

</FrameLayout>
</FrameLayout>
19 changes: 6 additions & 13 deletions res/menu/action_status.xml
Expand Up @@ -6,20 +6,13 @@
android:icon="@drawable/ic_menu_reply"
android:title="@string/reply"/>
<item
android:id="@+id/retweet_submenu"
android:id="@id/retweet"
android:icon="@drawable/ic_menu_retweet"
android:title="@string/retweet">
<menu>
<item
android:id="@id/retweet"
android:icon="@drawable/ic_menu_retweet"
android:title="@string/retweet"/>
<item
android:id="@id/quote"
android:icon="@drawable/ic_menu_quote"
android:title="@string/quote"/>
</menu>
</item>
android:title="@string/retweet"/>
<item
android:id="@id/quote"
android:icon="@drawable/ic_menu_quote"
android:title="@string/quote"/>
<item
android:id="@id/fav"
android:icon="@drawable/ic_menu_star"
Expand Down
19 changes: 2 additions & 17 deletions res/menu/menu_drafts.xml
Expand Up @@ -3,7 +3,7 @@

<item
android:id="@+id/delete_all_submenu"
android:icon="@drawable/ic_menu_delete"
android:icon="@drawable/ic_menu_clear_list"
android:showAsAction="always"
android:title="@string/delete_all">
<menu>
Expand All @@ -12,24 +12,9 @@
android:title="@android:string/cancel"/>
<item
android:id="@id/delete_all"
android:icon="@drawable/ic_menu_delete"
android:icon="@drawable/ic_menu_clear_list"
android:title="@string/delete_all"/>
</menu>
</item>
<item
android:id="@+id/send_all_submenu"
android:icon="@drawable/ic_menu_send"
android:showAsAction="always"
android:title="@string/send_all">
<menu>
<item
android:icon="@drawable/ic_menu_close_clear_cancel"
android:title="@android:string/cancel"/>
<item
android:id="@id/send_all"
android:icon="@drawable/ic_menu_send"
android:title="@string/send_all"/>
</menu>
</item>

</menu>

0 comments on commit 71d4399

Please sign in to comment.