Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ Examples of custom Matchers used within the Espresso tests:
```
* The app and test apks will now be present under <br/>
aws-device-farm-sample-app-for-android/app/build/outputs/apk
8. We can upload the app and test apks to AWS Device Farm as Instrumentation tests and run them against hundreds of devices in parallel. The pre-built app and tests can be found [here](https://s3.console.aws.amazon.com/s3/buckets/prebuiltappsreinvent2017/).
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

8. We can upload the app and test apks to AWS Device Farm as Instrumentation tests and run them against hundreds of devices in parallel. There is a [pre-built app with tests ](https://s3.console.aws.amazon.com/s3/buckets/prebuiltappsreinvent2017/).
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/scottgo/Library/Android/sdk/tools/proguard/proguard-android.txt
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like a legacy from where something was first generated. Most users won't have a /Users/scottgo directory and it won't be their home directory.

# in ~/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ public void testSanity() {
* Tests if the wifi is on
*/
@Test
public void testWifiOn (){
public void testWiFiOn (){
assertIdStatus(R.id.wifi, true);
}

/**
* Tests if the bluetooth is on
* Tests if the Bluetooth is on
*/
@Test
public void testBluetoothOn() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void testLoginFailCheck(){
}

/**
* Attemps to log into the form
* Attempts to log into the form
*
* @param user the username
* @param pass the password
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
import butterknife.InjectView;

/**
* <h1>Main acitivity</h1>
* <h1>Main activity</h1>
*
* <p>
* This acitivty holds the navigation drawer
* This activity holds the navigation drawer
* and all of the navigation fragments.
* </p>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
/**
* <h1>Up Navigation Activity</h1>
* <p>
* An activity demonstating Up navigation
* An activity demonstrating Up navigation
* </p>
*/
public class UpNavigationActivity extends AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

/**
* <h1>Navigation Drawer Adapter</h1>
* <p>A adapter for the navigation drawer which initalizes the rows of the drawer</p>
* <p>A adapter for the navigation drawer which initializes the rows of the drawer</p>
*/
public class DrawerAdapter extends RecyclerView.Adapter<DrawerAdapter.ViewHolder>{
private final List<DrawerCategoryModel> data;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void onReceive(Context context, Intent intent) {
if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
updateBluetoothStatusDisplay();
} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
updateWifiStatusDisplay();
updateWiFiStatusDisplay();
} else if (action.equals(LocationManager.PROVIDERS_CHANGED_ACTION)) {
updateGPSStatusDisplay();
} else if (action.equals(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED)) {
Expand All @@ -101,7 +101,7 @@ public void onReceive(Context context, Intent intent) {
filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
filter.addAction(LocationManager.PROVIDERS_CHANGED_ACTION);

updateWifiStatusDisplay();
updateWiFiStatusDisplay();
updateBluetoothStatusDisplay();
updateGPSStatusDisplay();
updateNFCStatusDisplay();
Expand Down Expand Up @@ -132,11 +132,11 @@ private synchronized void buildGoogleApiClient() {
}

/**
* Updates the Wifi status
* Updates the WiFi status
*/
private void updateWifiStatusDisplay() {
private void updateWiFiStatusDisplay() {
final WifiManager wifiManager = (WifiManager)getActivity().getSystemService(Context.WIFI_SERVICE);
wifi.setText(Boolean.toString(wifiManager.isWifiEnabled()));
wifi.setText(Boolean.toString(wifiManager.isWiFiEnabled()));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
}

/**
* Checks if username and passwork are correct
* Checks if username and password are correct
*/
@OnClick(R.id.login_button)
public void loginButtonPressed(){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import static android.content.Context.*;

/**
* Fragment for the the navigation drawer
* Fragment for the navigation drawer
*/
public class NavigationDrawerFragment extends Fragment {
@InjectView(R.id.drawerList)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import butterknife.OnClick;

/**
* A fragment used to demonstrate notications
* A fragment used to demonstrate notifications
*/
public class NotificationsFragment extends Fragment {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<string name="default_location_text">Finding Location</string>
<string name="Latitude_text_label">Lat:</string>
<string name="longitude_text_label">Long:</string>
<string name="wifi_text_label">Wifi:</string>
<string name="wifi_text_label">WiFi:</string>
<string name="bluetooth_text_label">Bluetooth:</string>
<string name="gps_text_label">GPS:</string>
<string name="nfc_text_label">NFC:</string>
Expand Down