diff --git a/app/src/main/java/org/openlp/android2/OpenLP.java b/app/src/main/java/org/openlp/android2/OpenLP.java index b546c4b..71b05a3 100644 --- a/app/src/main/java/org/openlp/android2/OpenLP.java +++ b/app/src/main/java/org/openlp/android2/OpenLP.java @@ -21,17 +21,12 @@ package org.openlp.android2; import android.app.Activity; - import android.app.ActionBar; -import android.app.Fragment; import android.app.FragmentManager; import android.content.Intent; import android.os.Bundle; -import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; import android.support.v4.widget.DrawerLayout; import org.openlp.android2.activities.ConnectionActivity; import org.openlp.android2.activities.SettingsActivity; @@ -78,7 +73,7 @@ public class OpenLP extends Activity fragmentManager.beginTransaction() .replace(R.id.container, HomeFragment.newInstance()) .commit(); - mTitle = getString(R.string.service_list); + mTitle = getString(R.string.home); break; case NavigationOptions.ServiceList: fragmentManager.beginTransaction() @@ -107,26 +102,6 @@ public class OpenLP extends Activity } } - public void onSectionAttached(int number) { - switch (number) { - case 0: - mTitle = getString(R.string.service_list); - break; - case 1: - mTitle = getString(R.string.service_list); - break; - case 2: - mTitle = getString(R.string.live_list); - break; - case 3: - mTitle = getString(R.string.stage_view); - break; - case 4: - mTitle = getString(R.string.live_view); - break; - } - } - public void restoreActionBar() { ActionBar actionBar = getActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); @@ -164,6 +139,13 @@ public class OpenLP extends Activity intent = new Intent(this, ConnectionActivity.class); startActivity(intent); return true; + case R.id.action_refresh: + if (mTitle.equals(R.string.service_list)){ + ServiceListFragment fragment = (ServiceListFragment) + getFragmentManager().findFragmentByTag("ServiceListFragment"); + fragment.refreshDisplay(); + } + return true; case R.id.action_blank: new BlankDisplayDialog().show(getFragmentManager(), "BlankDialog"); return true; @@ -179,44 +161,4 @@ public class OpenLP extends Activity } } - /** - * A placeholder fragment containing a simple view. - */ - public static class PlaceholderFragment extends Fragment { - /** - * The fragment argument representing the section number for this - * fragment. - */ - private static final String ARG_SECTION_NUMBER = "section_number"; - - public PlaceholderFragment() { - } - - /** - * Returns a new instance of this fragment for the given section - * number. - */ - public static PlaceholderFragment newInstance(int sectionNumber) { - PlaceholderFragment fragment = new PlaceholderFragment(); - Bundle args = new Bundle(); - args.putInt(ARG_SECTION_NUMBER, sectionNumber); - fragment.setArguments(args); - return fragment; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View rootView = inflater.inflate(R.layout.fragment_service_list, container, false); - return rootView; - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - ((OpenLP) activity).onSectionAttached( - getArguments().getInt(ARG_SECTION_NUMBER)); - } - } - } diff --git a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java index 734d0dc..e6ca40c 100644 --- a/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java +++ b/app/src/main/java/org/openlp/android2/common/OpenLPFragment.java @@ -56,6 +56,7 @@ abstract public class OpenLPFragment extends ListFragment{ private static AsyncHttpClient client = new AsyncHttpClient(); + protected void refreshDisplay(){} protected void populateDisplay(String responseString) {} protected void processUpdate(String responseString) {} protected void errorDisplay(int statusCode, String responseString) {} diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java index 3295bdb..ad52826 100644 --- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java @@ -20,52 +20,39 @@ *******************************************************************************/ package org.openlp.android2.fragments; -import android.app.Activity; +import android.content.Context; import android.os.Bundle; -import android.app.Fragment; +import android.content.SharedPreferences; +import android.text.Html; +import android.util.Log; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AbsListView; -import android.widget.AdapterView; -import android.widget.ArrayAdapter; import android.widget.ListAdapter; +import android.widget.SimpleAdapter; import android.widget.TextView; +import android.widget.Toast; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import org.openlp.android2.R; +import org.openlp.android2.api.Api; +import org.openlp.android2.common.JsonHelpers; +import org.openlp.android2.common.OpenLPFragment; +import org.openlp.android2.common.OpenLPHttpClient; -import org.openlp.android2.fragments.dummy.DummyContent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; -public class LiveListFragment extends Fragment implements AbsListView.OnItemClickListener { - // TODO: Rename parameter arguments, choose names that match - // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER - private static final String ARG_PARAM1 = "param1"; - private static final String ARG_PARAM2 = "param2"; +public class LiveListFragment extends OpenLPFragment { - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; + private String LOG_TAG = LiveListFragment.class.getName(); - private OnFragmentInteractionListener mListener; - - /** - * The fragment's ListView/GridView. - */ - private AbsListView mListView; - - /** - * The Adapter which will be used to populate the ListView/GridView with - * Views. - */ - private ListAdapter mAdapter; - - // TODO: Rename and change types of parameters public static LiveListFragment newInstance() { LiveListFragment fragment = new LiveListFragment(); - Bundle args = new Bundle(); - //args.putString(ARG_PARAM1, param1); - //args.putString(ARG_PARAM2, param2); - //fragment.setArguments(args); return fragment; } @@ -79,85 +66,106 @@ public class LiveListFragment extends Fragment implements AbsListView.OnItemClic @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + } - if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + context = getActivity(); + updateUrl = Api.LIVE_TEXT; + httpClient = new OpenLPHttpClient(context); + return super.onCreateView(inflater, container, savedInstanceState); + } + + @Override + public void populateDisplay(String json) { + Log.i(LOG_TAG, "populate_display - entry"); + List> aList = new ArrayList>(); + int selected = 0; + + try { + JSONArray items = new JSONObject(json).getJSONObject("results").getJSONArray("slides"); + for (int i = 0; i < items.length(); ++i) { + JSONObject item = items.getJSONObject(i); + + HashMap hm = new HashMap(); + hm.put("tag", item.getString("tag")); + if (item.getString("selected").equals("true")) { + hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); + selected = i; + } else { + hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString()); + } + aList.add(hm); + } + } catch (JSONException e) { + e.printStackTrace(); + } + + // Keys used in Hashmap + String[] from = {"tag", "liveListNormal", "liveListSelected"}; + + // Ids of views in live_list_fragment + int[] to = {R.id.tag, R.id.liveListNormal, R.id.liveListSelected}; + + SharedPreferences prefs = context.getSharedPreferences( + context.getString(R.string.keySharedPreferences), + Context.MODE_PRIVATE); + + final int size = Integer.parseInt(prefs.getString( + context.getString(R.string.keyTextSize), + String.valueOf(context.getResources().getInteger( + R.integer.textSizeDefaultValue)))); + + // Instantiating an adapter to store each items + ListAdapter adapter = new SimpleAdapter(getActivity().getBaseContext(), aList, + R.layout.fragment_livelist, from, to){ + public View getView(int position, View convertView, ViewGroup parent) { + View view = super.getView(position, convertView, parent); + TextView text1 = (TextView) view.findViewById(R.id.liveListNormal); + text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); + TextView text2 = (TextView) view.findViewById(R.id.liveListSelected); + text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); + TextView text3 = (TextView) view.findViewById(R.id.tag); + text3.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); + return view; + + }; + }; + setListAdapter(adapter); + getListView().setSelection(selected - 1); + Log.i(LOG_TAG, "populate_display - exit"); + } + + + @Override + public void refreshDisplay(){ + Log.d(LOG_TAG, "Resuming..."); + triggerTextRequest(Api.LIVE_TEXT); + } + + @Override + public void onResume() { + super.onResume(); + Log.d(LOG_TAG, "Resuming..."); + triggerTextRequest(Api.LIVE_TEXT); + Log.d(LOG_TAG, "Resumed..."); + } + + public void processUpdate(String response) { + triggerTextRequest(Api.LIVE_TEXT); + } + + public void itemClicked(int position) { + try { + String request = JsonHelpers.createRequestJSON("id", Integer.toString(position)); + triggerTextRequest(String.format("%s%s", Api.LIVE_SET, request)); + Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), position(%s)", + Api.LIVE_SET, position)); + Toast.makeText(getActivity().getBaseContext(), "Display Item selected", Toast.LENGTH_SHORT).show(); + } catch (JsonHelpers.JSONHandlerException e) { + e.printStackTrace(); + Toast.makeText(getActivity().getBaseContext(), "Request Failed", Toast.LENGTH_SHORT).show(); } - - // TODO: Change Adapter to display your content - mAdapter = new ArrayAdapter(getActivity(), - android.R.layout.simple_list_item_1, android.R.id.text1, DummyContent.ITEMS); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_livelist, container, false); - - // Set the adapter - mListView = (AbsListView) view.findViewById(android.R.id.list); - ((AdapterView) mListView).setAdapter(mAdapter); - - // Set OnItemClickListener so we can be notified on item clicks - mListView.setOnItemClickListener(this); - - return view; - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - //try { - // mListener = (OnFragmentInteractionListener) activity; - //} catch (ClassCastException e) { - // throw new ClassCastException(activity.toString() - // + " must implement OnFragmentInteractionListener"); - //} - } - - @Override - public void onDetach() { - super.onDetach(); - mListener = null; - } - - - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - if (null != mListener) { - // Notify the active callbacks interface (the activity, if the - // fragment is attached to one) that an item has been selected. - mListener.onFragmentInteraction(DummyContent.ITEMS.get(position).id); - } - } - - /** - * The default content for this Fragment has a TextView that is shown when - * the list is empty. If you would like to change the text, call this method - * to supply the text it should use. - */ - public void setEmptyText(CharSequence emptyText) { - View emptyView = mListView.getEmptyView(); - - if (emptyText instanceof TextView) { - ((TextView) emptyView).setText(emptyText); - } - } - - /** - * This interface must be implemented by activities that contain this - * fragment to allow an interaction in this fragment to be communicated - * to the activity and potentially other fragments contained in that - * activity. - *

- * See the Android Training lesson Communicating with Other Fragments for more information. - */ - public interface OnFragmentInteractionListener { - // TODO: Update argument type and name - public void onFragmentInteraction(String id); } } diff --git a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java index 6ac890f..7524780 100644 --- a/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java +++ b/app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java @@ -33,13 +33,14 @@ import android.widget.*; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.openlp.android2.OpenLP; import org.openlp.android2.R; import org.openlp.android2.api.Api; import org.openlp.android2.common.JsonHelpers; +import org.openlp.android2.common.NavigationOptions; import org.openlp.android2.common.OpenLPFragment; import org.openlp.android2.common.OpenLPHttpClient; -import org.openlp.android2.fragments.dummy.DummyContent; import java.util.ArrayList; import java.util.HashMap; @@ -52,31 +53,11 @@ public class ServiceListFragment extends OpenLPFragment { private boolean noScreenUpdate = false; private boolean isDoubleClick = false; - /** - * The fragment's ListView/GridView. - */ - private AbsListView mListView; - - /** - * The Adapter which will be used to populate the ListView/GridView with - * Views. - */ - private ListAdapter mAdapter; - - /** - * Mandatory empty constructor for the fragment manager to instantiate the - * fragment (e.g. upon screen orientation changes). - */ public ServiceListFragment() { } - // TODO: Rename and change types of parameters public static ServiceListFragment newInstance() { ServiceListFragment fragment = new ServiceListFragment(); - Bundle args = new Bundle(); - //args.putString(ARG_PARAM1, param1); - //args.putString(ARG_PARAM2, param2); - fragment.setArguments(args); return fragment; } @@ -103,7 +84,8 @@ public class ServiceListFragment extends OpenLPFragment { isDoubleClick = true; //((OpenLP) getActivity()).makeBackArrowVisible(true); //((OpenLP) getActivity()).menuVisible(R.id.action_back); - //((OpenLP) getActivity()).selectItem(NavigationOptions.LiveList); + ((OpenLP) getActivity()).onNavigationDrawerItemSelected(NavigationOptions.LiveList); + ((OpenLP) getActivity()).restoreActionBar(); return false; } }; @@ -120,6 +102,12 @@ public class ServiceListFragment extends OpenLPFragment { super.onDetach(); } + @Override + public void refreshDisplay(){ + Log.d(LOG_TAG, "Resuming..."); + triggerTextRequest(Api.SERVICE_LIST); + } + @Override public void onResume() { super.onResume(); @@ -127,6 +115,7 @@ public class ServiceListFragment extends OpenLPFragment { triggerTextRequest(Api.SERVICE_LIST); Log.d(LOG_TAG, "Resumed..."); } + public void processUpdate(String response) { triggerTextRequest(Api.SERVICE_LIST); } @@ -198,19 +187,6 @@ public class ServiceListFragment extends OpenLPFragment { Log.i(LOG_TAG, "populate_display - exit"); } - /** - * The default content for this Fragment has a TextView that is shown when - * the list is empty. If you would like to change the text, call this method - * to supply the text it should use. - */ - public void setEmptyText(CharSequence emptyText) { - View emptyView = mListView.getEmptyView(); - - if (emptyText instanceof TextView) { - ((TextView) emptyView).setText(emptyText); - } - } - public void itemClicked(int position) { try { noScreenUpdate = true; diff --git a/app/src/main/res/drawable-hdpi/ic_alarm_add.png b/app/src/main/res/drawable-hdpi/ic_alarm_add.png index a4b163b..61bdab0 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_alarm_add.png and b/app/src/main/res/drawable-hdpi/ic_alarm_add.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_dvr.png b/app/src/main/res/drawable-hdpi/ic_dvr.png index 6138754..6c034ce 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_dvr.png and b/app/src/main/res/drawable-hdpi/ic_dvr.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_edit.png b/app/src/main/res/drawable-hdpi/ic_edit.png index 6ea4e96..b5f88c8 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_edit.png and b/app/src/main/res/drawable-hdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_image.png b/app/src/main/res/drawable-hdpi/ic_image.png index 2971c79..c837fd8 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_image.png and b/app/src/main/res/drawable-hdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_local_movies.png b/app/src/main/res/drawable-hdpi/ic_local_movies.png index bd7751e..ecc68fe 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_local_movies.png and b/app/src/main/res/drawable-hdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_books.png b/app/src/main/res/drawable-hdpi/ic_my_library_books.png index c7f5699..5f7b9a2 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_my_library_books.png and b/app/src/main/res/drawable-hdpi/ic_my_library_books.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_my_library_music.png b/app/src/main/res/drawable-hdpi/ic_my_library_music.png index b326ce6..151f180 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_my_library_music.png and b/app/src/main/res/drawable-hdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_refresh.png b/app/src/main/res/drawable-hdpi/ic_refresh.png index cd16fdd..c136c59 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_refresh.png and b/app/src/main/res/drawable-hdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png index a2fc5b2..ba65a13 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_search.png and b/app/src/main/res/drawable-hdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings_display.png b/app/src/main/res/drawable-hdpi/ic_settings_display.png index ea8efc7..47f7291 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_settings_display.png and b/app/src/main/res/drawable-hdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_alarm_add.png b/app/src/main/res/drawable-mdpi/ic_alarm_add.png index db26b2f..c3b9b4b 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_alarm_add.png and b/app/src/main/res/drawable-mdpi/ic_alarm_add.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_dvr.png b/app/src/main/res/drawable-mdpi/ic_dvr.png index 613916f..97d697c 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_dvr.png and b/app/src/main/res/drawable-mdpi/ic_dvr.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_edit.png b/app/src/main/res/drawable-mdpi/ic_edit.png index 00e7d07..4e5a3a3 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_edit.png and b/app/src/main/res/drawable-mdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_image.png b/app/src/main/res/drawable-mdpi/ic_image.png index 25d91b4..ec3a011 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_image.png and b/app/src/main/res/drawable-mdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_local_movies.png b/app/src/main/res/drawable-mdpi/ic_local_movies.png index 9272687..5c4e4a3 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_local_movies.png and b/app/src/main/res/drawable-mdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_books.png b/app/src/main/res/drawable-mdpi/ic_my_library_books.png index 6e13c74..d36fb11 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_my_library_books.png and b/app/src/main/res/drawable-mdpi/ic_my_library_books.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_my_library_music.png b/app/src/main/res/drawable-mdpi/ic_my_library_music.png index 3f3b0b7..fe902e0 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_my_library_music.png and b/app/src/main/res/drawable-mdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_refresh.png b/app/src/main/res/drawable-mdpi/ic_refresh.png index 54d4716..5877832 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_refresh.png and b/app/src/main/res/drawable-mdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_search.png b/app/src/main/res/drawable-mdpi/ic_search.png index 9ad0bfe..d51e1e4 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_search.png and b/app/src/main/res/drawable-mdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings_display.png b/app/src/main/res/drawable-mdpi/ic_settings_display.png index 6cb312b..77c95da 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_settings_display.png and b/app/src/main/res/drawable-mdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_alarm_add.png b/app/src/main/res/drawable-xhdpi/ic_alarm_add.png index a287011..fa13e81 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_alarm_add.png and b/app/src/main/res/drawable-xhdpi/ic_alarm_add.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_dvr.png b/app/src/main/res/drawable-xhdpi/ic_dvr.png index 81fca04..a513eb9 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_dvr.png and b/app/src/main/res/drawable-xhdpi/ic_dvr.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_edit.png b/app/src/main/res/drawable-xhdpi/ic_edit.png index 14c9a3c..f8970cb 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_edit.png and b/app/src/main/res/drawable-xhdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_image.png b/app/src/main/res/drawable-xhdpi/ic_image.png index a505137..0a060b5 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_image.png and b/app/src/main/res/drawable-xhdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_local_movies.png b/app/src/main/res/drawable-xhdpi/ic_local_movies.png index 46406a6..3114dec 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_local_movies.png and b/app/src/main/res/drawable-xhdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_books.png b/app/src/main/res/drawable-xhdpi/ic_my_library_books.png index 7ee6c75..212c6f3 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_my_library_books.png and b/app/src/main/res/drawable-xhdpi/ic_my_library_books.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_my_library_music.png b/app/src/main/res/drawable-xhdpi/ic_my_library_music.png index 3f3b0b7..b89a8ad 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_my_library_music.png and b/app/src/main/res/drawable-xhdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh.png b/app/src/main/res/drawable-xhdpi/ic_refresh.png index fe4285f..0afc65f 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh.png and b/app/src/main/res/drawable-xhdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png index c572197..88be1d6 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_search.png and b/app/src/main/res/drawable-xhdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_display.png b/app/src/main/res/drawable-xhdpi/ic_settings_display.png index 26a95e4..5598c13 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_display.png and b/app/src/main/res/drawable-xhdpi/ic_settings_display.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_alarm_add.png b/app/src/main/res/drawable-xxhdpi/ic_alarm_add.png index 4284c77..498049d 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_alarm_add.png and b/app/src/main/res/drawable-xxhdpi/ic_alarm_add.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_dvr.png b/app/src/main/res/drawable-xxhdpi/ic_dvr.png index 3f5f99d..b0ee734 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_dvr.png and b/app/src/main/res/drawable-xxhdpi/ic_dvr.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_edit.png b/app/src/main/res/drawable-xxhdpi/ic_edit.png index 827b684..6ed4351 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_edit.png and b/app/src/main/res/drawable-xxhdpi/ic_edit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_image.png b/app/src/main/res/drawable-xxhdpi/ic_image.png index a2367d4..b69c520 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_image.png and b/app/src/main/res/drawable-xxhdpi/ic_image.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_local_movies.png b/app/src/main/res/drawable-xxhdpi/ic_local_movies.png index 407918a..8002dfb 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_local_movies.png and b/app/src/main/res/drawable-xxhdpi/ic_local_movies.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_books.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_books.png index 179ad65..0d4aa30 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_my_library_books.png and b/app/src/main/res/drawable-xxhdpi/ic_my_library_books.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png b/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png index 1d7249f..e583029 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png and b/app/src/main/res/drawable-xxhdpi/ic_my_library_music.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh.png b/app/src/main/res/drawable-xxhdpi/ic_refresh.png index 72128fe..7891eff 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh.png and b/app/src/main/res/drawable-xxhdpi/ic_refresh.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png index 0bbeab1..9424ae9 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search.png and b/app/src/main/res/drawable-xxhdpi/ic_search.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_display.png b/app/src/main/res/drawable-xxhdpi/ic_settings_display.png index bdf9957..1cd2828 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_display.png and b/app/src/main/res/drawable-xxhdpi/ic_settings_display.png differ diff --git a/app/src/main/res/layout/fragment_livelist_list.xml b/app/src/main/res/layout/fragment_livelist_list.xml index 145d4c2..4b075e3 100644 --- a/app/src/main/res/layout/fragment_livelist_list.xml +++ b/app/src/main/res/layout/fragment_livelist_list.xml @@ -1,19 +1,40 @@ - - - - - - + android:orientation="horizontal" + android:smoothScrollbar="true" + android:clickable="false" + android:longClickable="false"> + + + +