anonfunc/LedD-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed wrong icon used when adding a new profile

Browse Source
This commit is contained in:
Giovanni Harting
2016-05-15 15:19:35 +02:00
parent 6c8e7bbfa0
commit 86282e6872
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@@ -77,15 +77,16 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:23.3.0' compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-v4:23.3.0' compile 'com.android.support:support-v4:23.4.0'
compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.jakewharton.timber:timber:4.1.2'
compile 'com.google.code.gson:gson:2.6.2' compile 'com.google.code.gson:gson:2.6.2'
compile 'com.jakewharton:butterknife:8.0.1' compile 'com.jakewharton:butterknife:8.0.1'
apt 'com.jakewharton:butterknife-compiler:8.0.1' apt 'com.jakewharton:butterknife-compiler:8.0.1'
compile 'net.hockeyapp.android:HockeySDK:4.0.0' compile 'net.hockeyapp.android:HockeySDK:4.0.0'
compile 'com.koushikdutta.async:androidasync:2.1.7' compile 'com.koushikdutta.async:androidasync:2.1.7'
compile 'com.android.support:design:23.3.0' compile 'com.android.support:design:23.4.0'
compile(name: 'holo-color-picker', ext: 'aar') compile(name: 'holo-color-picker', ext: 'aar')
compile 'com.google.guava:guava:19.0' compile 'com.google.guava:guava:19.0'
compile 'com.thetransactioncompany:jsonrpc2-base:1.38' compile 'com.thetransactioncompany:jsonrpc2-base:1.38'

6
app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
View File

@@ -74,6 +74,7 @@ import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import timber.log.Timber;
public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerItemClickListener, Drawer.OnDrawerItemLongClickListener, OnCheckedChangeListener { public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerItemClickListener, Drawer.OnDrawerItemLongClickListener, OnCheckedChangeListener {
@@ -106,6 +107,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_color); setContentView(R.layout.activity_color);
ButterKnife.bind(this); ButterKnife.bind(this);
Timber.asTree();
// check for connectivity // check for connectivity
ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -338,6 +340,8 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
@Override @Override
public boolean onItemLongClick(View view, int position, IDrawerItem drawerItem) { public boolean onItemLongClick(View view, int position, IDrawerItem drawerItem) {
Timber.d("Longclick of %s", drawerItem.getClass().getName());
return false; return false;
} }
@@ -350,7 +354,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
profiles.add(profile); profiles.add(profile);
List<IDrawerItem> subProfiles = menuProfiles.getSubItems(); List<IDrawerItem> subProfiles = menuProfiles.getSubItems();
subProfiles.add(0, new SecondaryDrawerItem().withName(profile.getName()).withSelectable(false).withTag(profile.getValues()).withIcon(R.drawable.ic_save_black_48dp)); subProfiles.add(0, new SecondaryDrawerItem().withName(profile.getName()).withSelectable(false).withTag(profile.getValues()).withIcon(R.drawable.ic_note_black_48dp));
menuProfiles.withSubItems(subProfiles).withIsExpanded(true).withBadge(String.valueOf(profiles.size())); menuProfiles.withSubItems(subProfiles).withIsExpanded(true).withBadge(String.valueOf(profiles.size()));
mDrawer.updateItem(menuProfiles); mDrawer.updateItem(menuProfiles);