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
fecf1d19
Commit
fecf1d19
authored
Oct 02, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine code style
parent
971ae1f9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
34 deletions
+18
-34
build.gradle
build.gradle
+1
-1
core/build.gradle
core/build.gradle
+2
-2
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+12
-28
mobile/src/main/res/layout/ad_unified.xml
mobile/src/main/res/layout/ad_unified.xml
+2
-2
tv/src/main/java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
.../java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
+1
-1
No files found.
build.gradle
View file @
fecf1d19
...
@@ -31,7 +31,7 @@ buildscript {
...
@@ -31,7 +31,7 @@ buildscript {
classpath
'com.github.ben-manes:gradle-versions-plugin:0.25.0'
classpath
'com.github.ben-manes:gradle-versions-plugin:0.25.0'
classpath
'com.google.gms:google-services:4.3.2'
classpath
'com.google.gms:google-services:4.3.2'
classpath
'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
classpath
'com.vanniktech:gradle-maven-publish-plugin:0.8.0'
classpath
'io.fabric.tools:gradle:1.31.
0
'
classpath
'io.fabric.tools:gradle:1.31.
1
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
}
}
...
...
core/build.gradle
View file @
fecf1d19
...
@@ -49,7 +49,7 @@ androidExtensions {
...
@@ -49,7 +49,7 @@ androidExtensions {
experimental
=
true
experimental
=
true
}
}
def
coroutinesVersion
=
'1.3.
1
'
def
coroutinesVersion
=
'1.3.
2
'
def
roomVersion
=
'2.1.0'
def
roomVersion
=
'2.1.0'
def
workVersion
=
'2.2.0'
def
workVersion
=
'2.2.0'
dependencies
{
dependencies
{
...
@@ -65,7 +65,7 @@ dependencies {
...
@@ -65,7 +65,7 @@ dependencies {
api
'com.crashlytics.sdk.android:crashlytics:2.10.1'
api
'com.crashlytics.sdk.android:crashlytics:2.10.1'
api
'com.google.code.gson:gson:2.8.5'
api
'com.google.code.gson:gson:2.8.5'
api
'com.google.firebase:firebase-analytics:17.2.0'
api
'com.google.firebase:firebase-analytics:17.2.0'
api
'com.google.firebase:firebase-config:19.0.
1
'
api
'com.google.firebase:firebase-config:19.0.
2
'
api
'dnsjava:dnsjava:2.1.9'
api
'dnsjava:dnsjava:2.1.9'
api
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
api
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
api
"org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
api
"org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion"
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
fecf1d19
...
@@ -29,7 +29,10 @@ import android.content.Intent
...
@@ -29,7 +29,10 @@ import android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android.text.format.Formatter
import
android.text.format.Formatter
import
android.util.LongSparseArray
import
android.util.LongSparseArray
import
android.view.*
import
android.view.LayoutInflater
import
android.view.MenuItem
import
android.view.View
import
android.view.ViewGroup
import
android.widget.*
import
android.widget.*
import
androidx.appcompat.widget.PopupMenu
import
androidx.appcompat.widget.PopupMenu
import
androidx.appcompat.widget.Toolbar
import
androidx.appcompat.widget.Toolbar
...
@@ -51,15 +54,13 @@ import com.github.shadowsocks.utils.readableMessage
...
@@ -51,15 +54,13 @@ import com.github.shadowsocks.utils.readableMessage
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.google.android.gms.ads.*
import
com.google.android.gms.ads.AdLoader
import
com.google.android.gms.ads.formats.MediaView
import
com.google.android.gms.ads.AdRequest
import
com.google.android.gms.ads.VideoOptions
import
com.google.android.gms.ads.formats.NativeAdOptions
import
com.google.android.gms.ads.formats.NativeAdOptions
import
com.google.android.gms.ads.formats.UnifiedNativeAd
import
com.google.android.gms.ads.formats.UnifiedNativeAd
import
com.google.android.gms.ads.formats.UnifiedNativeAdView
import
com.google.android.gms.ads.formats.UnifiedNativeAdView
import
net.glxn.qrgen.android.QRCode
import
net.glxn.qrgen.android.QRCode
import
java.util.*
import
kotlin.collections.ArrayList
import
kotlin.collections.HashSet
class
ProfilesFragment
:
ToolbarFragment
(),
Toolbar
.
OnMenuItemClickListener
{
class
ProfilesFragment
:
ToolbarFragment
(),
Toolbar
.
OnMenuItemClickListener
{
companion
object
{
companion
object
{
...
@@ -125,7 +126,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -125,7 +126,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
TooltipCompat
.
setTooltipText
(
share
,
share
.
contentDescription
)
TooltipCompat
.
setTooltipText
(
share
,
share
.
contentDescription
)
}
}
fun
populateUnifiedNativeAdView
(
nativeAd
:
UnifiedNativeAd
,
adView
:
UnifiedNativeAdView
)
{
private
fun
populateUnifiedNativeAdView
(
nativeAd
:
UnifiedNativeAd
,
adView
:
UnifiedNativeAdView
)
{
// You must call destroy on old ads when you are done with them,
// You must call destroy on old ads when you are done with them,
// otherwise you will have a memory leak.
// otherwise you will have a memory leak.
currentNativeAd
?.
destroy
()
currentNativeAd
?.
destroy
()
...
@@ -183,22 +184,6 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -183,22 +184,6 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
// This method tells the Google Mobile Ads SDK that you have finished populating your
// This method tells the Google Mobile Ads SDK that you have finished populating your
// native ad view with this native ad.
// native ad view with this native ad.
adView
.
setNativeAd
(
nativeAd
)
adView
.
setNativeAd
(
nativeAd
)
// Get the video controller for the ad. One will always be provided, even if the ad doesn't
// have a video asset.
val
vc
=
nativeAd
.
videoController
// Updates the UI to say whether or not this ad has a video asset.
if
(
vc
.
hasVideoContent
())
{
// Create a new VideoLifecycleCallbacks object and pass it to the VideoController. The
// VideoController will call methods on this object when events occur in the video
// lifecycle.
vc
.
videoLifecycleCallbacks
=
object
:
VideoController
.
VideoLifecycleCallbacks
()
{
override
fun
onVideoEnd
()
{
super
.
onVideoEnd
()
}
}
}
}
}
fun
attach
()
{
fun
attach
()
{
...
@@ -209,10 +194,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -209,10 +194,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
builder
.
forUnifiedNativeAd
{
unifiedNativeAd
->
builder
.
forUnifiedNativeAd
{
unifiedNativeAd
->
if
(!
isAdLoaded
&&
isAttached
)
{
if
(!
isAdLoaded
&&
isAttached
)
{
// OnUnifiedNativeAdLoadedListener implementation.
// OnUnifiedNativeAdLoadedListener implementation.
val
adView
=
layoutInflater
.
inflate
(
R
.
layout
.
ad_unified
,
null
)
as
UnifiedNativeAdView
populateUnifiedNativeAdView
(
unifiedNativeAd
,
adView
)
val
adContainer
=
itemView
.
findViewById
<
LinearLayout
>(
R
.
id
.
ad_container
)
val
adContainer
=
itemView
.
findViewById
<
LinearLayout
>(
R
.
id
.
ad_container
)
val
adView
=
layoutInflater
.
inflate
(
R
.
layout
.
ad_unified
,
adContainer
,
false
)
as
UnifiedNativeAdView
populateUnifiedNativeAdView
(
unifiedNativeAd
,
adView
)
adContainer
.
removeAllViews
()
adContainer
.
removeAllViews
()
adContainer
.
addView
(
adView
)
adContainer
.
addView
(
adView
)
...
@@ -234,7 +219,6 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -234,7 +219,6 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
addTestDevice
(
"B08FC1764A7B250E91EA9D0D5EBEB208"
)
addTestDevice
(
"B08FC1764A7B250E91EA9D0D5EBEB208"
)
addTestDevice
(
"7509D18EB8AF82F915874FEF53877A64"
)
addTestDevice
(
"7509D18EB8AF82F915874FEF53877A64"
)
}.
build
())
}.
build
())
}
else
{
}
else
{
itemView
.
findViewById
<
LinearLayout
>(
R
.
id
.
ad_container
).
removeAllViews
()
itemView
.
findViewById
<
LinearLayout
>(
R
.
id
.
ad_container
).
removeAllViews
()
}
}
...
@@ -293,7 +277,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -293,7 +277,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
override
fun
onMenuItemClick
(
item
:
MenuItem
):
Boolean
=
when
(
item
.
itemId
)
{
override
fun
onMenuItemClick
(
item
:
MenuItem
):
Boolean
=
when
(
item
.
itemId
)
{
R
.
id
.
action_qr_code
->
{
R
.
id
.
action_qr_code
->
{
requireFragmentManager
()
.
beginTransaction
().
add
(
QRCodeDialog
(
this
.
item
.
toString
()),
""
)
parentFragmentManager
.
beginTransaction
().
add
(
QRCodeDialog
(
this
.
item
.
toString
()),
""
)
.
commitAllowingStateLoss
()
.
commitAllowingStateLoss
()
true
true
}
}
...
...
mobile/src/main/res/layout/ad_unified.xml
View file @
fecf1d19
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
...
@@ -28,8 +28,8 @@
...
@@ -28,8 +28,8 @@
android:layout_width=
"40dp"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
android:layout_height=
"40dp"
android:adjustViewBounds=
"true"
android:adjustViewBounds=
"true"
android:importantForAccessibility=
"no"
android:paddingBottom=
"5dp"
android:paddingBottom=
"5dp"
android:paddingRight=
"5dp"
android:paddingEnd=
"5dp"
/>
android:paddingEnd=
"5dp"
/>
<LinearLayout
<LinearLayout
...
...
tv/src/main/java/com/github/shadowsocks/tv/ProfilesDialogFragment.kt
View file @
fecf1d19
...
@@ -47,7 +47,7 @@ class ProfilesDialogFragment : LeanbackListPreferenceDialogFragmentCompat() {
...
@@ -47,7 +47,7 @@ class ProfilesDialogFragment : LeanbackListPreferenceDialogFragmentCompat() {
if
(
index
==
RecyclerView
.
NO_POSITION
)
return
if
(
index
==
RecyclerView
.
NO_POSITION
)
return
Core
.
switchProfile
(
adapter
.
profiles
[
index
].
id
)
Core
.
switchProfile
(
adapter
.
profiles
[
index
].
id
)
(
targetFragment
as
MainPreferenceFragment
).
startService
()
(
targetFragment
as
MainPreferenceFragment
).
startService
()
fragmentManager
?
.
popBackStack
()
parentFragmentManager
.
popBackStack
()
adapter
.
notifyDataSetChanged
()
adapter
.
notifyDataSetChanged
()
}
}
}
}
...
...
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