Feat: Add updated lesson 10

Author: Lyla

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/.gitignore

@@ -1,41 +1,124 @@
-.DS_Store
 
-# built application files
+# Created by https://www.gitignore.io/api/intellij,android,gradle
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+
+# Mongo Explorer plugin:
+.idea/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml 
+# *.ipr
+
+
+### Android ###
+# Built application files
 *.apk
 *.ap_
 
-# files for the dex VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
 *.class
 
-# generated files
+# Generated files
 bin/
-out/
 gen/
+out/
 
-# Libraries used by the app
-# Can explicitly add if we want, but shouldn't do so blindly. Licenses, bloat, etc.
-/libs
-
+# Gradle files
+.gradle/
+build/
 
-# Build stuff (auto-generated by android update project ...)
-build.xml
-ant.properties
+# Local configuration file (sdk path, etc)
 local.properties
-project.properties
 
-# Eclipse project files
-.classpath
-.project
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
 
-# idea project files
-.idea/
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
 *.iml
-*.ipr
-*.iws
+.idea/workspace.xml
+.idea/libraries
+
+# Keystore files
+*.jks
 
-# Gradle-based build
+### Android Patch ###
+gen-external-apklibs
+
+
+### Gradle ###
 .gradle
-build/
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+#removing .idea folder
+
+.idea/

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/build.gradle

@@ -20,5 +20,4 @@ android {
 dependencies {
  compile fileTree(include: ['*.jar'], dir: 'libs')
  compile 'com.android.support:appcompat-v7:25.0.0'
- compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
 }

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/src/main/AndroidManifest.xml

@@ -18,7 +18,8 @@
  </intent-filter>
  </activity>
 
- <!-- TODO (14) Declare WaterReminderIntentService in the Manifest -->
+ <!-- TODO (14) Declare WaterReminderIntentService in the Manifest and set the exported
+ attribute to false-->
 
  </application>
 </manifest>

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/src/main/java/com/example/android/background/MainActivity.java

@@ -20,17 +20,17 @@
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.example.android.background.utilities.PreferenceUtilities;
 
 public class MainActivity extends AppCompatActivity implements
  SharedPreferences.OnSharedPreferenceChangeListener {
 
  private TextView mWaterCountDisplay;
  private TextView mChargingCountDisplay;
- private TextView mWifiReminderCountDisplay;
+ private ImageView mChargingImageView;
 
  private Toast mToast;
 
@@ -39,73 +39,69 @@ protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_main);
 
+ /** Get the views **/
  mWaterCountDisplay = (TextView) findViewById(R.id.tv_water_count);
  mChargingCountDisplay = (TextView) findViewById(R.id.tv_charging_reminder_count);
- mWifiReminderCountDisplay = (TextView) findViewById(R.id.tv_wifi_reminder_count);
+ mChargingImageView = (ImageView) findViewById(R.id.iv_power_increment);
 
- updateFormattedWaterCount();
+ /** Set the original values in the UI **/
+ updateWaterCount();
  updateChargingReminderCount();
- updateWiFiReminderCount();
 
+ /** Setup the shared preference listener **/
  SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
  prefs.registerOnSharedPreferenceChangeListener(this);
  }
 
