Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
fix menu flickering
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgallard
lgallard committed Jan 12, 2020
1 parent 42ff479 commit 11edf71
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 91 deletions.
3 changes: 3 additions & 0 deletions app/src/main/java/com/lgallardo/qbittorrentclient/DrawerItemRecyclerViewAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,9 @@ public void refreshDrawer() {
DrawerItemRecyclerViewAdapter.items.addAll(DrawerItemRecyclerViewAdapter.settingsItems);
DrawerItemRecyclerViewAdapter.items.addAll(DrawerItemRecyclerViewAdapter.categoryItems);

// Close servers
removeServerItems();

// Refresh
notifyDataSetChanged();

Expand Down
137 changes: 46 additions & 91 deletions app/src/main/java/com/lgallardo/qbittorrentclient/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import android.provider.Settings;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
Expand Down Expand Up @@ -556,51 +557,6 @@ public void onDrawerOpened(View drawerView) {
super.onDrawerOpened(drawerView);
// getSupportActionBar().setTitle(drawerTitle);
// setTitle(R.string.app_shortname);

// Categories
String category = null;

final ArrayList<DrawerItem> categoryItems = new ArrayList<DrawerItem>();

// Set uncategorized first

// Add category
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_categories, getResources().getString(R.string.drawer_category_categories), DRAWER_CATEGORIES, true, "categories"));

// Add All
category = getResources().getString(R.string.drawer_category_all);
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, category, DRAWER_CATEGORY, (currentCategory.equals(category)), "category"));

// Add uncategorized
// TODO: Uncomment to enable uncategorized item
// category = getResources().getString(R.string.drawer_category_uncategorized);
//

getCategoryListV(new CategoriesListCallBack() {
@Override
public void onSuccess(List<Category> categories) {
Log.d("Debug", "[getCategoryListV] onSuccess");

String name, savePath;

for (int i = 0; i < categories.size(); i++) {

name = categories.get(i).getName();
savePath = categories.get(i).getSavePath();

// Log.d("Debug", "[getCategoryListV] Name: " + name);
// Log.d("Debug", "[getCategoryListV] Save Path: " + savePath);

// Add category name to the drawer menu
if (name != null && !name.equals("")) {
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, name, DRAWER_CATEGORY, currentCategory.equals(name), "category"));
}
}

rAdapter.refreshDrawerCategories(categoryItems);
}
});

}
};

Expand Down Expand Up @@ -2836,7 +2792,7 @@ private List getTorrentListV(final String state, final String category, final To
@Override
public void onResponse(JSONArray response) {

// Log.d("Debug: ", "[getTorrentListV] onResponse");
// Log.d("Debug: ", "[getTorrentListV] onResponse");

// Get list type to parse it
Type listType = new TypeToken<List<Torrent>>() {
Expand Down Expand Up @@ -3915,48 +3871,50 @@ public void onSuccess(List<Torrent> torrents) {

}

// // Categories
// final ArrayList<DrawerItem> categoryItems = new ArrayList<DrawerItem>();
//
// // Set uncategorized first
//
// // Add category
// categoryItems.add(new DrawerItem(R.drawable.ic_drawer_categories, getResources().getString(R.string.drawer_category_categories), DRAWER_CATEGORIES, true, "categories"));
//
// // Add All
// category = getResources().getString(R.string.drawer_category_all);
// categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, category, DRAWER_CATEGORY, (currentCategory.equals(category)), "category"));
//
// // Add uncategorized
// // TODO: Uncomment to enable uncategorized item
//// category = getResources().getString(R.string.drawer_category_uncategorized);
//// categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, category, DRAWER_CATEGORY, currentCategory.equals(category) || currentCategory.equals(""), "category"));
//
//
// getCategoryListV(new CategoriesListCallBack() {
// @Override
// public void onSuccess(List<Category> categories) {
// Log.d("Debug", "[getCategoryListV] onSuccess");
//
// String name, savePath;
//
// for (int i = 0; i < categories.size(); i++) {
//
// name = categories.get(i).getName();
// savePath = categories.get(i).getSavePath();
//
//// Log.d("Debug", "[getCategoryListV] Name: " + name);
//// Log.d("Debug", "[getCategoryListV] Save Path: " + savePath);
//
// // Add category name to the drawer menu
// if (name != null && !name.equals("")) {
// categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, name, DRAWER_CATEGORY, currentCategory.equals(name), "category"));
// }
// }
//
// rAdapter.refreshDrawerCategories(categoryItems);
// }
// });
// Categories
final ArrayList<DrawerItem> categoryItems = new ArrayList<DrawerItem>();

// Set uncategorized first

// Add category
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_categories, getResources().getString(R.string.drawer_category_categories), DRAWER_CATEGORIES, true, "categories"));

// Add All
category = getResources().getString(R.string.drawer_category_all);
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, category, DRAWER_CATEGORY, (currentCategory.equals(category)), "category"));

// Add uncategorized
// TODO: Uncomment to enable uncategorized item
// category = getResources().getString(R.string.drawer_category_uncategorized);
// categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, category, DRAWER_CATEGORY, currentCategory.equals(category) || currentCategory.equals(""), "category"));

if (!drawerLayout.isDrawerOpen(GravityCompat.START)) {

getCategoryListV(new CategoriesListCallBack() {
@Override
public void onSuccess(List<Category> categories) {
Log.d("Debug", "[getCategoryListV] onSuccess");

String name, savePath;

for (int i = 0; i < categories.size(); i++) {

name = categories.get(i).getName();
savePath = categories.get(i).getSavePath();

// Log.d("Debug", "[getCategoryListV] Name: " + name);
// Log.d("Debug", "[getCategoryListV] Save Path: " + savePath);

// Add category name to the drawer menu
if (name != null && !name.equals("")) {
categoryItems.add(new DrawerItem(R.drawable.ic_drawer_subitem, name, DRAWER_CATEGORY, currentCategory.equals(name), "category"));
}
}

rAdapter.refreshDrawerCategories(categoryItems);
}
});
}

// Sort by filename
if (sortby_value == SORTBY_NAME) {
Expand Down Expand Up @@ -4330,9 +4288,6 @@ public void onSuccess(List<Torrent> torrents) {
item.setName(name);
actionItems.set(6, item);

// Refresh drawer
rAdapter.refreshDrawer();

// Send report
emailReport();

Expand Down

0 comments on commit 11edf71

Please sign in to comment.