Add settings
This commit is contained in:
parent
23cc2d746f
commit
b74b35cec0
@ -53,6 +53,10 @@
|
||||
android:name="com.annimon.socketfiletransfer.BrightnessActivity"
|
||||
android:label="@string/title_activity_brightness" >
|
||||
</activity>
|
||||
<activity
|
||||
android:name="com.annimon.socketfiletransfer.SettingsActivity"
|
||||
android:label="@string/action_settings" >
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
@ -8,12 +8,15 @@ import android.os.Bundle;
|
||||
import android.app.Activity;
|
||||
import android.provider.MediaStore;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.LinearLayout.LayoutParams;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.annimon.socketfiletransfer.util.Configuration;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
public class MainActivity extends Activity implements View.OnClickListener {
|
||||
@ -48,6 +51,8 @@ public class MainActivity extends Activity implements View.OnClickListener {
|
||||
}
|
||||
|
||||
setContentView(layout);
|
||||
|
||||
Configuration.getInstance().setContext(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -57,6 +62,16 @@ public class MainActivity extends Activity implements View.OnClickListener {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch(item.getItemId()) {
|
||||
case R.id.action_settings:
|
||||
Intent prefIntent = new Intent(this, SettingsActivity.class);
|
||||
startActivity(prefIntent);
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
|
@ -0,0 +1,17 @@
|
||||
package com.annimon.socketfiletransfer;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceActivity;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
*/
|
||||
public class SettingsActivity extends PreferenceActivity {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
addPreferencesFromResource(R.xml.settings_main);
|
||||
}
|
||||
|
||||
}
|
@ -3,6 +3,8 @@ package com.annimon.socketfiletransfer;
|
||||
import android.os.AsyncTask;
|
||||
import android.util.Log;
|
||||
|
||||
import com.annimon.socketfiletransfer.util.Config;
|
||||
|
||||
import java.net.Socket;
|
||||
|
||||
public class SocketTransferTask extends AsyncTask<Object, Void, Boolean> {
|
||||
@ -19,7 +21,7 @@ public class SocketTransferTask extends AsyncTask<Object, Void, Boolean> {
|
||||
boolean success = true;
|
||||
OperationManager manager = new OperationManager();
|
||||
try {
|
||||
Socket socket = new Socket("192.168.1.35", 7119);
|
||||
Socket socket = new Socket(Config.getIpAddress(), Config.getPort());
|
||||
manager.setSocket(socket);
|
||||
manager.execute(mode, objects);
|
||||
} catch (Exception e) {
|
||||
|
@ -0,0 +1,21 @@
|
||||
package com.annimon.socketfiletransfer.util;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author aNNiMON
|
||||
*/
|
||||
public class Config {
|
||||
|
||||
private static final String
|
||||
PORT = "port",
|
||||
IP_ADDRESS = "address";
|
||||
|
||||
public static int getPort() {
|
||||
return Configuration.getInstance().getProperty(PORT, 7119);
|
||||
}
|
||||
|
||||
public static String getIpAddress() {
|
||||
String path = Configuration.getInstance().getProperty(IP_ADDRESS, "192.168.1.35");
|
||||
return path.trim();
|
||||
}
|
||||
}
|
@ -0,0 +1,42 @@
|
||||
package com.annimon.socketfiletransfer.util;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
|
||||
/**
|
||||
* @author aNNiMON
|
||||
*/
|
||||
public class Configuration {
|
||||
|
||||
private static Configuration instance;
|
||||
|
||||
public static synchronized Configuration getInstance() {
|
||||
if (instance == null) {
|
||||
instance = new Configuration();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
private Context context;
|
||||
private SharedPreferences preferences;
|
||||
|
||||
private Configuration() { }
|
||||
|
||||
public void setContext(Context context) {
|
||||
this.context = context;
|
||||
preferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
}
|
||||
|
||||
public String getProperty(String key, String defaultValue) {
|
||||
if (preferences == null) return defaultValue;
|
||||
|
||||
return preferences.getString(key, defaultValue);
|
||||
}
|
||||
|
||||
public int getProperty(String key, int defaultValue) {
|
||||
if (preferences == null) return defaultValue;
|
||||
|
||||
return preferences.getInt(key, defaultValue);
|
||||
}
|
||||
}
|
@ -9,6 +9,8 @@
|
||||
<string name="title_activity_cursor">Cursor control</string>
|
||||
<string name="title_activity_brightness">Brightness control</string>
|
||||
<string name="send">Send</string>
|
||||
<string name="ip_address">IP address</string>
|
||||
<string name="port">Port</string>
|
||||
|
||||
<string-array name="main_menu">
|
||||
<item>Start server</item>
|
||||
|
15
SocketFileTransfer/src/main/res/xml/settings_main.xml
Normal file
15
SocketFileTransfer/src/main/res/xml/settings_main.xml
Normal file
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/action_settings">
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="192.168.1.35"
|
||||
android:inputType="text"
|
||||
android:key="address"
|
||||
android:title="@string/ip_address" />
|
||||
<EditTextPreference
|
||||
android:defaultValue="7119"
|
||||
android:inputType="number"
|
||||
android:key="port"
|
||||
android:title="@string/port" />
|
||||
</PreferenceScreen>
|
Loading…
Reference in New Issue
Block a user