- private void updateFormattedWaterCount() {
+ /**
+ * Updates the TextView to display the new water count from SharedPreferences
+ */
+ private void updateWaterCount() {
  int waterCount = PreferenceUtilities.getWaterCount(this);
- String waterCountDisplayFormat = getString(R.string.water_count_format);
- String formattedWaterCount = String.format(
- waterCountDisplayFormat,
- waterCount);
-
- mWaterCountDisplay.setText(formattedWaterCount);
+ mWaterCountDisplay.setText(waterCount+"");
  }
 
+ /**
+ * Updates the TextView to display the new charging reminder count from SharedPreferences
+ */
  private void updateChargingReminderCount() {
  int chargingReminders = PreferenceUtilities.getChargingReminderCount(this);
- String chargingReminderCountFormat = getString(R.string.charging_reminder_count_format);
- String formattedChargingReminders = String.format(
- chargingReminderCountFormat,
- chargingReminders);
-
+ String formattedChargingReminders = getResources().getQuantityString(
+ R.plurals.charge_notification_count, chargingReminders, chargingReminders);
  mChargingCountDisplay.setText(formattedChargingReminders);
- }
 
- private void updateWiFiReminderCount() {
- int wifiReminders = PreferenceUtilities.getWifiReminderCount(this);
- String wiFiReminderCountFormat = getString(R.string.wifi_reminder_count_format);
- String formattedWifiReminderCount = String.format(
- wiFiReminderCountFormat,
- wifiReminders);
-
- mWifiReminderCountDisplay.setText(formattedWifiReminderCount);
  }
 
+ /**
+ * Adds one to the water count and shows a toast
+ */
  public void incrementWater(View view) {
  if (mToast != null) mToast.cancel();
- mToast = Toast.makeText(this, R.string.water_chug, Toast.LENGTH_SHORT);
+ mToast = Toast.makeText(this, R.string.water_chug_toast, Toast.LENGTH_SHORT);
  mToast.show();
-
-// TODO (15) Start WaterReminderIntentService to increment the water count when the button is pressed
+ // TODO (15) Create an explicit intent for WaterReminderIntentService
+ // TODO (16) Set the action of the intent to ACTION_INCREMENT_WATER_COUNT
+ // TODO (17) Call startService and pass the explicit intent you just created
  }
 
  @Override
  protected void onDestroy() {
  super.onDestroy();
-
+ /** Cleanup the shared preference listener **/
  SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
  prefs.unregisterOnSharedPreferenceChangeListener(this);
  }
 
+ /**
+ * This is a listener that will update the UI when the water count or charging reminder counts
+ * change
+ */
  @Override
  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-
  if (PreferenceUtilities.KEY_WATER_COUNT.equals(key)) {
- updateFormattedWaterCount();
+ updateWaterCount();
  } else if (PreferenceUtilities.KEY_CHARGING_REMINDER_COUNT.equals(key)) {
  updateChargingReminderCount();
- } else if (PreferenceUtilities.KEY_WIFI_REMINDER_COUNT.equals(key)) {
- updateWiFiReminderCount();
  }
  }
 }

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/src/main/java/com/example/android/background/sync/ReminderTasks.java

@@ -7,7 +7,7 @@
 // TODO (6) Create a public static void method called executeTask
 // TODO (7) Add a Context called context and String parameter called action to the parameter list
 
-// TODO (8) If the action equals ACTION_INCREMENT_WATER, call this class's incrementWaterCount
+// TODO (8) If the action equals ACTION_INCREMENT_WATER_COUNT, call this class's incrementWaterCount
 
 // TODO (3) Create a private static void method called incrementWaterCount
 // TODO (4) Add a Context called context to the argument list

Lesson10-Hydration-Reminder/T10.01-Exercise-IntentServices/app/src/main/java/com/example/android/background/utilities/PreferenceUtilities.java

@@ -19,15 +19,17 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
+/**
+ * This class contains utility methods which update water and charging counts in SharedPreferences
+ */
 public final class PreferenceUtilities {
 
  public static final String KEY_WATER_COUNT = "water-count";
- public static final String KEY_WIFI_REMINDER_COUNT = "wifi-reminder-count";
  public static final String KEY_CHARGING_REMINDER_COUNT = "charging-reminder-count";
 
  private static final int DEFAULT_COUNT = 0;
 
- synchronized public static void setWaterCount(Context context, int glassesOfWater) {
+ synchronized private static void setWaterCount(Context context, int glassesOfWater) {
  SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
  SharedPreferences.Editor editor = prefs.edit();
  editor.putInt(KEY_WATER_COUNT, glassesOfWater);
@@ -45,21 +47,6 @@ synchronized public static void incrementWaterCount(Context context) {
  PreferenceUtilities.setWaterCount(context, ++waterCount);
  }
 
- synchronized public static void incrementWifiReminderCount(Context context) {
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
- int wifiReminders = prefs.getInt(KEY_WIFI_REMINDER_COUNT, DEFAULT_COUNT);
-
- SharedPreferences.Editor editor = prefs.edit();
- editor.putInt(KEY_WIFI_REMINDER_COUNT, ++wifiReminders);
- editor.apply();
- }
-
- public static int getWifiReminderCount(Context context) {
- SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
- int wifiReminders = prefs.getInt(KEY_WIFI_REMINDER_COUNT, DEFAULT_COUNT);
- return wifiReminders;
- }
-
  synchronized public static void incrementChargingReminderCount(Context context) {
  SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
  int chargingReminders = prefs.getInt(KEY_CHARGING_REMINDER_COUNT, DEFAULT_COUNT);