diff --git a/build.sbt b/build.sbt index a1aece97..fcd92b70 100644 --- a/build.sbt +++ b/build.sbt @@ -37,6 +37,7 @@ libraryDependencies ++= Seq( "com.google.android.gms" % "play-services-ads" % "8.4.0", "com.google.android.gms" % "play-services-analytics" % "8.4.0", "com.android.support" % "design" % "23.1.1", + "com.android.support" % "gridlayout-v7" % "23.1.1", "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01", "com.j256.ormlite" % "ormlite-core" % "4.48", "com.j256.ormlite" % "ormlite-android" % "4.48", diff --git a/src/main/res/layout/status_pref.xml b/src/main/res/layout/status_pref.xml index 4f861b06..f5c50fd6 100644 --- a/src/main/res/layout/status_pref.xml +++ b/src/main/res/layout/status_pref.xml @@ -30,92 +30,95 @@ android:gravity="end" /> - - + app:layout_columnWeight="1" + app:layout_gravity="fill_horizontal" /> - - + - - - + diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index c2cada0a..1dea01cb 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -169,12 +169,12 @@ class Shadowsocks def updateTraffic(): Unit = if (trafficCache == null) callback.trafficUpdated(0, 0, 0, 0) else { if (connectionTestResult == null) connectionTestResult = getString(R.string.connection_test_pending) if (preferences.natSwitch.isChecked) { - preferences.stat.setSummary("") + preferences.stat.setSummary(null) } else { if (connectionTestSuccess) { preferences.stat.setSummary(connectionTestResult) } else { - preferences.stat.setSummary(getString(R.string.connection_test_fail)) + preferences.stat.setSummary(R.string.connection_test_fail) Snackbar.make(findViewById(android.R.id.content), connectionTestResult, Snackbar.LENGTH_LONG).show } } diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala index bd2902e0..7274f0e9 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala @@ -78,7 +78,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan addPreferencesFromResource(R.xml.pref_all) getPreferenceManager.getSharedPreferences.registerOnSharedPreferenceChangeListener(this) - stat= findPreference(Key.stat) + stat = findPreference(Key.stat) stat.setOnPreferenceClickListener(_ => { val id = synchronized { testCount += 1 @@ -97,7 +97,7 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan conn.setUseCaches(false) if (testCount == id) { var result: String = null - var success: Boolean = true + var success = true try { val start = currentTimeMillis conn.getInputStream