Skip to content
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

Jump to bottom

Upgrade project to use gradle 3 #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade project to use gradle 3 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions app/build.gradle
View file
Open in desktop
Expand Up @@ -36,21 +36,23 @@ repositories {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.jakewharton:butterknife:6.1.0'
compile 'com.google.code.gson:gson:2.3.1'
compile 'com.android.support:cardview-v7:21.0.3'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:recyclerview-v7:22.2.0'
compile 'com.android.support:support-v4:22.2.1'
compile 'com.google.android.gms:play-services-location:7.5.0'
compile 'com.squareup.picasso:picasso:2.5.2'

androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-web:2.2'
androidTestCompile 'com.android.support.test:runner:0.3'
androidTestCompile 'com.android.support.test:rules:0.3'
androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.2'){
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.jakewharton:butterknife:8.1.0'
implementation 'com.google.code.gson:gson:2.8.0'
implementation 'com.android.support:cardview-v7:22.2.1'
implementation 'com.android.support:appcompat-v7:22.2.1'
implementation 'com.android.support:recyclerview-v7:22.2.1'
implementation 'com.android.support:support-v4:22.2.1'
implementation 'com.google.android.gms:play-services-location:10.0.0'
implementation 'com.squareup.picasso:picasso:2.5.2'

annotationProcessor 'com.jakewharton:butterknife-compiler:8.1.0'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-web:2.2'
androidTestImplementation 'com.android.support.test:runner:0.3'
androidTestImplementation 'com.android.support.test:rules:0.3'
androidTestImplementation ('com.android.support.test.espresso:espresso-contrib:2.2'){
exclude group: 'com.android.support', module: 'appcompat'
exclude group: 'com.android.support', module: 'support-v4'
exclude module: 'recyclerview-v7'
Expand Down
10 changes: 5 additions & 5 deletions ...java/com/amazonaws/devicefarm/android/referenceapp/Activities/BackNavigationActivity.java
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@

import com.amazonaws.devicefarm.android.referenceapp.R;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;

/**
Expand All @@ -41,20 +41,20 @@
public class BackNavigationActivity extends AppCompatActivity {
private int PeerCount;

@InjectView(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@InjectView(R.id.back_navigation_counter)
@BindView(R.id.back_navigation_counter)
TextView counter;

@InjectView(R.id.toolbar_title)
@BindView(R.id.toolbar_title)
TextView toolbarTitle;

@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.back_navigation);
ButterKnife.inject(this);
ButterKnife.bind(this);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false);
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/amazonaws/devicefarm/android/referenceapp/Activities/MainActivity.java
View file
Open in desktop
Expand Up @@ -37,8 +37,8 @@
import java.util.ArrayList;
import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;

/**
* <h1>Main acitivity</h1>
Expand All @@ -49,13 +49,13 @@
* </p>
*/
public class MainActivity extends AppCompatActivity implements DrawerAdapter.OnItemClickListener{
@InjectView(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@InjectView(R.id.toolbar_title)
@BindView(R.id.toolbar_title)
TextView toolbarTitle;

@InjectView(R.id.drawer_layout)
@BindView(R.id.drawer_layout)
DrawerLayout drawerLayout;

/**
Expand All @@ -66,7 +66,7 @@ public class MainActivity extends AppCompatActivity implements DrawerAdapter.OnI
public void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
setContentView(R.layout.activity_main);
ButterKnife.inject(this);
ButterKnife.bind(this);
generateDataModel();
setUpToolBar();
setUpNavigationDrawer();
Expand Down
8 changes: 4 additions & 4 deletions ...n/java/com/amazonaws/devicefarm/android/referenceapp/Activities/UpNavigationActivity.java
View file
Open in desktop
Expand Up @@ -25,8 +25,8 @@

import com.amazonaws.devicefarm.android.referenceapp.R;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;

/**
Expand All @@ -36,17 +36,17 @@
* </p>
*/
public class UpNavigationActivity extends AppCompatActivity {
@InjectView(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@InjectView(R.id.toolbar_title)
@BindView(R.id.toolbar_title)
TextView toolbarTitle;

@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.up_navigation);
ButterKnife.inject(this);
ButterKnife.bind(this);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false);
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/com/amazonaws/devicefarm/android/referenceapp/Activities/UpNavigationContent.java
View file
Open in desktop
Expand Up @@ -27,8 +27,8 @@

import com.amazonaws.devicefarm.android.referenceapp.R;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;

/**
* <h1>Up Navigation Content Activity</h1>
Expand All @@ -37,23 +37,23 @@
* </p>
*/
public class UpNavigationContent extends AppCompatActivity{
@InjectView(R.id.toolbar)
@BindView(R.id.toolbar)
Toolbar toolbar;

@InjectView(R.id.nested_up_button)
@BindView(R.id.nested_up_button)
Button nextButton;

@InjectView(R.id.toolbar_title)
@BindView(R.id.toolbar_title)
TextView toolbarTitle;

@InjectView(R.id.up_navigation_content_text)
@BindView(R.id.up_navigation_content_text)
TextView content_text;

@Override
protected void onCreate(final Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.up_navigation);
ButterKnife.inject(this);
ButterKnife.bind(this);
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(false);
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/amazonaws/devicefarm/android/referenceapp/Adapters/DrawerAdapter.java
View file
Open in desktop
Expand Up @@ -29,8 +29,8 @@

import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;

/**
* <h1>Navigation Drawer Adapter</h1>
Expand All @@ -56,13 +56,13 @@ public interface OnItemClickListener {
public static class ViewHolder extends RecyclerView.ViewHolder {
protected int viewType;

@InjectView(R.id.drawer_row_icon) ImageView rowImage;
@InjectView(R.id.drawer_row_title) TextView rowTitle;
@BindView(R.id.drawer_row_icon) ImageView rowImage;
@BindView(R.id.drawer_row_title) TextView rowTitle;

public ViewHolder(View itemView, int viewType) {
super(itemView);
this.viewType = viewType;
ButterKnife.inject(this, itemView);
ButterKnife.bind(this, itemView);
}
}

Expand Down
16 changes: 8 additions & 8 deletions ...c/main/java/com/amazonaws/devicefarm/android/referenceapp/Fragments/FixturesFragment.java
View file
Open in desktop
Expand Up @@ -41,8 +41,8 @@
import com.google.android.gms.common.api.GoogleApiClient;
import com.google.android.gms.location.LocationServices;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;

/**
* A fragment to detect the radio statuses within the Android app
Expand All @@ -53,17 +53,17 @@ public class FixturesFragment extends Fragment implements

private static final String TAG = "fixtures-fragment";

@InjectView(R.id.longitude)
@BindView(R.id.longitude)
TextView longitude;
@InjectView(R.id.lat)
@BindView(R.id.lat)
TextView lat;
@InjectView(R.id.wifi)
@BindView(R.id.wifi)
TextView wifi;
@InjectView(R.id.bluetooth)
@BindView(R.id.bluetooth)
TextView bluetooth;
@InjectView(R.id.gps)
@BindView(R.id.gps)
TextView gps;
@InjectView(R.id.nfc)
@BindView(R.id.nfc)
TextView nfc;

private GoogleApiClient googleApiClient;
Expand All @@ -72,7 +72,7 @@ public class FixturesFragment extends Fragment implements
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, final Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fixtures_layout, container, false);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
buildGoogleApiClient();

//Registering events to detect radio changes
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/amazonaws/devicefarm/android/referenceapp/Fragments/LocalWebView.java
View file
Open in desktop
Expand Up @@ -26,22 +26,22 @@

import com.amazonaws.devicefarm.android.referenceapp.R;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;


public class LocalWebView extends Fragment {

@InjectView(R.id.website_input)
@BindView(R.id.website_input)
EditText websiteInput;

@InjectView(R.id.webView_browser)
@BindView(R.id.webView_browser)
WebView webView;

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.web_fragment, container, false);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
websiteInput.setVisibility(View.GONE);
setUpWebView();
return view;
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/java/com/amazonaws/devicefarm/android/referenceapp/Fragments/LoginFragment.java
View file
Open in desktop
Expand Up @@ -27,8 +27,8 @@

import com.amazonaws.devicefarm.android.referenceapp.R;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;

/**
Expand All @@ -44,32 +44,32 @@ public class LoginFragment extends Fragment {
private String ALT_BUTTON_SUCCESS_TITLE;
private InputMethodManager imm;

@InjectView(R.id.login_main_view)
@BindView(R.id.login_main_view)
View mainView;

@InjectView(R.id.login_alt_view)
@BindView(R.id.login_alt_view)
View altView;

@InjectView(R.id.username_text_input)
@BindView(R.id.username_text_input)
EditText usernameInput;

@InjectView(R.id.password_text_input)
@BindView(R.id.password_text_input)
EditText passwordInput;

@InjectView(R.id.login_button)
@BindView(R.id.login_button)
Button loginButton;

@InjectView(R.id.login_alt_message_textView)
@BindView(R.id.login_alt_message_textView)
TextView altText;

@InjectView(R.id.alt_button)
@BindView(R.id.alt_button)
Button altButton;

public LoginFragment(){}

public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_login, container, false);
ButterKnife.inject(this,view);
ButterKnife.bind(this,view);

USERNAME = getString(R.string.login_username);
PASSWORD = getString(R.string.login_password);
Expand Down
8 changes: 4 additions & 4 deletions ...ava/com/amazonaws/devicefarm/android/referenceapp/Fragments/NavigationDrawerFragment.java
View file
Open in desktop
Expand Up @@ -34,16 +34,16 @@

import java.util.List;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.InjectView;

import static android.content.Context.*;
import static android.content.Context.INPUT_METHOD_SERVICE;

/**
* Fragment for the the navigation drawer
*/
public class NavigationDrawerFragment extends Fragment {
@InjectView(R.id.drawerList)
@BindView(R.id.drawerList)
RecyclerView recycleView;

private DrawerAdapter drawerAdapter;
Expand Down Expand Up @@ -89,7 +89,7 @@ public void onCreate(Bundle savedInstanceState) {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
ButterKnife.inject(this, layout);
ButterKnife.bind(this, layout);
return layout;
}
}
2 changes: 1 addition & 1 deletion ...src/main/java/com/amazonaws/devicefarm/android/referenceapp/Fragments/NestedFragment.java
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ public NestedFragment() {}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.nested_fragment, container, false);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
return view;
}

Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/amazonaws/devicefarm/android/referenceapp/Fragments/NotificationsFragment.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ public class NotificationsFragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.notifications_fragment, container, false);
ButterKnife.inject(this, view);
ButterKnife.bind(this, view);
return view;
}

Expand Down