Skip to content

Commit

Permalink
Update to 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@cbeuw
cbeuw committed Sep 21, 2019
1 parent f2b76d0 commit df42e4b
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 185 deletions.
15 changes: 8 additions & 7 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/caches
/.idea/libraries
local.properties
.idea/workspace.xml
.idea/caches
.idea/libraries
.DS_Store
/build
/captures
build
captures
.externalNativeBuild
/app/src/.deps
app/src/.deps
app/src/jniLibs
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "com.github.shadowsocks.plugin.ck_client"
minSdkVersion 19
targetSdkVersion 26
versionCode 4
versionName '2.0.0'
versionCode 5
versionName '2.1.1'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified app/src/main/ic_launcher-web.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/shadowsocks/plugin/ck_client/ConfigFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ConfigFragment : PreferenceFragment() {
this._options = options
val ary = arrayOf(Pair("ProxyMethod","shadowsocks"), Pair("EncryptionMethod","plain"),
Pair("UID", ""), Pair("PublicKey",""), Pair("ServerName", "bing.com"),
Pair("NumConn","4"), Pair("BrowserSig", "chrome"))
Pair("NumConn","4"), Pair("BrowserSig", "chrome"), Pair("StreamTimeout","300"))
for (element in ary) {
val key = element.first
val defaultValue = element.second
Expand Down
203 changes: 35 additions & 168 deletions app/src/main/res/drawable/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,170 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="108dp"
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:viewportHeight="108"
android:viewportWidth="108"
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillColor="#26A69A"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeColor="#33FFFFFF"
android:strokeWidth="0.8" />
android:height="108dp"
android:viewportWidth="47.761223"
android:viewportHeight="47.761223">
<group android:translateX="7.880602"
android:translateY="7.8806043">
<path
android:pathData="M0,0h32v8h-32z"
android:strokeAlpha="1"
android:strokeWidth="0.36594364"
android:fillColor="#f5b9b5"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
<path
android:pathData="M0,8h32v8h-32z"
android:strokeAlpha="1"
android:strokeWidth="0.36594364"
android:fillColor="#ef877f"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
<path
android:pathData="M0,16h32v8h-32z"
android:strokeAlpha="1"
android:strokeWidth="0.36594361"
android:fillColor="#e8554a"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
<path
android:pathData="M0,24h32v8h-32z"
android:strokeAlpha="1"
android:strokeWidth="0.36594364"
android:fillColor="#da291c"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</group>
</vector>
23 changes: 16 additions & 7 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="40.09324"
android:viewportHeight="40.09324">
<group android:translateX="8.04662"
android:translateY="8.04662">
<path
android:fillColor="#FF000000"
android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
android:viewportWidth="50.281986"
android:viewportHeight="50.281986">
<group android:translateX="13.576136"
android:translateY="15.140992">
<path
android:pathData="m-0,13.0545q0,-1.4702 0.4563,-2.7376 0.4563,-1.2928 1.2928,-2.2307 0.8619,-0.9379 2.0786,-1.4702 1.2167,-0.5323 2.7376,-0.5323 1.8758,0 3.5488,0.6844l-0.6591,2.5095q-0.5323,-0.2281 -1.2167,-0.3802 -0.6591,-0.1521 -1.4195,-0.1521 -1.7997,0 -2.7376,1.1407 -0.9379,1.1153 -0.9379,3.1686 0,1.9772 0.8872,3.1432 0.8872,1.1407 2.9911,1.1407 0.7858,0 1.5463,-0.1521 0.7605,-0.1521 1.3181,-0.3802l0.4309,2.5349q-0.507,0.2535 -1.5463,0.4563 -1.0139,0.2028 -2.1039,0.2028 -1.6984,0 -2.9658,-0.507 -1.2421,-0.5323 -2.0786,-1.4449 -0.8112,-0.9379 -1.2167,-2.2053 -0.4056,-1.2928 -0.4056,-2.7883z"
android:strokeWidth="0.47528517"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
<path
android:pathData="m14.4605,11.5843q0.583,-0.6084 1.2421,-1.2928 0.6591,-0.7098 1.2928,-1.3942 0.6337,-0.7098 1.1914,-1.3435 0.583,-0.6591 0.9886,-1.1407h3.6248q-1.2674,1.4195 -2.6869,2.9404 -1.3942,1.5209 -2.8137,2.9658 0.7605,0.6337 1.597,1.5463 0.8365,0.8872 1.6223,1.9011 0.7858,1.0139 1.4702,2.0279 0.6844,1.0139 1.1407,1.8758h-3.5488q-0.4563,-0.7858 -1.0646,-1.6477 -0.583,-0.8619 -1.2674,-1.673 -0.6844,-0.8112 -1.3942,-1.5209 -0.7098,-0.7351 -1.3942,-1.2421v6.0837L11.3933,19.6705L11.3933,0.507l3.0672,-0.507z"
android:strokeWidth="0.47528517"
android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"/>
</group>
</vector>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
<string name="cloak_browser_sig">Browser Signature</string>
<string name="cloak_encryption_method">Encryption Method</string>
<string name="cloak_proxy_method">Proxy Method</string>
<string name="cloak_stream_timeout">Stream Timeout</string>
</resources>
6 changes: 6 additions & 0 deletions app/src/main/res/xml/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,11 @@
android:summary="%s"
android:entries="@array/browsers"
android:entryValues="@array/browsers" />
<EditTextPreference
android:key="StreamTimeout"
android:persistent="false"
android:inputType="numberDecimal"
android:digits="0123456789"
android:title="@string/cloak_stream_timeout"/>
</PreferenceCategory>
</PreferenceScreen>
1 change: 1 addition & 0 deletions app/src/make.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ fi

pushd $DEPS
echo "Getting Cloak source code"
rm -rf Cloak
GO111MOD=on
git clone https://github.com/cbeuw/Cloak
pushd Cloak
Expand Down

0 comments on commit df42e4b

Please sign in to comment.