diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index aed907a4..5b3260dc 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -18,7 +18,6 @@ import android.view.KeyEvent import com.v2ray.ang.AppConfig import com.v2ray.ang.util.MessageUtil import com.v2ray.ang.util.V2rayConfigUtil -import org.jetbrains.anko.* import java.lang.ref.SoftReference import java.net.URL import android.content.IntentFilter @@ -52,10 +51,10 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList field = value adapter.changeable = !value if (value) { - fab.imageResource = R.drawable.ic_v + fab.setImageResource(R.drawable.ic_v) tv_test_state.text = getString(R.string.connection_connected) } else { - fab.imageResource = R.drawable.ic_v_idle + fab.setImageResource(R.drawable.ic_v_idle) tv_test_state.text = getString(R.string.connection_not_connected) } hideCircle() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt index 4eddafb5..bd9d7492 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainRecyclerAdapter.kt @@ -2,6 +2,7 @@ package com.v2ray.ang.ui import android.content.Intent import android.graphics.Color +import android.support.v7.app.AlertDialog import android.support.v7.widget.RecyclerView import android.text.TextUtils import android.view.View @@ -61,7 +62,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter + AlertDialog.Builder(mActivity).setItems(shareOptions.toTypedArray()) { _, i -> try { when (i) { 0 -> { @@ -95,14 +96,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter { @@ -118,7 +112,7 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter, blacklist: MutableSet?) : @@ -68,17 +66,17 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List, bl fun bind(appInfo: AppInfo) { this.appInfo = appInfo - icon.image = appInfo.appIcon + icon.setImageDrawable(appInfo.appIcon) // name.text = appInfo.appName checkBox.isChecked = inBlacklist package_name.text = appInfo.packageName if (appInfo.isSystemApp) { name.text = String.format("** %1s", appInfo.appName) - name.textColor = Color.RED + name.setTextColor(Color.RED) } else { name.text = appInfo.appName - name.textColor = Color.DKGRAY + name.setTextColor(Color.DKGRAY) } itemView.setOnClickListener(this) @@ -94,4 +92,4 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List, bl } } } -} \ No newline at end of file +} diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server2Activity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server2Activity.kt index 02ee56ae..a021c1ec 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server2Activity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server2Activity.kt @@ -1,6 +1,7 @@ package com.v2ray.ang.ui import android.os.Bundle +import android.support.v7.app.AlertDialog import android.text.Editable import android.text.TextUtils import android.view.Menu @@ -14,7 +15,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.Utils import kotlinx.android.synthetic.main.activity_server2.* -import org.jetbrains.anko.* import java.lang.Exception class Server2Activity : BaseActivity() { @@ -112,17 +112,16 @@ class Server2Activity : BaseActivity() { */ fun deleteServer(): Boolean { if (edit_index >= 0) { - alert(R.string.del_config_comfirm) { - positiveButton(android.R.string.ok) { - if (AngConfigManager.removeServer(edit_index) == 0) { - toast(R.string.toast_success) - finish() - } else { - toast(R.string.toast_failure) + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + if (AngConfigManager.removeServer(edit_index) == 0) { + toast(R.string.toast_success) + finish() + } else { + toast(R.string.toast_failure) + } } - } - show() - } + .show() } else { } return true diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server3Activity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server3Activity.kt index 248feb1e..89b98424 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server3Activity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server3Activity.kt @@ -1,6 +1,7 @@ package com.v2ray.ang.ui import android.os.Bundle +import android.support.v7.app.AlertDialog import android.text.TextUtils import android.view.Menu import android.view.MenuItem @@ -10,7 +11,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.Utils import kotlinx.android.synthetic.main.activity_server3.* -import org.jetbrains.anko.* class Server3Activity : BaseActivity() { companion object { @@ -126,17 +126,16 @@ class Server3Activity : BaseActivity() { */ fun deleteServer(): Boolean { if (edit_index >= 0) { - alert(R.string.del_config_comfirm) { - positiveButton(android.R.string.ok) { - if (AngConfigManager.removeServer(edit_index) == 0) { - toast(R.string.toast_success) - finish() - } else { - toast(R.string.toast_failure) + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + if (AngConfigManager.removeServer(edit_index) == 0) { + toast(R.string.toast_success) + finish() + } else { + toast(R.string.toast_failure) + } } - } - show() - } + .show() } else { } return true diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server4Activity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server4Activity.kt index b4b9d007..d6355470 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server4Activity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/Server4Activity.kt @@ -1,6 +1,7 @@ package com.v2ray.ang.ui import android.os.Bundle +import android.support.v7.app.AlertDialog import android.text.TextUtils import android.view.Menu import android.view.MenuItem @@ -10,7 +11,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.Utils import kotlinx.android.synthetic.main.activity_server4.* -import org.jetbrains.anko.* class Server4Activity : BaseActivity() { companion object { @@ -110,17 +110,16 @@ class Server4Activity : BaseActivity() { */ fun deleteServer(): Boolean { if (edit_index >= 0) { - alert(R.string.del_config_comfirm) { - positiveButton(android.R.string.ok) { - if (AngConfigManager.removeServer(edit_index) == 0) { - toast(R.string.toast_success) - finish() - } else { - toast(R.string.toast_failure) + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + if (AngConfigManager.removeServer(edit_index) == 0) { + toast(R.string.toast_success) + finish() + } else { + toast(R.string.toast_failure) + } } - } - show() - } + .show() } else { } return true diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt index ae753cd3..7f95cbde 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt @@ -1,6 +1,7 @@ package com.v2ray.ang.ui import android.os.Bundle +import android.support.v7.app.AlertDialog import android.text.TextUtils import android.view.Menu import android.view.MenuItem @@ -10,7 +11,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.Utils import kotlinx.android.synthetic.main.activity_server.* -import org.jetbrains.anko.* class ServerActivity : BaseActivity() { companion object { @@ -169,17 +169,16 @@ class ServerActivity : BaseActivity() { */ fun deleteServer(): Boolean { if (edit_index >= 0) { - alert(R.string.del_config_comfirm) { - positiveButton(android.R.string.ok) { - if (AngConfigManager.removeServer(edit_index) == 0) { - toast(R.string.toast_success) - finish() - } else { - toast(R.string.toast_failure) + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + if (AngConfigManager.removeServer(edit_index) == 0) { + toast(R.string.toast_success) + finish() + } else { + toast(R.string.toast_failure) + } } - } - show() - } + .show() } else { } return true diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt index dfb6a716..1d60a327 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubEditActivity.kt @@ -1,6 +1,7 @@ package com.v2ray.ang.ui import android.os.Bundle +import android.support.v7.app.AlertDialog import android.text.TextUtils import android.view.Menu import android.view.MenuItem @@ -10,7 +11,6 @@ import com.v2ray.ang.extension.toast import com.v2ray.ang.util.AngConfigManager import com.v2ray.ang.util.Utils import kotlinx.android.synthetic.main.activity_sub_edit.* -import org.jetbrains.anko.* class SubEditActivity : BaseActivity() { @@ -95,17 +95,16 @@ class SubEditActivity : BaseActivity() { */ fun deleteServer(): Boolean { if (edit_index >= 0) { - alert(R.string.del_config_comfirm) { - positiveButton(android.R.string.ok) { - if (AngConfigManager.removeSubItem(edit_index) == 0) { - toast(R.string.toast_success) - finish() - } else { - toast(R.string.toast_failure) + AlertDialog.Builder(this).setMessage(R.string.del_config_comfirm) + .setPositiveButton(android.R.string.ok) { _, _ -> + if (AngConfigManager.removeSubItem(edit_index) == 0) { + toast(R.string.toast_success) + finish() + } else { + toast(R.string.toast_failure) + } } - } - show() - } + .show() } else { } return true diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt index 364147ea..307f3a46 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt @@ -29,7 +29,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) : RecyclerView holder.name.text = remarks holder.url.text = url - holder.itemView.backgroundColor = Color.TRANSPARENT + holder.itemView.setBackgroundColor(Color.TRANSPARENT) holder.layout_edit.setOnClickListener { mActivity.startActivity(Intent(mActivity, SubEditActivity::class.java)