Permalink
Browse files

sliding pane feature finished.

removed some unused resources.
  • Loading branch information...
1 parent d3de0c3 commit 1ed722d283832190c53ba7341118fe746530b101 @mariotaku committed Nov 18, 2012
Showing with 1,098 additions and 428 deletions.
  1. +4 −4 AndroidManifest.xml
  2. BIN res/drawable-hdpi/right_pane_shadow.9.png
  3. BIN res/drawable-hdpi/shadow_holo.9.png
  4. BIN res/drawable-mdpi/right_pane_shadow.9.png
  5. BIN res/drawable-mdpi/shadow_holo.9.png
  6. BIN res/drawable-xhdpi/right_pane_shadow.9.png
  7. BIN res/drawable-xhdpi/shadow_holo.9.png
  8. +9 −16 res/layout-land/base_dual_pane.xml
  9. +10 −16 res/layout-land/home_dual_pane.xml
  10. +31 −0 res/layout-land/search_dual_pane.xml
  11. +10 −32 res/layout/base_dual_pane.xml
  12. +16 −0 res/layout/base_pane_left_content.xml
  13. +5 −0 res/layout/base_pane_right_content.xml
  14. +17 −9 res/layout/filters.xml
  15. +10 −32 res/layout/home_dual_pane.xml
  16. +16 −0 res/layout/home_pane_left_content.xml
  17. +11 −41 res/layout/search_dual_pane.xml
  18. +23 −0 res/layout/search_pane_left_content.xml
  19. +1 −0 res/values-land/dimens.xml
  20. +4 −4 res/values-land/integers.xml
  21. +1 −1 res/values-large-land/dimens.xml
  22. +1 −1 res/values-large/dimens.xml
  23. +36 −7 res/values/attrs.xml
  24. +5 −5 res/values/bools.xml
  25. +5 −2 res/values/dimens.xml
  26. +6 −4 res/values/integers.xml
  27. +1 −1 res/values/strings_donttranslate.xml
  28. +3 −4 src/edu/ucdavis/earlybird/UCDService.java
  29. +0 −1 src/org/mariotaku/twidere/Constants.java
  30. +1 −1 src/org/mariotaku/twidere/activity/ComposeActivity.java
  31. +19 −63 src/org/mariotaku/twidere/activity/DualPaneActivity.java
  32. +11 −8 src/org/mariotaku/twidere/activity/FiltersActivity.java
  33. +1 −0 src/org/mariotaku/twidere/activity/LinkHandlerActivity.java
  34. +1 −1 src/org/mariotaku/twidere/activity/SettingsActivity.java
  35. +1 −2 src/org/mariotaku/twidere/fragment/StatusFragment.java
  36. +1 −1 src/org/mariotaku/twidere/util/ExtendedViewGroupInterface.java
  37. +0 −1 src/org/mariotaku/twidere/util/ExtendedViewInterface.java
  38. +3 −2 src/org/mariotaku/twidere/view/ExtendedFrameLayout.java
  39. +2 −2 src/org/mariotaku/twidere/view/ExtendedLinearLayout.java
  40. +824 −0 src/org/mariotaku/twidere/view/SlidingPaneView.java
  41. +0 −163 src/org/mariotaku/twidere/view/SlidingPanel.java
  42. +9 −4 src/org/mariotaku/twidere/view/TabPageIndicator.java
