Merge branch 'alpha' into beta

# Conflicts:
#	CHANGELOG.md

README.md

@@ -52,6 +52,15 @@ avoided for new code (e.g. the "m" member variable prefix).
 It's possible that contributions may be folded into future releases of Orange Squeeze. If so, the
 authors will be recognized in the release notes.
 
+## Languages and Translations
+
+Open Squeeze was developed by a native American English speaker. The German and French translations were
+initially machine generated and then heavily modified by users and contributors.
+
+Translations to new languages and modifications to existing translations should be done via
+[Weblate](https://hosted.weblate.org/projects/open-squeeze/) which is freely provided for
+Open Source projects. Thank you to them for providing this service!
+
 ## License
 
 The license for the code is [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).

app/build.gradle

@@ -190,15 +190,15 @@ dependencies {
     implementation "com.google.code.findbugs:jsr305:${obl_jsr305Version}"
 
     // ReactiveX
-    implementation "io.reactivex.rxjava3:rxandroid:3.0.0"
+    implementation "io.reactivex.rxjava3:rxandroid:3.0.2"
     implementation "io.reactivex.rxjava3:rxjava:3.1.5"
     implementation "io.reactivex.rxjava3:rxkotlin:3.0.1"
 
     // sqldelight
     implementation "com.squareup.sqldelight:android-driver:${sqldelight_version}"
     implementation "com.squareup.sqldelight:coroutines-extensions:${sqldelight_version}"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     implementation 'androidx.multidex:multidex:2.0.1'
 
@@ -211,17 +211,17 @@ dependencies {
     testImplementation "io.mockk:mockk-android:1.13.2"
     testImplementation "com.google.truth:truth:1.1.3"
 
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test:core:1.4.0"
-    androidTestImplementation "androidx.test:core-ktx:1.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:3.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.3"
-    androidTestImplementation "androidx.test.ext:truth:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.5.1"
+    androidTestImplementation "androidx.test:rules:1.5.0"
+    androidTestImplementation "androidx.test:core:1.5.0"
+    androidTestImplementation "androidx.test:core-ktx:1.5.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:3.5.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.4"
+    androidTestImplementation "androidx.test.ext:junit-ktx:1.1.4"
+    androidTestImplementation "androidx.test.ext:truth:1.5.0"
     androidTestImplementation "io.mockk:mockk-android:1.13.2"
-    androidTestUtil "androidx.test:orchestrator:1.4.1"
+    androidTestUtil "androidx.test:orchestrator:1.4.2"
 }
 
 tasks.withType(JavaCompile) {

app/src/main/java/com/orangebikelabs/orangesqueeze/app/SBActivity.java

@@ -11,6 +11,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.support.v4.media.session.MediaControllerCompat;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -78,6 +80,8 @@ public static int getInstanceCount() {
         return sInstanceCount;
     }
 
+    final static private Handler sHandler = new Handler(Looper.getMainLooper());
+
     static public boolean sShouldAutoStart = true;
 
     static private int sInstanceCount = 0;
@@ -209,13 +213,15 @@ protected void onStart() {
         }
         setWindowFlags();
 
-        // show deferred player snackbar when the UI is ready
-        if (sDeferredPlayerSnackbar != null) {
-            PlayerStatus status = sDeferredPlayerSnackbar;
-            sDeferredPlayerSnackbar = null;
+        sHandler.postDelayed(() -> {
+            // show deferred player snackbar when the UI is ready
+            if (sDeferredPlayerSnackbar != null) {
+                PlayerStatus status = sDeferredPlayerSnackbar;
+                sDeferredPlayerSnackbar = null;
 
-            showPlayerSnackbar(status);
-        }
+                showPlayerSnackbar(status);
+            }
+        }, 250);
     }
 
     @Override
@@ -445,7 +451,8 @@ protected void setWindowFlags() {
 
     protected void showPlayerSnackbar(PlayerStatus status) {
         OSAssert.assertMainThread();
-        if (!mStarted || isFinishing() || !allowSnackbarDisplay() || getSnackbarView() == null) {
+        View snackbarView = getSnackbarView();
+        if (!mStarted || isFinishing() || !allowSnackbarDisplay() || snackbarView == null || snackbarView.getWidth() <= 0 || snackbarView.getHeight() <= 0) {
             sDeferredPlayerSnackbar = status;
             return;
         }
@@ -454,7 +461,10 @@ protected void showPlayerSnackbar(PlayerStatus status) {
         if (!status.getId().equals(mLastShownPlayerSnackbar)) {
             mLastShownPlayerSnackbar = status.getId();
             String text = getString(R.string.change_player_snackbar, status.getName());
-            Snackbar.make(getSnackbarView(), HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT), Snackbar.LENGTH_SHORT).show();
+            Snackbar
+                    .make(snackbarView, HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_COMPACT), Snackbar.LENGTH_SHORT)
+                    .setAnchorView(snackbarView)
+                    .show();
         }
     }
 

app/src/main/java/com/orangebikelabs/orangesqueeze/menu/AbsMenuFragment.java

@@ -245,7 +245,7 @@ public void showSnackbar(CharSequence text, SnackbarLength length) {
         } else {
             translatedLength = Snackbar.LENGTH_SHORT;
         }
-        mLastSnackbar = Snackbar.make(getSnackbarView(), text, translatedLength);
+        mLastSnackbar = Snackbar.make(getSnackbarView(), text, translatedLength).setAnchorView(getSnackbarView());
         mLastSnackbar.show();
     }
 

app/src/main/java/com/orangebikelabs/orangesqueeze/nowplaying/NowPlayingActivity.java

@@ -23,6 +23,7 @@
 
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 
 import com.orangebikelabs.orangesqueeze.BuildConfig;
 import com.orangebikelabs.orangesqueeze.R;
@@ -191,6 +192,17 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
+    @Override
+    protected boolean allowSnackbarDisplay() {
+        return true;
+    }
+
+    @Nullable
+    @Override
+    protected View getSnackbarView() {
+        return findViewById(R.id.controls);
+    }
+
     private void setHidePlaylistItemDrawable() {
         if (mHidePlaylistItem == null) {
             return;

app/src/main/java/com/orangebikelabs/orangesqueeze/players/ManagePlayersAdapter.java

@@ -5,7 +5,6 @@
 
 package com.orangebikelabs.orangesqueeze.players;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 
 import arrow.core.Option;
@@ -40,6 +39,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -84,11 +84,13 @@ public interface OnPlayerCommandListener {
     private SyncStatus mSyncStatus;
     private boolean mDrawerMode;
     private int mPlayerItemLayoutRid;
+    final private NumberFormat mNumberFormat;
 
     public ManagePlayersAdapter(Context context) {
         super(context, 0);
 
         setDrawerMode(false);
+        mNumberFormat = NumberFormat.getInstance();
     }
 
     @Nonnull
@@ -291,15 +293,31 @@ public View getView(int pos, @Nullable View convertView, ViewGroup parent) {
         return convertView;
     }
 
-    @SuppressLint("SetTextI18n")
-    protected void setVolume(Slider sb, TextView playerVolumeLabel, int volume) {
+    /** called when volume is set by user */
+    protected void setVolumeFromUser(Slider sb, TextView playerVolumeLabel, int volume) {
         View parentView = (View) sb.getTag(R.id.tag_containerview);
         PlayerId pid = (PlayerId) parentView.getTag(R.id.tag_playerid);
-        playerVolumeLabel.setText(Integer.toString(volume));
+        updateVolumeText(playerVolumeLabel, volume);
 
         mOnPlayerCommandListener.onPlayerCommand(pid, PlayerCommand.VOLUME, volume);
     }
 
+    protected void hideVolumeText(@Nullable TextView playerVolumeLabel) {
+        if(playerVolumeLabel != null) {
+            playerVolumeLabel.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    /** called to update the text field to a specific volume level */
+    protected void updateVolumeText(@Nullable TextView playerVolumeLabel, int volume) {
+        if(playerVolumeLabel != null) {
+            if(playerVolumeLabel.getVisibility() != View.VISIBLE) {
+                playerVolumeLabel.setVisibility(View.VISIBLE);
+            }
+            playerVolumeLabel.setText(mNumberFormat.format(volume));
+        }
+    }
+
     /**
      * tag should be the player status
      */
@@ -422,7 +440,7 @@ protected void updateView(View view) {
             SwitchMaterial powerButton = view.findViewById(R.id.player_power_toggle);
             Slider volumeBar = view.findViewById(R.id.volume_bar);
             View actionButton = view.findViewById(R.id.action_button);
-            TextView playerStatusText = view.findViewById(R.id.player_status_label);
+            TextView playerStatusLabel = view.findViewById(R.id.player_status_label);
             final TextView playerVolumeLabel = view.findViewById(R.id.player_volume_label);
 
             if (powerButton != null) {
@@ -441,7 +459,7 @@ protected void updateView(View view) {
                 volumeBar.addOnChangeListener((slider, value, fromUser) -> {
                     if (fromUser) {
                         // only respond to user-generated events
-                        setVolume(slider, playerVolumeLabel, (int) value);
+                        setVolumeFromUser(slider, playerVolumeLabel, (int) value);
                     }
                 });
                 volumeBar.addOnSliderTouchListener(new Slider.OnSliderTouchListener() {
@@ -457,7 +475,7 @@ public void onStopTrackingTouch(Slider slider) {
                         playerVolumeLabel.setVisibility(View.VISIBLE);
                         // called at the end of a touch/drag cycle, call with update to make
                         // sure we are in sync with remote volume
-                        setVolume(slider, playerVolumeLabel, (int) slider.getValue());
+                        setVolumeFromUser(slider, playerVolumeLabel, (int) slider.getValue());
                     }
                 });
                 volumeBar.setLabelFormatter((value -> Integer.toString((int) value)));
@@ -475,10 +493,11 @@ public void onStopTrackingTouch(Slider slider) {
             // when progress is visible, don't routinely update the volume,
             // power buttons because they may lag
 
+            int clampedVolume = MoreMath.coerceIn(mPlayerStatus.getVolume(), 0, 100);
             int playerStatusVisibility = View.GONE;
-            boolean progressVisible = false;
+            boolean statusInProgress = false;
             if (!mPlayerStatus.isInitialized()) {
-                progressVisible = true;
+                statusInProgress = true;
 
                 if (volumeBar != null) {
                     volumeBar.setValue(0);
@@ -489,7 +508,7 @@ public void onStopTrackingTouch(Slider slider) {
                     powerButton.setChecked(false);
                 }
             } else if (isWorkInProgress(mPlayerStatus.getId())) {
-                progressVisible = true;
+                statusInProgress = true;
             } else {
                 if (powerButton != null) {
                     powerButton.setChecked(mPlayerStatus.isPowered());
@@ -502,28 +521,34 @@ public void onStopTrackingTouch(Slider slider) {
                 } else {
                     if (volumeBar != null) {
                         // ensure received values are within 0 <= value <= 100
-                        int clampedVolume = MoreMath.coerceIn(mPlayerStatus.getVolume(), 0, 100);
                         volumeBar.setValue(clampedVolume);
                     }
                 }
+                updateVolumeText(playerVolumeLabel, clampedVolume);
 
                 // TODO add different text if mPlayerStatus.isVolumeLocked()
                 if (volumeBar != null) {
                     volumeBar.setEnabled(true);
                 }
                 if (mPlayerStatus.isPowered()) {
                     playerStatusVisibility = View.VISIBLE;
-                    if (playerStatusText != null) {
+                    if (playerStatusLabel != null) {
                         if (mPlayerStatus.isConnected()) {
-                            playerStatusText.setText(mPlayerStatus.getMode().getRid());
+                            playerStatusLabel.setText(mPlayerStatus.getMode().getRid());
                         } else {
-                            playerStatusText.setText(getContext().getString(R.string.disconnected));
+                            playerStatusLabel.setText(getContext().getString(R.string.disconnected));
                         }
                     }
                 }
             }
-            if (playerStatusText != null) {
-                playerStatusText.setVisibility(playerStatusVisibility);
+
+            if(statusInProgress) {
+                hideVolumeText(playerVolumeLabel);
+            } else {
+                updateVolumeText(playerVolumeLabel, clampedVolume);
+            }
+            if (playerStatusLabel != null) {
+                playerStatusLabel.setVisibility(playerStatusVisibility);
             }
             if (mPlayerStatus.getId().equals(mSelectedPlayer)) {
                 view.setBackgroundResource(R.drawable.manageplayers_item_selected);

app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MainActivity.kt

@@ -8,6 +8,7 @@ package com.orangebikelabs.orangesqueeze.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.commitNow
 
 import com.orangebikelabs.orangesqueeze.BuildConfig
@@ -105,6 +106,11 @@ class MainActivity : DrawerActivity() {
         return true
     }
 
+    override fun getSnackbarView(): View? {
+        val retval = findViewById<View>(R.id.tiny_nowplaying_container)
+        return retval
+    }
+
     override fun applyDrawerState(drawerState: DrawerState) {
         if (drawerState !== DrawerState.BROWSE) {
             supportActionBar.title = title

app/src/main/java/com/orangebikelabs/orangesqueeze/ui/MaintenanceDialogFragment.java

@@ -118,7 +118,7 @@ public View getView(int position, @Nullable View convertView, ViewGroup parent)
             }
             dialog.dismiss();
         });
-        builder.setNegativeButton(R.string.close, (dialog, which) -> {
+        builder.setNegativeButton(R.string.dismiss_dialog, (dialog, which) -> {
             // nothing to do
         });
         Dialog retval = builder.create();

app/src/main/res/values-de/strings.xml

@@ -104,7 +104,7 @@
     <string name="nextbutton_label">Weiter</string>
     <string name="cancel">Abbrechen</string>
     <string name="ok">OK</string>
-    <string name="close">OK</string>
+    <string name="dismiss_dialog">OK</string>
     <string name="permission_write_external_storage_rationale_title">Speicherberechtigung</string>
     <string name="permission_write_external_storage_neverask">Die Berechtigung zu speichern wird nie wieder angefordert.</string>
     <string name="permission_write_external_storage_denied">Die Berechtigung zu speichern wurde abgelehnt.</string>

app/src/main/res/values-fr/strings.xml

@@ -100,7 +100,7 @@
     <string name="pause_desc">Pause de la lecture</string>
     <string name="error_invalid_credentials">Nom d\'utilisateur et/ou mot de passe incorrect</string>
     <string name="no">Annuler</string>
-    <string name="close">OK</string>
+    <string name="dismiss_dialog">OK</string>
     <string name="empty_downloads_text">Aucun téléchargement actif ou terminé</string>
     <string name="empty_text">Pas d\'objet</string>
     <string name="select_player_prompt">Sélectionner un platine:</string>