Add ActionBar to oss activity

shadowsocks · Jun 26, 2020 · 4064636 · 4064636
1 parent eeef4b5
commit 4064636
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -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"

diff --git a/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt b/mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
@@ -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 {

diff --git a/plugin/src/main/res/values/styles.xml b/plugin/src/main/res/values/styles.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="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>