Skip to content

Commit

Permalink
for sync.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mariotaku
mariotaku committed Nov 17, 2012
1 parent e8d145f commit d3de0c3
Show file tree
Hide file tree
Showing 17 changed files with 227 additions and 192 deletions.
38 changes: 38 additions & 0 deletions res/layout-land/base_dual_pane.xml
View file
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">

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

<org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/panel_anchor"
android:layout_width="@dimen/pane_left_width"
android:layout_height="match_parent"
android:layout_weight="0">

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

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

<View
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout>

<FrameLayout
android:id="@+id/fragment_container_right"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>

</merge>
3 changes: 2 additions & 1 deletion res/layout-land/home_dual_pane.xml
View file
Expand Up @@ -4,7 +4,8 @@
<LinearLayout <LinearLayout
android:id="@+id/main_container" android:id="@+id/main_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="horizontal">


<org.mariotaku.twidere.view.ExtendedFrameLayout <org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/panel_anchor" android:id="@+id/panel_anchor"
Expand Down
4 changes: 2 additions & 2 deletions res/layout/base.xml
View file
Expand Up @@ -2,8 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">


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


</merge> </merge>
53 changes: 22 additions & 31 deletions res/layout/base_dual_pane.xml
View file
@@ -1,48 +1,39 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_container" xmlns:twidere="http://schemas.android.com/apk/res/org.mariotaku.twidere">
android:layout_width="match_parent"
android:layout_height="match_parent">


<LinearLayout <org.mariotaku.twidere.view.SlidingPanel
android:id="@+id/left_pane_layer" android:id="@+id/main_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:baselineAligned="false" twidere:anchor="@+id/panel_anchor"
android:orientation="horizontal"> twidere:content="@+id/fragment_container_right"
twidere:closedLimit="@dimen/pane_closed_limit">


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


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

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


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


<View <View
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"/>
android:layout_weight="@integer/pane_left_shadow_weight"/> </org.mariotaku.twidere.view.ExtendedFrameLayout>
</LinearLayout>


<org.mariotaku.twidere.view.SlidePane <org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/right_pane_layer" android:id="@+id/fragment_container_right"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
</org.mariotaku.twidere.view.SlidingPanel>


</FrameLayout> </merge>
9 changes: 1 addition & 8 deletions res/layout/home_dual_pane.xml
View file
Expand Up @@ -7,16 +7,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
twidere:anchor="@+id/panel_anchor" twidere:anchor="@+id/panel_anchor"
twidere:button="@+id/panel_button"
twidere:content="@+id/fragment_container_right" twidere:content="@+id/fragment_container_right"
twidere:openOverlap="4dp"
twidere:closedLimit="@dimen/pane_closed_limit"> twidere:closedLimit="@dimen/pane_closed_limit">


<Button
android:id="@+id/panel_button"
android:layout_width="match_parent"
android:layout_height="64dp"/>

<org.mariotaku.twidere.view.ExtendedFrameLayout <org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/panel_anchor" android:id="@+id/panel_anchor"
android:layout_width="@dimen/pane_left_width" android:layout_width="@dimen/pane_left_width"
Expand All @@ -37,7 +30,7 @@
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
</org.mariotaku.twidere.view.ExtendedFrameLayout> </org.mariotaku.twidere.view.ExtendedFrameLayout>


<FrameLayout <org.mariotaku.twidere.view.ExtendedFrameLayout
android:id="@+id/fragment_container_right" android:id="@+id/fragment_container_right"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent"/>
Expand Down
84 changes: 36 additions & 48 deletions res/layout/search_dual_pane.xml
View file
@@ -1,59 +1,47 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:twidere="http://schemas.android.com/apk/res/org.mariotaku.twidere">


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

twidere:anchor="@+id/panel_anchor"
<LinearLayout twidere:content="@+id/fragment_container_right"
android:id="@+id/left_pane_layer" twidere:closedLimit="@dimen/pane_closed_limit">
android:layout_width="match_parent"
android:layout_height="match_parent" <org.mariotaku.twidere.view.ExtendedFrameLayout
android:baselineAligned="false" android:id="@+id/panel_anchor"
android:orientation="horizontal"> android:layout_width="@dimen/pane_left_width"

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


<FrameLayout <android.support.v4.view.PagerTabStrip
android:id="@+id/main" android:id="@+id/pager_tab"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="wrap_content"

android:layout_gravity="top"/>
<org.mariotaku.twidere.view.ExtendedViewPager
android:id="@+id/pager" </org.mariotaku.twidere.view.ExtendedViewPager>
android:layout_width="match_parent"
android:layout_height="match_parent"> <FrameLayout

android:id="@+id/fragment_container_left"
<android.support.v4.view.PagerTabStrip android:layout_width="match_parent"
android:id="@+id/pager_tab" android:layout_height="match_parent"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"/>

</org.mariotaku.twidere.view.ExtendedViewPager>
</FrameLayout>

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


<View <View
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"/>
android:layout_weight="@integer/pane_left_shadow_weight"/> </org.mariotaku.twidere.view.ExtendedFrameLayout>
</LinearLayout>


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


</merge> </merge>
8 changes: 3 additions & 5 deletions res/values/attrs.xml
View file
Expand Up @@ -12,11 +12,9 @@
<attr name="tabBackground" format="reference"/> <attr name="tabBackground" format="reference"/>
</declare-styleable> </declare-styleable>
<declare-styleable name="SlidingPanel"> <declare-styleable name="SlidingPanel">
<attr name="button" format="reference" /> <attr name="anchor" format="reference"/>
<attr name="anchor" format="reference" /> <attr name="content" format="reference"/>
<attr name="content" format="reference" /> <attr name="closedLimit" format="dimension"/>
<attr name="openOverlap" format="dimension" />
<attr name="closedLimit" format="dimension" />
</declare-styleable> </declare-styleable>




Expand Down

0 comments on commit d3de0c3

Please sign in to comment.