Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refine Tasker features

Browse Source
This commit is contained in:
Mygod
2015-12-02 00:31:18 +08:00
parent 41b7da4b63
commit e5ce8fd0a6
16 changed files with 109 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/drawable-anydpi-v21/ic_check.xml
-9
View File
@@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>
src/main/res/drawable-hdpi/ic_check.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 181 B

src/main/res/drawable-mdpi/ic_check.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 137 B

src/main/res/drawable-xhdpi/ic_check.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 199 B

src/main/res/drawable-xxhdpi/ic_check.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 276 B

src/main/res/drawable-xxxhdpi/ic_check.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 308 B

src/main/res/layout/layout_tasker.xml
+18 -9
View File
@@ -1,12 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/toolbar_light_dark" />
<FrameLayout
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="1dp"
android:background="@android:color/white">
<Switch android:id="@+id/serviceSwitch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/toggle_service_state"
android:textSize="18sp"
android:padding="16dp"/>
</FrameLayout>
<android.support.v7.widget.RecyclerView android:id="@+id/profilesList"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
src/main/res/layout/layout_tasker_toggle_service.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Switch android:id="@+id/service_switch"
android:checked="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/toggle_service_state"
android:textSize="18sp"
android:textColor="?android:attr/textColorSecondary"
android:padding="16dp"/>
</FrameLayout>
src/main/res/menu/tasker_menu.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:title="@string/save"
android:id="@+id/save"
android:icon="@drawable/ic_check"
android:alphabeticShortcut="s"
android:numericShortcut="0"
app:showAsAction="always"/>
</menu>
src/main/res/values-zh/strings.xml
+5 -2
View File
@@ -97,7 +97,10 @@
<string name="removed">已删除</string>
<string name="undo">撤销</string>
<string name="toggle_service_state">切换服务状态</string>
<string name="save">保存</string>
<string name="toggle_service_state">启动服务</string>
<string name="start_service_default">连接到当前服务器</string>
<string name="start_service">连接到 %s</string>
<string name="stop_service">切换到 %s</string>
<string name="profile_default">使用当前配置</string>
</resources>
src/main/res/values/arrays.xml
-10
View File
@@ -226,14 +226,4 @@
<item>204.0.0.0/6</item>
<item>208.0.0.0/4</item>
</string-array>
<string-array name="tasker_action_name">
<item>Toggle service</item>
<item>Switch profile</item>
</string-array>
<string-array name="tasker_action_value">
<item>toggle_service</item>
<item>switch_profile</item>
</string-array>
</resources>
src/main/res/values/strings.xml
+5 -8
View File
@@ -103,12 +103,9 @@
<string name="undo">Undo</string>
<!-- tasker -->
<string name="toggle_service_state">Toggle service state</string>
<string name="save">Save</string>
<string name="turn_service_state">Turn service %s</string>
<string name="no_action_selected">No action was selected</string>
<string name="no_profile_selected">No profile was selected</string>
<string name="switch_profile_to">Switch profile to %s</string>
<string name="state_on">on</string>
<string name="state_off">off</string>
<string name="toggle_service_state">Start the service</string>
<string name="start_service_default">Connect to the current server</string>
<string name="start_service">Connect to %s</string>
<string name="stop_service">Switch to %s</string>
<string name="profile_default">Use the current profile</string>
</resources>
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
+1 -1
View File
@@ -93,7 +93,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
private class ProfilesAdapter extends RecyclerView.Adapter[ProfileViewHolder] {
private val recycleBin = new ArrayBuffer[(Int, Profile)]
private var profiles = new ArrayBuffer[Profile]
profiles ++= ShadowsocksApplication.profileManager.getAllProfiles.getOrElse(List[Profile]())
profiles ++= ShadowsocksApplication.profileManager.getAllProfiles.getOrElse(List.empty[Profile])
def getItemCount = profiles.length
src/main/scala/com/github/shadowsocks/TaskerActivity.scala
+55 -158
View File
@@ -39,25 +39,63 @@
package com.github.shadowsocks
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.{Fragment, ListFragment}
import android.content.res.Resources
import android.os.{Build, Bundle}
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import android.util.Log
import android.support.v7.widget.{DefaultItemAnimator, LinearLayoutManager, RecyclerView, Toolbar}
import android.view.{LayoutInflater, View, ViewGroup}
import android.widget.AdapterView.OnItemClickListener
import android.widget._
import android.widget.{Switch, CheckedTextView}
import com.github.shadowsocks.database.Profile
import com.github.shadowsocks.helper.TaskerSettings
import com.twofortyfouram.locale.api.{Intent => ApiIntent}
/**
* @author CzBiX
*/
class TaskerActivity extends AppCompatActivity {
var taskerOption: TaskerSettings = _
var actionSelected: Boolean = false
private class ProfileViewHolder(val view: View) extends RecyclerView.ViewHolder(view) with View.OnClickListener {
{
val typedArray = obtainStyledAttributes(Array(android.R.attr.selectableItemBackground))
view.setBackgroundResource(typedArray.getResourceId(0, 0))
typedArray.recycle
}
private var item: Profile = _
private val text = itemView.findViewById(android.R.id.text1).asInstanceOf[CheckedTextView]
itemView.setOnClickListener(this)
def bindDefault {
item = null
text.setText(R.string.profile_default)
text.setChecked(taskerOption.profileId < 0)
}
def bind(item: Profile) {
this.item = item
text.setText(item.name)
text.setChecked(taskerOption.profileId == item.id)
}
def onClick(v: View) {
taskerOption.switchOn = switch.isChecked
taskerOption.profileId = if (item == null) -1 else item.id
setResult(Activity.RESULT_OK, taskerOption.toIntent(TaskerActivity.this))
finish
}
}
private class ProfilesAdapter extends RecyclerView.Adapter[ProfileViewHolder] {
private val profiles = ShadowsocksApplication.profileManager.getAllProfiles.getOrElse(List.empty[Profile])
def getItemCount = 1 + profiles.length
def onBindViewHolder(vh: ProfileViewHolder, i: Int) = i match {
case 0 => vh.bindDefault
case _ => vh.bind(profiles(i - 1))
}
private val name = "select_dialog_singlechoice_" + (if (Build.VERSION.SDK_INT >= 21) "material" else "holo")
def onCreateViewHolder(vg: ViewGroup, i: Int) = new ProfileViewHolder(LayoutInflater.from(vg.getContext)
.inflate(Resources.getSystem.getIdentifier(name, "layout", "android"), vg, false))
}
private var taskerOption: TaskerSettings = _
private var switch: Switch = _
private val profilesAdapter = new ProfilesAdapter
override def onCreate(savedInstanceState: Bundle) {
super.onCreate(savedInstanceState)
@@ -67,155 +105,14 @@ class TaskerActivity extends AppCompatActivity {
toolbar.setTitle(R.string.app_name)
toolbar.setNavigationIcon(R.drawable.ic_close)
toolbar.setNavigationOnClickListener(_ => finish())
toolbar.inflateMenu(R.menu.tasker_menu)
toolbar.setOnMenuItemClickListener(_.getItemId match {
case R.id.save =>
saveResult()
true
case _ => false
})
loadSettings()
loadFragment()
}
private def loadSettings() {
val intent: Intent = getIntent
if (intent.getAction != ApiIntent.ACTION_EDIT_SETTING) {
Log.w(Shadowsocks.TAG, "unknown tasker action")
finish()
return
}
taskerOption = TaskerSettings.fromIntent(intent)
}
private def loadFragment() {
actionSelected = !taskerOption.isEmpty
val fragment: Fragment = taskerOption.action match {
case TaskerSettings.ACTION_TOGGLE_SERVICE =>
new ToggleServiceFragment
case TaskerSettings.ACTION_SWITCH_PROFILE =>
new ProfileChoiceFragment
case _ =>
val fragment: ActionChoiceFragment = new ActionChoiceFragment
fragment.onItemClickedListener = (_, _, _, id) => {
taskerOption.action = getResources.getStringArray(R.array.tasker_action_value)(id.toInt)
loadFragment()
actionSelected = true
}
fragment
}
getSupportFragmentManager.beginTransaction()
.replace(R.id.fragment, fragment)
.commit()
}
private def saveResult() {
if (actionSelected) {
val fragment: OptionFragment = getSupportFragmentManager.findFragmentById(R.id.fragment).asInstanceOf[OptionFragment]
if (fragment.saveResult()) {
setResult(Activity.RESULT_OK, taskerOption.toIntent(this))
finish()
}
} else {
Toast.makeText(this, R.string.no_action_selected, Toast.LENGTH_SHORT).show()
}
}
private class ActionChoiceFragment extends ListFragment {
var onItemClickedListener: OnItemClickListener = _
override def onActivityCreated(savedInstanceState: Bundle) {
super.onActivityCreated(savedInstanceState)
val adapter = ArrayAdapter.createFromResource(getActivity, R.array.tasker_action_name, android.R.layout.simple_selectable_list_item)
setListAdapter(adapter)
}
override def onListItemClick(l: ListView, v: View, position: Int, id: Long) {
if (onItemClickedListener != null) {
onItemClickedListener.onItemClick(l, v, position, id)
}
}
}
private class ToggleServiceFragment extends Fragment with OptionFragment {
var switch: Switch = _
override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle): View = {
val view: View = inflater.inflate(R.layout.layout_tasker_toggle_service, container, false)
switch = view.findViewById(R.id.service_switch).asInstanceOf[Switch]
view
}
override def onActivityCreated(savedInstanceState: Bundle) {
super.onActivityCreated(savedInstanceState)
if (!taskerOption.isEmpty) {
switch.setChecked(taskerOption.isStart)
}
}
override def saveResult() = {
taskerOption.action = TaskerSettings.ACTION_TOGGLE_SERVICE
taskerOption.isStart = switch.isChecked
true
}
}
private class ProfileChoiceFragment extends ListFragment with OptionFragment {
override def onActivityCreated(savedInstanceState: Bundle) {
super.onActivityCreated(savedInstanceState)
import scala.collection.JavaConverters._
val profiles = ShadowsocksApplication.profileManager.getAllProfiles.getOrElse(List.empty)
val adapter = new ArrayAdapter[Profile](getActivity, 0, android.R.id.text1, profiles.asJava) {
override def getView(position: Int, convertView: View, parent: ViewGroup): View = {
val view: TextView = if (convertView == null) {
val inflater = LayoutInflater.from(parent.getContext)
inflater.inflate(android.R.layout.simple_list_item_single_choice, parent, false).asInstanceOf[TextView]
} else {
convertView.asInstanceOf[TextView]
}
view.setText(getItem(position).name)
view
}
}
setListAdapter(adapter)
val listView: ListView = getListView
listView.setChoiceMode(AbsListView.CHOICE_MODE_SINGLE)
if (!taskerOption.isEmpty) {
val index = profiles.indexWhere(_.id == taskerOption.profileId)
if (index > -1) {
listView.setItemChecked(index, true)
}
}
}
override def saveResult() = {
taskerOption.action = TaskerSettings.ACTION_SWITCH_PROFILE
val listView = getListView
val item = listView.getItemAtPosition(listView.getCheckedItemPosition)
if (item == null) {
Toast.makeText(getActivity, R.string.no_profile_selected, Toast.LENGTH_SHORT).show()
false
} else {
taskerOption.profileId = item.asInstanceOf[Profile].id
true
}
}
}
trait OptionFragment extends Fragment {
def saveResult(): Boolean
taskerOption = TaskerSettings.fromIntent(getIntent)
switch = findViewById(R.id.serviceSwitch).asInstanceOf[Switch]
switch.setChecked(taskerOption.switchOn)
val profilesList = findViewById(R.id.profilesList).asInstanceOf[RecyclerView]
profilesList.setLayoutManager(new LinearLayoutManager(this))
profilesList.setItemAnimator(new DefaultItemAnimator)
profilesList.setAdapter(profilesAdapter)
}
}
src/main/scala/com/github/shadowsocks/TaskerReceiver.scala
+8 -14
View File
@@ -39,7 +39,6 @@
package com.github.shadowsocks
import android.content.{BroadcastReceiver, Context, Intent}
import android.util.Log
import com.github.shadowsocks.helper.TaskerSettings
import com.github.shadowsocks.utils.Utils
@@ -47,20 +46,15 @@ import com.github.shadowsocks.utils.Utils
* @author CzBiX
*/
class TaskerReceiver extends BroadcastReceiver {
override def onReceive(context: Context, intent: Intent): Unit = {
val settings: TaskerSettings = TaskerSettings.fromIntent(intent)
settings.action match {
case TaskerSettings.ACTION_TOGGLE_SERVICE =>
if (settings.isStart) {
Utils.startSsService(context)
} else {
Utils.stopSsService(context)
}
case TaskerSettings.ACTION_SWITCH_PROFILE =>
override def onReceive(context: Context, intent: Intent) {
val settings = TaskerSettings.fromIntent(intent)
val switched = ShadowsocksApplication.profileManager.getProfile(settings.profileId) match {
case Some(p) =>
Utils.stopSsService(context)
ShadowsocksApplication.switchProfile(settings.profileId)
case _ =>
Log.e(Shadowsocks.TAG, s"unknown tasker action: ${settings.action}")
true
case _ => false
}
if (settings.switchOn) Utils.startSsService(context) else if (!switched) Utils.stopSsService(context)
}
}
src/main/scala/com/github/shadowsocks/helper/TaskerSettings.scala
+17 -60
View File
@@ -40,78 +40,35 @@ package com.github.shadowsocks.helper
import android.content.{Context, Intent}
import android.os.Bundle
import android.util.Log
import com.github.shadowsocks.{R, Shadowsocks, ShadowsocksApplication}
import com.github.shadowsocks.{R, ShadowsocksApplication}
import com.twofortyfouram.locale.api.{Intent => ApiIntent}
object TaskerSettings {
val ACTION_UNKNOWN = "unknown"
val ACTION_TOGGLE_SERVICE = "toggle_service"
val ACTION_SWITCH_PROFILE = "switch_profile"
private val KEY_ACTION = "action"
private val KEY_SWITCH_ON = "switch_on"
private val KEY_PROFILE_ID = "profile_id"
def fromIntent(intent: Intent): TaskerSettings = {
val bundle: Bundle = if (intent.hasExtra(ApiIntent.EXTRA_BUNDLE))
intent.getBundleExtra(ApiIntent.EXTRA_BUNDLE) else Bundle.EMPTY
def fromIntent(intent: Intent) = new TaskerSettings(if (intent.hasExtra(ApiIntent.EXTRA_BUNDLE))
intent.getBundleExtra(ApiIntent.EXTRA_BUNDLE) else Bundle.EMPTY)
new TaskerSettings(bundle)
}
def fromBundle(bundle: Bundle): TaskerSettings = {
new TaskerSettings(bundle)
}
def fromBundle(bundle: Bundle) = new TaskerSettings(bundle)
}
class TaskerSettings(bundle: Bundle) {
import TaskerSettings._
private val KEY_ACTION = "action"
private val KEY_IS_START = "is_start"
private val KEY_PROFILE_ID = "profile_id"
var switchOn = bundle.getBoolean(KEY_SWITCH_ON, true)
var profileId = bundle.getInt(KEY_PROFILE_ID, -1)
var action: String = bundle.getString(KEY_ACTION, ACTION_UNKNOWN)
var isStart: Boolean = _
var profileId: Int = _
action match {
case ACTION_TOGGLE_SERVICE =>
isStart = bundle.getBoolean(KEY_IS_START, true)
case ACTION_SWITCH_PROFILE =>
profileId = bundle.getInt(KEY_PROFILE_ID, -1)
assert(profileId != -1, "profile id was wrong")
case _ =>
Log.w(Shadowsocks.TAG, s"unknown tasker action settings: $action")
}
def isEmpty = action == ACTION_UNKNOWN
def toIntent(context: Context): Intent = {
def toIntent(context: Context) = {
val bundle = new Bundle()
action match {
case ACTION_TOGGLE_SERVICE =>
bundle.putString(KEY_ACTION, action)
bundle.putBoolean(KEY_IS_START, isStart)
case ACTION_SWITCH_PROFILE =>
bundle.putString(KEY_ACTION, action)
bundle.putInt(KEY_PROFILE_ID, profileId)
}
val desc: String = action match {
case ACTION_TOGGLE_SERVICE =>
context.getString(R.string.turn_service_state,
context.getString(if (isStart) R.string.state_on else R.string.state_off))
case ACTION_SWITCH_PROFILE =>
val profileName = ShadowsocksApplication.profileManager.getProfile(profileId) match {
case Some(p) => p.name
case None => context.getString(R.string.removed)
}
context.getString(R.string.switch_profile_to, profileName)
}
val intent: Intent = new Intent()
intent.putExtra(ApiIntent.EXTRA_STRING_BLURB, desc)
.putExtra(ApiIntent.EXTRA_BUNDLE, bundle)
if (!switchOn) bundle.putBoolean(KEY_SWITCH_ON, false)
if (profileId >= 0) bundle.putInt(KEY_PROFILE_ID, profileId)
new Intent().putExtra(ApiIntent.EXTRA_BUNDLE, bundle).putExtra(ApiIntent.EXTRA_STRING_BLURB,
ShadowsocksApplication.profileManager.getProfile(profileId) match {
case Some(p) => context.getString(if (switchOn) R.string.start_service else R.string.stop_service, p.name)
case None => context.getString(if (switchOn) R.string.start_service_default else R.string.stop)
})
}
}