wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compatibility issues with latest AndroidSlidingUpPanel

Browse source
This commit is contained in:
David Development 2015-02-21 23:44:57 +01:00
parent 9a4a1f76a0
commit 8c4348c00f
6 changed files with 87 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

176
News-Android-App/News-Android-App-News-Android-App.iml
View file

@ -9,6 +9,7 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
@ -91,135 +92,98 @@
</content>
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="library" exported="" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="library-2.0.4" level="project" />
<orderEntry type="library" exported="" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" name="library-3.0.0" level="project" />
<orderEntry type="library" exported="" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" name="butterknife-5.1.2" level="project" />
<orderEntry type="module" module-name="library" exported="" />
<orderEntry type="module" module-name="ownCloud-Account-Importer" exported="" />
<orderEntry type="module" module-name="android-HoloCircularProgressBar-library" exported="" />
<orderEntry type="module" module-name="MessageBar" exported="" />
<orderEntry type="module" module-name="ChangeLogLibrary" exported="" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.0.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="butterknife-5.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ownCloud-Account-Importer-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ChangeLogLibrary-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="MessageBar-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-logging-1.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.0.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="butterknife-5.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ownCloud-Account-Importer-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ChangeLogLibrary-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="MessageBar-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-logging-1.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.0.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="butterknife-5.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ownCloud-Account-Importer-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ChangeLogLibrary-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="MessageBar-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="butterknife-5.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-logging-1.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ChangeLogLibrary-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="MessageBar-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-logging-1.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-3.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ownCloud-Account-Importer-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="butterknife-5.1.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ChangeLogLibrary-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpclient-4.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="freemarker-2.3.18" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="picasso-2.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-generator-1.3.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="MessageBar-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="jsoup-1.7.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="eventbus-2.2.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="greendao-1.3.7" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="httpcore-4.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="commons-logging-1.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-release" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="library-3.0.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
</component>
</module>

11
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
View file

@ -25,6 +25,7 @@ import android.widget.LinearLayout;
import android.widget.Toast;
import com.nineoldandroids.view.ViewHelper;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;
import com.squareup.picasso.Picasso;
import java.io.File;
@ -133,7 +134,7 @@ public class PodcastFragmentActivity extends ActionBarActivity implements IPlayP
if(hasWindowFocus) {
int currentOrientation = getResources().getConfiguration().orientation;
if (currentOrientation != lastOrientation) {
sliding_layout.collapsePanel();
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
lastOrientation = currentOrientation;
}
}
@ -217,9 +218,9 @@ public class PodcastFragmentActivity extends ActionBarActivity implements IPlayP
}
public boolean handlePodcastBackPressed() {
if(mPodcastFragment != null && sliding_layout.isPanelExpanded()) {
if(mPodcastFragment != null && sliding_layout.getPanelState().equals(SlidingUpPanelLayout.PanelState.EXPANDED)) {
if (!mPodcastFragment.onBackPressed())
sliding_layout.collapsePanel();
sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
return true;
}
return false;
@ -436,11 +437,11 @@ public class PodcastFragmentActivity extends ActionBarActivity implements IPlayP
int podcastMediaControlHeightDp = pxToDp((int) getResources().getDimension(R.dimen.podcast_media_control_height));
if(isTabletView && sliding_layout.isPanelExpanded()) { //On Tablets
if(isTabletView && sliding_layout.getPanelState().equals(SlidingUpPanelLayout.PanelState.EXPANDED)) { //On Tablets
animateToPositionTargetApiSafe(podcastMediaControlHeightDp);
} else if(!isTabletView && isLeftSliderOpen)
animateToPositionTargetApiSafe(0);
else if(sliding_layout.isPanelExpanded()) {
else if(sliding_layout.getPanelState().equals(SlidingUpPanelLayout.PanelState.EXPANDED)) {
animateToPositionTargetApiSafe(podcastMediaControlHeightDp);
} else {
animateToPositionTargetApiSafe(64);

2
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/view/PodcastSlidingUpPanelLayout.java
View file

@ -50,7 +50,7 @@ public class PodcastSlidingUpPanelLayout extends SlidingUpPanelLayout {
//original implementation - only allow dragging on mDragView
View v = isPanelExpanded() ? mDragView : mSlideableView;
View v = getPanelState().equals(SlidingUpPanelLayout.PanelState.EXPANDED) ? mDragView : mSlideableView;
if (v == null) return false;
int[] viewLocation = new int[2];
v.getLocationOnScreen(viewLocation);

8
News-Android-App/src/main/res/layout/activity_news_detail.xml
View file

@ -19,10 +19,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:panelHeight="68dp"
sothree:shadowHeight="4dp"
sothree:paralaxOffset="100dp"
sothree:dragView="@+id/name">
sothree:umanoPanelHeight="68dp"
sothree:umanoShadowHeight="4dp"
sothree:umanoParalaxOffset="100dp"
sothree:umanoDragView="@+id/name">

6
News-Android-App/src/main/res/layout/activity_newsreader.xml
View file

@ -60,9 +60,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:panelHeight="68dp"
sothree:shadowHeight="4dp"
sothree:paralaxOffset="100dp" > <!-- sothree:dragView="@+id/name" -->
sothree:umanoPanelHeight="68dp"
sothree:umanoShadowHeight="4dp"
sothree:umanoParalaxOffset="100dp" > <!-- sothree:dragView="@+id/name" -->
<FrameLayout
android:id="@+id/content_frame"

6
News-Android-App/src/main/res/layout/activity_newsreader_twopane.xml
View file

@ -35,9 +35,9 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="bottom"
sothree:panelHeight="68dp"
sothree:shadowHeight="4dp"
sothree:paralaxOffset="100dp"> <!-- sothree:dragView="@+id/name" -->
sothree:umanoPanelHeight="68dp"
sothree:umanoShadowHeight="4dp"
sothree:umanoParalaxOffset="100dp"> <!-- sothree:dragView="@+id/name" -->
<FrameLayout
android:id="@+id/content_frame"