Skip to content
Snippets Groups Projects
Commit 98e01921 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Remove focus helpers

parent e9dc1405
No related branches found
No related tags found
No related merge requests found
......@@ -59,15 +59,6 @@ public class HistoryFragment extends MediaBrowserFragment implements IRefreshabl
mHistoryAdapter = new HistoryAdapter();
}
private void focusHelper(boolean idIsEmpty) {
MainActivity main = (MainActivity)getActivity();
if (main == null)
return;
main.setMenuFocusDown(idIsEmpty, android.R.id.list);
main.setSearchAsFocusDown(idIsEmpty, getView(),
android.R.id.list);
}
@Override
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
......@@ -84,7 +75,6 @@ public class HistoryFragment extends MediaBrowserFragment implements IRefreshabl
mRecyclerView.setNextFocusRightId(android.R.id.list);
if (AndroidUtil.isHoneycombOrLater())
mRecyclerView.setNextFocusForwardId(android.R.id.list);
focusHelper(mHistoryAdapter.getItemCount() == 0);
mRecyclerView.requestFocus();
registerForContextMenu(mRecyclerView);
......@@ -151,14 +141,11 @@ public class HistoryFragment extends MediaBrowserFragment implements IRefreshabl
public void handleMessage(Message msg) {
switch (msg.what){
case UPDATE_LIST:
focusHelper(mHistoryAdapter.isEmpty());
mHistoryAdapter.setList((ArrayList<MediaWrapper>) msg.obj);
updateEmptyView();
if( mHistoryAdapter != null ) {
mHistoryAdapter.notifyDataSetChanged();
focusHelper(mHistoryAdapter.getItemCount() == 0);
} else
focusHelper(true);
}
mSwipeRefreshLayout.setRefreshing(false);
getActivity().supportInvalidateOptionsMenu();
}
......
......@@ -268,7 +268,6 @@ public class AudioBrowserFragment extends MediaBrowserFragment implements SwipeR
updateLists();
else {
updateEmptyView(mViewPager.getCurrentItem());
focusHelper(false, mLists.get(mViewPager.getCurrentItem()).getId());
}
mMediaLibrary.addUpdateHandler(mHandler);
mMediaLibrary.setBrowser(this);
......@@ -282,20 +281,6 @@ public class AudioBrowserFragment extends MediaBrowserFragment implements SwipeR
updatePlaylists();
}
private void focusHelper(final boolean idIsEmpty, final int listId) {
final View parent = getView();
final MainActivity main = (MainActivity)getActivity();
if (main == null)
return;
main.runOnUiThread(new Runnable() {
@Override
public void run() {
main.setMenuFocusDown(false, R.id.header);
main.setSearchAsFocusDown(idIsEmpty, parent, listId);
}
});
}
// Focus support. Start.
View.OnKeyListener keyListener = new View.OnKeyListener() {
@Override
......@@ -324,10 +309,6 @@ public class AudioBrowserFragment extends MediaBrowserFragment implements SwipeR
ListView vList = (ListView) mLists.get(newPosition);
mViewPager.setCurrentItem(newPosition);
((MainActivity)getActivity()).setSearchAsFocusDown(
vList.getCount() == 0, getView(),
vList.getId());
}
}
......@@ -647,7 +628,6 @@ public class AudioBrowserFragment extends MediaBrowserFragment implements SwipeR
for (View v : mLists)
((ListView)v).setFastScrollEnabled(true);
}
focusHelper(false, R.id.artists_list);
mHandler.removeMessages(MSG_LOADING);
mSwipeRefreshLayout.setRefreshing(false);
mDisplaying = false;
......@@ -809,7 +789,6 @@ public class AudioBrowserFragment extends MediaBrowserFragment implements SwipeR
updateEmptyView(mViewPager.getCurrentItem());
mSwipeRefreshLayout.setRefreshing(false);
mTabLayout.setVisibility(View.GONE);
focusHelper(true, R.id.artists_list);
} else {
mTabLayout.setVisibility(View.VISIBLE);
mHandler.sendEmptyMessageDelayed(MSG_LOADING, 300);
......
......@@ -317,7 +317,6 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
}
mAdapter.notifyDataSetChanged();
parseSubDirectories();
focusHelper();
if (mFAB != null) {
if (mAdapter.getMediaCount() > 0) {
mFAB.setVisibility(View.VISIBLE);
......@@ -394,15 +393,6 @@ public abstract class BaseBrowserFragment extends MediaBrowserFragment implement
}
}
protected void focusHelper() {
if (getActivity() == null || !(getActivity() instanceof MainActivity))
return;
boolean isEmpty = mAdapter.isEmpty();
MainActivity main = (MainActivity) getActivity();
main.setMenuFocusDown(isEmpty, R.id.network_list);
main.setSearchAsFocusDown(isEmpty, getView(), R.id.network_list);
}
public void clear(){
mAdapter.clear();
}
......
......@@ -36,7 +36,6 @@ import android.widget.ImageView;
import android.widget.TextView;
import org.videolan.vlc.R;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.helpers.UiTools;
import org.videolan.vlc.interfaces.IHistory;
import org.videolan.vlc.media.MediaDatabase;
......@@ -83,7 +82,6 @@ public class MRLPanelFragment extends Fragment implements IHistory, View.OnKeyLi
public void onStart(){
super.onStart();
getActivity().supportInvalidateOptionsMenu();
focusHelper(mAdapter.isEmpty());
}
private void updateHistory() {
......@@ -127,12 +125,6 @@ public class MRLPanelFragment extends Fragment implements IHistory, View.OnKeyLi
return false;
}
private void focusHelper(boolean idIsEmpty) {
MainActivity main = (MainActivity)getActivity();
main.setMenuFocusDown(idIsEmpty, R.id.mrl_list);
main.setSearchAsFocusDown(idIsEmpty, mRootView, R.id.mrl_list);
}
public boolean isEmpty(){
return mAdapter.isEmpty();
}
......
......@@ -183,7 +183,6 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
updateList();
else {
mViewNomedia.setVisibility(View.GONE);
focusHelper(false);
}
//Get & set times
ArrayMap<String, Long> times = MediaDatabase.getInstance().getVideoTimes();
......@@ -388,16 +387,6 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
mVideoAdapter.update(item);
}
private void focusHelper(boolean idIsEmpty) {
View parent = getView();
if (getActivity() == null || !(getActivity() instanceof MainActivity))
return;
MainActivity activity = (MainActivity)getActivity();
activity.setMenuFocusDown(idIsEmpty, android.R.id.list);
activity.setSearchAsFocusDown(idIsEmpty, parent,
android.R.id.list);
}
public void updateList() {
if (!mSwipeRefreshLayout.isRefreshing())
mSwipeRefreshLayout.setRefreshing(true);
......@@ -438,8 +427,7 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
display();
}
});
} else
focusHelper(true);
}
stopRefresh();
}
......@@ -520,7 +508,6 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
mViewNomedia.setVisibility(mVideoAdapter.getItemCount() > 0 ? View.GONE : View.VISIBLE);
mReadyToDisplay = true;
mGridView.requestFocus();
focusHelper(false);
}
});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment