demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Renamed a few variables in FwAppInstallerActivity

Browse Source
This commit is contained in:
TaaviE
2020-10-11 19:16:31 +03:00
parent 1bcca41000
commit 42b7dd6d2a
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/FwAppInstallerActivity.java
+37 -35
View File
@@ -31,14 +31,15 @@ import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.core.app.NavUtils;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import androidx.core.app.NavUtils;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.adapter.ItemWithDetailsAdapter; import nodomain.freeyourgadget.gadgetbridge.adapter.ItemWithDetailsAdapter;
@@ -64,16 +65,16 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
private InstallHandler installHandler; private InstallHandler installHandler;
private boolean mayConnect; private boolean mayConnect;
private ProgressBar mProgressBar; private ProgressBar progressBar;
private ListView itemListView; private ListView itemListView;
private final List<ItemWithDetails> mItems = new ArrayList<>(); private final List<ItemWithDetails> items = new ArrayList<>();
private ItemWithDetailsAdapter mItemAdapter; private ItemWithDetailsAdapter itemAdapter;
private ListView detailsListView; private ListView detailsListView;
private ItemWithDetailsAdapter mDetailsItemAdapter; private ItemWithDetailsAdapter detailsAdapter;
private ArrayList<ItemWithDetails> mDetails = new ArrayList<>(); private ArrayList<ItemWithDetails> details = new ArrayList<>();
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver receiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
@@ -103,11 +104,11 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
private void refreshBusyState(GBDevice dev) { private void refreshBusyState(GBDevice dev) {
if (dev.isConnecting() || dev.isBusy()) { if (dev.isConnecting() || dev.isBusy()) {
mProgressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
} else { } else {
boolean wasBusy = mProgressBar.getVisibility() != View.GONE; boolean wasBusy = progressBar.getVisibility() != View.GONE;
if (wasBusy) { if (wasBusy) {
mProgressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
// done! // done!
} }
} }
@@ -134,28 +135,29 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
device = dev; device = dev;
} }
if (savedInstanceState != null) { if (savedInstanceState != null) {
mDetails = savedInstanceState.getParcelableArrayList(ITEM_DETAILS); details = savedInstanceState.getParcelableArrayList(ITEM_DETAILS);
if (mDetails == null) { if (details == null) {
mDetails = new ArrayList<>(); details = new ArrayList<>();
} }
} }
mayConnect = true; mayConnect = true;
itemListView = (ListView) findViewById(R.id.itemListView); itemListView = findViewById(R.id.itemListView);
mItemAdapter = new ItemWithDetailsAdapter(this, mItems); itemAdapter = new ItemWithDetailsAdapter(this, items);
itemListView.setAdapter(mItemAdapter); itemListView.setAdapter(itemAdapter);
fwAppInstallTextView = (TextView) findViewById(R.id.infoTextView); fwAppInstallTextView = findViewById(R.id.infoTextView);
installButton = (Button) findViewById(R.id.installButton); installButton = findViewById(R.id.installButton);
mProgressBar = (ProgressBar) findViewById(R.id.installProgressBar); progressBar = findViewById(R.id.installProgressBar);
detailsListView = (ListView) findViewById(R.id.detailsListView); detailsListView = findViewById(R.id.detailsListView);
mDetailsItemAdapter = new ItemWithDetailsAdapter(this, mDetails); detailsAdapter = new ItemWithDetailsAdapter(this, details);
mDetailsItemAdapter.setSize(ItemWithDetailsAdapter.SIZE_SMALL); detailsAdapter.setSize(ItemWithDetailsAdapter.SIZE_SMALL);
detailsListView.setAdapter(mDetailsItemAdapter); detailsListView.setAdapter(detailsAdapter);
setInstallEnabled(false); setInstallEnabled(false);
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(GBDevice.ACTION_DEVICE_CHANGED); filter.addAction(GBDevice.ACTION_DEVICE_CHANGED);
filter.addAction(GB.ACTION_DISPLAY_MESSAGE); filter.addAction(GB.ACTION_DISPLAY_MESSAGE);
LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter); LocalBroadcastManager.getInstance(this).registerReceiver(receiver, filter);
installButton.setOnClickListener(new View.OnClickListener() { installButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
@@ -167,7 +169,7 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
}); });
uri = getIntent().getData(); uri = getIntent().getData();
if (uri == null) { //for "share" intent if (uri == null) { // For "share" intent
uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM); uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
} }
installHandler = findInstallHandlerFor(uri); installHandler = findInstallHandlerFor(uri);
@@ -188,7 +190,7 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
@Override @Override
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putParcelableArrayList(ITEM_DETAILS, mDetails); outState.putParcelableArrayList(ITEM_DETAILS, details);
} }
private InstallHandler findInstallHandlerFor(Uri uri) { private InstallHandler findInstallHandlerFor(Uri uri) {
@@ -236,7 +238,7 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
@Override @Override
protected void onDestroy() { protected void onDestroy() {
LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver); LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver);
super.onDestroy(); super.onDestroy();
} }
@@ -259,19 +261,19 @@ public class FwAppInstallerActivity extends AbstractGBActivity implements Instal
@Override @Override
public void clearInstallItems() { public void clearInstallItems() {
mItems.clear(); items.clear();
mItemAdapter.notifyDataSetChanged(); itemAdapter.notifyDataSetChanged();
} }
@Override @Override
public void setInstallItem(ItemWithDetails item) { public void setInstallItem(ItemWithDetails item) {
mItems.clear(); items.clear();
mItems.add(item); items.add(item);
mItemAdapter.notifyDataSetChanged(); itemAdapter.notifyDataSetChanged();
} }
private void addMessage(String message, int severity) { private void addMessage(String message, int severity) {
mDetails.add(new GenericItem(message)); details.add(new GenericItem(message));
mDetailsItemAdapter.notifyDataSetChanged(); detailsAdapter.notifyDataSetChanged();
} }
} }