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>