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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 0000000..4023d1c
Binary files /dev/null and b/app/src/main/res/drawable/avatar.png differ
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">
+
+
\ No newline at end of file