be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'Start-screen-hint' of git://github.com/Ashanmaril/NewPipe into Ashanmaril-Start-screen-hint

This commit is contained in:
Christian Schabesberger 2016-03-25 19:05:56 +01:00
parent c05d9303a9 6c7204eae0
commit 381f054daf
5 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
View File

@ -102,6 +102,8 @@ public class VideoItemListActivity extends AppCompatActivity
} catch(Exception e) {
e.printStackTrace();
}
View bg = findViewById(R.id.mainBG);
bg.setVisibility(View.GONE);
return true;
}
@ -200,6 +202,9 @@ public class VideoItemListActivity extends AppCompatActivity
setContentView(R.layout.activity_videoitem_list);
StreamingService streamingService = null;
View bg = findViewById(R.id.mainBG);
bg.setVisibility(View.VISIBLE);
try {
//------ todo: remove this line when multiservice support is implemented ------
currentStreamingServiceId = ServiceList.getIdOfService("Youtube");

2
app/src/main/res/layout-sw600dp-land/activity_videoitem_list.xml
View File

@ -28,6 +28,8 @@
android:focusable="false"
tools:ignore="InconsistentLayout" />
<include layout="@layout/main_bg" />
<fragment android:id="@+id/videoitem_list"
android:name="org.schabi.newpipe.VideoItemListFragment"
android:layout_width="match_parent"

3
app/src/main/res/layout/activity_videoitem_list.xml
View File

@ -1,8 +1,11 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/main_bg" />
<fragment
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/videoitem_list"

29
app/src/main/res/layout/main_bg.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/mainBG"
tools:context=".VideoItemDetailActivity"
tools:showIn="@layout/activity_videoitem_list">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/app_name"
android:textSize="40sp"
android:fontFamily="sans-serif-condensed"
android:layout_marginTop="30dp"
android:id="@+id/mainBGTitle"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/main_bg_subtitle"
android:id="@+id/mainBGSubtitle"
android:layout_gravity="center_horizontal" />
</LinearLayout>

1
app/src/main/res/values/strings.xml
View File

@ -1,6 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" translatable="false">NewPipe</string>
<string name="main_bg_subtitle">Tap search to get started</string>
<string name="background_player_name">NewPipe Background Player</string>
<string name="title_videoitem_detail" translatable="false">NewPipe</string>
<string name="view_count_text">%1$s views</string>