Skip to content

Main Tiles Resolved #2132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2020
Merged

Main Tiles Resolved #2132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2988f76
Main Screen Tiles Fixed
Shivam7-1 Jun 2, 2020
4e4bdad
Merge pull request #3 from fossasia/development
nileshteji Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions app/src/main/java/io/pslab/fragment/InstrumentsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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);
Expand All @@ -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;
}

Expand All @@ -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<Void, Void, Void> {
private class LoadList {

@Override
protected Void doInBackground(Void... params) {
private void doTask(RecyclerView listView) {

int[] descriptions = new int[]{
R.string.oscilloscope_description,
Expand Down Expand Up @@ -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();
}
}

Expand Down