Merge branch 'tabs' into dev

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -181,7 +181,6 @@ public class MainActivity extends AppCompatActivity implements HistoryListener {
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(false);
             actionBar.setDisplayHomeAsUpEnabled(false);
         }
         return true;

app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java

@@ -2,6 +2,7 @@ package org.schabi.newpipe.fragments;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,6 +14,24 @@ public class BlankFragment extends BaseFragment {
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        if(activity != null && activity.getSupportActionBar() != null) {
+            activity.getSupportActionBar()
+                    .setTitle("NewPipe");
+        }
         return inflater.inflate(R.layout.fragment_blank, container, false);
     }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(isVisibleToUser) {
+            if(activity != null && activity.getSupportActionBar() != null) {
+                activity.getSupportActionBar()
+                        .setTitle("NewPipe");
+            }
+            // leave this inline. Will make it harder for copy cats.
+            // If you are a Copy cat FUCK YOU.
+            // I WILL FIND YOU, AND I WILL ...
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -84,6 +84,15 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         viewPager.setOffscreenPageLimit(adapter.getCount());
 
         tabLayout.setupWithViewPager(viewPager);
+
+       if(PreferenceManager.getDefaultSharedPreferences(getActivity())
+                .getString(getString(R.string.main_page_content_key), getString(R.string.blank_page_key))
+                .equals(getString(R.string.subscription_page_key))) {
+           tabLayout.getTabAt(0).setIcon(R.drawable.ic_channel_white_24dp);
+       } else {
+           tabLayout.getTabAt(0).setIcon(R.drawable.ic_whatshot_white_24dp);
+           tabLayout.getTabAt(1).setIcon(R.drawable.ic_channel_white_24dp);
+       }
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -108,7 +117,6 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
         ActionBar supportActionBar = activity.getSupportActionBar();
         if (supportActionBar != null) {
-            supportActionBar.setDisplayShowTitleEnabled(false);
             supportActionBar.setDisplayHomeAsUpEnabled(false);
         }
     }
@@ -171,7 +179,8 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
 
         @Override
         public CharSequence getPageTitle(int position) {
-            return getString(this.tabTitles[position]);
+            //return getString(this.tabTitles[position]);
+            return "";
         }
 
         @Override

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -26,6 +26,7 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.subscription.SubscriptionEntity;
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.UrlIdHandler;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
@@ -33,6 +34,7 @@ import org.schabi.newpipe.fragments.subscription.SubscriptionService;
 import org.schabi.newpipe.report.UserAction;
 import org.schabi.newpipe.util.AnimationUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.Localization;
 
 import java.util.List;
@@ -81,6 +83,20 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(activity != null
+                && useAsFrontPage
+                && isVisibleToUser) {
+            try {
+                activity.getSupportActionBar().setTitle(currentInfo.name);
+            } catch (Exception e) {
+                onError(e);
+            }
+        }
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -125,7 +141,6 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
         ActionBar supportActionBar = activity.getSupportActionBar();
         if(useAsFrontPage) {
             supportActionBar.setDisplayHomeAsUpEnabled(false);
-            //supportActionBar.setDisplayShowTitleEnabled(false);
         } else {
             inflater.inflate(R.menu.menu_channel, menu);
 

app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java

@@ -121,7 +121,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
         }
 
         if(useAsFrontPage) {
-            supportActionBar.setDisplayHomeAsUpEnabled(false);
+            supportActionBar.setDisplayShowTitleEnabled(true);
             //supportActionBar.setDisplayShowTitleEnabled(false);
         }
     }

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -53,6 +53,9 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
 
 public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
 
+    private String kioskId = "";
+
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -76,6 +79,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         instance.setInitialData(serviceId,
                 kioskTypeUrlIdHandler.getUrl(kioskId),
                 kioskId);
+        instance.kioskId = kioskId;
         return instance;
     }
 
@@ -83,6 +87,18 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
     // LifeCycle
     //////////////////////////////////////////////////////////////////////////*/
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(useAsFrontPage && isVisibleToUser) {
+            try {
+                activity.getSupportActionBar().setTitle(KioskTranslator.getTranslatedKioskName(kioskId, getActivity()));
+            } catch (Exception e) {
+                onError(e);
+            }
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_kiosk, container, false);
@@ -97,7 +113,6 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         super.onCreateOptionsMenu(menu, inflater);
         ActionBar supportActionBar = activity.getSupportActionBar();
         if (supportActionBar != null && useAsFrontPage) {
-            //supportActionBar.setDisplayShowTitleEnabled(false);
             supportActionBar.setDisplayHomeAsUpEnabled(false);
         }
     }

app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java

@@ -7,6 +7,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import org.schabi.newpipe.fragments.BaseStateFragment;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.info_list.InfoListAdapter;
 import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.KioskTranslator;
 import org.schabi.newpipe.util.NavigationHelper;
 
 import java.util.ArrayList;
@@ -52,6 +54,17 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     // Fragment LifeCycle
     ///////////////////////////////////////////////////////////////////////////
 
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if(isVisibleToUser && activity != null) {
+            activity.getSupportActionBar()
+                    .setTitle(R.string.tab_subscriptions);
+        }
+    }
+
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -64,6 +77,9 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
         activity.setTitle(R.string.tab_subscriptions);
+        if(useAsFrontPage) {
+            activity.getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+        }
         return inflater.inflate(R.layout.fragment_subscription, container, false);
     }
 

app/src/main/res/layout/fragment_blank.xml

@@ -16,4 +16,10 @@
         android:layout_marginTop="50dp"
         android:visibility="gone" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_channel.xml

@@ -62,4 +62,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_feed.xml

@@ -34,4 +34,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_kiosk.xml

@@ -4,6 +4,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/items_list"
         android:layout_width="match_parent"
@@ -61,4 +62,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_main.xml

@@ -10,13 +10,14 @@
         android:id="@+id/main_tab_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:layout_alignParentTop="true"
+        android:background="@color/dark_youtube_primary_color"
         app:tabGravity="fill"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_above="@id/main_tab_layout"/>
+        android:layout_below="@id/main_tab_layout"/>
 
 </RelativeLayout>

app/src/main/res/layout/fragment_playlist.xml

@@ -62,4 +62,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_search.xml

@@ -81,4 +81,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_subscription.xml

@@ -35,4 +35,10 @@
         android:visibility="gone"
         tools:visibility="visible"/>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+
 </RelativeLayout>

app/src/main/res/layout/fragment_video_detail.xml

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/video_item_detail"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:focusableInTouchMode="true">
@@ -394,4 +398,12 @@
                 </RelativeLayout>
             </LinearLayout>
         </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>
+    </FrameLayout>
+
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="?attr/toolbar_shadow_drawable"
+        android:layout_alignParentTop="true"/>
+</RelativeLayout>

app/src/main/res/layout/toolbar_layout.xml

@@ -36,9 +36,4 @@
 
     </android.support.v7.widget.Toolbar>
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:background="?attr/toolbar_shadow_drawable"/>
-
 </LinearLayout>