Finish GUI for all preferences supported by the old preferences views

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
         
         <!-- Launcher for traditional devices -->
         <activity
-            android:name="com.limelight.PcView"
+            android:name=".PcView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,7 +30,7 @@
         
         <!-- Launcher for Android TV devices -->
         <activity
-            android:name="com.limelight.PcViewTv"
+            android:name=".PcViewTv"
             android:logo="@drawable/atv_banner"
             android:icon="@drawable/atv_banner"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
@@ -41,7 +41,7 @@
         </activity>
         
         <activity
-            android:name="com.limelight.AppView"
+            android:name=".AppView"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
             android:label="App List" >
             <meta-data
@@ -49,28 +49,21 @@
                 android:value="com.limelight.PcView" />
         </activity>
         <activity
-            android:name="com.limelight.StreamSettings"
+            android:name=".preferences.StreamSettings"
             android:label="Streaming Settings" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
         <activity
-            android:name="com.limelight.AdvancedSettings"
+            android:name=".preferences.AddComputerManually"
-            android:label="Advanced Settings" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.StreamSettings" />
-        </activity>
-        <activity
-            android:name="com.limelight.AddComputerManually"
             android:label="Add Computer Manually" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
         <activity
-            android:name="com.limelight.Game"
+            android:name=".Game"
             android:screenOrientation="sensorLandscape"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
             android:theme="@style/FullscreenTheme" >
@@ -79,10 +72,10 @@
                 android:value="com.limelight.Connection" />
         </activity>
         <service
-            android:name="com.limelight.discovery.DiscoveryService"
+            android:name=".discovery.DiscoveryService"
             android:label="mDNS PC Auto-Discovery Service" />
         <service
-            android:name="com.limelight.computers.ComputerManagerService"
+            android:name=".computers.ComputerManagerService"
             android:label="Computer Management Service" />
     </application>
 

app/src/main/java/com/limelight/AdvancedSettings.java

@@ -1,82 +0,0 @@
-package com.limelight;
-
-import com.limelight.utils.Dialog;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.widget.SeekBar;
-import android.widget.SeekBar.OnSeekBarChangeListener;
-import android.widget.TextView;
-
-public class AdvancedSettings extends Activity {
-	private SharedPreferences prefs;
-	private SeekBar bitrateSlider;
-	private TextView bitrateLabel;
-	
-	private static final int BITRATE_FLOOR = 1;
-	private static final int BITRATE_CEILING = 100;
-
-	@Override
-	public void onPause() {
-		SharedPreferences.Editor editor = prefs.edit();
-		
-		editor.putInt(Game.BITRATE_PREF_STRING, bitrateSlider.getProgress());
-		editor.apply();
-		
-		super.onPause();
-	}
-	
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		Dialog.closeDialogs();
-	}
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		setContentView(R.layout.activity_advanced_settings);
-
-		this.bitrateLabel = (TextView) findViewById(R.id.bitrateLabel);
-		this.bitrateSlider = (SeekBar) findViewById(R.id.bitrateSeekBar);
-
-		prefs = getSharedPreferences(Game.PREFS_FILE_NAME, Context.MODE_MULTI_PROCESS);
-		
-		bitrateSlider.setMax(BITRATE_CEILING);
-		bitrateSlider.setProgress(prefs.getInt(Game.BITRATE_PREF_STRING, Game.DEFAULT_BITRATE));
-		updateBitrateLabel();
-		
-		this.bitrateSlider.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
-			@Override
-			public void onProgressChanged(SeekBar seekBar, int progress,
-					boolean fromUser) {
-
-				// Verify the user's selection
-				if (fromUser) {
-					if (progress < BITRATE_FLOOR) {
-						seekBar.setProgress(BITRATE_FLOOR);
-						return;
-					}
-				}
-
-				updateBitrateLabel();
-			}
-
-			@Override
-			public void onStartTrackingTouch(SeekBar seekBar) {
-			}
-
-			@Override
-			public void onStopTrackingTouch(SeekBar seekBar) {
-			}
-		});
-	}
-
-	private void updateBitrateLabel() {
-		bitrateLabel.setText("Max Bitrate: "+bitrateSlider.getProgress()+" Mbps");
-	}
-}

