diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -85,4 +85,5 @@ androidTestCompile 'org.skyscreamer:jsonassert:1.3.0' testCompile 'junit:junit:4.12' + compile 'com.android.support.constraint:constraint-layout:1.0.2' } diff --git a/easiestfixever.diff b/easiestfixever.diff new file mode 100644 --- /dev/null +++ b/easiestfixever.diff @@ -0,0 +1,12 @@ +diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +index 01a9df8d..5c864a5b 100644 +--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java ++++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +@@ -238,6 +238,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb + @Override + public void onStop() { + super.onStop(); ++ mSwipeRefreshLayout.setEnabled(false); + BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() { + @Override + public void onServiceStart(BackgroundService service) { diff --git a/res/drawable-hdpi/ic_add_white_48dp.png b/res/drawable-hdpi/ic_add_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0fdced8fce76a0f9a527388935adecebf63d0dae GIT binary patch literal 97 zc%17D@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k literal 0 Hc$@T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq literal 0 Hc$@mdK II;Vst04bp$H~;_u literal 0 Hc$@t;*x+CNt}`(XORZL4pR-a$^(|0EsS LS3j3^P6FVdQ&MBb@07vc`*Z=?k literal 0 Hc$@T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq literal 0 Hc$@mdK II;Vst04bp$H~;_u literal 0 Hc$@t;*x+CNt}`(XORZL4pR-a$^(|0EsS LS3j3^P6 diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -19,8 +19,8 @@ android:layout_height="?attr/actionBarSize" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - android:elevation="8dp" - android:background="?attr/colorPrimary" /> + android:elevation="4dp" + android:background="?attr/colorPrimary"/> + + + + + + \ No newline at end of file diff --git a/res/layout/addcommanddialog.xml b/res/layout/addcommanddialog.xml new file mode 100644 --- /dev/null +++ b/res/layout/addcommanddialog.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/res/menu/menu_runcommand.xml b/res/menu/menu_runcommand.xml new file mode 100644 --- /dev/null +++ b/res/menu/menu_runcommand.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -217,4 +217,8 @@ To see phone calls and SMS from the desktop you need to give permission to phone calls and SMS To see a contact name instead of a phone number you need to give access to the phone\'s contacts + Add a command + Name + Command + diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/AddCommandDialog.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/AddCommandDialog.java new file mode 100644 --- /dev/null +++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/AddCommandDialog.java @@ -0,0 +1,66 @@ +package org.kde.kdeconnect.Plugins.RunCommandPlugin; + +import android.app.Activity; +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.Fragment; +import android.support.v7.app.AlertDialog; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.EditText; + +import org.kde.kdeconnect_tp.R; + +public class AddCommandDialog extends DialogFragment { + + private EditText nameField; + private EditText commandField; + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.add_command); + + LayoutInflater inflater = getActivity().getLayoutInflater(); + + View view = inflater.inflate(R.layout.addcommanddialog, null); + + nameField = (EditText) view.findViewById(R.id.addcommand_name); + commandField = (EditText) view.findViewById(R.id.addcommand_command); + + builder.setView(view); + + builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + if(getActivity() instanceof RunCommandActivity){ + + String name = nameField.getText().toString(); + String command = commandField.getText().toString(); + + ((RunCommandActivity) getActivity()).dialogResult(name, command); + } + } + }); + builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + if(getActivity() instanceof RunCommandActivity){ + + } + } + }); + return builder.create(); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + } +} \ No newline at end of file diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java --- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java +++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandActivity.java @@ -21,11 +21,18 @@ package org.kde.kdeconnect.Plugins.RunCommandPlugin; +import android.content.DialogInterface; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; import android.util.Log; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; +import android.widget.EditText; import android.widget.ListView; import org.json.JSONException; @@ -39,9 +46,15 @@ import java.util.Collections; import java.util.Comparator; -public class RunCommandActivity extends ActionBarActivity { +public class RunCommandActivity extends AppCompatActivity { private String deviceId; + private final RunCommandPlugin.CommandsChangedCallback theCallback = new RunCommandPlugin.CommandsChangedCallback() { + @Override + public void update() { + updateView(); + } + }; private void updateView() { BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { @@ -95,17 +108,10 @@ }); } - private final RunCommandPlugin.CommandsChangedCallback theCallback = new RunCommandPlugin.CommandsChangedCallback() { - @Override - public void update() { - updateView(); - } - }; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_list); + setContentView(R.layout.activity_runcommand); deviceId = getIntent().getStringExtra("deviceId"); @@ -149,4 +155,35 @@ } }); } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_runcommand, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_addcommand: + new AddCommandDialog().show(getSupportFragmentManager(), "addcommanddialog"); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + public void dialogResult(final String cmdName, final String cmdCmd) { + BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { + @Override + public void onServiceStart(BackgroundService service) { + Device device = service.getDevice(deviceId); + RunCommandPlugin plugin = device.getPlugin(RunCommandPlugin.class); + if(!cmdName.isEmpty() && !cmdCmd.isEmpty()) { + plugin.addCommand(cmdName, cmdCmd); + } + } + }); + } } diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java --- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java +++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandPlugin.java @@ -39,6 +39,7 @@ public final static String PACKAGE_TYPE_RUNCOMMAND = "kdeconnect.runcommand"; public final static String PACKAGE_TYPE_RUNCOMMAND_REQUEST = "kdeconnect.runcommand.request"; + public final static String PACKAGE_TYPE_RUNCOMMAND_ADD = "kdeconnect.runcommand.add"; private ArrayList commandList = new ArrayList<>(); private ArrayList callbacks = new ArrayList<>(); @@ -148,4 +149,16 @@ return context.getString(R.string.pref_plugin_runcommand); } + public void addCommand(String name, String command){ + + NetworkPackage np = new NetworkPackage(PACKAGE_TYPE_RUNCOMMAND_ADD); + np.set("name", name); + np.set("command", command); + + device.sendPackage(np); + + requestCommandList(); + + } + }