Refactoring

Author: David-Development

News-Android-App/build.gradle

@@ -79,7 +79,7 @@ dependencies {
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.jakewharton:butterknife:5.1.+'
-    compile 'com.sothree.slidinguppanel:library:3.1.1'
+    compile 'com.sothree.slidinguppanel:library:3.2.1'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile 'de.greenrobot:eventbus:2.2.1'
     compile 'de.greenrobot:greendao:2.0.0'
@@ -94,7 +94,7 @@ dependencies {
     testCompile 'junit:junit:4.+'
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.5.0'
 
-    androidTestCompile 'com.android.support:support-annotations:23.0.1'
+    androidTestCompile 'com.android.support:support-annotations:23.1.1'
     androidTestCompile 'com.android.support.test:runner:0.3'
     androidTestCompile 'com.android.support.test:rules:0.3'
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'

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

@@ -49,22 +49,18 @@
 
 public class PodcastFragmentActivity extends AppCompatActivity implements IPlayPausePodcastClicked {
 
-    private PodcastPlaybackService mPodcastPlaybackService;
-    boolean mBound = false;
-
-
-    private static final String TAG = "PodcastFragmentActivity";
-    private PodcastFragment mPodcastFragment;
+    private static final String TAG = PodcastFragmentActivity.class.getCanonicalName();
 
+    private PodcastPlaybackService mPodcastPlaybackService;
+    private boolean mBound = false;
     private EventBus eventBus;
+    private PodcastFragment mPodcastFragment;
+    private int appHeight;
+    private int appWidth;
 
     @InjectView(R.id.videoPodcastSurfaceWrapper) ZoomableRelativeLayout rlVideoPodcastSurfaceWrapper;
-    //@InjectView(R.id.videoPodcastSurface) SurfaceView surfaceView;
     @InjectView(R.id.sliding_layout) PodcastSlidingUpPanelLayout sliding_layout;
 
-    int appHeight;
-    int appWidth;
-
 
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
@@ -90,15 +86,6 @@ public void onGlobalLayout() {
 
         UpdatePodcastView();
 
-        /*
-        new OrientationEventListener(this, SensorManager.SENSOR_DELAY_UI) {
-            @Override
-            public void onOrientationChanged(int i) {
-                sliding_layout.collapsePanel();
-            }
-        };
-        */
-
         if(isMyServiceRunning(PodcastPlaybackService.class)) {
             Intent intent = new Intent(this, PodcastPlaybackService.class);
             bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
@@ -147,7 +134,6 @@ protected void onResume() {
             sliding_layout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
         }
 
-        //eventBus.post(new RegisterVideoOutput(surfaceView));
         super.onResume();
     }
 
@@ -234,19 +220,13 @@ public void onEventMainThread(UpdatePodcastStatusEvent podcast) {
         //If file is loaded or preparing and podcast is paused/not running expand the view
         if((podcast.isFileLoaded() || podcast.isPreparingFile()) && !currentlyPlaying) {
             //Expand view
-
             sliding_layout.setPanelHeight((int) dipToPx(68));
-
             currentlyPlaying = true;
-
             Log.v(TAG, "expanding podcast view!");
         } else if(!(podcast.isPreparingFile() || podcast.isFileLoaded()) && currentlyPlaying) { //If file is not loaded or podcast is not preparing file and is playing
             //Hide view
-
             sliding_layout.setPanelHeight(0);
-
             currentlyPlaying = false;
-
             Log.v(TAG, "collapsing podcast view!");
         }
 

News-Android-App/src/main/res/layout-sw600dp-land/activity_newsreader.xml

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:gravity="bottom"
     sothree:umanoPanelHeight="68dp"
-    sothree:umanoParalaxOffset="100dp"
+    sothree:umanoParallaxOffset="100dp"
     sothree:umanoShadowHeight="4dp"> <!-- sothree:dragView="@+id/name" -->
 
         <android.support.design.widget.CoordinatorLayout

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

@@ -14,7 +14,7 @@
         android:gravity="bottom"
         sothree:umanoPanelHeight="68dp"
         sothree:umanoShadowHeight="4dp"
-        sothree:umanoParalaxOffset="100dp"
+        sothree:umanoParallaxOffset="100dp"
         sothree:umanoDragView="@+id/name">
 
         <android.support.v4.view.ViewPager

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

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:gravity="bottom"
     sothree:umanoPanelHeight="68dp"
-    sothree:umanoParalaxOffset="100dp"
+    sothree:umanoParallaxOffset="100dp"
     sothree:umanoShadowHeight="4dp"> <!-- sothree:dragView="@+id/name" -->
 
     <android.support.v4.widget.DrawerLayout