fix an UI issue

This commit is contained in:
Max Lv
2013-08-21 12:55:34 +08:00
parent 02fc0b8873
commit 4f0e95f72d
2 changed files with 21 additions and 19 deletions
+2 -2
View File
@@ -5,8 +5,8 @@ import sbtandroid._
import sbtandroid.AndroidKeys._
object App {
val version = "1.8.1"
val versionCode = 46
val version = "1.8.2"
val versionCode = 47
}
object General {
@@ -359,6 +359,24 @@ class Shadowsocks
}
}
def getLayoutView(view: ViewParent): LinearLayout = {
view match {
case layout: LinearLayout => layout
case _ => if (view != null) getLayoutView(view.getParent) else null
}
}
def initAdView() {
if (settings.getString(Key.proxy, "") == "198.199.101.152") {
val adView = new AdView(this, AdSize.BANNER, "a151becb8068b09")
val layoutView = getLayoutView(getListview.asInstanceOf[ViewParent])
if (layoutView != null) {
layoutView.addView(adView, 0)
adView.loadAd(new AdRequest)
}
}
}
/** Called when the activity is first created. */
override def onCreate(savedInstanceState: Bundle) {
setHeaderRes(R.xml.shadowsocks_headers)
@@ -383,23 +401,7 @@ class Shadowsocks
receiver = new StateBroadcastReceiver()
registerReceiver(receiver, new IntentFilter(Action.UPDATE_STATE))
if (settings.getString(Key.proxy, "") == "198.199.101.152") {
val adView = new AdView(this, AdSize.SMART_BANNER, "a151becb8068b09")
val rootView = findViewById(android.R.id.content).asInstanceOf[ViewParent]
val layoutView = {
def getLayoutView(view: ViewParent): LinearLayout = {
view match {
case layout: LinearLayout => layout
case _ => if (view != null) getLayoutView(view.getParent) else null
}
}
getLayoutView(rootView)
}
if (layoutView != null) {
layoutView.addView(adView, 0)
adView.loadAd(new AdRequest)
}
}
initAdView()
val init: Boolean = !Shadowsocks.isServiceStarted(this)
if (init) {