Commit 7203c6d0 authored by Max Lv's avatar Max Lv

Merge pull request #418 from Mygod/master

Reduce apk size
parents 257b44f3 49bcfb27
...@@ -18,6 +18,8 @@ ndkJavah in Android := List() ...@@ -18,6 +18,8 @@ ndkJavah in Android := List()
ndkBuild in Android := List() ndkBuild in Android := List()
shrinkResources in Android := true
typedResources in Android := false typedResources in Android := false
resolvers += Resolver.jcenterRepo resolvers += Resolver.jcenterRepo
...@@ -39,12 +41,7 @@ libraryDependencies ++= Seq( ...@@ -39,12 +41,7 @@ libraryDependencies ++= Seq(
"com.j256.ormlite" % "ormlite-android" % "4.48" "com.j256.ormlite" % "ormlite-android" % "4.48"
) )
proguardOptions in Android ++= Seq("-keep class android.support.v4.app.** { *; }", proguardOptions in Android ++= Seq("-keep class com.github.shadowsocks.** { <init>(...); }",
"-keep interface android.support.v4.app.** { *; }", "-keep class com.github.shadowsocks.System { *; }",
"-keep class android.support.v7.widget.Toolbar { <init>(...); }",
"-keep class org.jraf.android.backport.** { *; }",
"-keep class com.github.shadowsocks.** { *; }",
"-keep class * extends com.j256.ormlite.** { *; }",
"-keepattributes *Annotation*", "-keepattributes *Annotation*",
"-dontwarn com.google.android.gms.internal.zzhu",
"-dontwarn org.xbill.**") "-dontwarn org.xbill.**")
/*
* Copyright (C) 2007 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.util;
/**
* Math routines similar to those found in {@link java.lang.Math}.
*
* <p>Historically these methods were faster than the equivalent double-based
* {@link java.lang.Math} methods. On versions of Android with a JIT they
* became slower and have since been re-implemented to wrap calls to
* {@link java.lang.Math}. {@link java.lang.Math} should be used in
* preference.
*
* @deprecated Use {@link java.lang.Math} instead.
*/
@Deprecated
public class FloatMath {
/** Prevents instantiation. */
private FloatMath() {}
/**
* Returns the float conversion of the most positive (i.e. closest to
* positive infinity) integer value which is less than the argument.
*
* @param value to be converted
* @return the floor of value
*/
public static float floor(float value) {
return (float) Math.floor(value);
}
/**
* Returns the float conversion of the most negative (i.e. closest to
* negative infinity) integer value which is greater than the argument.
*
* @param value to be converted
* @return the ceiling of value
*/
public static float ceil(float value) {
return (float) Math.ceil(value);
}
/**
* Returns the closest float approximation of the sine of the argument.
*
* @param angle to compute the cosine of, in radians
* @return the sine of angle
*/
public static float sin(float angle) {
return (float) Math.sin(angle);
}
/**
* Returns the closest float approximation of the cosine of the argument.
*
* @param angle to compute the cosine of, in radians
* @return the cosine of angle
*/
public static float cos(float angle) {
return (float) Math.cos(angle);
}
/**
* Returns the closest float approximation of the square root of the
* argument.
*
* @param value to compute sqrt of
* @return the square root of value
*/
public static float sqrt(float value) {
return (float) Math.sqrt(value);
}
/**
* Returns the closest float approximation of the raising "e" to the power
* of the argument.
*
* @param value to compute the exponential of
* @return the exponential of value
*/
public static float exp(float value) {
return (float) Math.exp(value);
}
/**
* Returns the closest float approximation of the result of raising {@code
* x} to the power of {@code y}.
*
* @param x the base of the operation.
* @param y the exponent of the operation.
* @return {@code x} to the power of {@code y}.
*/
public static float pow(float x, float y) {
return (float) Math.pow(x, y);
}
/**
* Returns {@code sqrt(}<i>{@code x}</i><sup>{@code 2}</sup>{@code +} <i>
* {@code y}</i><sup>{@code 2}</sup>{@code )}.
*
* @param x a float number
* @param y a float number
* @return the hypotenuse
*/
public static float hypot(float x, float y) {
return (float) Math.hypot(x, y);
}
}
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
package com.github.shadowsocks package com.github.shadowsocks
import android.app.{Activity, AlertDialog, ProgressDialog} import android.app.{Activity, AlertDialog}
import android.content.DialogInterface import android.content.DialogInterface
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.ColorDrawable import android.graphics.drawable.ColorDrawable
import android.os.{Bundle, Handler, Message} import android.os.Bundle
import android.preference.PreferenceManager import android.preference.PreferenceManager
import android.view.WindowManager import android.view.WindowManager
import com.github.shadowsocks.database.{Profile, ProfileManager} import com.github.shadowsocks.database.{Profile, ProfileManager}
...@@ -84,27 +84,11 @@ class ParserActivity extends Activity { ...@@ -84,27 +84,11 @@ class ParserActivity extends Activity {
} }
def addProfile(profile: Profile) { def addProfile(profile: Profile) {
val profileManager =
val h = showProgress(getString(R.string.loading)) new ProfileManager(PreferenceManager.getDefaultSharedPreferences(getBaseContext),
ShadowsocksApplication.dbHelper)
h.postDelayed(() => { profileManager.createOrUpdateProfile(profile)
val profileManager = profileManager.reload(profile.id)
new ProfileManager(PreferenceManager.getDefaultSharedPreferences(getBaseContext),
ShadowsocksApplication.dbHelper)
profileManager.createOrUpdateProfile(profile)
profileManager.reload(profile.id)
h.sendEmptyMessage(0)
}, 600)
}
private def showProgress(msg: String): Handler = {
val progressDialog = ProgressDialog.show(this, "", msg, true, false)
new Handler {
override def handleMessage(msg: Message) {
progressDialog.dismiss()
finish()
}
}
} }
} }
...@@ -467,18 +467,22 @@ class Shadowsocks ...@@ -467,18 +467,22 @@ class Shadowsocks
fab.setBackgroundTintList(greyTint) fab.setBackgroundTintList(greyTint)
fabProgressCircle.show() fabProgressCircle.show()
changeSwitch(checked = true) changeSwitch(checked = true)
setPreferenceEnabled(false)
case State.CONNECTED => case State.CONNECTED =>
fab.setBackgroundTintList(greenTint) fab.setBackgroundTintList(greenTint)
fabProgressCircle.hide() fabProgressCircle.hide()
changeSwitch(checked = true) changeSwitch(checked = true)
setPreferenceEnabled(false)
case State.STOPPING => case State.STOPPING =>
fab.setBackgroundTintList(greyTint) fab.setBackgroundTintList(greyTint)
fabProgressCircle.show() fabProgressCircle.show()
changeSwitch(checked = false) changeSwitch(checked = false)
setPreferenceEnabled(false)
case _ => case _ =>
fab.setBackgroundTintList(greyTint) fab.setBackgroundTintList(greyTint)
fabProgressCircle.hide() fabProgressCircle.hide()
changeSwitch(checked = false) changeSwitch(checked = false)
setPreferenceEnabled(true)
} }
state = bgService.getState state = bgService.getState
} }
...@@ -526,10 +530,6 @@ class Shadowsocks ...@@ -526,10 +530,6 @@ class Shadowsocks
} }
} }
override def onStart() {
super.onStart()
}
override def onStop() { override def onStop() {
super.onStop() super.onStop()
clearDialog() clearDialog()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment