Skip to content

Commit f67158a

Browse files
theScrabitheScrabi
committed
Fixed:
- made "could not find a streamingplayer" thing inside ActionBarHandler yield stacktraces - remove watermark - fixed fab layout - changed version number to 0.5.0
1 parent c22c200 commit f67158a

9 files changed

Lines changed: 19 additions & 36 deletions

File tree

‎app/app.iml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,10 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.0.1/jars" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7879
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7980
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -91,11 +92,12 @@
9192
</content>
9293
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9394
<orderEntry type="sourceFolder" forTests="false" />
95+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
9496
<orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
95-
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
97+
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
9698
<orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
97-
<orderEntry type="library" exported="" name="design-23.0.1" level="project" />
98-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
99-
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
99+
<orderEntry type="library" exported="" name="design-23.1.0" level="project" />
100+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
101+
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
100102
</component>
101103
</module>

‎app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.schabi.newpipe"
99
minSdkVersion 15
1010
targetSdkVersion 23
11-
versionCode 4
12-
versionName "0.4.1"
11+
versionCode 5
12+
versionName "0.5.0"
1313
}
1414
buildTypes {
1515
release {
@@ -21,9 +21,9 @@ android {
2121

2222
dependencies {
2323
compile fileTree(include: ['*.jar'], dir: 'libs')
24-
compile 'com.android.support:appcompat-v7:23.0.1'
25-
compile 'com.android.support:support-v4:23.0.1'
24+
compile 'com.android.support:appcompat-v7:23.1.0'
25+
compile 'com.android.support:support-v4:23.1.0'
2626
compile 'org.jsoup:jsoup:1.8.3'
2727
compile 'org.mozilla:rhino:1.7.7'
28-
compile 'com.android.support:design:23.0.1'
28+
compile 'com.android.support:design:23.1.0'
2929
}

‎app/src/main/java/org/schabi/newpipe/ActionBarHandler.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ public void onClick(DialogInterface dialog, int which) {
320320
}
321321
});
322322
builder.create().show();
323+
Log.d(TAG, "Either no Streaming player for audio was installed, or something importand crashed:");
324+
e.printStackTrace();
323325
}
324326
}
325327
}

‎app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public boolean onQueryTextSubmit(String query) {
6363
// onQueryTextSubmit to trigger twice when focus is not cleared.
6464
// See: http://stackoverflow.com/questions/17874951/searchview-onquerytextsubmit-runs-twice-while-i-pressed-once
6565
getCurrentFocus().clearFocus();
66-
hideWatermark();
6766
} catch(Exception e) {
6867
e.printStackTrace();
6968
}
@@ -77,13 +76,6 @@ public boolean onQueryTextChange(String newText) {
7776

7877
}
7978

80-
private void hideWatermark() {
81-
ImageView waterMark = (ImageView) findViewById(R.id.list_view_watermark);
82-
if(waterMark != null) {
83-
waterMark.setVisibility(View.GONE);
84-
}
85-
}
86-
8779
/**
8880
* Whether or not the activity is in two-pane mode, i.e. running on a tablet
8981
* device.
@@ -109,7 +101,6 @@ protected void onCreate(Bundle savedInstanceState) {
109101
searchQuery = savedInstanceState.getString(QUERY);
110102
currentStreamingServiceId = savedInstanceState.getInt(STREAMING_SERVICE);
111103
if(!searchQuery.isEmpty()) {
112-
hideWatermark();
113104
listFragment.search(searchQuery);
114105
}
115106
}

‎app/src/main/res/layout-land/fragment_videoitem_detail.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190

191191
<View
192192
android:layout_width="match_parent"
193-
android:layout_height="70dip"
193+
android:layout_height="90dp"
194194
android:layout_below="@id/detailNextVideoRootLayout"/>
195195

196196
</RelativeLayout>

‎app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@
4242
android:layout_width="0dp"
4343
android:layout_weight="4">
4444

45-
<ImageView android:id="@+id/list_view_watermark"
46-
android:layout_width="match_parent"
47-
android:layout_height="match_parent"
48-
android:layout_margin="10dp"
49-
android:src="@drawable/new_pipe_watermark"/>
50-
5145
<FrameLayout android:id="@+id/videoitem_detail_container"
5246
android:layout_width="match_parent"
5347
android:layout_height="match_parent" />

‎app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190

191191
<View
192192
android:layout_width="match_parent"
193-
android:layout_height="70dip"
193+
android:layout_height="90dp"
194194
android:layout_below="@id/detailNextVideoRootLayout"/>
195195

196196
</RelativeLayout>

‎app/src/main/res/layout/activity_videoitem_list.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@
33
android:layout_height="match_parent"
44
android:orientation="vertical">
55

6-
<ImageView android:id="@+id/list_view_watermark"
7-
android:layout_width="match_parent"
8-
android:layout_height="match_parent"
9-
android:layout_margin="10dp"
10-
android:src="@drawable/new_pipe_watermark"/>
11-
126
<fragment
137
xmlns:tools="http://schemas.android.com/tools"
148
android:id="@+id/videoitem_list"

‎app/src/main/res/layout/fragment_videoitem_detail.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187

188188
<View
189189
android:layout_width="match_parent"
190-
android:layout_height="70dip"
190+
android:layout_height="90dp"
191191
android:layout_below="@id/detailNextVideoRootLayout"/>
192192

193193
</RelativeLayout>

0 commit comments

Comments
 (0)