Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
b39f1f6a
Commit
b39f1f6a
authored
Jul 20, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing appcompat tooltipText
parent
7895e1e5
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
13 deletions
+4
-13
mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
...e/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
+2
-2
mobile/src/main/res/layout/layout_apps.xml
mobile/src/main/res/layout/layout_apps.xml
+1
-1
mobile/src/main/res/layout/layout_main.xml
mobile/src/main/res/layout/layout_main.xml
+1
-1
mobile/src/main/res/values-v26/styles.xml
mobile/src/main/res/values-v26/styles.xml
+0
-6
mobile/src/main/res/values/styles.xml
mobile/src/main/res/values/styles.xml
+0
-3
No files found.
mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
View file @
b39f1f6a
...
...
@@ -21,11 +21,11 @@
package
com.github.shadowsocks.widget
import
android.content.Context
import
android.os.Build
import
android.text.format.Formatter
import
android.util.AttributeSet
import
android.view.View
import
android.widget.TextView
import
androidx.appcompat.widget.TooltipCompat
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.fragment.app.FragmentActivity
import
androidx.lifecycle.Observer
...
...
@@ -73,7 +73,7 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private
fun
setStatus
(
text
:
CharSequence
)
{
statusText
.
text
=
text
if
(
Build
.
VERSION
.
SDK_INT
>=
26
)
tooltipText
=
text
TooltipCompat
.
setTooltipText
(
this
,
text
)
}
fun
changeState
(
state
:
BaseService
.
State
)
{
...
...
mobile/src/main/res/layout/layout_apps.xml
View file @
b39f1f6a
...
...
@@ -76,7 +76,7 @@
android:layout_weight=
"1"
android:text=
"@string/bypass_apps"
tools:checked=
"true"
a
ndroid
:tooltipText=
"@string/bypass_apps_summary"
/>
a
pp
:tooltipText=
"@string/bypass_apps_summary"
/>
</RadioGroup>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
mobile/src/main/res/layout/layout_main.xml
View file @
b39f1f6a
...
...
@@ -114,7 +114,7 @@
android:layout_row=
"2"
android:layout_column=
"0"
android:layout_columnSpan=
"3"
style=
"@style/stats_status
"
android:ellipsize=
"end
"
tools:text=
"@string/connection_test_available"
/>
</GridLayout>
...
...
mobile/src/main/res/values-v26/styles.xml
deleted
100644 → 0
View file @
7895e1e5
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"stats_status"
>
<item
name=
"android:ellipsize"
>
end
</item>
</style>
</resources>
mobile/src/main/res/values/styles.xml
View file @
b39f1f6a
...
...
@@ -3,7 +3,4 @@
<style
name=
"Theme.Shadowsocks.Immersive.Navigation"
>
<item
name=
"android:statusBarColor"
>
@android:color/transparent
</item>
</style>
<style
name=
"stats_status"
>
<item
name=
"android:ellipsize"
>
marquee
</item>
</style>
</resources>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment