hide textview in player status when empty

segler-alex · May 8, 2016 · 810741e · 810741e
1 parent 6a951a4
commit 810741e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/src/main/java/net/programmierecke/radiodroid2/ActivityPlayerInfo.java b/app/src/main/java/net/programmierecke/radiodroid2/ActivityPlayerInfo.java
@@ -173,9 +173,11 @@ private void UpdateOutput() {
 		if (seconds <= 0){
 			buttonClearTimeout.setVisibility(View.GONE);
 			textViewCountdown.setText("");
+			textViewCountdown.setVisibility(View.GONE);
 		}else{
 			buttonClearTimeout.setVisibility(View.VISIBLE);
 			textViewCountdown.setText(getResources().getString(R.string.sleep_timer,seconds / 60, seconds % 60));
+			textViewCountdown.setVisibility(View.VISIBLE);
 		}
 
 		Map<String,String> liveInfo = PlayerServiceUtil.getMetadataLive();
@@ -195,15 +197,15 @@ private void UpdateOutput() {
 		if (PlayerServiceUtil.getCurrentRecordFileName() != null){
 			strExtra += "Recording to:" + PlayerServiceUtil.getCurrentRecordFileName() + "\n";
 		}
-		if (PlayerServiceUtil.getMetadataBitrate() > 0) {
-			strExtra += "" + PlayerServiceUtil.getMetadataBitrate() + " kbps\n";
-		}
 		if (PlayerServiceUtil.getMetadataGenre() != null) {
 			strExtra += PlayerServiceUtil.getMetadataGenre() + "\n";
 		}
 		if (PlayerServiceUtil.getMetadataHomepage() != null) {
 			strExtra += PlayerServiceUtil.getMetadataHomepage() + "\n";
 		}
+		if (PlayerServiceUtil.getMetadataBitrate() > 0) {
+			strExtra += "" + PlayerServiceUtil.getMetadataBitrate() + " kbps\n";
+		}
 		textViewExtraInfo.setText(strExtra);
 
 		if (!PlayerServiceUtil.isPlaying()){

diff --git a/app/src/main/java/net/programmierecke/radiodroid2/Utils.java b/app/src/main/java/net/programmierecke/radiodroid2/Utils.java
@@ -10,6 +10,7 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
@@ -180,7 +181,7 @@ protected void onPostExecute(String result) {
 
 	public static boolean verifyStoragePermissions(Activity activity) {
 		// Check if we have write permission
-		int permission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+		int permission = ContextCompat.checkSelfPermission(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
 		if (permission != PackageManager.PERMISSION_GRANTED) {
 			// We don't have permission so prompt the user