diff --git a/app/build.gradle b/app/build.gradle index 7134edd1f..7cede827a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.2" defaultConfig { applicationId "org.schabi.newpipe" minSdkVersion 15 targetSdkVersion 23 - versionCode 7 - versionName "0.6.1" + versionCode 8 + versionName "0.6.2" } buildTypes { release { @@ -31,6 +31,8 @@ dependencies { compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.android.support:support-v4:23.1.1' compile 'com.android.support:design:23.1.1' + compile 'com.android.support:cardview-v7:23.1.1' + compile 'com.android.support:recyclerview-v7:23.1.1' compile 'org.jsoup:jsoup:1.8.3' compile 'org.mozilla:rhino:1.7.7' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6f4fd2e19..715680f4f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" package="org.schabi.newpipe" > - + + android:label="@string/app_name"> diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java index 0e3867035..a7c80bea6 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java @@ -245,7 +245,6 @@ public class VideoItemDetailFragment extends Fragment { String.format( res.getString(R.string.viewCountText), localisedViewCount)); - thumbsUpView.setText(nf.format(info.like_count)); thumbsDownView.setText(nf.format(info.dislike_count)); @@ -359,8 +358,7 @@ public class VideoItemDetailFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceBundle) { super.onActivityCreated(savedInstanceBundle); Activity a = getActivity(); - playVideoButton = - (FloatingActionButton) a.findViewById(R.id.playVideoButton); + playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton); thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout); Button backgroundButton = (Button) a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton); @@ -435,7 +433,6 @@ public class VideoItemDetailFragment extends Fragment { newWindowLayoutParams.height = bottom - top; thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams); - //noinspection SuspiciousNameCombination initialThumbnailPos.set(top, left); @@ -444,6 +441,8 @@ public class VideoItemDetailFragment extends Fragment { } } + + /**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences. * Currently not affected by the device's locale.*/ private Locale getPreferredLocale() { diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java index b841fbf7c..4e35a5a20 100644 --- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java @@ -33,7 +33,6 @@ import java.util.Vector; */ class VideoListAdapter extends BaseAdapter { - private final Context context; private final VideoInfoItemViewCreator viewCreator; private Vector videoList = new Vector<>(); @@ -43,6 +42,8 @@ class VideoListAdapter extends BaseAdapter { public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) { viewCreator = new VideoInfoItemViewCreator(LayoutInflater.from(context)); this.listView = videoListFragment.getListView(); + this.listView.setDivider(null); + this.listView.setDividerHeight(0); this.context = context; } diff --git a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java index 21168badd..da1b293fb 100644 --- a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java +++ b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java @@ -26,6 +26,7 @@ import org.schabi.newpipe.services.youtube.YoutubeService; /**Provides access to the video streaming services supported by NewPipe. * Currently only Youtube until the API becomes more stable.*/ + @SuppressWarnings("ALL") public class ServiceList { private static final String TAG = ServiceList.class.toString(); diff --git a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java index 80f06c05d..dfe2e161f 100644 --- a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java +++ b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java @@ -23,6 +23,7 @@ package org.schabi.newpipe.services; import org.schabi.newpipe.VideoInfo; /**Scrapes information from a video streaming service (eg, YouTube).*/ + @SuppressWarnings("ALL") public abstract class VideoExtractor { protected final String pageUrl; diff --git a/app/src/main/res/drawable-nodpi/thumbs_down.png b/app/src/main/res/drawable-nodpi/thumbs_down.png index 62baa65ac..23c0f0487 100644 Binary files a/app/src/main/res/drawable-nodpi/thumbs_down.png and b/app/src/main/res/drawable-nodpi/thumbs_down.png differ diff --git a/app/src/main/res/drawable-nodpi/thumbs_up.png b/app/src/main/res/drawable-nodpi/thumbs_up.png index 11bf85637..1fdd2293f 100644 Binary files a/app/src/main/res/drawable-nodpi/thumbs_up.png and b/app/src/main/res/drawable-nodpi/thumbs_up.png differ diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml index 302086667..dba717abd 100644 --- a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml +++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml @@ -10,187 +10,163 @@ android:layout_height="match_parent" android:id="@+id/videoitem_detail"> - + android:layout_centerInParent="true" + android:indeterminate="true"/> + android:visibility="invisible"> - + android:layout_height="wrap_content"> - - - - -