Skip to content

Commit

Permalink
Fix #2803
Browse files Browse the repository at this point in the history
  • Loading branch information
Mygod committed Sep 17, 2021
1 parent 20a3b45 commit cefbe39
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
4 changes: 2 additions & 2 deletions core/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

<activity
android:name="com.github.shadowsocks.UrlImportActivity"
android:theme="@style/Theme.AppCompat.Translucent"
android:theme="@style/Theme.Shadowsocks.Translucent"
android:exported="true"
android:excludeFromRecents="true">
<intent-filter>
Expand All @@ -87,7 +87,7 @@

<activity
android:name="com.github.shadowsocks.VpnRequestActivity"
android:theme="@style/Theme.AppCompat.Translucent"
android:theme="@style/Theme.Shadowsocks.Translucent"
android:exported="false"
android:excludeFromRecents="true"
android:taskAffinity=""/>
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
15 changes: 15 additions & 0 deletions plugin/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@
<style name="Theme.Shadowsocks.Immersive">
<item name="android:navigationBarColor">#6000</item>
</style>
<style name="Theme.Shadowsocks.Translucent" parent="Theme.MaterialComponents.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@null</item>
<item name="android:backgroundDimEnabled">false</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowCloseOnTouchOutside">false</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="windowNoTitle">true</item>
</style>
<style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowFrame">@null</item>
Expand Down

0 comments on commit cefbe39

Please sign in to comment.