From a8c4e9cf1bfbf965f1e5c46f96ec8de93761b2b0 Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Thu, 30 Apr 2015 22:12:19 -0400 Subject: [PATCH 01/13] initial commit --- exercises/5_OOP-and-Intents/.idea/.name | 1 + .../.idea/5_OOP-and-Intents.iml | 9 + .../5_OOP-and-Intents/.idea/compiler.xml | 23 + .../.idea/copyright/profiles_settings.xml | 3 + .../5_OOP-and-Intents/.idea/encodings.xml | 4 + exercises/5_OOP-and-Intents/.idea/modules.xml | 8 + .../.idea/scopes/scope_settings.xml | 5 + exercises/5_OOP-and-Intents/.idea/vcs.xml | 6 + .../5_OOP-and-Intents/.idea/workspace.xml | 299 +++++++++ exercises/5_OOP-and-Intents/oop/.idea/.name | 1 + .../5_OOP-and-Intents/oop/.idea/compiler.xml | 23 + .../oop/.idea/copyright/profiles_settings.xml | 3 + .../5_OOP-and-Intents/oop/.idea/encodings.xml | 4 + .../5_OOP-and-Intents/oop/.idea/misc.xml | 206 +++++++ .../5_OOP-and-Intents/oop/.idea/modules.xml | 8 + .../oop/.idea/scopes/scope_settings.xml | 5 + .../oop/.idea/uiDesigner.xml | 124 ++++ exercises/5_OOP-and-Intents/oop/.idea/vcs.xml | 6 + .../5_OOP-and-Intents/oop/.idea/workspace.xml | 578 ++++++++++++++++++ exercises/5_OOP-and-Intents/oop/oop.iml | 11 + .../5_OOP-and-Intents/oop/src/Clarinet.java | 1 + .../oop/src/ClarinetAnswer.java | 1 + .../oop/src/ClarinetPlayer.java | 1 + .../oop/src/ReedInstrument.java | 1 + .../5_OOP-and-Intents/oop/src/ReedPlayer.java | 1 + 25 files changed, 1332 insertions(+) create mode 100644 exercises/5_OOP-and-Intents/.idea/.name create mode 100644 exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml create mode 100644 exercises/5_OOP-and-Intents/.idea/compiler.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/encodings.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/modules.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/vcs.xml create mode 100644 exercises/5_OOP-and-Intents/.idea/workspace.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/.name create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/compiler.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/encodings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/misc.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/modules.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/vcs.xml create mode 100644 exercises/5_OOP-and-Intents/oop/.idea/workspace.xml create mode 100644 exercises/5_OOP-and-Intents/oop/oop.iml create mode 100644 exercises/5_OOP-and-Intents/oop/src/Clarinet.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java create mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java diff --git a/exercises/5_OOP-and-Intents/.idea/.name b/exercises/5_OOP-and-Intents/.idea/.name new file mode 100644 index 00000000..6799a003 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/.name @@ -0,0 +1 @@ +5_OOP-and-Intents \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml b/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/compiler.xml b/exercises/5_OOP-and-Intents/.idea/compiler.xml new file mode 100644 index 00000000..a8523149 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml b/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/encodings.xml b/exercises/5_OOP-and-Intents/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/modules.xml b/exercises/5_OOP-and-Intents/.idea/modules.xml new file mode 100644 index 00000000..7b0c4337 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml b/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/vcs.xml b/exercises/5_OOP-and-Intents/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/workspace.xml b/exercises/5_OOP-and-Intents/.idea/workspace.xml new file mode 100644 index 00000000..f6e4fbe9 --- /dev/null +++ b/exercises/5_OOP-and-Intents/.idea/workspace.xml @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430441476774 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/.name b/exercises/5_OOP-and-Intents/oop/.idea/.name new file mode 100644 index 00000000..d85a74a5 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/.name @@ -0,0 +1 @@ +oop \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml b/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml new file mode 100644 index 00000000..a8523149 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml b/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/misc.xml b/exercises/5_OOP-and-Intents/oop/.idea/misc.xml new file mode 100644 index 00000000..a4115268 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/misc.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + 1.7 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/modules.xml b/exercises/5_OOP-and-Intents/oop/.idea/modules.xml new file mode 100644 index 00000000..b67b02b8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml b/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml new file mode 100644 index 00000000..e96534fb --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml b/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml b/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml new file mode 100644 index 00000000..d686b663 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml @@ -0,0 +1,578 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430441604370 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.7 + + + + + + + + oop + + + + + + + + 1.7 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/oop.iml b/exercises/5_OOP-and-Intents/oop/oop.iml new file mode 100644 index 00000000..c90834f2 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/oop.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/Clarinet.java b/exercises/5_OOP-and-Intents/oop/src/Clarinet.java new file mode 100644 index 00000000..ee67a5be --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/Clarinet.java @@ -0,0 +1 @@ +/** * Created by Hoshiko on 4/30/15. */ public class Clarinet extends ReedInstrument { boolean reed; @Override boolean hasReed(){ return reed; } @Override public String play(){ return "reed sound"; } @Override void place_reed(){ this.reed = true; } @Override void remove_reed(){ this.reed = false; } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java b/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java new file mode 100644 index 00000000..b7bb36b5 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java @@ -0,0 +1 @@ +/** * Created by Hoshiko on 4/30/15. */ public class ClarinetAnswer extends ReedInstrument { boolean reed; @Override boolean hasReed(){ return reed; } @Override public String play(){ return "reed sound"; } @Override void place_reed(){ reed = true; } @Override void remove_reed(){ reed = false; } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java new file mode 100644 index 00000000..f799b14a --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java @@ -0,0 +1 @@ +/** * Created by Hoshiko on 4/30/15. */ public class ClarinetPlayer extends Musician { Clarinet myClarinet = new Clarinet(); @Override public String play_instrument() { if (!myClarinet.hasReed()){ return null; }else{ return myClarinet.play(); } } public void toggle_reed(){ if (!myClarinet.hasReed()){ myClarinet.place_reed(); }else{ myClarinet.remove_reed(); } } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java b/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java new file mode 100644 index 00000000..31457cb5 --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java @@ -0,0 +1 @@ +/** * Created by Hoshiko on 4/30/15. */ public abstract class ReedInstrument implements Instrument { abstract boolean hasReed(); // puts a reed on the instrument abstract void place_reed(); //removes the reed from the instrument abstract void remove_reed(); //Why an abstract class implementing an interface can miss // the declaration/implementation of one of the interface's methods? // Because if a class is abstract, then by definition you are required to create // subclasses of it to instantiate. The subclasses will be required // (by the compiler) to implement any interface methods that the abstract class left out. } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java new file mode 100644 index 00000000..02f24b3a --- /dev/null +++ b/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java @@ -0,0 +1 @@ +/** * Created by Hoshiko on 4/30/15. */ public abstract class ReedPlayer extends Musician { } \ No newline at end of file From 625a03df3eb09d7ff871322672f04f983e4709de Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Thu, 30 Apr 2015 22:20:39 -0400 Subject: [PATCH 02/13] add homework --- homework/week-0/.idea/compiler.xml | 23 + .../.idea/copyright/profiles_settings.xml | 3 + homework/week-0/.idea/description.html | 1 + homework/week-0/.idea/encodings.xml | 4 + homework/week-0/.idea/misc.xml | 12 + homework/week-0/.idea/modules.xml | 8 + homework/week-0/.idea/project-template.xml | 3 + .../week-0/.idea/scopes/scope_settings.xml | 5 + homework/week-0/.idea/vcs.xml | 6 + homework/week-0/.idea/workspace.xml | 561 ++++++++++++++++++ .../week-0/nyc/c4q/hoshikoo/Animal.class | Bin 0 -> 1424 bytes .../week-0/nyc/c4q/hoshikoo/Card.class | Bin 0 -> 966 bytes .../week-0/nyc/c4q/hoshikoo/Domestic.class | Bin 0 -> 197 bytes .../week-0/nyc/c4q/hoshikoo/DomesticCat.class | Bin 0 -> 1695 bytes .../week-0/nyc/c4q/hoshikoo/Game.class | Bin 0 -> 383 bytes .../week-0/nyc/c4q/hoshikoo/Main.class | Bin 0 -> 2254 bytes .../nyc/c4q/hoshikoo/PlayingCards.class | Bin 0 -> 1100 bytes .../week-0/src/nyc/c4q/hoshikoo/Animal.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Card.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Domestic.java | 1 + .../src/nyc/c4q/hoshikoo/DomesticCat.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Game.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Main.java | 59 ++ .../src/nyc/c4q/hoshikoo/PlayingCards.java | 1 + homework/week-0/week-0.iml | 12 + 25 files changed, 703 insertions(+) create mode 100644 homework/week-0/.idea/compiler.xml create mode 100644 homework/week-0/.idea/copyright/profiles_settings.xml create mode 100644 homework/week-0/.idea/description.html create mode 100644 homework/week-0/.idea/encodings.xml create mode 100644 homework/week-0/.idea/misc.xml create mode 100644 homework/week-0/.idea/modules.xml create mode 100644 homework/week-0/.idea/project-template.xml create mode 100644 homework/week-0/.idea/scopes/scope_settings.xml create mode 100644 homework/week-0/.idea/vcs.xml create mode 100644 homework/week-0/.idea/workspace.xml create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Card.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/DomesticCat.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class create mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Animal.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Card.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Domestic.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/DomesticCat.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Game.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Main.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/PlayingCards.java create mode 100644 homework/week-0/week-0.iml diff --git a/homework/week-0/.idea/compiler.xml b/homework/week-0/.idea/compiler.xml new file mode 100644 index 00000000..a8523149 --- /dev/null +++ b/homework/week-0/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/copyright/profiles_settings.xml b/homework/week-0/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/homework/week-0/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/homework/week-0/.idea/description.html b/homework/week-0/.idea/description.html new file mode 100644 index 00000000..db5f1295 --- /dev/null +++ b/homework/week-0/.idea/description.html @@ -0,0 +1 @@ +Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/homework/week-0/.idea/encodings.xml b/homework/week-0/.idea/encodings.xml new file mode 100644 index 00000000..d8210482 --- /dev/null +++ b/homework/week-0/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/misc.xml b/homework/week-0/.idea/misc.xml new file mode 100644 index 00000000..ccf24ce4 --- /dev/null +++ b/homework/week-0/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/modules.xml b/homework/week-0/.idea/modules.xml new file mode 100644 index 00000000..da56c862 --- /dev/null +++ b/homework/week-0/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/project-template.xml b/homework/week-0/.idea/project-template.xml new file mode 100644 index 00000000..1f08b887 --- /dev/null +++ b/homework/week-0/.idea/project-template.xml @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/homework/week-0/.idea/scopes/scope_settings.xml b/homework/week-0/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/homework/week-0/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/vcs.xml b/homework/week-0/.idea/vcs.xml new file mode 100644 index 00000000..6564d52d --- /dev/null +++ b/homework/week-0/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/homework/week-0/.idea/workspace.xml b/homework/week-0/.idea/workspace.xml new file mode 100644 index 00000000..f704c64d --- /dev/null +++ b/homework/week-0/.idea/workspace.xml @@ -0,0 +1,561 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1430091604981 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class new file mode 100644 index 0000000000000000000000000000000000000000..cb5bda480931afa45cec181b596a6549505ae451 GIT binary patch literal 1424 zcmZ`%Yfscb6g{(Tx4We%$jeoH;ER2r^?{%ZE+C2_Su|!5l=!7A6$)jG-D1K|(ci!a zO>{My7(e@)jC!VBbXQ`U&Yih4_uO;Oz2AR+{tDm*9vJAv^)wXR&@pPz-ZapGF&*Ou zlDICHTLx~UD0dS&CgqzuI!ZdG1Ul+FPSthl5AAJ7;8=Oneq~#pU0b&*Vc^!*Cj^p{ zZp{r#0)5%T*SRGDb=F^F@X@kca~|$)uR6h^z3N49e%1Dt?7)@hrc(_!+`2%fT-&Q! z)zO#MhF{-sw|w84skz&>$BakTov_l%t2diFoLV4V^|yEIz*+SFA@^u?)2W6Nxp|WF z+Wi?7cGGOeGlFT6Hs0KyzO1+8!SeL$hCmPCzAAofm$cZ3jw55@3M_%1XdK!Jo0x&6 za{^uej*W>EIN9cp=?V1yeL5R;FCG;oDkE~=dqKnUt_sy-4EExp5_=v zw4ydfp`011$b9RhG&R8xN4^srEdG$?b5*(T#xbrvJk24&4>0l{A@YR}NW9}IfnKgh z7%ihz#-$n4$5Vg&ns$IE#zm+c7pYzo)1sC6wETM{-f|PeB_n5l1Y^bznlM7DMh^*z z`+S{d%!+bHEhWa(!Z#>IE#H7zOlCA`^h`3NH=w(s{*;(Qv?`WxE^3O73h{^N>BIuF3_xSn z2e?S7lgvHMtXfgc6r4>QyK$Wl(k7*}^g~>nAmIbtK)qC|R4IZ(P$iCzYb7qh7LJR=f8qcV z6%q%206z*b&$~@Z8ZNuf&-3QZ%>MrK^A~{UICfFPejOGb%W>e~(7}qr!bg>=_D8xd6G_ED!B6h_4S8woGYkv1^ZQ!CdG+D)$d;@Sf|-#tk4=JX{=#y z!|{xr&M=F@*+rNq@@<+{F-_(QJHzyI6htpR2GeXlP2Oi&aLP4Y*Y)p{{4A^=6692Gji*SM(C?yFt=UHFZtb3cAZD@St6e5vgw(mD^G*aLYrSg@W2q95m{n|VDR(?l_g6PRic|@X>oPCWa=4a%_KWSo``VKF`Vy+ zk;&GAbFhDd>XNuaN)T>gi^SU`?v~_7dd$cqfgzVl+)El;#B1*XZ|(g%Dql&cz1wAT zwX#KEPu2=~h+Q+h6teeEMp}qZ QA^radkwhecN9D%7zqVV2VgLXD literal 0 HcmV?d00001 diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class new file mode 100644 index 0000000000000000000000000000000000000000..13eea31cd033a6870682bbbbf5435d1e5fd46d51 GIT binary patch literal 197 zcmX^0Z`VEs1_omWZgvJvb_Om+2KM6A62HXUR7M6-4WF#UvPAuy#JqI<;F6-uymV{L zFrbQbm3|ztarA5i9ZkahiQ+QqSb5n~;GL!W{hA}co=2a%^Cz}-NXXF=W zWM=2*>%$Za^fr*8Yfti7YfdNRfGOz(ffGz=vGjIR^ DX7w

U2_yg6g@qko7o9O@_`!y5=2RMkwFLnHen%b0HX`2!JsK$CX*o<*xd=U6RYx5 z^f%-|t8}rn%HrAIWT~fnWZzI5Ndef!*V&%HB${{7n@0Is6pU>Mhipkv;~b%*;6 z2SwbpQFUNpK`x69ZlNZv+cxgVm?ax`ZPW#fw%-Z`PBfnT-}zqCZ*O_4X%e-!76gi& zoiK>P&Lb6KEk^AqtqF|J3Hm|bBx&8U;|I(xsHMon)iN&LMA-Q*?s^ss9AO93-{x$8F> zKn&A=mWGLdwGlpx6G~xhvMPasEI#9E#@Rm6=o4vgrzcciKtF-S!K!K`HN2Yo!Hb9f zjuM&kU}Kpb=PZze;zh~(`qwLXUBFq5catEzAIYAL9O}X)IU6ocVARENj0jBqU(Z~e z!jy}TaYbNMO;ta233SiJeO$5ez{Mw6aq%fWW6HNj(8Xz-5jZ)JZK)l#q{O9xn;z>v zw5&z}eMXL{?r&~Vgg4CUakI&$M{%3t7@as_gGTeIQ`A+*)l<%u)NkeRP~{3@nxEA$ z1dc)Dhe@5d0`I8ZqM!0{9iy+t2pMCQE3Y7aqNQP+tE0SQFnOBbc_NF#NxaJw;}sew zi&&)`>kG!{yepP3602PK1=<_HW9n*>fTsvPr9jVS;Rm2aMO8=$1+Ni!@+hi($QjjX zBA@#Ys!{++mBWxz_0$Xx+s!>iCN5Qx3N5 z-M3`xp@R2t76r-sK=5@=$~ji0;cL84ER8wV@BuBInO2E>o}OVm#0B=%>4^<(l*8b literal 0 HcmV?d00001 diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class new file mode 100644 index 0000000000000000000000000000000000000000..001df77a600f26e8dc02c55be08fb63ae679a893 GIT binary patch literal 383 zcmZutJx{|h6g;;{(}Y4x0Wq_+AmIVFR+SJEED;Pr-5p~kE~x{KgVdkJgv7uP;71{B zm$4q+$Gv;L)BE}T`UY@?;{;tCMi@spBIwPfl4e2BolKVm!EOC42!^Rt;-OvVLO-#* zvdB2CIjfdTOV|H{fhlD}aGI(Or~LYjmUUCgm%66+Y%OL4aUsmB6kIsgWSXwnJEN_U z6}{1#ZBp47$I4`(m}#}ux!BE`Z&xd(3Yr-$RWV!G%_OT^&BdK`7Go!R=_CdS5E7j1 zv_&xTHvC_Y`ATpToS|cn;$8>#2ncQL*^b&wY!1&qK|cIAva#pEKKiyEYzc^w00F_C ONA^AUz|Mxg8vOxP!B%eo literal 0 HcmV?d00001 diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..da5d8360e259f6f1374d91406fe95130f53a4a49 GIT binary patch literal 2254 zcmZuzO;;OL7=CU@GLvBh%4ef|)vrSNNTC!dU@ZhuG*B!^1*~=$Mi`o8!enThsy#g} z)s^S?1N;L$M;F0k&T-|!<8kA{ZTIe7tIwTD2$*DX@B6;@z3<2KJ~NZw{`u)=09Wu> z!^=o2SWxk%h7cB2yrtr81xp$fB&F#cDZQ&9h2NN*UfE%mZ7?Cslmfv!}xU?$9o!^FOm z-?#5MPGZ@xvoj2r;V#fQu$?+E?i-1;k=;wId9Iz^oAJ{b?j8fQ)j4KGrr`<1YlF{a z?TnFT_=a6)k4dIvAldsiu->0@&0dqY7b6$d} z;{iCpuK#mm{>V=6S}q$U)^eWH{W>0^AeTovK9yA-%9eU+YB-I(j?eHpsZir2;S*@7 zroFjyV40FN1GVT&o;K}S-dfHwZ7aWGWSF>ppgg?Oj3&g!E-82>N)UQxaEtaT=1GU` zo1X1tNyTv9ahbfWoZKIZPgj}xRF!Lmyk}*Y#W|`n+;$SHe4ac$RhE$6B*Mb*p2dnCWD4hHI^p@^yWdSn0r$tm$GMnCb(k5V!!bsFBNAS)wyi=W;EWWeTvL zGyWAcYqC}SRnH0DFl>q0bGBt#@+DQ7*jdic-~wLan_2!s5b|;2dXZX!yWk$VbPVym ze>}i7>KkJiq^t)HxP&2UF$`mb7G4hhjxbLlzAhoO+1hZ7aLSh=l$KAV6<>V^* zkr2rlHbBns8-L(U(9n!_ej0mmj`M88IJH@HU=f}CYIb3pAJDsq^NrZe7hew^)ALL8 z;ah$|zawp)GERw<`IV&klaZe>%3ox|-{ix;7#12vL^DRkAjZTb#zhiW#40Al9b6R$ zm=q5%C7$4#_zKfLpB@FA!6?ZGXyOZ8#uypZE*`SBF%q;_WcgoWjC~9W6BCrejJt)a zm_&s2Ji}|4B1cR31J@`itnC*@pMuH?k1<0jMz5#rbCMaJFyrgEjz+w}jGfF7M7zOg Pf!7V9BrwO*5a#~_kuw=K literal 0 HcmV?d00001 diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class new file mode 100644 index 0000000000000000000000000000000000000000..91f3415e50998aca40bbe5e728940c85a66bb118 GIT binary patch literal 1100 zcmaJ<+fEZv6kVq+?NH18;;jgxXiF`lg13M~#i%6plGNbk?Q~{R4h%EnbV}^I|KPhX zzUoU!B=H0MARkP;tkZ%ifzqaXpR@L!z1LdPAAi1m2QZI2X$)W{g-dC~biSNM0y743 zI_Gtm)uEuvR}2&l%o#9KxSGN>f#j0%RJ1G*&*j$y5-Yy#2n>{z=RB)#Rh;mpthhvm zOTH!DH5n>>-vblTx~d6Gmb`{#S_|*Yb-%W*HhtfG;mU^csw*#?T znah_pW}3XnI~lsIG!y~%pEpu&)maAX=XOJdR*Cv{I>G~qx-&g%;A8zw7GVy zbM5oWhGRvG`L{Tae*Vk#CkCOdWE|$rWERXlvpW!9TjdePWD7Jf%5$dOfH92oMze8> zL-fNx5$6|pzl+$L9mGqCyV=41Pf&$jBnb2jC!0uRn=qQ_Z6f{ZKYpSMp6P=39mGGx z#OJ>s3tzZ90nK+B24f%N0L2X=M}haq@inUfv2AkKTBgW14Hu_zh8oCxPnE&0v&d52 h1W~QHjhy3YvW3KcBb~yO_=QcHscoEQ?LzBx@gEY^0bu|D literal 0 HcmV?d00001 diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/Animal.java b/homework/week-0/src/nyc/c4q/hoshikoo/Animal.java new file mode 100644 index 00000000..57f80523 --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/Animal.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; import java.util.ArrayList; import java.util.Collections; import java.util.Objects; /** * Created by Hoshiko on 4/26/15. */ public class Animal implements Comparable{ String speciesName; public Animal (String speciesName) { this.speciesName = speciesName; } //Compare two animals by species name, alphabetically. public String getSpeciesName(){ return this.speciesName; } @Override public int compareTo(Object o){ int equal = 0; int after = 1; int before = -1; Animal oAnimal =(Animal) o; String thisName = this.getSpeciesName(); String oName = oAnimal.getSpeciesName(); if(thisName.equals(oName)){ return equal; }else { ArrayList list = new ArrayList(); list.add(thisName); list.add(oName); Collections.sort(list); if(list.get(0).equals(oName)){ return after; }else{ return before; } } } //Implement equals to compare by species name. @Override public boolean equals(Object o) { if(this.compareTo(o)==0){ return true; }else{ return false; } } } \ No newline at end of file diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/Card.java b/homework/week-0/src/nyc/c4q/hoshikoo/Card.java new file mode 100644 index 00000000..646883a9 --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/Card.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; /** * Created by Hoshiko on 4/30/15. */ public class Card { public String cardSign; public int cardNumber; public Card(){ } public Card (String cardSign){ this.cardSign = cardSign; } public Card (String cardSign, int cardNumber){ this.cardSign = cardSign; this.cardNumber = cardNumber; } public String getCardSign() { return cardSign; } public void setCardSign(String cardSign) { this.cardSign = cardSign; } public int getCardNumber() { return cardNumber; } public void setCardNumber(int cardNumber) { this.cardNumber = cardNumber; } } \ No newline at end of file diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/Domestic.java b/homework/week-0/src/nyc/c4q/hoshikoo/Domestic.java new file mode 100644 index 00000000..62f2818b --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/Domestic.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; /** * Created by Hoshiko on 4/27/15. */ public interface Domestic { //Create the Domestic interface. // This interface should include getters and setters for a name field, // since pets tend to have their own names. public void setName(String name); public String getName(); } \ No newline at end of file diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/DomesticCat.java b/homework/week-0/src/nyc/c4q/hoshikoo/DomesticCat.java new file mode 100644 index 00000000..563dfa8c --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/DomesticCat.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; import java.util.ArrayList; import java.util.Collections; /** * Created by Hoshiko on 4/27/15. */ //Create a class for a Domestic Animal, perhaps a DomesticCat, // that both inherits from Animal and implements the Domesitc interface. public class DomesticCat extends Animal implements Domestic { String name; String speciesName; public DomesticCat(String speciesName) { super(speciesName); } //Create a constructor for your Domestic animal // that takes in both the species name and given name. public DomesticCat(String name, String speciesName){ super(speciesName); this.name = name; } @Override public void setName(String name) { this.name =name; } @Override public String getName() { return name; } //Override the compareTo function for // your Domestic animal so that it compares // two such animals by their given name instead // of their species name. @Override public int compareTo(Object o){ int equal = 0; int after = 1; int before = -1; DomesticCat dCat =(DomesticCat) o; String thisName = this.getName(); String oName = dCat.getName(); if(thisName.equals(oName)){ return equal; }else { ArrayList list = new ArrayList(); list.add(thisName); list.add(oName); Collections.sort(list); if(list.get(0).equals(oName)){ return after; }else{ return before; } } } //Implement equals to compare by given name. @Override public boolean equals(Object o) { if(this.compareTo(o)==0){ return true; }else{ return false; } } } \ No newline at end of file diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/Game.java b/homework/week-0/src/nyc/c4q/hoshikoo/Game.java new file mode 100644 index 00000000..c66a2a27 --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/Game.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; import java.util.ArrayList; /** * Created by Hoshiko on 4/30/15. */ public abstract class Game { public abstract ArrayList getpieces(); } \ No newline at end of file diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/Main.java b/homework/week-0/src/nyc/c4q/hoshikoo/Main.java new file mode 100644 index 00000000..98047a3f --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/Main.java @@ -0,0 +1,59 @@ +package nyc.c4q.hoshikoo; + + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; + +public class Main { + + public static void main(String[] args) { + // Test your compareTo function by creating an array of Animal instances and calling sort. + + Animal cat = new Animal("Cat"); + Animal dog = new Animal("Dog"); + Animal dog2 = new Animal("Dog"); + Animal bird = new Animal("Bird"); + + ArrayList list = new ArrayList(); + list.add(cat.getSpeciesName()); + list.add(dog.getSpeciesName()); + list.add(dog2.getSpeciesName()); + list.add(bird.getSpeciesName()); + Collections.sort(list); + System.out.println(list); + + + System.out.println(cat.compareTo(dog)); + System.out.println(dog.compareTo(dog2)); + System.out.println(dog2.compareTo(bird)); + System.out.println(cat.compareTo(dog2)); + System.out.println(dog.compareTo(bird)); + + + DomesticCat cosmos = new DomesticCat("Cosmos", "cat"); + DomesticCat yamato = new DomesticCat("Yamato", "cat"); + DomesticCat tama = new DomesticCat("Tama", "cat"); + DomesticCat belle = new DomesticCat("Belle", "cat"); + + ArrayList catList = new ArrayList(); + catList.add(cosmos.getName()); + catList.add(yamato.getName()); + catList.add(tama.getName()); + catList.add(belle.getName()); + Collections.sort(catList); + System.out.println("catlist: "+catList); + + + System.out.println(cosmos.compareTo(yamato)); + System.out.println(cosmos.compareTo(tama)); + System.out.println(cosmos.compareTo(belle)); + System.out.println(yamato.compareTo(tama)); + System.out.println(yamato.compareTo(belle)); + System.out.println(tama.compareTo(belle)); + + PlayingCards pc = new PlayingCards(); + System.out.println(pc.getpieces()); + } +} diff --git a/homework/week-0/src/nyc/c4q/hoshikoo/PlayingCards.java b/homework/week-0/src/nyc/c4q/hoshikoo/PlayingCards.java new file mode 100644 index 00000000..fa2f4a5b --- /dev/null +++ b/homework/week-0/src/nyc/c4q/hoshikoo/PlayingCards.java @@ -0,0 +1 @@ +package nyc.c4q.hoshikoo; import java.util.ArrayList; import java.util.HashMap; /** * Created by Hoshiko on 4/30/15. */ public class PlayingCards extends Game { @Override public ArrayList getpieces(){ ArrayList cardsMap = new ArrayList(); for(int i = 1; i<14; i++){ cardsMap.add("Heart-"+i); cardsMap.add("Diamond-"+i); cardsMap.add("Club-"+i); cardsMap.add("Spade-"+i); } return cardsMap; } } \ No newline at end of file diff --git a/homework/week-0/week-0.iml b/homework/week-0/week-0.iml new file mode 100644 index 00000000..d5c07432 --- /dev/null +++ b/homework/week-0/week-0.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 3b79673578d013fe041ab0f6c0f2cd0fd24054ed Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Fri, 1 May 2015 20:32:45 -0400 Subject: [PATCH 03/13] add homework --- homework/week-0/.idea/workspace.xml | 284 +++++++++++++----- .../src/nyc/c4q/hoshikoo/Character.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Room.java | 1 + .../week-0/src/nyc/c4q/hoshikoo/Weapon.java | 1 + 4 files changed, 204 insertions(+), 83 deletions(-) create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Character.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Room.java create mode 100644 homework/week-0/src/nyc/c4q/hoshikoo/Weapon.java diff --git a/homework/week-0/.idea/workspace.xml b/homework/week-0/.idea/workspace.xml index f704c64d..072788b1 100644 --- a/homework/week-0/.idea/workspace.xml +++ b/homework/week-0/.idea/workspace.xml @@ -25,93 +25,76 @@ - + - - + + - - - + + - - - - - - - - - - - - + + - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + - - + + - - + + - + + + + + + + + + + @@ -129,12 +112,15 @@ - @@ -213,7 +199,7 @@ - + @@ -384,7 +370,7 @@ - + @@ -394,23 +380,23 @@ - - - + + + @@ -439,13 +425,89 @@ - @@ -372,7 +372,7 @@ - + From 2beb6381529fe4fc45f9d22afe39752de6a7451d Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Sun, 3 May 2015 11:38:20 -0400 Subject: [PATCH 05/13] add homework 3 --- homework/week-0/.idea/workspace.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/homework/week-0/.idea/workspace.xml b/homework/week-0/.idea/workspace.xml index 072788b1..a49b6abd 100644 --- a/homework/week-0/.idea/workspace.xml +++ b/homework/week-0/.idea/workspace.xml @@ -82,8 +82,8 @@ - - + + @@ -658,8 +658,8 @@ - - + + From 4863560dfbfe2a66f5a26a28fa731b7b31ff30c9 Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Thu, 7 May 2015 16:59:30 -0400 Subject: [PATCH 06/13] removed .idea/files and binaries --- exercises/5_OOP-and-Intents/.idea/.name | 1 - .../.idea/5_OOP-and-Intents.iml | 9 - .../5_OOP-and-Intents/.idea/compiler.xml | 23 - .../.idea/copyright/profiles_settings.xml | 3 - .../5_OOP-and-Intents/.idea/encodings.xml | 4 - exercises/5_OOP-and-Intents/.idea/modules.xml | 8 - .../.idea/scopes/scope_settings.xml | 5 - exercises/5_OOP-and-Intents/.idea/vcs.xml | 6 - .../5_OOP-and-Intents/.idea/workspace.xml | 299 -------- homework/week-0/.idea/compiler.xml | 23 - .../.idea/copyright/profiles_settings.xml | 3 - homework/week-0/.idea/description.html | 1 - homework/week-0/.idea/encodings.xml | 4 - homework/week-0/.idea/misc.xml | 12 - homework/week-0/.idea/modules.xml | 8 - homework/week-0/.idea/project-template.xml | 3 - .../week-0/.idea/scopes/scope_settings.xml | 5 - homework/week-0/.idea/vcs.xml | 6 - homework/week-0/.idea/workspace.xml | 679 ------------------ .../week-0/nyc/c4q/hoshikoo/Animal.class | Bin 1424 -> 0 bytes .../week-0/nyc/c4q/hoshikoo/Card.class | Bin 966 -> 0 bytes .../week-0/nyc/c4q/hoshikoo/Domestic.class | Bin 197 -> 0 bytes .../week-0/nyc/c4q/hoshikoo/DomesticCat.class | Bin 1695 -> 0 bytes .../week-0/nyc/c4q/hoshikoo/Game.class | Bin 383 -> 0 bytes .../week-0/nyc/c4q/hoshikoo/Main.class | Bin 2254 -> 0 bytes .../nyc/c4q/hoshikoo/PlayingCards.class | Bin 1100 -> 0 bytes 26 files changed, 1102 deletions(-) delete mode 100644 exercises/5_OOP-and-Intents/.idea/.name delete mode 100644 exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml delete mode 100644 exercises/5_OOP-and-Intents/.idea/compiler.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/encodings.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/modules.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/vcs.xml delete mode 100644 exercises/5_OOP-and-Intents/.idea/workspace.xml delete mode 100644 homework/week-0/.idea/compiler.xml delete mode 100644 homework/week-0/.idea/copyright/profiles_settings.xml delete mode 100644 homework/week-0/.idea/description.html delete mode 100644 homework/week-0/.idea/encodings.xml delete mode 100644 homework/week-0/.idea/misc.xml delete mode 100644 homework/week-0/.idea/modules.xml delete mode 100644 homework/week-0/.idea/project-template.xml delete mode 100644 homework/week-0/.idea/scopes/scope_settings.xml delete mode 100644 homework/week-0/.idea/vcs.xml delete mode 100644 homework/week-0/.idea/workspace.xml delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Card.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/DomesticCat.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class delete mode 100644 homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class diff --git a/exercises/5_OOP-and-Intents/.idea/.name b/exercises/5_OOP-and-Intents/.idea/.name deleted file mode 100644 index 6799a003..00000000 --- a/exercises/5_OOP-and-Intents/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -5_OOP-and-Intents \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml b/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml deleted file mode 100644 index d6ebd480..00000000 --- a/exercises/5_OOP-and-Intents/.idea/5_OOP-and-Intents.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/compiler.xml b/exercises/5_OOP-and-Intents/.idea/compiler.xml deleted file mode 100644 index a8523149..00000000 --- a/exercises/5_OOP-and-Intents/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml b/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/exercises/5_OOP-and-Intents/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/encodings.xml b/exercises/5_OOP-and-Intents/.idea/encodings.xml deleted file mode 100644 index d8210482..00000000 --- a/exercises/5_OOP-and-Intents/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/modules.xml b/exercises/5_OOP-and-Intents/.idea/modules.xml deleted file mode 100644 index 7b0c4337..00000000 --- a/exercises/5_OOP-and-Intents/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml b/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/exercises/5_OOP-and-Intents/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/vcs.xml b/exercises/5_OOP-and-Intents/.idea/vcs.xml deleted file mode 100644 index 6564d52d..00000000 --- a/exercises/5_OOP-and-Intents/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/.idea/workspace.xml b/exercises/5_OOP-and-Intents/.idea/workspace.xml deleted file mode 100644 index f6e4fbe9..00000000 --- a/exercises/5_OOP-and-Intents/.idea/workspace.xml +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1430441476774 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/compiler.xml b/homework/week-0/.idea/compiler.xml deleted file mode 100644 index a8523149..00000000 --- a/homework/week-0/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/copyright/profiles_settings.xml b/homework/week-0/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/homework/week-0/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/homework/week-0/.idea/description.html b/homework/week-0/.idea/description.html deleted file mode 100644 index db5f1295..00000000 --- a/homework/week-0/.idea/description.html +++ /dev/null @@ -1 +0,0 @@ -Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/homework/week-0/.idea/encodings.xml b/homework/week-0/.idea/encodings.xml deleted file mode 100644 index d8210482..00000000 --- a/homework/week-0/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/misc.xml b/homework/week-0/.idea/misc.xml deleted file mode 100644 index ccf24ce4..00000000 --- a/homework/week-0/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/modules.xml b/homework/week-0/.idea/modules.xml deleted file mode 100644 index da56c862..00000000 --- a/homework/week-0/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/project-template.xml b/homework/week-0/.idea/project-template.xml deleted file mode 100644 index 1f08b887..00000000 --- a/homework/week-0/.idea/project-template.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/homework/week-0/.idea/scopes/scope_settings.xml b/homework/week-0/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/homework/week-0/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/vcs.xml b/homework/week-0/.idea/vcs.xml deleted file mode 100644 index 6564d52d..00000000 --- a/homework/week-0/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/homework/week-0/.idea/workspace.xml b/homework/week-0/.idea/workspace.xml deleted file mode 100644 index a49b6abd..00000000 --- a/homework/week-0/.idea/workspace.xml +++ /dev/null @@ -1,679 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1430091604981 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Animal.class deleted file mode 100644 index cb5bda480931afa45cec181b596a6549505ae451..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1424 zcmZ`%Yfscb6g{(Tx4We%$jeoH;ER2r^?{%ZE+C2_Su|!5l=!7A6$)jG-D1K|(ci!a zO>{My7(e@)jC!VBbXQ`U&Yih4_uO;Oz2AR+{tDm*9vJAv^)wXR&@pPz-ZapGF&*Ou zlDICHTLx~UD0dS&CgqzuI!ZdG1Ul+FPSthl5AAJ7;8=Oneq~#pU0b&*Vc^!*Cj^p{ zZp{r#0)5%T*SRGDb=F^F@X@kca~|$)uR6h^z3N49e%1Dt?7)@hrc(_!+`2%fT-&Q! z)zO#MhF{-sw|w84skz&>$BakTov_l%t2diFoLV4V^|yEIz*+SFA@^u?)2W6Nxp|WF z+Wi?7cGGOeGlFT6Hs0KyzO1+8!SeL$hCmPCzAAofm$cZ3jw55@3M_%1XdK!Jo0x&6 za{^uej*W>EIN9cp=?V1yeL5R;FCG;oDkE~=dqKnUt_sy-4EExp5_=v zw4ydfp`011$b9RhG&R8xN4^srEdG$?b5*(T#xbrvJk24&4>0l{A@YR}NW9}IfnKgh z7%ihz#-$n4$5Vg&ns$IE#zm+c7pYzo)1sC6wETM{-f|PeB_n5l1Y^bznlM7DMh^*z z`+S{d%!+bHEhWa(!Z#>IE#H7zOlCA`^h`3NH=w(s{*;(Qv?`WxE^3O73h{^N>BIuF3_xSn z2e?S7lgvHMtXfgc6r4>QyK$Wl(k7*}^g~>nAmIbtK)qC|R4IZ(P$iCzYb7qh7LJR=f8qcV z6%q%206z*b&$~@Z8ZNuf&-3QZ%>MrK^A~{UICfFPejOGb%W>e~(7}qr!bg>=_D8xd6G_ED!B6h_4S8woGYkv1^ZQ!CdG+D)$d;@Sf|-#tk4=JX{=#y z!|{xr&M=F@*+rNq@@<+{F-_(QJHzyI6htpR2GeXlP2Oi&aLP4Y*Y)p{{4A^=6692Gji*SM(C?yFt=UHFZtb3cAZD@St6e5vgw(mD^G*aLYrSg@W2q95m{n|VDR(?l_g6PRic|@X>oPCWa=4a%_KWSo``VKF`Vy+ zk;&GAbFhDd>XNuaN)T>gi^SU`?v~_7dd$cqfgzVl+)El;#B1*XZ|(g%Dql&cz1wAT zwX#KEPu2=~h+Q+h6teeEMp}qZ QA^radkwhecN9D%7zqVV2VgLXD diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Domestic.class deleted file mode 100644 index 13eea31cd033a6870682bbbbf5435d1e5fd46d51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmX^0Z`VEs1_omWZgvJvb_Om+2KM6A62HXUR7M6-4WF#UvPAuy#JqI<;F6-uymV{L zFrbQbm3|ztarA5i9ZkahiQ+QqSb5n~;GL!W{hA}co=2a%^Cz}-NXXF=W zWM=2*>%$Za^fr*8Yfti7YfdNRfGOz(ffGz=vGjIR^ DX7w

U2_yg6g@qko7o9O@_`!y5=2RMkwFLnHen%b0HX`2!JsK$CX*o<*xd=U6RYx5 z^f%-|t8}rn%HrAIWT~fnWZzI5Ndef!*V&%HB${{7n@0Is6pU>Mhipkv;~b%*;6 z2SwbpQFUNpK`x69ZlNZv+cxgVm?ax`ZPW#fw%-Z`PBfnT-}zqCZ*O_4X%e-!76gi& zoiK>P&Lb6KEk^AqtqF|J3Hm|bBx&8U;|I(xsHMon)iN&LMA-Q*?s^ss9AO93-{x$8F> zKn&A=mWGLdwGlpx6G~xhvMPasEI#9E#@Rm6=o4vgrzcciKtF-S!K!K`HN2Yo!Hb9f zjuM&kU}Kpb=PZze;zh~(`qwLXUBFq5catEzAIYAL9O}X)IU6ocVARENj0jBqU(Z~e z!jy}TaYbNMO;ta233SiJeO$5ez{Mw6aq%fWW6HNj(8Xz-5jZ)JZK)l#q{O9xn;z>v zw5&z}eMXL{?r&~Vgg4CUakI&$M{%3t7@as_gGTeIQ`A+*)l<%u)NkeRP~{3@nxEA$ z1dc)Dhe@5d0`I8ZqM!0{9iy+t2pMCQE3Y7aqNQP+tE0SQFnOBbc_NF#NxaJw;}sew zi&&)`>kG!{yepP3602PK1=<_HW9n*>fTsvPr9jVS;Rm2aMO8=$1+Ni!@+hi($QjjX zBA@#Ys!{++mBWxz_0$Xx+s!>iCN5Qx3N5 z-M3`xp@R2t76r-sK=5@=$~ji0;cL84ER8wV@BuBInO2E>o}OVm#0B=%>4^<(l*8b diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Game.class deleted file mode 100644 index 001df77a600f26e8dc02c55be08fb63ae679a893..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmZutJx{|h6g;;{(}Y4x0Wq_+AmIVFR+SJEED;Pr-5p~kE~x{KgVdkJgv7uP;71{B zm$4q+$Gv;L)BE}T`UY@?;{;tCMi@spBIwPfl4e2BolKVm!EOC42!^Rt;-OvVLO-#* zvdB2CIjfdTOV|H{fhlD}aGI(Or~LYjmUUCgm%66+Y%OL4aUsmB6kIsgWSXwnJEN_U z6}{1#ZBp47$I4`(m}#}ux!BE`Z&xd(3Yr-$RWV!G%_OT^&BdK`7Go!R=_CdS5E7j1 zv_&xTHvC_Y`ATpToS|cn;$8>#2ncQL*^b&wY!1&qK|cIAva#pEKKiyEYzc^w00F_C ONA^AUz|Mxg8vOxP!B%eo diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/Main.class deleted file mode 100644 index da5d8360e259f6f1374d91406fe95130f53a4a49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2254 zcmZuzO;;OL7=CU@GLvBh%4ef|)vrSNNTC!dU@ZhuG*B!^1*~=$Mi`o8!enThsy#g} z)s^S?1N;L$M;F0k&T-|!<8kA{ZTIe7tIwTD2$*DX@B6;@z3<2KJ~NZw{`u)=09Wu> z!^=o2SWxk%h7cB2yrtr81xp$fB&F#cDZQ&9h2NN*UfE%mZ7?Cslmfv!}xU?$9o!^FOm z-?#5MPGZ@xvoj2r;V#fQu$?+E?i-1;k=;wId9Iz^oAJ{b?j8fQ)j4KGrr`<1YlF{a z?TnFT_=a6)k4dIvAldsiu->0@&0dqY7b6$d} z;{iCpuK#mm{>V=6S}q$U)^eWH{W>0^AeTovK9yA-%9eU+YB-I(j?eHpsZir2;S*@7 zroFjyV40FN1GVT&o;K}S-dfHwZ7aWGWSF>ppgg?Oj3&g!E-82>N)UQxaEtaT=1GU` zo1X1tNyTv9ahbfWoZKIZPgj}xRF!Lmyk}*Y#W|`n+;$SHe4ac$RhE$6B*Mb*p2dnCWD4hHI^p@^yWdSn0r$tm$GMnCb(k5V!!bsFBNAS)wyi=W;EWWeTvL zGyWAcYqC}SRnH0DFl>q0bGBt#@+DQ7*jdic-~wLan_2!s5b|;2dXZX!yWk$VbPVym ze>}i7>KkJiq^t)HxP&2UF$`mb7G4hhjxbLlzAhoO+1hZ7aLSh=l$KAV6<>V^* zkr2rlHbBns8-L(U(9n!_ej0mmj`M88IJH@HU=f}CYIb3pAJDsq^NrZe7hew^)ALL8 z;ah$|zawp)GERw<`IV&klaZe>%3ox|-{ix;7#12vL^DRkAjZTb#zhiW#40Al9b6R$ zm=q5%C7$4#_zKfLpB@FA!6?ZGXyOZ8#uypZE*`SBF%q;_WcgoWjC~9W6BCrejJt)a zm_&s2Ji}|4B1cR31J@`itnC*@pMuH?k1<0jMz5#rbCMaJFyrgEjz+w}jGfF7M7zOg Pf!7V9BrwO*5a#~_kuw=K diff --git a/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class b/homework/week-0/out/production/week-0/nyc/c4q/hoshikoo/PlayingCards.class deleted file mode 100644 index 91f3415e50998aca40bbe5e728940c85a66bb118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1100 zcmaJ<+fEZv6kVq+?NH18;;jgxXiF`lg13M~#i%6plGNbk?Q~{R4h%EnbV}^I|KPhX zzUoU!B=H0MARkP;tkZ%ifzqaXpR@L!z1LdPAAi1m2QZI2X$)W{g-dC~biSNM0y743 zI_Gtm)uEuvR}2&l%o#9KxSGN>f#j0%RJ1G*&*j$y5-Yy#2n>{z=RB)#Rh;mpthhvm zOTH!DH5n>>-vblTx~d6Gmb`{#S_|*Yb-%W*HhtfG;mU^csw*#?T znah_pW}3XnI~lsIG!y~%pEpu&)maAX=XOJdR*Cv{I>G~qx-&g%;A8zw7GVy zbM5oWhGRvG`L{Tae*Vk#CkCOdWE|$rWERXlvpW!9TjdePWD7Jf%5$dOfH92oMze8> zL-fNx5$6|pzl+$L9mGqCyV=41Pf&$jBnb2jC!0uRn=qQ_Z6f{ZKYpSMp6P=39mGGx z#OJ>s3tzZ90nK+B24f%N0L2X=M}haq@inUfv2AkKTBgW14Hu_zh8oCxPnE&0v&d52 h1W~QHjhy3YvW3KcBb~yO_=QcHscoEQ?LzBx@gEY^0bu|D From f6e4e3ebad27dc867e027c13429fbc1902a9a938 Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Thu, 7 May 2015 17:03:08 -0400 Subject: [PATCH 07/13] removed 5_OOP-and-Intents/oop/ --- exercises/5_OOP-and-Intents/oop/.idea/.name | 1 - .../5_OOP-and-Intents/oop/.idea/compiler.xml | 23 - .../oop/.idea/copyright/profiles_settings.xml | 3 - .../5_OOP-and-Intents/oop/.idea/encodings.xml | 4 - .../5_OOP-and-Intents/oop/.idea/misc.xml | 206 ------- .../5_OOP-and-Intents/oop/.idea/modules.xml | 8 - .../oop/.idea/scopes/scope_settings.xml | 5 - .../oop/.idea/uiDesigner.xml | 124 ---- exercises/5_OOP-and-Intents/oop/.idea/vcs.xml | 6 - .../5_OOP-and-Intents/oop/.idea/workspace.xml | 578 ------------------ exercises/5_OOP-and-Intents/oop/oop.iml | 11 - .../5_OOP-and-Intents/oop/src/Clarinet.java | 1 - .../oop/src/ClarinetAnswer.java | 1 - .../oop/src/ClarinetPlayer.java | 1 - .../5_OOP-and-Intents/oop/src/Instrument.java | 7 - .../5_OOP-and-Intents/oop/src/Musician.java | 7 - .../oop/src/ReedInstrument.java | 1 - .../5_OOP-and-Intents/oop/src/ReedPlayer.java | 1 - 18 files changed, 988 deletions(-) delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/.name delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/compiler.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/encodings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/misc.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/modules.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/vcs.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/.idea/workspace.xml delete mode 100644 exercises/5_OOP-and-Intents/oop/oop.iml delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Clarinet.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Instrument.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/Musician.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java delete mode 100644 exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java diff --git a/exercises/5_OOP-and-Intents/oop/.idea/.name b/exercises/5_OOP-and-Intents/oop/.idea/.name deleted file mode 100644 index d85a74a5..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -oop \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml b/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml deleted file mode 100644 index a8523149..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml b/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml deleted file mode 100644 index d8210482..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/misc.xml b/exercises/5_OOP-and-Intents/oop/.idea/misc.xml deleted file mode 100644 index a4115268..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/misc.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.7 - - - - - - - - 1.7 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/modules.xml b/exercises/5_OOP-and-Intents/oop/.idea/modules.xml deleted file mode 100644 index b67b02b8..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml b/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml b/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml b/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml deleted file mode 100644 index 6564d52d..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml b/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml deleted file mode 100644 index 7b083018..00000000 --- a/exercises/5_OOP-and-Intents/oop/.idea/workspace.xml +++ /dev/null @@ -1,578 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1430441604370 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.7 - - - - - - - - oop - - - - - - - - 1.7 - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/oop.iml b/exercises/5_OOP-and-Intents/oop/oop.iml deleted file mode 100644 index c90834f2..00000000 --- a/exercises/5_OOP-and-Intents/oop/oop.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/Clarinet.java b/exercises/5_OOP-and-Intents/oop/src/Clarinet.java deleted file mode 100644 index ee67a5be..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/Clarinet.java +++ /dev/null @@ -1 +0,0 @@ -/** * Created by Hoshiko on 4/30/15. */ public class Clarinet extends ReedInstrument { boolean reed; @Override boolean hasReed(){ return reed; } @Override public String play(){ return "reed sound"; } @Override void place_reed(){ this.reed = true; } @Override void remove_reed(){ this.reed = false; } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java b/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java deleted file mode 100644 index b7bb36b5..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/ClarinetAnswer.java +++ /dev/null @@ -1 +0,0 @@ -/** * Created by Hoshiko on 4/30/15. */ public class ClarinetAnswer extends ReedInstrument { boolean reed; @Override boolean hasReed(){ return reed; } @Override public String play(){ return "reed sound"; } @Override void place_reed(){ reed = true; } @Override void remove_reed(){ reed = false; } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java deleted file mode 100644 index f799b14a..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/ClarinetPlayer.java +++ /dev/null @@ -1 +0,0 @@ -/** * Created by Hoshiko on 4/30/15. */ public class ClarinetPlayer extends Musician { Clarinet myClarinet = new Clarinet(); @Override public String play_instrument() { if (!myClarinet.hasReed()){ return null; }else{ return myClarinet.play(); } } public void toggle_reed(){ if (!myClarinet.hasReed()){ myClarinet.place_reed(); }else{ myClarinet.remove_reed(); } } } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/Instrument.java b/exercises/5_OOP-and-Intents/oop/src/Instrument.java deleted file mode 100644 index e3f342e9..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/Instrument.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Created by amyquispe on 4/30/15. - */ -public interface Instrument { - /* expected behavior: when play() is called, return a String that represents the Instrument's noise */ - public String play(); -} diff --git a/exercises/5_OOP-and-Intents/oop/src/Musician.java b/exercises/5_OOP-and-Intents/oop/src/Musician.java deleted file mode 100644 index fe90f5ff..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/Musician.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Created by amyquispe on 4/30/15. - */ -public abstract class Musician { - /* expected behavior: when play_instrument() is called, return a String that represents the instrument's noise */ - public abstract String play_instrument(); -} diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java b/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java deleted file mode 100644 index 31457cb5..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/ReedInstrument.java +++ /dev/null @@ -1 +0,0 @@ -/** * Created by Hoshiko on 4/30/15. */ public abstract class ReedInstrument implements Instrument { abstract boolean hasReed(); // puts a reed on the instrument abstract void place_reed(); //removes the reed from the instrument abstract void remove_reed(); //Why an abstract class implementing an interface can miss // the declaration/implementation of one of the interface's methods? // Because if a class is abstract, then by definition you are required to create // subclasses of it to instantiate. The subclasses will be required // (by the compiler) to implement any interface methods that the abstract class left out. } \ No newline at end of file diff --git a/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java b/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java deleted file mode 100644 index 02f24b3a..00000000 --- a/exercises/5_OOP-and-Intents/oop/src/ReedPlayer.java +++ /dev/null @@ -1 +0,0 @@ -/** * Created by Hoshiko on 4/30/15. */ public abstract class ReedPlayer extends Musician { } \ No newline at end of file From 0bf20b0bdf7f8d458d4aa538ea6768e54eb8c3f5 Mon Sep 17 00:00:00 2001 From: hoshikoo Date: Fri, 8 May 2015 21:16:50 -0400 Subject: [PATCH 08/13] hoshikoo_unit1_wk1_hw --- homework/week-1/.gitignore | 6 + homework/week-1/.idea/.name | 1 + homework/week-1/.idea/compiler.xml | 23 ++ .../.idea/copyright/profiles_settings.xml | 3 + homework/week-1/.idea/encodings.xml | 5 + homework/week-1/.idea/gradle.xml | 18 ++ homework/week-1/.idea/misc.xml | 10 + homework/week-1/.idea/modules.xml | 10 + .../week-1/.idea/scopes/scope_settings.xml | 5 + homework/week-1/.idea/vcs.xml | 7 + homework/week-1/app/.gitignore | 1 + homework/week-1/app/app.iml | 93 ++++++ homework/week-1/app/build.gradle | 25 ++ homework/week-1/app/proguard-rules.pro | 17 ++ .../nyc/myapplication/ApplicationTest.java | 13 + .../week-1/app/src/main/AndroidManifest.xml | 21 ++ .../hoshikoo/c4q/nyc/myapplication/Aries.java | 47 +++ .../c4q/nyc/myapplication/ChooseZodiac.java | 46 +++ .../c4q/nyc/myapplication/EnterBirthday.java | 84 ++++++ .../hoshikoo/c4q/nyc/myapplication/Game.java | 22 ++ .../c4q/nyc/myapplication/MainActivity.java | 167 ++++++++++ .../c4q/nyc/myapplication/MainFragment.java | 18 ++ .../NavigationDrawerFragment.java | 284 ++++++++++++++++++ .../myapplication/RomanticCompatibility.java | 31 ++ .../c4q/nyc/myapplication/Spinners.java | 27 ++ .../nyc/myapplication/zodiacSignDialog.java | 39 +++ .../res/drawable-hdpi/drawer_shadow.9.png | Bin 0 -> 161 bytes .../src/main/res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2829 bytes .../res/drawable-mdpi/drawer_shadow.9.png | Bin 0 -> 142 bytes .../src/main/res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2820 bytes .../res/drawable-xhdpi/drawer_shadow.9.png | Bin 0 -> 174 bytes .../src/main/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes .../res/drawable-xxhdpi/drawer_shadow.9.png | Bin 0 -> 208 bytes .../main/res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 202 bytes .../app/src/main/res/layout/activity_main.xml | 25 ++ .../src/main/res/layout/fragment_aries.xml | 9 + .../res/layout/fragment_choose_zodiac.xml | 156 ++++++++++ .../res/layout/fragment_enter_birthday.xml | 73 +++++ .../app/src/main/res/layout/fragment_game.xml | 10 + .../app/src/main/res/layout/fragment_main.xml | 22 ++ .../src/main/res/layout/fragment_main2.xml | 10 + .../res/layout/fragment_navigation_drawer.xml | 5 + .../fragment_romantic_compatibility.xml | 81 +++++ .../layout/fragment_zodiac_sign_dialog.xml | 10 + .../week-1/app/src/main/res/menu/global.xml | 5 + .../week-1/app/src/main/res/menu/main.xml | 8 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../app/src/main/res/values-w820dp/dimens.xml | 6 + .../week-1/app/src/main/res/values/dimens.xml | 9 + .../app/src/main/res/values/strings.xml | 30 ++ .../week-1/app/src/main/res/values/styles.xml | 8 + homework/week-1/build.gradle | 19 ++ homework/week-1/gradle.properties | 18 ++ .../week-1/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + homework/week-1/gradlew | 164 ++++++++++ homework/week-1/gradlew.bat | 90 ++++++ homework/week-1/settings.gradle | 1 + homework/week-1/week-01.iml | 19 ++ 62 files changed, 1807 insertions(+) create mode 100644 homework/week-1/.gitignore create mode 100644 homework/week-1/.idea/.name create mode 100644 homework/week-1/.idea/compiler.xml create mode 100644 homework/week-1/.idea/copyright/profiles_settings.xml create mode 100644 homework/week-1/.idea/encodings.xml create mode 100644 homework/week-1/.idea/gradle.xml create mode 100644 homework/week-1/.idea/misc.xml create mode 100644 homework/week-1/.idea/modules.xml create mode 100644 homework/week-1/.idea/scopes/scope_settings.xml create mode 100644 homework/week-1/.idea/vcs.xml create mode 100644 homework/week-1/app/.gitignore create mode 100644 homework/week-1/app/app.iml create mode 100644 homework/week-1/app/build.gradle create mode 100644 homework/week-1/app/proguard-rules.pro create mode 100644 homework/week-1/app/src/androidTest/java/hoshikoo/c4q/nyc/myapplication/ApplicationTest.java create mode 100644 homework/week-1/app/src/main/AndroidManifest.xml create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Aries.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/ChooseZodiac.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/EnterBirthday.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Game.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainActivity.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainFragment.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/NavigationDrawerFragment.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/RomanticCompatibility.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Spinners.java create mode 100644 homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/zodiacSignDialog.java create mode 100644 homework/week-1/app/src/main/res/drawable-hdpi/drawer_shadow.9.png create mode 100644 homework/week-1/app/src/main/res/drawable-hdpi/ic_drawer.png create mode 100644 homework/week-1/app/src/main/res/drawable-mdpi/drawer_shadow.9.png create mode 100644 homework/week-1/app/src/main/res/drawable-mdpi/ic_drawer.png create mode 100644 homework/week-1/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png create mode 100644 homework/week-1/app/src/main/res/drawable-xhdpi/ic_drawer.png create mode 100644 homework/week-1/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png create mode 100644 homework/week-1/app/src/main/res/drawable-xxhdpi/ic_drawer.png create mode 100644 homework/week-1/app/src/main/res/layout/activity_main.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_aries.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_choose_zodiac.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_enter_birthday.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_game.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_main.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_main2.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_navigation_drawer.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_romantic_compatibility.xml create mode 100644 homework/week-1/app/src/main/res/layout/fragment_zodiac_sign_dialog.xml create mode 100644 homework/week-1/app/src/main/res/menu/global.xml create mode 100644 homework/week-1/app/src/main/res/menu/main.xml create mode 100644 homework/week-1/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 homework/week-1/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 homework/week-1/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 homework/week-1/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 homework/week-1/app/src/main/res/values-w820dp/dimens.xml create mode 100644 homework/week-1/app/src/main/res/values/dimens.xml create mode 100644 homework/week-1/app/src/main/res/values/strings.xml create mode 100644 homework/week-1/app/src/main/res/values/styles.xml create mode 100644 homework/week-1/build.gradle create mode 100644 homework/week-1/gradle.properties create mode 100644 homework/week-1/gradle/wrapper/gradle-wrapper.jar create mode 100644 homework/week-1/gradle/wrapper/gradle-wrapper.properties create mode 100755 homework/week-1/gradlew create mode 100644 homework/week-1/gradlew.bat create mode 100644 homework/week-1/settings.gradle create mode 100644 homework/week-1/week-01.iml diff --git a/homework/week-1/.gitignore b/homework/week-1/.gitignore new file mode 100644 index 00000000..afbdab33 --- /dev/null +++ b/homework/week-1/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/homework/week-1/.idea/.name b/homework/week-1/.idea/.name new file mode 100644 index 00000000..b3405b3b --- /dev/null +++ b/homework/week-1/.idea/.name @@ -0,0 +1 @@ +My Application \ No newline at end of file diff --git a/homework/week-1/.idea/compiler.xml b/homework/week-1/.idea/compiler.xml new file mode 100644 index 00000000..217af471 --- /dev/null +++ b/homework/week-1/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/homework/week-1/.idea/copyright/profiles_settings.xml b/homework/week-1/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/homework/week-1/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/homework/week-1/.idea/encodings.xml b/homework/week-1/.idea/encodings.xml new file mode 100644 index 00000000..e206d70d --- /dev/null +++ b/homework/week-1/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/homework/week-1/.idea/gradle.xml b/homework/week-1/.idea/gradle.xml new file mode 100644 index 00000000..736c7b5c --- /dev/null +++ b/homework/week-1/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/homework/week-1/.idea/misc.xml b/homework/week-1/.idea/misc.xml new file mode 100644 index 00000000..59436c98 --- /dev/null +++ b/homework/week-1/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/homework/week-1/.idea/modules.xml b/homework/week-1/.idea/modules.xml new file mode 100644 index 00000000..152553e8 --- /dev/null +++ b/homework/week-1/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/homework/week-1/.idea/scopes/scope_settings.xml b/homework/week-1/.idea/scopes/scope_settings.xml new file mode 100644 index 00000000..922003b8 --- /dev/null +++ b/homework/week-1/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/homework/week-1/.idea/vcs.xml b/homework/week-1/.idea/vcs.xml new file mode 100644 index 00000000..def6a6a1 --- /dev/null +++ b/homework/week-1/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/homework/week-1/app/.gitignore b/homework/week-1/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/homework/week-1/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/homework/week-1/app/app.iml b/homework/week-1/app/app.iml new file mode 100644 index 00000000..a8a862fe --- /dev/null +++ b/homework/week-1/app/app.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/homework/week-1/app/build.gradle b/homework/week-1/app/build.gradle new file mode 100644 index 00000000..ab831892 --- /dev/null +++ b/homework/week-1/app/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + + defaultConfig { + applicationId "hoshikoo.c4q.nyc.myapplication" + minSdkVersion 15 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:22.1.1' +} diff --git a/homework/week-1/app/proguard-rules.pro b/homework/week-1/app/proguard-rules.pro new file mode 100644 index 00000000..8ade1982 --- /dev/null +++ b/homework/week-1/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/Hoshiko/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/homework/week-1/app/src/androidTest/java/hoshikoo/c4q/nyc/myapplication/ApplicationTest.java b/homework/week-1/app/src/androidTest/java/hoshikoo/c4q/nyc/myapplication/ApplicationTest.java new file mode 100644 index 00000000..fa5d7bda --- /dev/null +++ b/homework/week-1/app/src/androidTest/java/hoshikoo/c4q/nyc/myapplication/ApplicationTest.java @@ -0,0 +1,13 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/homework/week-1/app/src/main/AndroidManifest.xml b/homework/week-1/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..346e03bf --- /dev/null +++ b/homework/week-1/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Aries.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Aries.java new file mode 100644 index 00000000..728ce109 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Aries.java @@ -0,0 +1,47 @@ +package hoshikoo.c4q.nyc.myapplication; + + +import android.app.Dialog; +import android.content.DialogInterface; +import android.os.Bundle; +import android.app.Fragment; +import android.support.v4.app.DialogFragment; +import android.support.v7.app.AlertDialog; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + + +public class Aries extends DialogFragment { + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + + // Use the Builder class for convenient dialog construction + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setMessage(R.string.Aries_Description) +// .setPositiveButton(R.string.fire, new DialogInterface.OnClickListener() { +// public void onClick(DialogInterface dialog, int id) { +// // FIRE ZE MISSILES! +// } +// }) + .setNegativeButton(R.string.done, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User cancelled the dialog + } + }); + // Create the AlertDialog object and return it + return builder.create(); + } + + + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_aries, container, false); + } + + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/ChooseZodiac.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/ChooseZodiac.java new file mode 100644 index 00000000..4cc8bf6c --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/ChooseZodiac.java @@ -0,0 +1,46 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.app.Dialog; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentActivity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + + +public class ChooseZodiac extends FragmentActivity{ + + + + //@Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View view = inflater.inflate(R.layout.fragment_choose_zodiac, container, false); + + final Button buttonAries = (Button) view.findViewById(R.id.button_Aries); + + + + return view; + + } + + public void showDialog (View v){ + zodiacSignDialog dialog = new zodiacSignDialog(); + FragmentManager fragmentManager = getSupportFragmentManager(); + dialog.show(fragmentManager, "you got it!"); + } + + + + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/EnterBirthday.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/EnterBirthday.java new file mode 100644 index 00000000..92321df0 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/EnterBirthday.java @@ -0,0 +1,84 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +public class EnterBirthday extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + + + final EditText birthday = (EditText) getView().findViewById(R.id.birth_day); + + Button getZodiac = (Button) getView().findViewById(R.id.get_zodiac_sign); + getZodiac.setOnClickListener(new View.OnClickListener() { + String zodiacSign; + @Override + public void onClick(View v) { + + String birthDay = birthday.getText().toString(); + long bd = Integer.parseInt(birthDay); + + if ( bd>=321 && bd<=331 || bd>=401 && bd <=419){ + zodiacSign = "Aries"; + }else if ( bd>=420 && bd<=430 ||bd>=501 && bd<=520 ){ + zodiacSign = "Taurus"; + }else if ( bd>=420 && bd<=430 ||bd>=501 && bd<=520 ){ + + }else if ( bd>=521 && bd<=531 ||bd>=601 && bd<=621 ){ + zodiacSign = "Gemini"; + + }else if ( bd>=622 && bd<=630 ||bd>=701 && bd<=722 ){ + zodiacSign = "Cancer"; + + }else if ( bd>=723 && bd<=731 ||bd>=801 && bd<=822 ) { + zodiacSign = "Leo"; + + }else if ( bd>=823 && bd<=831 ||bd>=901 && bd<=922 ) { + zodiacSign = "Virgo"; + + }else if ( bd>=923 && bd<=930 ||bd>=1001 && bd<=1023 ) { + zodiacSign = "Libra"; + + }else if ( bd>=1024 && bd<=1031 ||bd>=1101 && bd<=1120 ) { + zodiacSign = "Scorpio"; + + }else if ( bd>=1121 && bd<=1130 ||bd>=1201 && bd<=1222 ) { + zodiacSign = "Sagittarius"; + + }else if ( bd>=1223 && bd<=1231 ||bd>=101 && bd<=120 ) { + zodiacSign = "Capricorn"; + }else if ( bd>=121 && bd<=131 ||bd>=201 && bd<=221 ) { + zodiacSign = "Aquarius"; + }else if ( bd>=222 && bd<=229 ||bd>=301 && bd<=320 ) { + zodiacSign = "Pisces"; + }else { + zodiacSign = "no zodiac sign"; + } + TextView tv = (TextView)getView().findViewById(R.id.zodiac_sign_result); + tv.setText(zodiacSign); + + } + }); + + + + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_enter_birthday, container, false); + } + + + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Game.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Game.java new file mode 100644 index 00000000..644e07a4 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Game.java @@ -0,0 +1,22 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + + +public class Game extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_game, container, false); + } + + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainActivity.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainActivity.java new file mode 100644 index 00000000..f4649b96 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainActivity.java @@ -0,0 +1,167 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.ActionBar; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.content.Context; +import android.os.Build; +import android.os.Bundle; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.support.v4.widget.DrawerLayout; +import android.widget.ArrayAdapter; +import android.widget.TextView; + + +public class MainActivity extends ActionBarActivity + implements NavigationDrawerFragment.NavigationDrawerCallbacks { + + /** + * Fragment managing the behaviors, interactions and presentation of the navigation drawer. + */ + private NavigationDrawerFragment mNavigationDrawerFragment; + + /** + * Used to store the last screen title. For use in {@link #restoreActionBar()}. + */ + private CharSequence mTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + mNavigationDrawerFragment = (NavigationDrawerFragment) + getSupportFragmentManager().findFragmentById(R.id.navigation_drawer); + mTitle = getTitle(); + + // Set up the drawer. + mNavigationDrawerFragment.setUp( + R.id.navigation_drawer, + (DrawerLayout) findViewById(R.id.drawer_layout)); + } + + @Override + public void onNavigationDrawerItemSelected(int position) { + + Fragment chosen=null; + + if (position == 0){ +// chosen = new ChooseZodiac(); + }else if(position == 1){ + chosen = new EnterBirthday(); + }else if(position == 2){ + chosen = new RomanticCompatibility(); + }else { + chosen = new Game(); + } + + // update the main content by replacing fragments + FragmentManager fragmentManager = getSupportFragmentManager(); + + fragmentManager.beginTransaction() + .replace(R.id.container, chosen) + .commit(); + + } + + public void onSectionAttached(int number) { + switch (number) { + case 1: + mTitle = getString(R.string.title_section1); + break; + case 2: + mTitle = getString(R.string.title_section2); + break; + case 3: + mTitle = getString(R.string.title_section3); + break; + case 4: + mTitle = getString(R.string.title_section4); + break; + } + } + + public void restoreActionBar() { + ActionBar actionBar = getSupportActionBar(); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setTitle(mTitle); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + if (!mNavigationDrawerFragment.isDrawerOpen()) { + // Only show items in the action bar relevant to this screen + // if the drawer is not showing. Otherwise, let the drawer + // decide what to show in the action bar. + getMenuInflater().inflate(R.menu.main, menu); + restoreActionBar(); + return true; + } + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * A placeholder fragment containing a simple view. + */ +// public static class PlaceholderFragment extends Fragment { +// /** +// * The fragment argument representing the section number for this +// * fragment. +// */ +// private static final String ARG_SECTION_NUMBER = "section_number"; +// +// /** +// * Returns a new instance of this fragment for the given section +// * number. +// */ +// public static PlaceholderFragment newInstance(int sectionNumber) { +// PlaceholderFragment fragment = new PlaceholderFragment(); +// Bundle args = new Bundle(); +// args.putInt(ARG_SECTION_NUMBER, sectionNumber); +// fragment.setArguments(args); +// return fragment; +// } +// +// public PlaceholderFragment() { +// } + +// @Override +// public View onCreateView(LayoutInflater inflater, ViewGroup container, +// Bundle savedInstanceState) { +// View rootView = inflater.inflate(R.layout.fragment_main, container, false); +// return rootView; +// } +// +// @Override +// public void onAttach(Activity activity) { +// super.onAttach(activity); +// ((MainActivity) activity).onSectionAttached( +// getArguments().getInt(ARG_SECTION_NUMBER)); +// } +// } + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainFragment.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainFragment.java new file mode 100644 index 00000000..117ca2ea --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/MainFragment.java @@ -0,0 +1,18 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.net.Uri; +import android.os.Bundle; +import android.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +public class MainFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_main2, container, false); + } +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/NavigationDrawerFragment.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/NavigationDrawerFragment.java new file mode 100644 index 00000000..4af619a7 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/NavigationDrawerFragment.java @@ -0,0 +1,284 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.support.v7.app.ActionBarActivity; +import android.app.Activity; +import android.support.v7.app.ActionBar; +import android.support.v4.app.Fragment; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +/** + * Fragment used for managing interactions for and presentation of a navigation drawer. + * See the + * design guidelines for a complete explanation of the behaviors implemented here. + */ +public class NavigationDrawerFragment extends Fragment { + + /** + * Remember the position of the selected item. + */ + private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position"; + + /** + * Per the design guidelines, you should show the drawer on launch until the user manually + * expands it. This shared preference tracks this. + */ + private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned"; + + /** + * A pointer to the current callbacks instance (the Activity). + */ + private NavigationDrawerCallbacks mCallbacks; + + /** + * Helper component that ties the action bar to the navigation drawer. + */ + private ActionBarDrawerToggle mDrawerToggle; + + private DrawerLayout mDrawerLayout; + private ListView mDrawerListView; + private View mFragmentContainerView; + + private int mCurrentSelectedPosition = 0; + private boolean mFromSavedInstanceState; + private boolean mUserLearnedDrawer; + + public NavigationDrawerFragment() { + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // Read in the flag indicating whether or not the user has demonstrated awareness of the + // drawer. See PREF_USER_LEARNED_DRAWER for details. + SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity()); + mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false); + + if (savedInstanceState != null) { + mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION); + mFromSavedInstanceState = true; + } + + // Select either the default item (0) or the last selected item. + selectItem(mCurrentSelectedPosition); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + // Indicate that this fragment would like to influence the set of actions in the action bar. + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + mDrawerListView = (ListView) inflater.inflate( + R.layout.fragment_navigation_drawer, container, false); + mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + selectItem(position); + } + }); + mDrawerListView.setAdapter(new ArrayAdapter( + getActionBar().getThemedContext(), + android.R.layout.simple_list_item_activated_1, + android.R.id.text1, + new String[]{ + getString(R.string.title_section1), + getString(R.string.title_section2), + getString(R.string.title_section3), + getString(R.string.title_section4), + + })); + mDrawerListView.setItemChecked(mCurrentSelectedPosition, true); + return mDrawerListView; + } + + public boolean isDrawerOpen() { + return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView); + } + + /** + * Users of this fragment must call this method to set up the navigation drawer interactions. + * + * @param fragmentId The android:id of this fragment in its activity's layout. + * @param drawerLayout The DrawerLayout containing this fragment's UI. + */ + public void setUp(int fragmentId, DrawerLayout drawerLayout) { + mFragmentContainerView = getActivity().findViewById(fragmentId); + mDrawerLayout = drawerLayout; + + // set a custom shadow that overlays the main content when the drawer opens + mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START); + // set up the drawer's list view with items and click listener + + ActionBar actionBar = getActionBar(); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setHomeButtonEnabled(true); + + // ActionBarDrawerToggle ties together the the proper interactions + // between the navigation drawer and the action bar app icon. + mDrawerToggle = new ActionBarDrawerToggle( + getActivity(), /* host Activity */ + mDrawerLayout, /* DrawerLayout object */ + R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */ + R.string.navigation_drawer_open, /* "open drawer" description for accessibility */ + R.string.navigation_drawer_close /* "close drawer" description for accessibility */ + ) { + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + if (!isAdded()) { + return; + } + + getActivity().supportInvalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + if (!isAdded()) { + return; + } + + if (!mUserLearnedDrawer) { + // The user manually opened the drawer; store this flag to prevent auto-showing + // the navigation drawer automatically in the future. + mUserLearnedDrawer = true; + SharedPreferences sp = PreferenceManager + .getDefaultSharedPreferences(getActivity()); + sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply(); + } + + getActivity().supportInvalidateOptionsMenu(); // calls onPrepareOptionsMenu() + } + }; + + // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer, + // per the navigation drawer design guidelines. + if (!mUserLearnedDrawer && !mFromSavedInstanceState) { + mDrawerLayout.openDrawer(mFragmentContainerView); + } + + // Defer code dependent on restoration of previous instance state. + mDrawerLayout.post(new Runnable() { + @Override + public void run() { + mDrawerToggle.syncState(); + } + }); + + mDrawerLayout.setDrawerListener(mDrawerToggle); + } + + private void selectItem(int position) { + mCurrentSelectedPosition = position; + if (mDrawerListView != null) { + mDrawerListView.setItemChecked(position, true); + } + if (mDrawerLayout != null) { + mDrawerLayout.closeDrawer(mFragmentContainerView); + } + if (mCallbacks != null) { + mCallbacks.onNavigationDrawerItemSelected(position); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mCallbacks = (NavigationDrawerCallbacks) activity; + } catch (ClassCastException e) { + throw new ClassCastException("Activity must implement NavigationDrawerCallbacks."); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mCallbacks = null; + } + + @Override + public void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + // Forward the new configuration the drawer toggle component. + mDrawerToggle.onConfigurationChanged(newConfig); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + // If the drawer is open, show the global app actions in the action bar. See also + // showGlobalContextActionBar, which controls the top-left area of the action bar. + if (mDrawerLayout != null && isDrawerOpen()) { + inflater.inflate(R.menu.global, menu); + showGlobalContextActionBar(); + } + super.onCreateOptionsMenu(menu, inflater); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (mDrawerToggle.onOptionsItemSelected(item)) { + return true; + } + + if (item.getItemId() == R.id.action_example) { + Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show(); + return true; + } + + return super.onOptionsItemSelected(item); + } + + /** + * Per the navigation drawer design guidelines, updates the action bar to show the global app + * 'context', rather than just what's in the current screen. + */ + private void showGlobalContextActionBar() { + ActionBar actionBar = getActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); + actionBar.setTitle(R.string.app_name); + } + + private ActionBar getActionBar() { + return ((ActionBarActivity) getActivity()).getSupportActionBar(); + } + + /** + * Callbacks interface that all activities using this fragment must implement. + */ + public static interface NavigationDrawerCallbacks { + /** + * Called when an item in the navigation drawer is selected. + */ + void onNavigationDrawerItemSelected(int position); + } +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/RomanticCompatibility.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/RomanticCompatibility.java new file mode 100644 index 00000000..5b0d2983 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/RomanticCompatibility.java @@ -0,0 +1,31 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.Spinner; + +public class RomanticCompatibility extends Fragment { + + private String[] arraySpinner; + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + + this.arraySpinner = new String[] { + "Aries", "Taurus", "Gemini", "Cancer", "Leo", "Virgo", "libra", "Scorpio", "Sagittarius", "Capricorn", "Aquarius", "Pisces" + }; + + Spinner s = (Spinner)getView().findViewById(R.id.spinner01); +// ArrayAdapter adapter = new ArrayAdapter(this, R.layout.fragment_romantic_compatibility, arraySpinner); +// s.setAdapter(adapter); + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_romantic_compatibility, container, false); + } + +} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Spinners.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Spinners.java new file mode 100644 index 00000000..979891ec --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/Spinners.java @@ -0,0 +1,27 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.ArrayAdapter; +import android.widget.Spinner; + +/** + * Created by Hoshiko on 5/7/15. + */ +//public class Spinners extends Activity{ +// private String[] arraySpinner; +// +// @Override +// public void onCreate(Bundle savedInstanceState) { +// super.onCreate(savedInstanceState); +// setContentView(R.layout.fragment_romantic_compatibility); +// +// this.arraySpinner = new String[] { +// "1", "2", "3", "4", "5" +// }; +// Spinner s = (Spinner) findViewById(R.id.spinner01); +// ArrayAdapter adapter = new ArrayAdapter(this, +// android.R.layout.simple_spinner_item, arraySpinner); +// s.setAdapter(adapter); +// } +//} diff --git a/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/zodiacSignDialog.java b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/zodiacSignDialog.java new file mode 100644 index 00000000..18e66040 --- /dev/null +++ b/homework/week-1/app/src/main/java/hoshikoo/c4q/nyc/myapplication/zodiacSignDialog.java @@ -0,0 +1,39 @@ +package hoshikoo.c4q.nyc.myapplication; + +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.DialogInterface; +import android.net.Uri; +import android.os.Bundle; +import android.app.Fragment; +import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.TextView; + + +public class zodiacSignDialog extends DialogFragment { + @Override + @NonNull + public Dialog onCreateDialog (Bundle savedInstandeState){ + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setMessage("This is my dialog").setPositiveButton("OK", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + + } + }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + + } + }); + AlertDialog dialog = builder.create(); + return dialog; + } +} + diff --git a/homework/week-1/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/homework/week-1/app/src/main/res/drawable-hdpi/drawer_shadow.9.png new file mode 100644 index 0000000000000000000000000000000000000000..236bff558af07faa3921ba35e2515edf62d04bb9 GIT binary patch literal 161 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 F2>^8yH@N@+ literal 0 HcmV?d00001 diff --git a/homework/week-1/app/src/main/res/drawable-xhdpi/ic_drawer.png b/homework/week-1/app/src/main/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..a5fa74def4b40d7eb6826da05bd5e12b836cb999 GIT binary patch literal 2836 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 m06>TUe1Q%C00DSr z1<%~X^wgl##FWaylc_d9MMa)2jv*QM-d<4Ta$*#5x!8O#VbcvCx78OjjCM19-`|n` zlcQ;yJWqK-!X?h+v^9}Es?F+hJ07=b>sdT*QRcgm+^%b8|A7C`|A*gYPjm3$2miRv cpZdzQt0C%<%j~>EK-(ESUHx3vIVCg!0CP)0sQ>@~ literal 0 HcmV?d00001 diff --git a/homework/week-1/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/homework/week-1/app/src/main/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4685d6e046ce6c450c19426dce627a88718bfc GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oVGw3ym^DWND5#L^ z5#-Cjkf+YTP`sXjk!=$LL!~YQgWnqlM%L3n1JW26goK+9UQq_B4e)ev49U3n_PU`U zg8>io#t-TVJM=pEGT)onF!&ZOd;8}O149hcq!N%?hK6(oZAK7-f#HS|n9?%@Qw{w* cAUc7wfPvd9>y+w~O{pNhr>mdKI;Vst074Kf@&Et; literal 0 HcmV?d00001 diff --git a/homework/week-1/app/src/main/res/layout/activity_main.xml b/homework/week-1/app/src/main/res/layout/activity_main.xml new file mode 100644 index 00000000..c3588d54 --- /dev/null +++ b/homework/week-1/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/homework/week-1/app/src/main/res/layout/fragment_aries.xml b/homework/week-1/app/src/main/res/layout/fragment_aries.xml new file mode 100644 index 00000000..e5d0f185 --- /dev/null +++ b/homework/week-1/app/src/main/res/layout/fragment_aries.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/homework/week-1/app/src/main/res/layout/fragment_choose_zodiac.xml b/homework/week-1/app/src/main/res/layout/fragment_choose_zodiac.xml new file mode 100644 index 00000000..33fe7760 --- /dev/null +++ b/homework/week-1/app/src/main/res/layout/fragment_choose_zodiac.xml @@ -0,0 +1,156 @@ + + + + + + + +