diff --git a/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java b/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java index 01a080f83..394de355e 100644 --- a/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java +++ b/app/src/main/java/io/pslab/fragment/InstrumentsFragment.java @@ -3,7 +3,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Configuration; -import android.os.AsyncTask; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; @@ -14,6 +13,9 @@ import android.view.View; import android.view.ViewGroup; +import java.util.ArrayList; +import java.util.List; + import io.pslab.R; import io.pslab.activity.AccelerometerActivity; import io.pslab.activity.BarometerActivity; @@ -34,9 +36,6 @@ import io.pslab.adapters.ApplicationAdapter; import io.pslab.items.ApplicationItem; -import java.util.ArrayList; -import java.util.List; - /** * Created by viveksb007 on 29/3/17. @@ -97,7 +96,7 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou intent = new Intent(context, GasSensorActivity.class); if (applicationName.equals(getString(R.string.dust_sensor))) intent = new Intent(context, DustSensorActivity.class); - if(applicationName.equals(getString(R.string.sound_meter))) + if (applicationName.equals(getString(R.string.sound_meter))) intent = new Intent(context, SoundMeterActivity.class); if (intent != null) startActivity(intent); @@ -106,7 +105,7 @@ public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGrou == Configuration.ORIENTATION_PORTRAIT ? 1 : 2; initiateViews(view, rows); - new loadList().execute(); + return view; } @@ -117,17 +116,16 @@ private void initiateViews(View view, int rows) { RecyclerView listView = view.findViewById(R.id.applications_recycler_view); RecyclerView.LayoutManager mLayoutManager = new GridLayoutManager(context, rows); listView.setLayoutManager(mLayoutManager); - listView.setItemAnimator(new DefaultItemAnimator()); - listView.setAdapter(applicationAdapter); + new LoadList().doTask(listView); + } /** - * Generate an array of Application Items and add them to the adapter in background + * Generate an array of Application Items and add them to the adapter */ - private class loadList extends AsyncTask { + private class LoadList { - @Override - protected Void doInBackground(Void... params) { + private void doTask(RecyclerView listView) { int[] descriptions = new int[]{ R.string.oscilloscope_description, @@ -196,13 +194,9 @@ protected Void doInBackground(Void... params) { applicationItemList.add(new ApplicationItem( getString(R.string.sound_meter), R.drawable.tile_icon_gas, getString(descriptions[15]) )); - return null; - } + listView.setItemAnimator(new DefaultItemAnimator()); + listView.setAdapter(applicationAdapter); - @Override - protected void onPostExecute(Void aVoid) { - super.onPostExecute(aVoid); - applicationAdapter.notifyDataSetChanged(); } }