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
40646360
Commit
40646360
authored
Jun 27, 2020
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ActionBar to oss activity
parent
eeef4b55
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
core/src/main/AndroidManifest.xml
core/src/main/AndroidManifest.xml
+2
-0
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+0
-1
plugin/src/main/res/values/styles.xml
plugin/src/main/res/values/styles.xml
+10
-1
No files found.
core/src/main/AndroidManifest.xml
View file @
40646360
...
...
@@ -104,6 +104,8 @@
</intent-filter>
</receiver>
<activity
android:name=
"com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
android:theme=
"@style/Theme.Shadowsocks.ActionBar"
/>
<service
android:name=
"com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware=
"true"
/>
<provider
android:name=
"com.google.firebase.provider.FirebaseInitProvider"
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
40646360
...
...
@@ -54,7 +54,6 @@ import com.google.android.material.snackbar.Snackbar
import
com.google.firebase.analytics.ktx.analytics
import
com.google.firebase.analytics.ktx.logEvent
import
com.google.firebase.ktx.Firebase
import
timber.log.Timber
class
MainActivity
:
AppCompatActivity
(),
ShadowsocksConnection
.
Callback
,
OnPreferenceDataStoreChangeListener
,
NavigationView
.
OnNavigationItemSelectedListener
{
...
...
plugin/src/main/res/values/styles.xml
View file @
40646360
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style
name=
"Theme.Shadowsocks"
parent=
"Theme.MaterialComponents.DayNight.
No
ActionBar"
>
<style
name=
"Theme.Shadowsocks"
parent=
"Theme.MaterialComponents.DayNight.
Dark
ActionBar"
>
<item
name=
"android:navigationBarColor"
>
@color/color_primary_dark
</item>
<item
name=
"actionBarStyle"
>
@style/Widget.MaterialComponents.Light.ActionBar.Solid
</item>
<item
name=
"actionModeCloseDrawable"
>
@drawable/ic_navigation_close
</item>
<item
name=
"colorAccent"
>
@color/material_accent_200
</item>
<item
name=
"colorButtonNormal"
>
@color/material_accent_200
</item>
<item
name=
"colorPrimary"
>
@color/color_primary
</item>
<item
name=
"colorPrimaryDark"
>
@color/color_primary_dark
</item>
<item
name=
"windowActionModeOverlay"
>
true
</item>
<!-- Remove ActionBar but keep styles and themes -->
<item
name=
"windowActionBar"
>
false
</item>
<item
name=
"windowNoTitle"
>
true
</item>
</style>
<style
name=
"Theme.Shadowsocks.ActionBar"
>
<item
name=
"windowActionBar"
>
true
</item>
<item
name=
"windowNoTitle"
>
false
</item>
</style>
<style
name=
"Theme.Shadowsocks.Immersive"
>
<item
name=
"android:navigationBarColor"
>
#6000
</item>
...
...
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