界面调整

.idea/deploymentTargetDropDown.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\Administrator\.android\avd\65_API_25.avd" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-09-02T08:29:34.790400Z" />
-  </component>
-</project>

app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java

@@ -33,7 +33,7 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
             actionBar.setCustomView(R.layout.activebar_custom);
 
-            activeBarBack = findViewById(R.id.activeBar_back);
+            activeBarBack = findViewById(R.id.actionBar_back);
             activeBarBack.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
@@ -41,7 +41,7 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt {
                 }
             });
 
-            ImageView activeBarSearch = findViewById(R.id.activeBar_searchBtn);
+            ImageView activeBarSearch = findViewById(R.id.actionBar_searchBtn);
             activeBarSearch.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
@@ -52,19 +52,23 @@ public class BaseActivity extends AppCompatActivity implements CustomAdapt {
         }
     }
 
-    @Override
+    private void actionBarSetBtnOnclick(){
-    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
+
-        getMenuInflater().inflate(R.menu.activebar_menu, menu);
-        return super.onCreateOptionsMenu(menu);
     }
 
-    @Override
+//    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+//    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
-        if (item.getItemId() == R.id.activeBar_option_logout) {
+//        getMenuInflater().inflate(R.menu.activebar_menu, menu);
-            logout();
+//        return super.onCreateOptionsMenu(menu);
-        }
+//    }
-        return super.onOptionsItemSelected(item);
+//
-    }
+//    @Override
+//    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+//        if (item.getItemId() == R.id.activeBar_option_logout) {
+//            logout();
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
 
     /**
      * 禁用标题栏返回按钮

app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java

@@ -56,7 +56,7 @@ public class CollectionActivity extends BaseActivity {
         }
 
         mGridContiner = findViewById(R.id.mGridView);
-        tvTitleTip = findViewById(R.id.activeBar_titleTip);
+        tvTitleTip = findViewById(R.id.actionBar_titleTip);
         V7GridLayoutManager v7GridLayoutManager = new V7GridLayoutManager(this,6);
         mGridContiner.setLayoutManager(v7GridLayoutManager);
         mGridContiner.setItemAnimator(null);  //防崩溃
@@ -157,7 +157,7 @@ public class CollectionActivity extends BaseActivity {
     }
 
     private void initSortByMenu(){
-        sortMenuBtn = findViewById(R.id.activeBar_sortBtn);
+        sortMenuBtn = findViewById(R.id.actionBar_sortBtn);
         sortMenuBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java

@@ -43,7 +43,7 @@ public class SearchActivity extends BaseActivity implements JAdapter.OnItemClick
 
         ActionBar actionBar = getSupportActionBar();
         if (null != actionBar) {
-            ImageView acb = actionBar.getCustomView().findViewById(R.id.activeBar_searchBtn);
+            ImageView acb = actionBar.getCustomView().findViewById(R.id.actionBar_searchBtn);
             if (null != acb) {
                 acb.setVisibility(View.GONE);
             }

app/src/main/res/layout/activebar_custom.xml

@@ -7,25 +7,23 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:id="@+id/activeBar_back"
+        android:id="@+id/actionBar_back"
         android:layout_width="20dp"
         android:layout_height="match_parent"
         android:background="@drawable/shape_user_focus"
         android:focusable="true"
         android:focusableInTouchMode="true"
-        android:defaultFocusHighlightEnabled="true"
-        android:screenReaderFocusable="true"
         android:src="@drawable/ic_outline_arrow_back_ios_48" />
 
     <ImageView
-        android:id="@+id/activeBar_banner"
+        android:id="@+id/actionBar_banner"
         android:layout_width="100dp"
         android:layout_height="match_parent"
         android:scaleType="fitStart"
         app:srcCompat="@drawable/banner" />
 
     <TextView
-        android:id="@+id/activeBar_title"
+        android:id="@+id/actionBar_title"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/button_margin_left"
@@ -35,7 +33,7 @@
         android:textSize="18dp" />
 
     <TextView
-        android:id="@+id/activeBar_titleTip"
+        android:id="@+id/actionBar_titleTip"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/button_margin_left"
@@ -45,25 +43,37 @@
         android:textSize="18dp" />
 
     <ImageView
-        android:id="@+id/activeBar_searchBtn"
+        android:id="@+id/actionBar_searchBtn"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:focusable="true"
+        android:focusableInTouchMode="true"
         android:background="@drawable/shape_user_focus"
         android:src="@drawable/ic_outline_search_48" />
 
     <TextView
-        android:id="@+id/activeBar_sortBtn"
+        android:id="@+id/actionBar_sortBtn"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginLeft="@dimen/button_margin_left"
-        android:layout_marginRight="@dimen/button_margin_left"
         android:background="@drawable/shape_user_focus"
         android:focusable="true"
+        android:focusableInTouchMode="true"
         android:gravity="center"
         android:minWidth="100dp"
         android:text="排序"
         android:textSize="18dp"
         android:visibility="gone" />
 
+    <ImageView
+        android:id="@+id/actionBar_setBtn"
+        android:layout_width="32dp"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="@dimen/button_margin_left"
+        android:src="@drawable/avatar"
+        android:focusableInTouchMode="true"
+        android:focusable="true"
+        android:scaleType="fitCenter"
+        android:background="@drawable/shape_user_focus" />
+
 </LinearLayout>