Commit b39f1f6a authored by Mygod's avatar Mygod

Fix missing appcompat tooltipText

parent 7895e1e5
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
package com.github.shadowsocks.widget package com.github.shadowsocks.widget
import android.content.Context import android.content.Context
import android.os.Build
import android.text.format.Formatter import android.text.format.Formatter
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.appcompat.widget.TooltipCompat
import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
...@@ -73,7 +73,7 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet? ...@@ -73,7 +73,7 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private fun setStatus(text: CharSequence) { private fun setStatus(text: CharSequence) {
statusText.text = text statusText.text = text
if (Build.VERSION.SDK_INT >= 26) tooltipText = text TooltipCompat.setTooltipText(this, text)
} }
fun changeState(state: BaseService.State) { fun changeState(state: BaseService.State) {
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
android:layout_weight="1" android:layout_weight="1"
android:text="@string/bypass_apps" android:text="@string/bypass_apps"
tools:checked="true" tools:checked="true"
android:tooltipText="@string/bypass_apps_summary" /> app:tooltipText="@string/bypass_apps_summary" />
</RadioGroup> </RadioGroup>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
......
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
android:layout_row="2" android:layout_row="2"
android:layout_column="0" android:layout_column="0"
android:layout_columnSpan="3" android:layout_columnSpan="3"
style="@style/stats_status" android:ellipsize="end"
tools:text="@string/connection_test_available"/> tools:text="@string/connection_test_available"/>
</GridLayout> </GridLayout>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="stats_status">
<item name="android:ellipsize">end</item>
</style>
</resources>
...@@ -3,7 +3,4 @@ ...@@ -3,7 +3,4 @@
<style name="Theme.Shadowsocks.Immersive.Navigation"> <style name="Theme.Shadowsocks.Immersive.Navigation">
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
</style> </style>
<style name="stats_status">
<item name="android:ellipsize">marquee</item>
</style>
</resources> </resources>
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