app/src/main/java/com/limelight/PcView.java

@@ -14,7 +14,8 @@ import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.http.PairingManager.PairState;
 import com.limelight.nvstream.wol.WakeOnLanSender;
-import com.limelight.R;
+import com.limelight.preferences.AddComputerManually;
+import com.limelight.preferences.StreamSettings;
 import com.limelight.utils.Dialog;
 
 import android.app.Activity;

app/src/main/java/com/limelight/preferences/AddComputerManually.java

@@ -1,4 +1,4 @@
-package com.limelight;
+package com.limelight.preferences;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

app/src/main/java/com/limelight/preferences/SeekBarPreference.java

@@ -0,0 +1,159 @@
+package com.limelight.preferences;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+// Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
+public class SeekBarPreference extends DialogPreference
+{
+    private static final String SCHEMA_URL = "http://schemas.android.com/apk/res/android";
+
+    private SeekBar seekBar;
+    private TextView splashText, valueText;
+    private Context context;
+
+    private String dialogMessage, suffix;
+    private int defaultValue, maxValue, currentValue;
+
+    public SeekBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+
+        // Read the message from XML
+        int dialogMessageId = attrs.getAttributeResourceValue(SCHEMA_URL, "dialogMessage", 0);
+        if (dialogMessageId == 0) {
+            dialogMessage = attrs.getAttributeValue(SCHEMA_URL, "dialogMessage");
+        }
+        else {
+            dialogMessage = context.getString(dialogMessageId);
+        }
+
+        // Get the suffix for the number displayed in the dialog
+        int suffixId = attrs.getAttributeResourceValue(SCHEMA_URL, "text", 0);
+        if (suffixId == 0) {
+            suffix = attrs.getAttributeValue(SCHEMA_URL, "text");
+        }
+        else {
+            suffix = context.getString(suffixId);
+        }
+
+        // Get default and max seekbar values
+        defaultValue = attrs.getAttributeIntValue(SCHEMA_URL, "defaultValue", 0);
+        maxValue = attrs.getAttributeIntValue(SCHEMA_URL, "max", 100);
+    }
+
+    @Override
+    protected View onCreateDialogView() {
+
+        LinearLayout.LayoutParams params;
+        LinearLayout layout = new LinearLayout(context);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        layout.setPadding(6, 6, 6, 6);
+
+        splashText = new TextView(context);
+        splashText.setPadding(30, 10, 30, 10);
+        if (dialogMessage != null) {
+            splashText.setText(dialogMessage);
+        }
+        layout.addView(splashText);
+
+        valueText = new TextView(context);
+        valueText.setGravity(Gravity.CENTER_HORIZONTAL);
+        valueText.setTextSize(32);
+        params = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.FILL_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        layout.addView(valueText, params);
+
+        seekBar = new SeekBar(context);
+        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int value, boolean b) {
+                String t = String.valueOf(value);
+                valueText.setText(suffix == null ? t : t.concat(" " + suffix));
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {}
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {}
+        });
+
+        layout.addView(seekBar, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+
+        if (shouldPersist()) {
+            currentValue = getPersistedInt(defaultValue);
+        }
+
+        seekBar.setMax(maxValue);
+        seekBar.setProgress(currentValue);
+
+        return layout;
+    }
+
+    @Override
+    protected void onBindDialogView(View v) {
+        super.onBindDialogView(v);
+        seekBar.setMax(maxValue);
+        seekBar.setProgress(currentValue);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restore, Object defaultValue)
+    {
+        super.onSetInitialValue(restore, defaultValue);
+        if (restore) {
+            currentValue = shouldPersist() ? getPersistedInt(this.defaultValue) : 0;
+        }
+        else {
+            currentValue = (Integer) defaultValue;
+        }
+    }
+
+    public void setMax(int max) {
+        this.maxValue = max;
+    }
+    public int getMax() {
+        return this.maxValue;
+    }
+
+    public void setProgress(int progress) {
+        this.currentValue = progress;
+        if (seekBar != null) {
+            seekBar.setProgress(progress);
+        }
+    }
+    public int getProgress() {
+        return currentValue;
+    }
+
+    @Override
+    public void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
+        positiveButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (shouldPersist()) {
+                    currentValue = seekBar.getProgress();
+                    persistInt(seekBar.getProgress());
+                    callChangeListener(Integer.valueOf(seekBar.getProgress()));
+                }
+
+                ((AlertDialog) getDialog()).dismiss();
+            }
+        });
+    }
+}