View
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mariotaku.twidere"
android:installLocation="auto"
- android:versionCode="51"
+ android:versionCode="52"
android:versionName="@string/app_version">
<uses-sdk
@@ -90,8 +90,8 @@
android:name=".activity.ComposeActivity"
android:label="@string/compose"
android:launchMode="singleTop"
- android:windowSoftInputMode="adjustResize"
- android:theme="@style/Theme.Twidere.Light.Dialog">
+ android:theme="@style/Theme.Twidere.Light.Dialog"
+ android:windowSoftInputMode="adjustResize">
<intent-filter android:label="@string/compose">
<action android:name="android.intent.action.MAIN"/>
<action android:name="org.mariotaku.twidere.COMPOSE"/>
@@ -460,4 +460,4 @@
</receiver>
</application>
-</manifest>
+</manifest>
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -2,31 +2,24 @@
<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:baselineAligned="false"
android:orientation="horizontal">
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/panel_anchor"
+ <FrameLayout
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"/>
+ <include layout="@layout/base_pane_left_content"/>
<View
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </org.mariotaku.twidere.view.ExtendedFrameLayout>
+ android:layout_width="@dimen/default_slidingpane_shadow_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:background="@drawable/shadow_holo"/>
+ </FrameLayout>
<FrameLayout
android:id="@+id/fragment_container_right"
@@ -35,4 +28,4 @@
android:layout_weight="1"/>
</LinearLayout>
-</merge>
+</merge>
@@ -2,31 +2,25 @@
<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:baselineAligned="false"
android:orientation="horizontal">
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/panel_anchor"
+ <FrameLayout
android:layout_width="@dimen/pane_left_width"
android:layout_height="match_parent"
android:layout_weight="0">
- <org.mariotaku.twidere.view.ExtendedViewPager
- 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"/>
+ <include layout="@layout/home_pane_left_content"/>
<View
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </org.mariotaku.twidere.view.ExtendedFrameLayout>
+ android:layout_width="@dimen/default_slidingpane_shadow_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:background="@drawable/shadow_holo"/>
+
+ </FrameLayout>
<FrameLayout
android:id="@+id/fragment_container_right"
@@ -44,4 +38,4 @@
android:onClick="onClick"
android:src="@drawable/ic_menu_tweet"/>
-</merge>
+</merge>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:baselineAligned="false"
+ android:orientation="horizontal">
+
+ <FrameLayout
+ android:layout_width="@dimen/pane_left_width"
+ android:layout_height="match_parent"
+ android:layout_weight="0">
+
+ <include layout="@layout/search_pane_left_content"/>
+
+ <View
+ android:layout_width="@dimen/default_slidingpane_shadow_width"
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:background="@drawable/shadow_holo"/>
+ </FrameLayout>
+
+ <FrameLayout
+ android:id="@+id/fragment_container_right"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"/>
+ </LinearLayout>
+
+</merge>
@@ -2,38 +2,16 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:twidere="http://schemas.android.com/apk/res/org.mariotaku.twidere">
- <org.mariotaku.twidere.view.SlidingPanel
- android:id="@+id/main_container"
+ <org.mariotaku.twidere.view.SlidingPaneView
+ android:id="@+id/sliding_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- twidere:anchor="@+id/panel_anchor"
- twidere:content="@+id/fragment_container_right"
- twidere:closedLimit="@dimen/pane_closed_limit">
+ twidere:fadeType="left"
+ twidere:layoutLeft="@layout/base_pane_left_content"
+ twidere:layoutRight="@layout/base_pane_right_content"
+ twidere:shadowDrawable="@drawable/shadow_holo"
+ twidere:shadowWidth="@dimen/default_slidingpane_shadow_width"
+ twidere:spacingLeft="@dimen/pane_spacing_right"
+ twidere:spacingRight="@dimen/pane_spacing_right"/>
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/panel_anchor"
- android:layout_width="@dimen/pane_left_width"
- android:layout_height="match_parent">
-
- <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>
-
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/fragment_container_right"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </org.mariotaku.twidere.view.SlidingPanel>
-
-</merge>
+</merge>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <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"/>
+
+</FrameLayout>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/fragment_container_right"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
View
@@ -1,13 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<org.mariotaku.twidere.view.ExtendedViewPager xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/pager"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <android.support.v4.view.PagerTabStrip
- android:id="@+id/pager_tab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"/>
+ <view
+ android:id="@android:id/tabs"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:layout_weight="0"
+ class="org.mariotaku.twidere.view.TabPageIndicator"
+ android:background="?actionBarBackground"/>
-</org.mariotaku.twidere.view.ExtendedViewPager>
+ <org.mariotaku.twidere.view.ExtendedViewPager
+ android:id="@+id/pager"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+</LinearLayout>
@@ -2,39 +2,17 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:twidere="http://schemas.android.com/apk/res/org.mariotaku.twidere">
- <org.mariotaku.twidere.view.SlidingPanel
- android:id="@+id/main_container"
+ <org.mariotaku.twidere.view.SlidingPaneView
+ android:id="@+id/sliding_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- twidere:anchor="@+id/panel_anchor"
- twidere:content="@+id/fragment_container_right"
- twidere:closedLimit="@dimen/pane_closed_limit">
-
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/panel_anchor"
- android:layout_width="@dimen/pane_left_width"
- android:layout_height="match_parent">
-
- <org.mariotaku.twidere.view.ExtendedViewPager
- 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>
-
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/fragment_container_right"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </org.mariotaku.twidere.view.SlidingPanel>
+ twidere:fadeType="left"
+ twidere:layoutLeft="@layout/home_pane_left_content"
+ twidere:layoutRight="@layout/base_pane_right_content"
+ twidere:shadowDrawable="@drawable/shadow_holo"
+ twidere:shadowWidth="@dimen/default_slidingpane_shadow_width"
+ twidere:spacingLeft="@dimen/pane_spacing_right"
+ twidere:spacingRight="@dimen/pane_spacing_right"/>
<ImageButton
android:id="@+id/button_compose"
@@ -45,4 +23,4 @@
android:onClick="onClick"
android:src="@drawable/ic_menu_tweet"/>
-</merge>
+</merge>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <org.mariotaku.twidere.view.ExtendedViewPager
+ 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"/>
+
+</FrameLayout>
@@ -2,46 +2,16 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:twidere="http://schemas.android.com/apk/res/org.mariotaku.twidere">
- <org.mariotaku.twidere.view.SlidingPanel
- android:id="@+id/main_container"
+ <org.mariotaku.twidere.view.SlidingPaneView
+ android:id="@+id/sliding_pane"
android:layout_width="match_parent"
android:layout_height="match_parent"
- twidere:anchor="@+id/panel_anchor"
- twidere:content="@+id/fragment_container_right"
- twidere:closedLimit="@dimen/pane_closed_limit">
-
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/panel_anchor"
- android:layout_width="@dimen/pane_left_width"
- android:layout_height="match_parent">
-
- <org.mariotaku.twidere.view.ExtendedViewPager
- android:id="@+id/main"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <android.support.v4.view.PagerTabStrip
- android:id="@+id/pager_tab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="top"/>
-
- </org.mariotaku.twidere.view.ExtendedViewPager>
-
- <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>
-
- <org.mariotaku.twidere.view.ExtendedFrameLayout
- android:id="@+id/fragment_container_right"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </org.mariotaku.twidere.view.SlidingPanel>
-
-</merge>
+ twidere:fadeType="left"
+ twidere:layoutLeft="@layout/search_pane_left_content"
+ twidere:layoutRight="@layout/base_pane_right_content"
+ twidere:shadowDrawable="@drawable/shadow_holo"
+ twidere:shadowWidth="@dimen/default_slidingpane_shadow_width"
+ twidere:spacingLeft="@dimen/pane_spacing_right"
+ twidere:spacingRight="@dimen/pane_spacing_right"/>
+
+</merge>
Oops, something went wrong.

0 comments on commit 1ed722d

Please sign in to comment.