From 93b68e01827583852f8519ddc0cf0a659981eb42 Mon Sep 17 00:00:00 2001
From: Jake Klinker <jklinker1@gmail.com>
Date: Fri, 3 Feb 2017 23:01:03 -0800
Subject: [PATCH] more refactoring

---
 app/build.gradle                                          | 3 +--
 app/src/main/AndroidManifest.xml                          | 3 +--
 .../java/com/klinker/android/dream/DreamSceneService.java | 5 +++--
 .../main/java/com/klinker/android/dream/NetworkUtils.java | 4 ++--
 app/src/main/res/layout/daydream_service.xml              | 3 +--
 app/src/main/res/values/strings.xml                       | 3 +--
 build.gradle                                              | 3 +--
 gradle.properties                                         | 8 +-------
 gradle/wrapper/gradle-wrapper.properties                  | 4 +---
 settings.gradle                                           | 3 +--
 10 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 17003d4..3423a98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 Jake
- *  Klinker
+ * Copyright (C) 2017 Jake Klinker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1ef867b..cc086b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Jake
-  ~  Klinker
+  ~ Copyright (C) 2017 Jake Klinker
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/java/com/klinker/android/dream/DreamSceneService.java b/app/src/main/java/com/klinker/android/dream/DreamSceneService.java
index 6348061..a8a7e26 100644
--- a/app/src/main/java/com/klinker/android/dream/DreamSceneService.java
+++ b/app/src/main/java/com/klinker/android/dream/DreamSceneService.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 Jake
- *  Klinker
+ * Copyright (C) 2017 Jake Klinker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,6 +124,7 @@ public void run() {
 
     /**
      * Choose a random background URL from the list
+     *
      * @return a URL for a background
      * @throws JSONException when the url is out of bounds on the JSON, shouldn't happen.
      */
@@ -141,6 +141,7 @@ private String getRandomBackgroundUrl() throws JSONException {
 
     /**
      * Choose a random time to switch, somewhere in the range [MIN_SWITCH_TIME, MAX_SWITCH_TIME)
+     *
      * @return a random time in milliseconds
      */
     private int getRandomSwitchTime() {
diff --git a/app/src/main/java/com/klinker/android/dream/NetworkUtils.java b/app/src/main/java/com/klinker/android/dream/NetworkUtils.java
index ae73526..3a637b6 100644
--- a/app/src/main/java/com/klinker/android/dream/NetworkUtils.java
+++ b/app/src/main/java/com/klinker/android/dream/NetworkUtils.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 Jake
- *  Klinker
+ * Copyright (C) 2017 Jake Klinker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +34,7 @@ public class NetworkUtils {
 
     /**
      * Get a JSON string from the given url
+     *
      * @param url the url where the JSON is located
      * @return the String in the format of a JSON
      */
diff --git a/app/src/main/res/layout/daydream_service.xml b/app/src/main/res/layout/daydream_service.xml
index 47c7251..7d94b1a 100644
--- a/app/src/main/res/layout/daydream_service.xml
+++ b/app/src/main/res/layout/daydream_service.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2017 Jake
-  ~  Klinker
+  ~ Copyright (C) 2017 Jake Klinker
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67bd2a7..466efc0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <!--
-  ~ Copyright (C) 2017 Jake
-  ~  Klinker
+  ~ Copyright (C) 2017 Jake Klinker
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/build.gradle b/build.gradle
index 1fe3eec..4007abe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 Jake
- *  Klinker
+ * Copyright (C) 2017 Jake Klinker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/gradle.properties b/gradle.properties
index 0a051b5..b636d94 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2017 Jake
-#  Klinker
+# Copyright (C) 2017 Jake Klinker
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,21 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 455e608..a9aa25d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
 #
-# Copyright (C) 2017 Jake
-#  Klinker
+# Copyright (C) 2017 Jake Klinker
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 #Sat May 30 20:20:48 CDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
index 5e50636..ccb9d20 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2017 Jake
- *  Klinker
+ * Copyright (C) 2017 Jake Klinker
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.