mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 12:47:43 +00:00
Code Issues Releases Wiki Activity

Use butterknife for view binding

Browse Source 
Summary: Use butterknife for view binding

Reviewers: #kde_connect, nicolasfella

Reviewed By: #kde_connect, nicolasfella

Subscribers: nicolasfella, kdeconnect

Tags: #kde_connect

Differential Revision: https://phabricator.kde.org/D17411
This commit is contained in:
Erik Duisters 2018-12-07 19:04:34 +01:00
parent 4158956dd9
commit 9f498f8127
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -80,6 +80,9 @@ dependencies {
implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation
implementation 'com.jakewharton:butterknife:9.0.0-rc2'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc2'
// Testing // Testing
androidTestImplementation 'org.mockito:mockito-core:1.10.19' androidTestImplementation 'org.mockito:mockito-core:1.10.19'
androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1'// Because mockito has some problems with dex environment androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1'// Because mockito has some problems with dex environment

23
src/org/kde/kdeconnect/UserInterface/MainActivity.java
View File

@ -34,6 +34,9 @@ import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import butterknife.BindView;
import butterknife.ButterKnife;
public class MainActivity extends AppCompatActivity { public class MainActivity extends AppCompatActivity {
private static final int MENU_ENTRY_ADD_DEVICE = 1; //0 means no-selection private static final int MENU_ENTRY_ADD_DEVICE = 1; //0 means no-selection
@ -50,8 +53,10 @@ public class MainActivity extends AppCompatActivity {
public static final String PAIRING_ACCEPTED = "accepted"; public static final String PAIRING_ACCEPTED = "accepted";
public static final String PAIRING_REJECTED = "rejected"; public static final String PAIRING_REJECTED = "rejected";
private NavigationView mNavigationView; @BindView(R.id.navigation_drawer) NavigationView mNavigationView;
private DrawerLayout mDrawerLayout; @BindView(R.id.drawer_layout) DrawerLayout mDrawerLayout;
@BindView(R.id.toolbar) Toolbar mToolbar;
TextView mNavViewDeviceName;
private String mCurrentDevice; private String mCurrentDevice;
private int mCurrentMenuEntry; private int mCurrentMenuEntry;
@ -69,12 +74,13 @@ public class MainActivity extends AppCompatActivity {
ThemeUtil.setUserPreferredTheme(this); ThemeUtil.setUserPreferredTheme(this);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
mDrawerLayout = findViewById(R.id.drawer_layout);
mNavigationView = findViewById(R.id.navigation_drawer);
View mDrawerHeader = mNavigationView.getHeaderView(0);
Toolbar toolbar = findViewById(R.id.toolbar); ButterKnife.bind(this);
setSupportActionBar(toolbar);
View mDrawerHeader = mNavigationView.getHeaderView(0);
mNavViewDeviceName = mDrawerHeader.findViewById(R.id.device_name);
setSupportActionBar(mToolbar);
ActionBar actionBar = getSupportActionBar(); ActionBar actionBar = getSupportActionBar();
@ -386,7 +392,6 @@ public class MainActivity extends AppCompatActivity {
} }
private void updateDeviceNameFromMenu(String newDeviceName) { private void updateDeviceNameFromMenu(String newDeviceName) {
final TextView nameView = mNavigationView.findViewById(R.id.device_name); mNavViewDeviceName.setText(newDeviceName);
nameView.setText(newDeviceName);
} }
} }