Fixed:

- made "could not find a streamingplayer" thing inside ActionBarHandler yield stacktraces - remove watermark - fixed fab layout - changed version number to 0.5.0
TeamNewPipe · Oct 29, 2015 · f67158a · f67158a
1 parent c22c200
commit f67158a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 36 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -71,9 +71,10 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -91,11 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="design-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 4
-        versionName "0.4.1"
+        versionCode 5
+        versionName "0.5.0"
     }
     buildTypes {
         release {
@@ -21,9 +21,9 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:appcompat-v7:23.1.0'
+    compile 'com.android.support:support-v4:23.1.0'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
-    compile 'com.android.support:design:23.0.1'
+    compile 'com.android.support:design:23.1.0'
 }
diff --git a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
@@ -320,6 +320,8 @@ public void onClick(DialogInterface dialog, int which) {
                         }
                     });
             builder.create().show();
+            Log.d(TAG, "Either no Streaming player for audio was installed, or something importand crashed:");
+            e.printStackTrace();
         }
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -63,7 +63,6 @@ public boolean onQueryTextSubmit(String query) {
                 //    onQueryTextSubmit to trigger twice when focus is not cleared.
                 // See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
                 getCurrentFocus().clearFocus();
-                hideWatermark();
             } catch(Exception e) {
                 e.printStackTrace();
             }
@@ -77,13 +76,6 @@ public boolean onQueryTextChange(String newText) {
 
     }
 
-    private void hideWatermark() {
-        ImageView waterMark = (ImageView) findViewById(R.id.list_view_watermark);
-        if(waterMark != null) {
-            waterMark.setVisibility(View.GONE);
-        }
-    }
-
     /**
      * Whether or not the activity is in two-pane mode, i.e. running on a tablet
      * device.
@@ -109,7 +101,6 @@ protected void onCreate(Bundle savedInstanceState) {
             searchQuery = savedInstanceState.getString(QUERY);
             currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
             if(!searchQuery.isEmpty()) {
-                hideWatermark();
                 listFragment.search(searchQuery);
             }
         }

diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
@@ -190,7 +190,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="70dip"
+                android:layout_height="90dp"
                 android:layout_below="@id/detailNextVideoRootLayout"/>
 
         </RelativeLayout>

diff --git a/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml b/app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
@@ -42,12 +42,6 @@
         android:layout_width="0dp"
         android:layout_weight="4">
 
-        <ImageView android:id="@+id/list_view_watermark"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="10dp"
-            android:src="@drawable/new_pipe_watermark"/>
-
         <FrameLayout android:id="@+id/videoitem_detail_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"  />

diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
@@ -190,7 +190,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="70dip"
+                android:layout_height="90dp"
                 android:layout_below="@id/detailNextVideoRootLayout"/>
 
         </RelativeLayout>

diff --git a/app/src/main/res/layout/activity_videoitem_list.xml b/app/src/main/res/layout/activity_videoitem_list.xml
@@ -3,12 +3,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <ImageView android:id="@+id/list_view_watermark"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="10dp"
-        android:src="@drawable/new_pipe_watermark"/>
-
     <fragment
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/videoitem_list"

diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -187,7 +187,7 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="70dip"
+                android:layout_height="90dp"
                 android:layout_below="@id/detailNextVideoRootLayout"/>
 
         </RelativeLayout>