aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-22 08:04:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Version 1.16.5 - new icon

Browse Source
This commit is contained in:
Aleksander Nowakowski
2016-07-12 13:01:56 +02:00
parent 310e2c1d8c
commit b0057a2587
22 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/src/main/java/no/nordicsemi/android/nrftoolbox/FeaturesActivity.java
View File

@@ -52,11 +52,11 @@ import java.util.List;
import no.nordicsemi.android.nrftoolbox.adapter.AppAdapter;
public class FeaturesActivity extends AppCompatActivity {
private static final String MCP_CATEGORY = "no.nordicsemi.android.nrftoolbox.LAUNCHER";
private static final String NRF_CONNECT_CATEGORY = "no.nordicsemi.android.nrftoolbox.LAUNCHER";
private static final String UTILS_CATEGORY = "no.nordicsemi.android.nrftoolbox.UTILS";
private static final String MCP_PACKAGE = "no.nordicsemi.android.mcp";
private static final String MCP_CLASS = MCP_PACKAGE + ".DeviceListActivity";
private static final String MCP_MARKET_URI = "market://details?id=no.nordicsemi.android.mcp";
private static final String NRF_CONNECT_PACKAGE = "no.nordicsemi.android.mcp";
private static final String NRF_CONNECT_CLASS = NRF_CONNECT_PACKAGE + ".DeviceListActivity";
private static final String NRF_CONNECT_MARKET_URI = "market://details?id=no.nordicsemi.android.mcp";
private DrawerLayout mDrawerLayout;
private ActionBarDrawerToggle mDrawerToggle;
@@ -137,26 +137,26 @@ public class FeaturesActivity extends AppCompatActivity {
final LayoutInflater inflater = LayoutInflater.from(this);
final PackageManager pm = getPackageManager();
// look for Master Control Panel
final Intent mcpIntent = new Intent(Intent.ACTION_MAIN);
mcpIntent.addCategory(MCP_CATEGORY);
mcpIntent.setClassName(MCP_PACKAGE, MCP_CLASS);
final ResolveInfo mcpInfo = pm.resolveActivity(mcpIntent, 0);
// look for nRF Connect
final Intent nrfConnectIntent = new Intent(Intent.ACTION_MAIN);
nrfConnectIntent.addCategory(NRF_CONNECT_CATEGORY);
nrfConnectIntent.setClassName(NRF_CONNECT_PACKAGE, NRF_CONNECT_CLASS);
final ResolveInfo nrfConnectInfo = pm.resolveActivity(nrfConnectIntent, 0);
// configure link to Master Control Panel
final TextView mcpItem = (TextView) container.findViewById(R.id.link_mcp);
if (mcpInfo == null) {
mcpItem.setTextColor(Color.GRAY);
// configure link to nRF Connect
final TextView nrfConnectItem = (TextView) container.findViewById(R.id.link_mcp);
if (nrfConnectInfo == null) {
nrfConnectItem.setTextColor(Color.GRAY);
ColorMatrix grayscale = new ColorMatrix();
grayscale.setSaturation(0.0f);
mcpItem.getCompoundDrawables()[0].mutate().setColorFilter(new ColorMatrixColorFilter(grayscale));
nrfConnectItem.getCompoundDrawables()[0].mutate().setColorFilter(new ColorMatrixColorFilter(grayscale));
}
mcpItem.setOnClickListener(new View.OnClickListener() {
nrfConnectItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(final View v) {
Intent action = mcpIntent;
if (mcpInfo == null)
action = new Intent(Intent.ACTION_VIEW, Uri.parse(MCP_MARKET_URI));
Intent action = nrfConnectIntent;
if (nrfConnectInfo == null)
action = new Intent(Intent.ACTION_VIEW, Uri.parse(NRF_CONNECT_MARKET_URI));
action.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
action.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/adapter/AppAdapter.java
View File

@@ -41,7 +41,7 @@ import no.nordicsemi.android.nrftoolbox.R;
public class AppAdapter extends BaseAdapter {
private static final String CATEGORY = "no.nordicsemi.android.nrftoolbox.LAUNCHER";
private static final String MCP_PACKAGE = "no.nordicsemi.android.mcp";
private static final String NRF_CONNECT_PACKAGE = "no.nordicsemi.android.mcp";
private final Context mContext;
private final PackageManager mPackageManager;
@@ -60,7 +60,7 @@ public class AppAdapter extends BaseAdapter {
final List<ResolveInfo> appList = mApplications = pm.queryIntentActivities(intent, 0);
// TODO remove the following loop after some time, when there will be no more MCP 1.1 at the market.
for (final ResolveInfo info : appList) {
if (MCP_PACKAGE.equals(info.activityInfo.packageName)) {
if (NRF_CONNECT_PACKAGE.equals(info.activityInfo.packageName)) {
appList.remove(info);
break;
}