Commit 40646360 authored by Mygod's avatar Mygod

Add ActionBar to oss activity

parent eeef4b55
...@@ -104,6 +104,8 @@ ...@@ -104,6 +104,8 @@
</intent-filter> </intent-filter>
</receiver> </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" <service android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"/> android:directBootAware="true"/>
<provider android:name="com.google.firebase.provider.FirebaseInitProvider" <provider android:name="com.google.firebase.provider.FirebaseInitProvider"
......
...@@ -54,7 +54,6 @@ import com.google.android.material.snackbar.Snackbar ...@@ -54,7 +54,6 @@ import com.google.android.material.snackbar.Snackbar
import com.google.firebase.analytics.ktx.analytics import com.google.firebase.analytics.ktx.analytics
import com.google.firebase.analytics.ktx.logEvent import com.google.firebase.analytics.ktx.logEvent
import com.google.firebase.ktx.Firebase import com.google.firebase.ktx.Firebase
import timber.log.Timber
class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPreferenceDataStoreChangeListener, class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPreferenceDataStoreChangeListener,
NavigationView.OnNavigationItemSelectedListener { NavigationView.OnNavigationItemSelectedListener {
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.Shadowsocks" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="Theme.Shadowsocks" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="android:navigationBarColor">@color/color_primary_dark</item> <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="actionModeCloseDrawable">@drawable/ic_navigation_close</item>
<item name="colorAccent">@color/material_accent_200</item> <item name="colorAccent">@color/material_accent_200</item>
<item name="colorButtonNormal">@color/material_accent_200</item> <item name="colorButtonNormal">@color/material_accent_200</item>
<item name="colorPrimary">@color/color_primary</item> <item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item> <item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="windowActionModeOverlay">true</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>
<style name="Theme.Shadowsocks.Immersive"> <style name="Theme.Shadowsocks.Immersive">
<item name="android:navigationBarColor">#6000</item> <item name="android:navigationBarColor">#6000</item>
......
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