Add more material design (3)
This commit is contained in:
@@ -198,14 +198,14 @@ object ConfigUtils {
|
||||
}
|
||||
|
||||
def refresh(context: Context) {
|
||||
val holder = context.getApplicationContext.asInstanceOf[ShadowsocksApplication].containerHolder
|
||||
val holder = ShadowsocksApplication.containerHolder
|
||||
if (holder != null) holder.refresh()
|
||||
}
|
||||
|
||||
def getRejectList(context: Context, app: ShadowsocksApplication): String = {
|
||||
def getRejectList(context: Context): String = {
|
||||
val default = context.getString(R.string.reject)
|
||||
try {
|
||||
val container = app.containerHolder.getContainer
|
||||
val container = ShadowsocksApplication.containerHolder.getContainer
|
||||
val update = container.getString("reject")
|
||||
if (update == null || update.isEmpty) default else update
|
||||
} catch {
|
||||
@@ -213,10 +213,10 @@ object ConfigUtils {
|
||||
}
|
||||
}
|
||||
|
||||
def getBlackList(context: Context, app: ShadowsocksApplication): String = {
|
||||
def getBlackList(context: Context): String = {
|
||||
val default = context.getString(R.string.black_list)
|
||||
try {
|
||||
val container = app.containerHolder.getContainer
|
||||
val container = ShadowsocksApplication.containerHolder.getContainer
|
||||
val update = container.getString("black_list")
|
||||
if (update == null || update.isEmpty) default else update
|
||||
} catch {
|
||||
|
||||
@@ -111,8 +111,6 @@ object State {
|
||||
object Action {
|
||||
val SERVICE = "com.github.shadowsocks.SERVICE"
|
||||
val CLOSE = "com.github.shadowsocks.CLOSE"
|
||||
val UPDATE_FRAGMENT = "com.github.shadowsocks.ACTION_UPDATE_FRAGMENT"
|
||||
val UPDATE_PREFS = "com.github.shadowsocks.ACTION_UPDATE_PREFS"
|
||||
}
|
||||
|
||||
object Route {
|
||||
|
||||
@@ -92,6 +92,9 @@ object Utils {
|
||||
new String(Base64.encode(mdg.digest, 0))
|
||||
}
|
||||
|
||||
def dpToPx(context: Context, dp: Int): Int =
|
||||
Math.round(dp * (context.getResources.getDisplayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT))
|
||||
|
||||
/*
|
||||
* round or floor depending on whether you are using offsets(floor) or
|
||||
* widths(round)
|
||||
|
||||
Reference in New Issue
Block a user