Commit fa083a8e authored by Max Lv's avatar Max Lv

fix #295

parent ef2ff23c
......@@ -79,4 +79,18 @@
<item name="android:textAppearanceSmallPopupMenu" >@style/m_textAppearanceSmallPopupMenu</item>
</style>
<style name="PopupTheme" parent="@android:style/Theme.Material.Light">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateAlwaysHidden</item>
<item name="android:windowActionModeOverlay">true</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:windowCloseOnTouchOutside">true</item>
<item name="android:windowIsTranslucent">true</item>
</style>
</resources>
......@@ -19,7 +19,9 @@
<style name="Theme.AppManager" parent="@style/Theme.Shadow">
</style>
<style name="PopupTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
<style name="PopupTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowContentOverlay">@null</item>
......@@ -72,4 +74,4 @@
<item name="mdMenuSize">250dp</item>
</style>
</resources>
\ No newline at end of file
</resources>
......@@ -638,6 +638,25 @@ class Shadowsocks
builder.create().show()
}
def reloadProfile() {
drawer.closeMenu(true)
val h = showProgress(getString(R.string.loading))
handler.postDelayed(new Runnable {
def run() {
currentProfile = {
profileManager.getProfile(settings.getInt(Key.profileId, -1)) getOrElse currentProfile
}
menuAdapter.updateList(getMenuList, currentProfile.id)
updatePreferenceScreen()
h.sendEmptyMessage(0)
}
}, 600)
}
def addProfile(profile: Profile) {
drawer.closeMenu(true)
......@@ -826,6 +845,10 @@ class Shadowsocks
switchButton.setOnCheckedChangeListener(Shadowsocks.this)
}
ConfigUtils.refresh(this)
// Check if profile list changed
if (currentProfile.id != settings.getInt(Key.profileId, -1))
reloadProfile()
}
private def setPreferenceEnabled(enabled: Boolean) {
......
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