diff --git a/README.md b/README.md new file mode 100644 index 0000000..79ff3bc --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# Android 平台下的智能代理 diff --git a/Smart Proxy X/src/main/res/drawable-hdpi/ic_launcher.png b/Smart Proxy X/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index c0e83ad..0000000 Binary files a/Smart Proxy X/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/Smart Proxy X/src/main/res/drawable-mdpi/ic_launcher.png b/Smart Proxy X/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index dce41aa..0000000 Binary files a/Smart Proxy X/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/Smart Proxy X/src/main/res/drawable-xhdpi/ic_launcher.png b/Smart Proxy X/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 6b43729..0000000 Binary files a/Smart Proxy X/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/Smart Proxy X/src/main/res/drawable-xxhdpi/ic_launcher.png b/Smart Proxy X/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 2e18b24..0000000 Binary files a/Smart Proxy X/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/Smart Proxy X/src/main/res/menu/main_activity_actions.xml b/Smart Proxy X/src/main/res/menu/main_activity_actions.xml deleted file mode 100644 index 41277c7..0000000 --- a/Smart Proxy X/src/main/res/menu/main_activity_actions.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/Smart Proxy X/src/main/res/values-v11/styles.xml b/Smart Proxy X/src/main/res/values-v11/styles.xml deleted file mode 100644 index 3c02242..0000000 --- a/Smart Proxy X/src/main/res/values-v11/styles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/Smart Proxy X/.gitignore b/SmartProxyX/.gitignore similarity index 100% rename from Smart Proxy X/.gitignore rename to SmartProxyX/.gitignore diff --git a/Smart Proxy X/build.gradle b/SmartProxyX/build.gradle similarity index 66% rename from Smart Proxy X/build.gradle rename to SmartProxyX/build.gradle index 0bdfe1e..f7a3bcd 100644 --- a/Smart Proxy X/build.gradle +++ b/SmartProxyX/build.gradle @@ -1,30 +1,21 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' - } -} -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { - mavenCentral() - + jcenter() maven { url "https://raw.github.com/embarkmobile/zxing-android-minimal/mvn-repo/maven-repository/" } } android { - compileSdkVersion 19 - buildToolsVersion "19.0.3" + compileSdkVersion 21 + buildToolsVersion "21.1.1" defaultConfig { minSdkVersion 14 - targetSdkVersion 19 - versionCode 7 - versionName "1.6" + targetSdkVersion 21 + versionCode 8 + versionName "1.7" } signingConfigs { @@ -38,14 +29,18 @@ android { buildTypes { release { - runProguard false + minifyEnabled false // runProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.release } } } +android.applicationVariants.all { variant -> + variant.outputs[0].outputFile = file("$project.buildDir/${variant.name}.apk") +} dependencies { + compile "com.android.support:appcompat-v7:21.0.2" compile 'com.embarkmobile:zxing-android-minimal:2.0.0@aar' compile 'com.embarkmobile:zxing-android-integration:2.0.0@aar' compile 'com.google.zxing:core:3.0.1' diff --git a/Smart Proxy X/proguard-rules.txt b/SmartProxyX/proguard-rules.txt similarity index 100% rename from Smart Proxy X/proguard-rules.txt rename to SmartProxyX/proguard-rules.txt diff --git a/Smart Proxy X/src/main/AndroidManifest.xml b/SmartProxyX/src/main/AndroidManifest.xml similarity index 100% rename from Smart Proxy X/src/main/AndroidManifest.xml rename to SmartProxyX/src/main/AndroidManifest.xml diff --git a/Smart Proxy X/src/main/ic_launcher-web.png b/SmartProxyX/src/main/ic_launcher-web.png similarity index 100% rename from Smart Proxy X/src/main/ic_launcher-web.png rename to SmartProxyX/src/main/ic_launcher-web.png diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/ChinaIpMaskManager.java b/SmartProxyX/src/main/java/me/smartproxy/core/ChinaIpMaskManager.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/ChinaIpMaskManager.java rename to SmartProxyX/src/main/java/me/smartproxy/core/ChinaIpMaskManager.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/DnsProxy.java b/SmartProxyX/src/main/java/me/smartproxy/core/DnsProxy.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/DnsProxy.java rename to SmartProxyX/src/main/java/me/smartproxy/core/DnsProxy.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/HttpHostHeaderParser.java b/SmartProxyX/src/main/java/me/smartproxy/core/HttpHostHeaderParser.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/HttpHostHeaderParser.java rename to SmartProxyX/src/main/java/me/smartproxy/core/HttpHostHeaderParser.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/LocalVpnService.java b/SmartProxyX/src/main/java/me/smartproxy/core/LocalVpnService.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/LocalVpnService.java rename to SmartProxyX/src/main/java/me/smartproxy/core/LocalVpnService.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/NatSession.java b/SmartProxyX/src/main/java/me/smartproxy/core/NatSession.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/NatSession.java rename to SmartProxyX/src/main/java/me/smartproxy/core/NatSession.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/NatSessionManager.java b/SmartProxyX/src/main/java/me/smartproxy/core/NatSessionManager.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/NatSessionManager.java rename to SmartProxyX/src/main/java/me/smartproxy/core/NatSessionManager.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/ProxyConfig.java b/SmartProxyX/src/main/java/me/smartproxy/core/ProxyConfig.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/ProxyConfig.java rename to SmartProxyX/src/main/java/me/smartproxy/core/ProxyConfig.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/TcpProxyServer.java b/SmartProxyX/src/main/java/me/smartproxy/core/TcpProxyServer.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/TcpProxyServer.java rename to SmartProxyX/src/main/java/me/smartproxy/core/TcpProxyServer.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/core/TunnelFactory.java b/SmartProxyX/src/main/java/me/smartproxy/core/TunnelFactory.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/core/TunnelFactory.java rename to SmartProxyX/src/main/java/me/smartproxy/core/TunnelFactory.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/DnsFlags.java b/SmartProxyX/src/main/java/me/smartproxy/dns/DnsFlags.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/DnsFlags.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/DnsFlags.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/DnsHeader.java b/SmartProxyX/src/main/java/me/smartproxy/dns/DnsHeader.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/DnsHeader.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/DnsHeader.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/DnsPacket.java b/SmartProxyX/src/main/java/me/smartproxy/dns/DnsPacket.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/DnsPacket.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/DnsPacket.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/Question.java b/SmartProxyX/src/main/java/me/smartproxy/dns/Question.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/Question.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/Question.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/Resource.java b/SmartProxyX/src/main/java/me/smartproxy/dns/Resource.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/Resource.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/Resource.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/dns/ResourcePointer.java b/SmartProxyX/src/main/java/me/smartproxy/dns/ResourcePointer.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/dns/ResourcePointer.java rename to SmartProxyX/src/main/java/me/smartproxy/dns/ResourcePointer.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tcpip/CommonMethods.java b/SmartProxyX/src/main/java/me/smartproxy/tcpip/CommonMethods.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tcpip/CommonMethods.java rename to SmartProxyX/src/main/java/me/smartproxy/tcpip/CommonMethods.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tcpip/IPHeader.java b/SmartProxyX/src/main/java/me/smartproxy/tcpip/IPHeader.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tcpip/IPHeader.java rename to SmartProxyX/src/main/java/me/smartproxy/tcpip/IPHeader.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tcpip/TCPHeader.java b/SmartProxyX/src/main/java/me/smartproxy/tcpip/TCPHeader.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tcpip/TCPHeader.java rename to SmartProxyX/src/main/java/me/smartproxy/tcpip/TCPHeader.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tcpip/UDPHeader.java b/SmartProxyX/src/main/java/me/smartproxy/tcpip/UDPHeader.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tcpip/UDPHeader.java rename to SmartProxyX/src/main/java/me/smartproxy/tcpip/UDPHeader.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/Config.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/Config.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/Config.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/Config.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/IEncryptor.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/IEncryptor.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/IEncryptor.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/IEncryptor.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/RawTunnel.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/RawTunnel.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/RawTunnel.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/RawTunnel.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/Tunnel.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/Tunnel.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/Tunnel.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/Tunnel.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectConfig.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectConfig.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectConfig.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectConfig.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectTunnel.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectTunnel.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectTunnel.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/httpconnect/HttpConnectTunnel.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/EncryptorFactory.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/EncryptorFactory.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/EncryptorFactory.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/EncryptorFactory.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksConfig.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksConfig.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksConfig.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksConfig.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksTunnel.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksTunnel.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksTunnel.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/ShadowsocksTunnel.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/TableEncryptor.java b/SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/TableEncryptor.java similarity index 100% rename from Smart Proxy X/src/main/java/me/smartproxy/tunnel/shadowsocks/TableEncryptor.java rename to SmartProxyX/src/main/java/me/smartproxy/tunnel/shadowsocks/TableEncryptor.java diff --git a/Smart Proxy X/src/main/java/me/smartproxy/ui/MainActivity.java b/SmartProxyX/src/main/java/me/smartproxy/ui/MainActivity.java similarity index 90% rename from Smart Proxy X/src/main/java/me/smartproxy/ui/MainActivity.java rename to SmartProxyX/src/main/java/me/smartproxy/ui/MainActivity.java index 31d050b..d338aec 100644 --- a/Smart Proxy X/src/main/java/me/smartproxy/ui/MainActivity.java +++ b/SmartProxyX/src/main/java/me/smartproxy/ui/MainActivity.java @@ -1,7 +1,7 @@ package me.smartproxy.ui; import android.annotation.SuppressLint; -import android.app.Activity; +import android.support.v7.app.ActionBarActivity; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; @@ -11,6 +11,7 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; +import android.support.v7.widget.SwitchCompat; import android.text.InputType; import android.text.TextUtils; import android.util.Log; @@ -21,13 +22,15 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; + +import me.smartproxy.BuildConfig; import me.smartproxy.R; import me.smartproxy.core.LocalVpnService; import java.io.File; import java.util.Calendar; -public class MainActivity extends Activity implements +public class MainActivity extends ActionBarActivity implements View.OnClickListener, OnCheckedChangeListener, LocalVpnService.onStatusChangedListener { @@ -40,7 +43,7 @@ public class MainActivity extends Activity implements private static final int START_VPN_SERVICE_REQUEST_CODE = 1985; - private Switch switchProxy; + private SwitchCompat switchProxy; private TextView textViewLog; private ScrollView scrollViewLog; private TextView textViewConfigUrl; @@ -79,22 +82,7 @@ void setConfigUrl(String configUrl) { SharedPreferences preferences = getSharedPreferences("SmartProxy", MODE_PRIVATE); Editor editor = preferences.edit(); editor.putString(CONFIG_URL_KEY, configUrl); - editor.commit(); - } - - String getVersionName() { - PackageManager packageManager = getPackageManager(); - if (packageManager == null) { - Log.e(TAG, "null package manager is impossible"); - return null; - } - - try { - return packageManager.getPackageInfo(getPackageName(), 0).versionName; - } catch (PackageManager.NameNotFoundException e) { - Log.e(TAG, "package not found is impossible", e); - return null; - } + editor.apply(); } boolean isValidUrl(String url) { @@ -264,22 +252,23 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent) switchProxy.setEnabled(true); onLogReceived("canceled."); } - return; - } - - IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); - if (scanResult != null) { - String configUrl = scanResult.getContents(); - if (isValidUrl(configUrl)) { - setConfigUrl(configUrl); - textViewConfigUrl.setText(configUrl); - } else { - Toast.makeText(MainActivity.this, R.string.err_invalid_url, Toast.LENGTH_SHORT).show(); + }else if (requestCode == IntentIntegrator.REQUEST_CODE) { + IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); + if (scanResult != null) { + String configUrl = scanResult.getContents(); + if (isValidUrl(configUrl)) { + setConfigUrl(configUrl); + textViewConfigUrl.setText(configUrl); + } else { + Toast.makeText(MainActivity.this, R.string.err_invalid_url, Toast.LENGTH_SHORT).show(); + } } - return; + }else{ + super.onActivityResult(requestCode, resultCode, intent); } - super.onActivityResult(requestCode, resultCode, intent); + + } @Override @@ -291,7 +280,7 @@ public boolean onCreateOptionsMenu(Menu menu) { return false; } - switchProxy = (Switch) menuItem.getActionView(); + switchProxy = (SwitchCompat) menuItem.getActionView(); if (switchProxy == null) { return false; } @@ -307,7 +296,7 @@ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_item_about: new AlertDialog.Builder(this) - .setTitle(getString(R.string.app_name) + getVersionName()) + .setTitle(getString(R.string.app_name) + BuildConfig.VERSION_NAME) .setMessage(R.string.about_info) .setPositiveButton(R.string.btn_ok, null) .setNegativeButton(R.string.btn_more, new OnClickListener() { diff --git a/SmartProxyX/src/main/res/drawable-hdpi/ic_launcher.png b/SmartProxyX/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100755 index 0000000..db8d921 Binary files /dev/null and b/SmartProxyX/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/SmartProxyX/src/main/res/drawable-mdpi/ic_launcher.png b/SmartProxyX/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100755 index 0000000..4ec4c5b Binary files /dev/null and b/SmartProxyX/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/SmartProxyX/src/main/res/drawable-xhdpi/ic_launcher.png b/SmartProxyX/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100755 index 0000000..741af0b Binary files /dev/null and b/SmartProxyX/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/SmartProxyX/src/main/res/drawable-xxhdpi/ic_launcher.png b/SmartProxyX/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100755 index 0000000..62eff6b Binary files /dev/null and b/SmartProxyX/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/Smart Proxy X/src/main/res/layout/activity_main.xml b/SmartProxyX/src/main/res/layout/activity_main.xml similarity index 100% rename from Smart Proxy X/src/main/res/layout/activity_main.xml rename to SmartProxyX/src/main/res/layout/activity_main.xml diff --git a/SmartProxyX/src/main/res/menu/main_activity_actions.xml b/SmartProxyX/src/main/res/menu/main_activity_actions.xml new file mode 100644 index 0000000..8a82334 --- /dev/null +++ b/SmartProxyX/src/main/res/menu/main_activity_actions.xml @@ -0,0 +1,14 @@ + + + + + diff --git a/Smart Proxy X/src/main/res/raw/ipmask b/SmartProxyX/src/main/res/raw/ipmask similarity index 100% rename from Smart Proxy X/src/main/res/raw/ipmask rename to SmartProxyX/src/main/res/raw/ipmask diff --git a/Smart Proxy X/src/main/res/values-sw600dp/dimens.xml b/SmartProxyX/src/main/res/values-sw600dp/dimens.xml similarity index 100% rename from Smart Proxy X/src/main/res/values-sw600dp/dimens.xml rename to SmartProxyX/src/main/res/values-sw600dp/dimens.xml diff --git a/Smart Proxy X/src/main/res/values-sw720dp-land/dimens.xml b/SmartProxyX/src/main/res/values-sw720dp-land/dimens.xml similarity index 100% rename from Smart Proxy X/src/main/res/values-sw720dp-land/dimens.xml rename to SmartProxyX/src/main/res/values-sw720dp-land/dimens.xml diff --git a/Smart Proxy X/src/main/res/values-v14/styles.xml b/SmartProxyX/src/main/res/values-v14/styles.xml similarity index 82% rename from Smart Proxy X/src/main/res/values-v14/styles.xml rename to SmartProxyX/src/main/res/values-v14/styles.xml index 3e61a52..0cf2919 100644 --- a/Smart Proxy X/src/main/res/values-v14/styles.xml +++ b/SmartProxyX/src/main/res/values-v14/styles.xml @@ -5,7 +5,7 @@ AppBaseTheme from BOTH res/values/styles.xml and res/values-v11/styles.xml on API 14+ devices. --> - diff --git a/SmartProxyX/src/main/res/values-v21/styles.xml b/SmartProxyX/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..28fc72e --- /dev/null +++ b/SmartProxyX/src/main/res/values-v21/styles.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Smart Proxy X/src/main/res/values-zh-rCN/strings.xml b/SmartProxyX/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from Smart Proxy X/src/main/res/values-zh-rCN/strings.xml rename to SmartProxyX/src/main/res/values-zh-rCN/strings.xml diff --git a/Smart Proxy X/src/main/res/values/dimens.xml b/SmartProxyX/src/main/res/values/dimens.xml similarity index 100% rename from Smart Proxy X/src/main/res/values/dimens.xml rename to SmartProxyX/src/main/res/values/dimens.xml diff --git a/Smart Proxy X/src/main/res/values/strings.xml b/SmartProxyX/src/main/res/values/strings.xml similarity index 100% rename from Smart Proxy X/src/main/res/values/strings.xml rename to SmartProxyX/src/main/res/values/strings.xml diff --git a/Smart Proxy X/src/main/res/values/styles.xml b/SmartProxyX/src/main/res/values/styles.xml similarity index 60% rename from Smart Proxy X/src/main/res/values/styles.xml rename to SmartProxyX/src/main/res/values/styles.xml index 7c28a60..1c0d24e 100644 --- a/Smart Proxy X/src/main/res/values/styles.xml +++ b/SmartProxyX/src/main/res/values/styles.xml @@ -1,10 +1,13 @@ + #3f51e5 + #334ac5 + #009688 - diff --git a/build.gradle b/build.gradle index 80eec1a..0299b4a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,12 +5,12 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.9.+' + classpath 'com.android.tools.build:gradle:0.14.4' } } allprojects { repositories { - mavenCentral() + jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5de946b..649bd03 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sun Nov 23 11:09:55 GMT+08:00 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip diff --git a/settings.gradle b/settings.gradle index 0abd40d..7ac3f43 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':Smart Proxy X' +include ':SmartProxyX'