1
0
mirror of https://github.com/TeamNewPipe/NewPipe.git synced 2024-11-22 19:12:45 +01:00

Merge branch 'master' of github.com:theScrabi/NewPipe

This commit is contained in:
Christian Schabesberger 2016-05-22 12:44:41 +02:00
commit 5bd9334f8f
3 changed files with 9 additions and 9 deletions

View File

@ -6,12 +6,12 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import org.schabi.newpipe.extractor.AbstractVideoInfo;
import org.schabi.newpipe.extractor.StreamPreviewInfo;
import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.schabi.newpipe.extractor.AbstractVideoInfo;
import org.schabi.newpipe.extractor.StreamPreviewInfo;
/**
* Created by Christian Schabesberger on 24.10.15.
*
@ -72,7 +72,7 @@ public class VideoInfoItemViewCreator {
if(info.uploader != null && !info.uploader.isEmpty()) {
holder.itemUploaderView.setText(info.uploader);
} else {
holder.itemDurationView.setVisibility(View.INVISIBLE);
holder.itemUploaderView.setVisibility(View.INVISIBLE);
}
if(info.duration > 0) {
holder.itemDurationView.setText(getDurationString(info.duration));

View File

@ -3,6 +3,7 @@ package org.schabi.newpipe;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.media.AudioManager;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
@ -215,8 +216,7 @@ public class VideoItemListActivity extends AppCompatActivity
ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
ServiceList.getNameOfService(currentStreamingServiceId), "", R.string.general_error));
}
//-----------------------------------------------------------------------------
//to solve issue 38
setVolumeControlStream(AudioManager.STREAM_MUSIC);
listFragment = (VideoItemListFragment) getSupportFragmentManager()
.findFragmentById(R.id.videoitem_list);
listFragment.setStreamingService(streamingService);

View File

@ -11,7 +11,7 @@
<string name="download">Descărcare</string>
<string name="search">Căutare</string>
<string name="settings">Setări</string>
<string name="did_you_mean">"V-ați referit la: "</string>
<string name="did_you_mean">V-ați referit la: %1$s ?</string>
<string name="search_page">"Pagina de căutare: "</string>
<string name="share_dialog_title">Partajează cu</string>
<string name="choose_browser">Alegeți browser-ul</string>
@ -25,12 +25,12 @@
<string name="download_path_dialog_title">Introduceți locul în care se vor descărca videoclipurile</string>
<string name="download_path_audio_title">Descărcați calea audio-ului</string>
<string name="download_path_audio_summary">Locul în care se vor stoca fișierele audio descărcate.</string>
<string name="download_path_audio_summary">Locul în care se vor stoca fișierele audio descărcate</string>
<string name="download_path_audio_dialog_title">Introduceți calea de descărcare pentru fișierele audio.</string>
<string name="autoplay_through_intent_title">Redare automată intenționată</string>
<string name="autoplay_through_intent_summary">Redați automat un videoclip atunci când este chemat din altă aplicație.</string>
<string name="default_resolution_title">Rezoluție de bază</string>
<string name="default_resolution_title">Rezoluție implicită</string>
<string name="play_with_kodi_title">Redați folosind Kodi</string>
<string name="kore_not_found">Aplicația Kore nu a fost găsită. Instalați Kore?</string>
<string name="show_play_with_kodi_title">Arată opțiunea \"Redați folosind Kodi\"</string>