katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimized UI

Browse Source 
com.google.android.material.progressindicator.LinearProgressIndicator
This commit is contained in:
2dust
2024-08-13 14:39:45 +08:00
parent 6be125b5cb
commit 5208bd62c5
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
View File

@@ -30,9 +30,7 @@ import com.tbruyelle.rxpermissions3.RxPermissions
import com.tencent.mmkv.MMKV
import com.v2ray.ang.AppConfig
import com.v2ray.ang.R
import com.v2ray.ang.databinding.ActivityLogcatBinding
import com.v2ray.ang.databinding.ActivityMainBinding
import com.v2ray.ang.databinding.LayoutProgressBinding
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.extension.isNetworkConnected
import com.v2ray.ang.extension.toast
@@ -42,12 +40,12 @@ import com.v2ray.ang.util.AngConfigManager
import com.v2ray.ang.util.MmkvManager
import com.v2ray.ang.util.Utils
import com.v2ray.ang.viewmodel.MainViewModel
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Observable
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import me.drakeet.support.toast.ToastCompat
import io.reactivex.rxjava3.core.Observable
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import java.util.concurrent.TimeUnit
class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
@@ -421,10 +419,11 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
}
private fun importBatchConfig(server: String?) {
val dialog = AlertDialog.Builder(this)
.setView(LayoutProgressBinding.inflate(layoutInflater).root)
.setCancelable(false)
.show()
// val dialog = AlertDialog.Builder(this)
// .setView(LayoutProgressBinding.inflate(layoutInflater).root)
// .setCancelable(false)
// .show()
binding.pbWaiting.show()
lifecycleScope.launch(Dispatchers.IO) {
val (count, countSub) = AngConfigManager.importBatchConfig(server, mainViewModel.subscriptionId, true)
@@ -438,7 +437,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
} else {
toast(R.string.toast_failure)
}
dialog.dismiss()
//dialog.dismiss()
binding.pbWaiting.hide()
}
}
}
@@ -518,10 +518,11 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
* import config from sub
*/
private fun importConfigViaSub() : Boolean {
val dialog = AlertDialog.Builder(this)
.setView(LayoutProgressBinding.inflate(layoutInflater).root)
.setCancelable(false)
.show()
// val dialog = AlertDialog.Builder(this)
// .setView(LayoutProgressBinding.inflate(layoutInflater).root)
// .setCancelable(false)
// .show()
binding.pbWaiting.show()
lifecycleScope.launch(Dispatchers.IO) {
val count = AngConfigManager.updateConfigViaSubAll()
@@ -533,7 +534,8 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
} else {
toast(R.string.toast_failure)
}
dialog.dismiss()
//dialog.dismiss()
binding.pbWaiting.hide()
}
}
return true

9
V2rayNG/app/src/main/res/layout/activity_main.xml
View File

@@ -37,6 +37,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/pb_waiting"
app:indicatorColor="@color/color_fab_active"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="invisible" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_group"
app:tabMode="scrollable"
@@ -76,7 +84,6 @@
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/fabProgressCircle"
android:layout_width="wrap_content"