app/src/main/java/com/limelight/preferences/StreamSettings.java

@@ -1,9 +1,11 @@
-package com.limelight;
+package com.limelight.preferences;
 
 import android.os.Bundle;
 import android.app.Activity;
 import android.preference.PreferenceFragment;
 
+import com.limelight.R;
+
 public class StreamSettings extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {

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

@@ -1,32 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="10dp"
-    tools:context=".Connection" >
-    
-    <RelativeLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
-
-        <TextView
-            android:id="@+id/bitrateLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp" />
-
-        <SeekBar
-            android:id="@+id/bitrateSeekBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_marginTop="10dp"
-            android:layout_toLeftOf="@+id/bitrateLabel" />
-    </RelativeLayout>
-	
-</ScrollView>

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

@@ -16,7 +16,12 @@
     <string name="category_basic_settings">Basic Settings</string>
     <string name="title_resolution_list">Select resolution and FPS target</string>
     <string name="summary_resolution_list">Setting values too high for your device may cause lag or crashing</string>
+    <string name="title_seekbar_bitrate">Select target video bitrate</string>
+    <string name="summary_seekbar_bitrate">Lower bitrate to reduce stuttering. Raise bitrate to increase image quality.</string>
+    <string name="suffix_seekbar_bitrate">Mbps</string>
     <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
+    <string name="title_checkbox_disable_warnings">Disable warning messages</string>
+    <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
 
     <string name="category_host_settings">Host Settings</string>
     <string name="title_checkbox_enable_sops">Optimize game settings</string>
@@ -26,6 +31,4 @@
 
     <string name="category_advanced_settings">Advanced Settings</string>
     <string name="title_decoder_list">Change decoder</string>
-    <string name="title_checkbox_disable_warnings">Disable warning messages</string>
-    <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -9,10 +9,23 @@
             android:entries="@array/resolution_names"
             android:entryValues="@array/resolution_values"
             android:defaultValue="720p60" />
+        <com.limelight.preferences.SeekBarPreference
+            android:key="seekbar_bitrate"
+            android:defaultValue="50"
+            android:dialogMessage="@string/summary_seekbar_bitrate"
+            android:max="100"
+            android:summary="@string/summary_seekbar_bitrate"
+            android:text="@string/suffix_seekbar_bitrate"
+            android:title="@string/title_seekbar_bitrate" />
         <CheckBoxPreference
             android:key="checkbox_stretch_video"
             android:title="@string/title_checkbox_stretch_video"
             android:defaultValue="false" />
+        <CheckBoxPreference
+            android:key="checkbox_disable_warnings"
+            android:title="@string/title_checkbox_disable_warnings"
+            android:summary="@string/summary_checkbox_disable_warnings"
+            android:defaultValue="false" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_host_settings">
         <CheckBoxPreference
@@ -33,11 +46,6 @@
             android:entries="@array/decoder_names"
             android:entryValues="@array/decoder_values"
             android:defaultValue="auto" />
-        <CheckBoxPreference
-            android:key="checkbox_disable_warnings"
-            android:title="@string/title_checkbox_disable_warnings"
-            android:summary="@string/summary_checkbox_disable_warnings"
-            android:defaultValue="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>