From 7ef3d9850fa3a03eddcdf705fabda6e7794323b0 Mon Sep 17 00:00:00 2001
From: sifacaii <sifacai@outlook.com>
Date: Fri, 2 Sep 2022 18:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetDropDown.xml            |  17 ----------
 .../org/sifacai/vlcjellyfin/BaseActivity.java |  30 ++++++++++--------
 .../vlcjellyfin/CollectionActivity.java       |   4 +--
 .../sifacai/vlcjellyfin/SearchActivity.java   |   2 +-
 app/src/main/res/drawable/avatar.png          | Bin 0 -> 1637 bytes
 app/src/main/res/layout/activebar_custom.xml  |  28 ++++++++++------
 6 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 app/src/main/res/drawable/avatar.png

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 4923905..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java
index 72e0fc5..1eb3d6e 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/BaseActivity.java
+++ b/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
-    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
-        getMenuInflater().inflate(R.menu.activebar_menu, menu);
-        return super.onCreateOptionsMenu(menu);
+    private void actionBarSetBtnOnclick(){
+
     }
 
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        if (item.getItemId() == R.id.activeBar_option_logout) {
-            logout();
-        }
-        return super.onOptionsItemSelected(item);
-    }
+//    @Override
+//    public boolean onCreateOptionsMenu(@NonNull Menu menu) {
+//        getMenuInflater().inflate(R.menu.activebar_menu, menu);
+//        return super.onCreateOptionsMenu(menu);
+//    }
+//
+//    @Override
+//    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+//        if (item.getItemId() == R.id.activeBar_option_logout) {
+//            logout();
+//        }
+//        return super.onOptionsItemSelected(item);
+//    }
 
     /**
      * 禁用标题栏返回按钮
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java
index 0dc1c00..7ae68b3 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/CollectionActivity.java
+++ b/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) {
diff --git a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java b/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java
index fecca65..f59a4ef 100644
--- a/app/src/main/java/org/sifacai/vlcjellyfin/SearchActivity.java
+++ b/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);
             }
diff --git a/app/src/main/res/drawable/avatar.png b/app/src/main/res/drawable/avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..4023d1c5c7775388429a9f7b252fe0971320b75e
GIT binary patch
literal 1637
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
B&~pF)

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activebar_custom.xml b/app/src/main/res/layout/activebar_custom.xml
index d0478bb..e1fe872 100644
--- a/app/src/main/res/layout/activebar_custom.xml
+++ b/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>
\ No newline at end of file