diff --git a/V2rayNG/app/build.gradle.kts b/V2rayNG/app/build.gradle.kts index cb1dffe9..7d0773e1 100644 --- a/V2rayNG/app/build.gradle.kts +++ b/V2rayNG/app/build.gradle.kts @@ -96,7 +96,7 @@ dependencies { implementation("androidx.viewpager2:viewpager2:1.1.0-beta02") // Androidx ktx - implementation("androidx.activity:activity-ktx:1.8.2") + implementation("androidx.activity:activity-ktx:1.9.0") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") @@ -111,7 +111,6 @@ dependencies { implementation("io.reactivex:rxjava:1.3.8") implementation("io.reactivex:rxandroid:1.2.1") implementation("com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar") - implementation("com.github.jorgecastilloprz:fabprogresscircle:1.01@aar") implementation("me.drakeet.support:toastcompat:1.1.0") implementation("com.blacksquircle.ui:editorkit:2.9.0") implementation("com.blacksquircle.ui:language-base:2.9.0") diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt index 5a00685c..fe6df1ff 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/service/V2RayServiceManager.kt @@ -1,6 +1,9 @@ package com.v2ray.ang.service -import android.app.* +import android.app.Notification +import android.app.NotificationChannel +import android.app.NotificationManager +import android.app.PendingIntent import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -290,7 +293,7 @@ object V2RayServiceManager { .setShowWhen(false) .setOnlyAlertOnce(true) .setContentIntent(contentPendingIntent) - .addAction(R.drawable.ic_close_grey_800_24dp, + .addAction(R.drawable.ic_delete_24dp, service.getString(R.string.notification_action_stop_v2ray), stopV2RayPendingIntent) //.build() 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 e20eb12e..5f335ec4 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 @@ -146,21 +146,16 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList mainViewModel.isRunning.observe(this) { isRunning -> adapter.isRunning = isRunning if (isRunning) { - if (!Utils.getDarkModeStatus(this)) { - binding.fab.setImageResource(R.drawable.ic_stat_name) - } + binding.fab.setImageResource(R.drawable.ic_stop_24dp) binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_orange)) setTestState(getString(R.string.connection_connected)) binding.layoutTest.isFocusable = true } else { - if (!Utils.getDarkModeStatus(this)) { - binding.fab.setImageResource(R.drawable.ic_stat_name) - } + binding.fab.setImageResource(R.drawable.ic_play_24dp) binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_grey)) setTestState(getString(R.string.connection_not_connected)) binding.layoutTest.isFocusable = false } - hideCircle() } mainViewModel.startListenBroadcast() } @@ -208,10 +203,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList if (mainStorage?.decodeString(MmkvManager.KEY_SELECTED_SERVER).isNullOrEmpty()) { return } - showCircle() -// toast(R.string.toast_services_start) V2RayServiceManager.startV2Ray(this) - hideCircle() } fun restartV2Ray() { @@ -657,29 +649,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList return super.onKeyDown(keyCode, event) } - - fun showCircle() { - binding.fabProgressCircle.show() - } - - fun hideCircle() { - try { - Observable.timer(300, TimeUnit.MILLISECONDS) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { - try { - if (binding.fabProgressCircle.isShown) { - binding.fabProgressCircle.hide() - } - } catch (e: Exception) { - Log.w(ANG_PACKAGE, e) - } - } - } catch (e: Exception) { - Log.d(ANG_PACKAGE, e.toString()) - } - } - override fun onNavigationItemSelected(item: MenuItem): Boolean { // Handle navigation view item clicks here. when (item.itemId) { 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 8ad9fe86..92b02cfd 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 @@ -3,12 +3,12 @@ package com.v2ray.ang.ui import android.content.Intent import android.graphics.Color import android.text.TextUtils -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AlertDialog +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView import com.google.gson.Gson import com.tencent.mmkv.MMKV import com.v2ray.ang.AngApplication.Companion.application @@ -166,13 +166,11 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter + + diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml deleted file mode 100644 index 97f8859d..00000000 --- a/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml new file mode 100644 index 00000000..d3fbe696 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable-night/ic_stop_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png deleted file mode 100644 index def2c8a7..00000000 Binary files a/V2rayNG/app/src/main/res/drawable-xhdpi/ic_stat_name_grey.png and /dev/null differ diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png deleted file mode 100644 index 01f688ab..00000000 Binary files a/V2rayNG/app/src/main/res/drawable-xxhdpi/ic_stat_name_grey.png and /dev/null differ diff --git a/V2rayNG/app/src/main/res/drawable-xxhdpi/side_nav_bar.xml b/V2rayNG/app/src/main/res/drawable-xxhdpi/side_nav_bar.xml deleted file mode 100644 index 6d81870b..00000000 --- a/V2rayNG/app/src/main/res/drawable-xxhdpi/side_nav_bar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png b/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png deleted file mode 100644 index b1478e07..00000000 Binary files a/V2rayNG/app/src/main/res/drawable-xxxhdpi/ic_stat_name_grey.png and /dev/null differ diff --git a/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml deleted file mode 100644 index 8a9a5226..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_close_grey_800_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml new file mode 100644 index 00000000..935408fb --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml deleted file mode 100644 index d8b29fc4..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml index 73d5e641..6b52da8c 100644 --- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml +++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml @@ -1,18 +1,13 @@ - - + + - - - - - \ No newline at end of file + + diff --git a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml deleted file mode 100644 index 1ce21f0a..00000000 --- a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml new file mode 100644 index 00000000..b827ebf9 --- /dev/null +++ b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml index d7ace3e6..7bddcc1c 100644 --- a/V2rayNG/app/src/main/res/layout/activity_main.xml +++ b/V2rayNG/app/src/main/res/layout/activity_main.xml @@ -70,7 +70,7 @@ - - + diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml index 758814f0..2cfe1ee2 100644 --- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml +++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml @@ -184,7 +184,7 @@ android:layout_height="wrap_content" android:lines="1" android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:textColor="@color/color_fab_orange" + android:textColor="@color/colorConfigType" android:textSize="10sp" /> diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml index 1b70ce04..210d238d 100644 --- a/V2rayNG/app/src/main/res/values-night/colors.xml +++ b/V2rayNG/app/src/main/res/values-night/colors.xml @@ -1,5 +1,6 @@ + #f97910 #424242 #646464 #BDBDBD diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml index dc2bb118..7a5054da 100644 --- a/V2rayNG/app/src/main/res/values/colors.xml +++ b/V2rayNG/app/src/main/res/values/colors.xml @@ -2,8 +2,9 @@ #009966 #FF0099 - #f97910 + #f97910 + #f97910 #CDCDCD #9C9C9C #727272 diff --git a/V2rayNG/app/src/main/res/xml/shortcuts.xml b/V2rayNG/app/src/main/res/xml/shortcuts.xml index 9db1e36f..8874a718 100644 --- a/V2rayNG/app/src/main/res/xml/shortcuts.xml +++ b/V2rayNG/app/src/main/res/xml/shortcuts.xml @@ -28,18 +28,4 @@ android:targetPackage="com.v2ray.ang" /> - - - - - \ No newline at end of file