From 262d585301e6859a41ac7fe2ee3b3a7b5e73f280 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Thu, 13 Aug 2015 10:16:32 +0200
Subject: [PATCH 01/10] add frameworks: unit testing, retrofit, roboguice

---
 app/app.iml                                   | 13 +++++++-
 app/build.gradle                              |  8 +++++
 app/src/main/AndroidManifest.xml              |  7 +++--
 .../akozlowski/doomvision/MainActivity.java   | 30 +++----------------
 .../doomvision/MainActivityFragment.java      |  8 ++---
 .../doomvision/service/ApiService.java        | 20 +++++++++++++
 app/src/main/res/layout/fragment_main.xml     | 30 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  2 ++
 8 files changed, 84 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/ApiService.java

diff --git a/app/app.iml b/app/app.iml
index d8186b9..a8a4932 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -82,11 +82,22 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="roboguice-3.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-mockito-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
+    <orderEntry type="library" exported="" name="roboblender-3.0.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang-2.4" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 6d6c95d..dbb31ab 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,4 +22,12 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'org.roboguice:roboguice:3.+'
+    provided 'org.roboguice:roboblender:3.+'
+    compile 'com.squareup.retrofit:retrofit:1.9.0'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.9.5'
+    androidTestCompile 'org.mockito:mockito-core:1.9.5'
+    androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
+    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ed9d7cb..28f08de 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.akozlowski.doomvision" >
+    package="com.akozlowski.doomvision">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/com/akozlowski/doomvision/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/MainActivity.java
index d8d413b..207bcca 100644
--- a/app/src/main/java/com/akozlowski/doomvision/MainActivity.java
+++ b/app/src/main/java/com/akozlowski/doomvision/MainActivity.java
@@ -1,39 +1,17 @@
 package com.akozlowski.doomvision;
 
-import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 
+import roboguice.activity.RoboActivity;
+import roboguice.inject.ContentView;
 
-public class MainActivity extends ActionBarActivity {
+@ContentView(R.layout.activity_main)
+public class MainActivity extends RoboActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
     }
 
-    @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);
-    }
 }
diff --git a/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java b/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
index 5df94f0..93d28ee 100644
--- a/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
+++ b/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
@@ -1,23 +1,23 @@
 package com.akozlowski.doomvision;
 
-import android.support.v4.app.Fragment;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import roboguice.fragment.provided.RoboFragment;
+
 
 /**
  * A placeholder fragment containing a simple view.
  */
-public class MainActivityFragment extends Fragment {
+public class MainActivityFragment extends RoboFragment {
 
     public MainActivityFragment() {
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         return inflater.inflate(R.layout.fragment_main, container, false);
     }
 }
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java b/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java
new file mode 100644
index 0000000..5cc26ce
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java
@@ -0,0 +1,20 @@
+package com.akozlowski.doomvision.service;
+
+import android.content.Intent;
+
+import roboguice.service.RoboIntentService;
+
+/**
+ * Created by akozlowski on 13/08/15.
+ */
+public class ApiService extends RoboIntentService {
+
+    public ApiService(String name) {
+        super(name);
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+
+    }
+}
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 6f07f14..b4b4f41 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -8,8 +8,38 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context=".MainActivityFragment">
 
+    <LinearLayout
+        android:id="@+id/search_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true">
+
+        <EditText
+            android:id="@+id/search_field"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:text="@string/search_field"
+            android:singleLine="true"
+            android:paddingTop="10dp"
+            android:layout_below="@+id/btn_search"
+            android:layout_weight="3"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content" />
+
+        <Button
+            android:id="@+id/search_btn"
+            android:layout_toRightOf="@+id/search_field"
+            android:text="@string/btn_search"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
     <TextView
         android:text="@string/hello_world"
+        android:paddingTop="10dp"
+        android:layout_below="@+id/search_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 743f2ac..ef323dc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,6 @@
     <string name="app_name">DoomVision</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="btn_search">Search</string>
+    <string name="search_field">search images, vectors and videos .... </string>
 </resources>

From d27f91ad90f43a7f56cfc775d471de17ea518006 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Sat, 15 Aug 2015 12:07:09 +0200
Subject: [PATCH 02/10] add working search

---
 app/app.iml                                   | 16 +++++++-----
 app/src/main/AndroidManifest.xml              |  2 +-
 .../akozlowski/doomvision/MainActivity.java   | 17 ------------
 .../doomvision/MainActivityFragment.java      | 23 ----------------
 .../doomvision/service/ApiService.java        | 20 --------------
 app/src/main/res/layout/activity_main.xml     | 10 ++++---
 app/src/main/res/layout/fragment_main.xml     | 26 +++++++++----------
 app/src/main/res/values/strings.xml           |  2 ++
 8 files changed, 32 insertions(+), 84 deletions(-)
 delete mode 100644 app/src/main/java/com/akozlowski/doomvision/MainActivity.java
 delete mode 100644 app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
 delete mode 100644 app/src/main/java/com/akozlowski/doomvision/service/ApiService.java

diff --git a/app/app.iml b/app/app.iml
index a8a4932..2c50ed9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -84,17 +86,19 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform (2)" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="roboguice-3.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
     <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-mockito-1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-mockito-1.1" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="roboblender-3.0.1" level="project" />
-    <orderEntry type="library" exported="" name="commons-lang-2.4" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-lang-2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="dexmaker-1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28f08de..f03ac95 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/akozlowski/doomvision/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/MainActivity.java
deleted file mode 100644
index 207bcca..0000000
--- a/app/src/main/java/com/akozlowski/doomvision/MainActivity.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.akozlowski.doomvision;
-
-import android.os.Bundle;
-
-import roboguice.activity.RoboActivity;
-import roboguice.inject.ContentView;
-
-@ContentView(R.layout.activity_main)
-public class MainActivity extends RoboActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-
-    }
-
-
-}
diff --git a/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java b/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
deleted file mode 100644
index 93d28ee..0000000
--- a/app/src/main/java/com/akozlowski/doomvision/MainActivityFragment.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.akozlowski.doomvision;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import roboguice.fragment.provided.RoboFragment;
-
-
-/**
- * A placeholder fragment containing a simple view.
- */
-public class MainActivityFragment extends RoboFragment {
-
-    public MainActivityFragment() {
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_main, container, false);
-    }
-}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java b/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java
deleted file mode 100644
index 5cc26ce..0000000
--- a/app/src/main/java/com/akozlowski/doomvision/service/ApiService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.akozlowski.doomvision.service;
-
-import android.content.Intent;
-
-import roboguice.service.RoboIntentService;
-
-/**
- * Created by akozlowski on 13/08/15.
- */
-public class ApiService extends RoboIntentService {
-
-    public ApiService(String name) {
-        super(name);
-    }
-
-    @Override
-    protected void onHandleIntent(Intent intent) {
-
-    }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a000def..8bc5c9a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,7 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/fragment"
-    android:name="com.akozlowski.doomvision.MainActivityFragment"
-    tools:layout="@layout/fragment_main" android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fragment"
+    android:name="com.akozlowski.doomvision.ui.MainActivityFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:layout="@layout/fragment_main" />
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index b4b4f41..15a44a8 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -2,10 +2,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context=".MainActivityFragment">
 
     <LinearLayout
@@ -17,31 +17,31 @@
 
         <EditText
             android:id="@+id/search_field"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:text="@string/search_field"
-            android:singleLine="true"
-            android:paddingTop="10dp"
             android:layout_below="@+id/btn_search"
             android:layout_weight="3"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content" />
+            android:paddingTop="10dp"
+            android:singleLine="true"
+            android:text="@string/search_field" />
 
         <Button
             android:id="@+id/search_btn"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             android:layout_toRightOf="@+id/search_field"
-            android:text="@string/btn_search"
             android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content" />
+            android:text="@string/btn_search" />
     </LinearLayout>
 
     <TextView
-        android:text="@string/hello_world"
-        android:paddingTop="10dp"
-        android:layout_below="@+id/search_layout"
+        android:id="@+id/response"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/search_layout"
+        android:paddingTop="10dp" />
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef323dc..ba87e99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,6 @@
     <string name="action_settings">Settings</string>
     <string name="btn_search">Search</string>
     <string name="search_field">search images, vectors and videos .... </string>
+    <string name="client_id">8f80cdd74ddbef680339</string>
+    <string name="client_secret">d1cc912295e23669be555fcadb02b4442b53be9e</string>
 </resources>

From 9e103e517f8a40edf59431a3b2c2fe6b3cceacb3 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Sat, 15 Aug 2015 12:10:37 +0200
Subject: [PATCH 03/10] add working search

---
 .../doomvision/DoomVisionApplication.java     |  14 ++
 .../doomvision/manager/RestManager.java       |  74 ++++++
 .../akozlowski/doomvision/pojo/Assets.java    | 164 ++++++++++++++
 .../akozlowski/doomvision/pojo/Category.java  |  42 ++++
 .../doomvision/pojo/Contributor.java          |  25 +++
 .../com/akozlowski/doomvision/pojo/Data.java  | 211 ++++++++++++++++++
 .../akozlowski/doomvision/pojo/HugeJpg.java   | 126 +++++++++++
 .../akozlowski/doomvision/pojo/HugeTiff.java  | 126 +++++++++++
 .../doomvision/pojo/LargeThumb.java           |  57 +++++
 .../akozlowski/doomvision/pojo/MediumJpg.java | 126 +++++++++++
 .../akozlowski/doomvision/pojo/Preview.java   |  57 +++++
 .../akozlowski/doomvision/pojo/Response.java  | 101 +++++++++
 .../akozlowski/doomvision/pojo/SmallJpg.java  | 125 +++++++++++
 .../doomvision/pojo/SmallThumb.java           |  57 +++++
 .../doomvision/pojo/SupersizeJpg.java         | 125 +++++++++++
 .../doomvision/pojo/SupersizeTiff.java        | 125 +++++++++++
 .../service/SearchImageService.java           |  22 ++
 .../doomvision/service/ServiceGenerator.java  |  23 ++
 .../doomvision/service/TestService.java       |  14 ++
 .../doomvision/service/ValidateService.java   |  15 ++
 .../doomvision/ui/MainActivity.java           |  23 ++
 .../doomvision/ui/MainActivityFragment.java   | 131 +++++++++++
 .../akozlowski/doomvision/util/DebugLog.java  |  86 +++++++
 23 files changed, 1869 insertions(+)
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Assets.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Category.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Contributor.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Data.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/HugeJpg.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/HugeTiff.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/LargeThumb.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/MediumJpg.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Preview.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/Response.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/SmallJpg.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/SmallThumb.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeJpg.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeTiff.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/ServiceGenerator.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/TestService.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/ValidateService.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/util/DebugLog.java

diff --git a/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
new file mode 100644
index 0000000..925b513
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
@@ -0,0 +1,14 @@
+package com.akozlowski.doomvision;
+
+import android.app.Application;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class DoomVisionApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+//        RestManager.createInstance(this);
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
new file mode 100644
index 0000000..5dc1665
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
@@ -0,0 +1,74 @@
+package com.akozlowski.doomvision.manager;
+
+import android.content.Context;
+import android.util.Base64;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.pojo.Response;
+import com.akozlowski.doomvision.service.SearchImageService;
+import com.akozlowski.doomvision.service.ServiceGenerator;
+import com.akozlowski.doomvision.service.TestService;
+import com.akozlowski.doomvision.service.ValidateService;
+import com.akozlowski.doomvision.util.DebugLog;
+
+import retrofit.Callback;
+import retrofit.RestAdapter;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class RestManager {
+
+    private static final String TAG = RestManager.class.getSimpleName();
+    //Resicle ListView
+    private Context context;
+
+    private RestAdapter restAdapter;
+    private String clientID;
+    private String clientSecret;
+
+    //"https://${client_id}:${client_secret}@api.shutterstock.com/v2"
+    //https://8f80cdd74ddbef680339:d1cc912295e23669be555fcadb02b4442b53be9e@api.shutterstock.com/v2/images/search?query=donkey
+    public RestManager(Context context) {
+        this.context = context;
+        this.clientID = context.getString(R.string.client_id);
+        this.clientSecret = context.getString(R.string.client_secret);
+    }
+
+    private void createRestAdapter() {
+        restAdapter = new RestAdapter.Builder()
+                .setEndpoint(getEndPoint())
+                .build();
+    }
+
+    private String getAuthBase64() {
+
+        String source = clientID + ":" + clientSecret;
+        String ret = "Basic " + Base64.encodeToString(source.getBytes(), Base64.URL_SAFE | Base64.NO_WRAP);
+
+        DebugLog.d(TAG + " Authorization: " + ret);
+        return ret;
+    }
+
+    private String getEndPoint() {
+        //https://api.shutterstock.com/v2/images/search?license=commercial&&&&&&&&&&query=dog&&sort=popular&view=minimal
+        return "https://api.shutterstock.com/v2";
+//        return "https://" + clientID + ":" + clientSecret + "@api.shutterstock.com/v2";
+    }
+
+    public void searchImage(String query, Callback<Response> cb) {
+//        SearchImageService service = restAdapter.create(SearchImageService.class);
+        SearchImageService service = ServiceGenerator.createService(SearchImageService.class, getEndPoint(), getAuthBase64());
+        service.search(query, cb);
+    }
+
+    public void test(Callback<Response> cb) {
+        TestService service = ServiceGenerator.createService(TestService.class, getEndPoint(), getAuthBase64());
+        service.test(cb);
+    }
+
+    public void validate(String id, String tag1, String tag2, Callback<Response> cb) {
+        ValidateService service = ServiceGenerator.createService(ValidateService.class, getEndPoint(), getAuthBase64());
+        service.validate(id, tag1, tag2, cb);
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Assets.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Assets.java
new file mode 100644
index 0000000..4204c28
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Assets.java
@@ -0,0 +1,164 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Assets {
+
+    @SerializedName("huge_jpg")
+    @Expose
+    private HugeJpg hugeJpg;
+    @SerializedName("medium_jpg")
+    @Expose
+    private MediumJpg mediumJpg;
+    @SerializedName("huge_tiff")
+    @Expose
+    private HugeTiff hugeTiff;
+    @SerializedName("supersize_jpg")
+    @Expose
+    private SupersizeJpg supersizeJpg;
+    @SerializedName("supersize_tiff")
+    @Expose
+    private SupersizeTiff supersizeTiff;
+    @SerializedName("small_jpg")
+    @Expose
+    private SmallJpg smallJpg;
+    @Expose
+    private Preview preview;
+    @SerializedName("small_thumb")
+    @Expose
+    private SmallThumb smallThumb;
+    @SerializedName("large_thumb")
+    @Expose
+    private LargeThumb largeThumb;
+
+    /**
+     * @return The hugeJpg
+     */
+    public HugeJpg getHugeJpg() {
+        return hugeJpg;
+    }
+
+    /**
+     * @param hugeJpg The huge_jpg
+     */
+    public void setHugeJpg(HugeJpg hugeJpg) {
+        this.hugeJpg = hugeJpg;
+    }
+
+    /**
+     * @return The mediumJpg
+     */
+    public MediumJpg getMediumJpg() {
+        return mediumJpg;
+    }
+
+    /**
+     * @param mediumJpg The medium_jpg
+     */
+    public void setMediumJpg(MediumJpg mediumJpg) {
+        this.mediumJpg = mediumJpg;
+    }
+
+    /**
+     * @return The hugeTiff
+     */
+    public HugeTiff getHugeTiff() {
+        return hugeTiff;
+    }
+
+    /**
+     * @param hugeTiff The huge_tiff
+     */
+    public void setHugeTiff(HugeTiff hugeTiff) {
+        this.hugeTiff = hugeTiff;
+    }
+
+    /**
+     * @return The supersizeJpg
+     */
+    public SupersizeJpg getSupersizeJpg() {
+        return supersizeJpg;
+    }
+
+    /**
+     * @param supersizeJpg The supersize_jpg
+     */
+    public void setSupersizeJpg(SupersizeJpg supersizeJpg) {
+        this.supersizeJpg = supersizeJpg;
+    }
+
+    /**
+     * @return The supersizeTiff
+     */
+    public SupersizeTiff getSupersizeTiff() {
+        return supersizeTiff;
+    }
+
+    /**
+     * @param supersizeTiff The supersize_tiff
+     */
+    public void setSupersizeTiff(SupersizeTiff supersizeTiff) {
+        this.supersizeTiff = supersizeTiff;
+    }
+
+    /**
+     * @return The smallJpg
+     */
+    public SmallJpg getSmallJpg() {
+        return smallJpg;
+    }
+
+    /**
+     * @param smallJpg The small_jpg
+     */
+    public void setSmallJpg(SmallJpg smallJpg) {
+        this.smallJpg = smallJpg;
+    }
+
+    /**
+     * @return The preview
+     */
+    public Preview getPreview() {
+        return preview;
+    }
+
+    /**
+     * @param preview The preview
+     */
+    public void setPreview(Preview preview) {
+        this.preview = preview;
+    }
+
+    /**
+     * @return The smallThumb
+     */
+    public SmallThumb getSmallThumb() {
+        return smallThumb;
+    }
+
+    /**
+     * @param smallThumb The small_thumb
+     */
+    public void setSmallThumb(SmallThumb smallThumb) {
+        this.smallThumb = smallThumb;
+    }
+
+    /**
+     * @return The largeThumb
+     */
+    public LargeThumb getLargeThumb() {
+        return largeThumb;
+    }
+
+    /**
+     * @param largeThumb The large_thumb
+     */
+    public void setLargeThumb(LargeThumb largeThumb) {
+        this.largeThumb = largeThumb;
+    }
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Category.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Category.java
new file mode 100644
index 0000000..d37da33
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Category.java
@@ -0,0 +1,42 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Category {
+    @Expose
+    private String id;
+    @Expose
+    private String name;
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return The name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name The name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Contributor.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Contributor.java
new file mode 100644
index 0000000..1797ba9
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Contributor.java
@@ -0,0 +1,25 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Contributor {
+    @Expose
+    private String id;
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Data.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Data.java
new file mode 100644
index 0000000..dc150bd
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Data.java
@@ -0,0 +1,211 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Data {
+    @Expose
+    private String id;
+    @SerializedName("added_date")
+    @Expose
+    private String addedDate;
+    @Expose
+    private double aspect;
+    @Expose
+    private Assets assets;
+    @Expose
+    private List<Category> categories = new ArrayList<Category>();
+    @Expose
+    private Contributor contributor;
+    @Expose
+    private String description;
+    @SerializedName("image_type")
+    @Expose
+    private String imageType;
+    @SerializedName("is_adult")
+    @Expose
+    private boolean isAdult;
+    @SerializedName("is_illustration")
+    @Expose
+    private boolean isIllustration;
+    @Expose
+    private List<String> keywords = new ArrayList<String>();
+    @SerializedName("media_type")
+    @Expose
+    private String mediaType;
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return The addedDate
+     */
+    public String getAddedDate() {
+        return addedDate;
+    }
+
+    /**
+     * @param addedDate The added_date
+     */
+    public void setAddedDate(String addedDate) {
+        this.addedDate = addedDate;
+    }
+
+    /**
+     * @return The aspect
+     */
+    public double getAspect() {
+        return aspect;
+    }
+
+    /**
+     * @param aspect The aspect
+     */
+    public void setAspect(double aspect) {
+        this.aspect = aspect;
+    }
+
+    /**
+     * @return The assets
+     */
+    public Assets getAssets() {
+        return assets;
+    }
+
+    /**
+     * @param assets The assets
+     */
+    public void setAssets(Assets assets) {
+        this.assets = assets;
+    }
+
+    /**
+     * @return The categories
+     */
+    public List<Category> getCategories() {
+        return categories;
+    }
+
+    /**
+     * @param categories The categories
+     */
+    public void setCategories(List<Category> categories) {
+        this.categories = categories;
+    }
+
+    /**
+     * @return The contributor
+     */
+    public Contributor getContributor() {
+        return contributor;
+    }
+
+    /**
+     * @param contributor The contributor
+     */
+    public void setContributor(Contributor contributor) {
+        this.contributor = contributor;
+    }
+
+    /**
+     * @return The description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * @param description The description
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return The imageType
+     */
+    public String getImageType() {
+        return imageType;
+    }
+
+    /**
+     * @param imageType The image_type
+     */
+    public void setImageType(String imageType) {
+        this.imageType = imageType;
+    }
+
+    /**
+     * @return The isAdult
+     */
+    public boolean isIsAdult() {
+        return isAdult;
+    }
+
+    /**
+     * @param isAdult The is_adult
+     */
+    public void setIsAdult(boolean isAdult) {
+        this.isAdult = isAdult;
+    }
+
+    /**
+     * @return The isIllustration
+     */
+    public boolean isIsIllustration() {
+        return isIllustration;
+    }
+
+    /**
+     * @param isIllustration The is_illustration
+     */
+    public void setIsIllustration(boolean isIllustration) {
+        this.isIllustration = isIllustration;
+    }
+
+    /**
+     * @return The keywords
+     */
+    public List<String> getKeywords() {
+        return keywords;
+    }
+
+    /**
+     * @param keywords The keywords
+     */
+    public void setKeywords(List<String> keywords) {
+        this.keywords = keywords;
+    }
+
+    /**
+     * @return The mediaType
+     */
+    public String getMediaType() {
+        return mediaType;
+    }
+
+    /**
+     * @param mediaType The media_type
+     */
+    public void setMediaType(String mediaType) {
+        this.mediaType = mediaType;
+    }
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/HugeJpg.java b/app/src/main/java/com/akozlowski/doomvision/pojo/HugeJpg.java
new file mode 100644
index 0000000..079e280
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/HugeJpg.java
@@ -0,0 +1,126 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class HugeJpg {
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/HugeTiff.java b/app/src/main/java/com/akozlowski/doomvision/pojo/HugeTiff.java
new file mode 100644
index 0000000..97f663b
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/HugeTiff.java
@@ -0,0 +1,126 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class HugeTiff {
+
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/LargeThumb.java b/app/src/main/java/com/akozlowski/doomvision/pojo/LargeThumb.java
new file mode 100644
index 0000000..77cce3a
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/LargeThumb.java
@@ -0,0 +1,57 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class LargeThumb {
+    @Expose
+    private int height;
+    @Expose
+    private String url;
+    @Expose
+    private int width;
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The url
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url The url
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/MediumJpg.java b/app/src/main/java/com/akozlowski/doomvision/pojo/MediumJpg.java
new file mode 100644
index 0000000..4eb5d48
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/MediumJpg.java
@@ -0,0 +1,126 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class MediumJpg {
+
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Preview.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Preview.java
new file mode 100644
index 0000000..329e87d
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Preview.java
@@ -0,0 +1,57 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Preview {
+    @Expose
+    private int height;
+    @Expose
+    private String url;
+    @Expose
+    private int width;
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The url
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url The url
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/Response.java b/app/src/main/java/com/akozlowski/doomvision/pojo/Response.java
new file mode 100644
index 0000000..9bd5d86
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/Response.java
@@ -0,0 +1,101 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class Response {
+
+    @Expose
+    private int page;
+    @SerializedName("per_page")
+    @Expose
+    private int perPage;
+    @SerializedName("total_count")
+    @Expose
+    private int totalCount;
+    @SerializedName("search_id")
+    @Expose
+    private String searchId;
+    @Expose
+    private List<Data> data = new ArrayList<Data>();
+
+    /**
+     * @return The page
+     */
+    public int getPage() {
+        return page;
+    }
+
+    /**
+     * @param page The page
+     */
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    /**
+     * @return The perPage
+     */
+    public int getPerPage() {
+        return perPage;
+    }
+
+    /**
+     * @param perPage The per_page
+     */
+    public void setPerPage(int perPage) {
+        this.perPage = perPage;
+    }
+
+    /**
+     * @return The totalCount
+     */
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    /**
+     * @param totalCount The total_count
+     */
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    /**
+     * @return The searchId
+     */
+    public String getSearchId() {
+        return searchId;
+    }
+
+    /**
+     * @param searchId The search_id
+     */
+    public void setSearchId(String searchId) {
+        this.searchId = searchId;
+    }
+
+    /**
+     * @return The data
+     */
+    public List<Data> getData() {
+        return data;
+    }
+
+    /**
+     * @param data The data
+     */
+    public void setData(List<Data> data) {
+        this.data = data;
+    }
+
+    public class Assets {
+
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/SmallJpg.java b/app/src/main/java/com/akozlowski/doomvision/pojo/SmallJpg.java
new file mode 100644
index 0000000..a4eab5a
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/SmallJpg.java
@@ -0,0 +1,125 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class SmallJpg {
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/SmallThumb.java b/app/src/main/java/com/akozlowski/doomvision/pojo/SmallThumb.java
new file mode 100644
index 0000000..8a4d9ad
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/SmallThumb.java
@@ -0,0 +1,57 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class SmallThumb {
+    @Expose
+    private int height;
+    @Expose
+    private String url;
+    @Expose
+    private int width;
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The url
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url The url
+     */
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeJpg.java b/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeJpg.java
new file mode 100644
index 0000000..d5102c9
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeJpg.java
@@ -0,0 +1,125 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class SupersizeJpg {
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeTiff.java b/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeTiff.java
new file mode 100644
index 0000000..abe9f62
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/SupersizeTiff.java
@@ -0,0 +1,125 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class SupersizeTiff {
+    @SerializedName("display_name")
+    @Expose
+    private String displayName;
+    @Expose
+    private int dpi;
+    @SerializedName("file_size")
+    @Expose
+    private int fileSize;
+    @Expose
+    private String format;
+    @Expose
+    private int height;
+    @SerializedName("is_licensable")
+    @Expose
+    private boolean isLicensable;
+    @Expose
+    private int width;
+
+    /**
+     * @return The displayName
+     */
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * @param displayName The display_name
+     */
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+     * @return The dpi
+     */
+    public int getDpi() {
+        return dpi;
+    }
+
+    /**
+     * @param dpi The dpi
+     */
+    public void setDpi(int dpi) {
+        this.dpi = dpi;
+    }
+
+    /**
+     * @return The fileSize
+     */
+    public int getFileSize() {
+        return fileSize;
+    }
+
+    /**
+     * @param fileSize The file_size
+     */
+    public void setFileSize(int fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    /**
+     * @return The format
+     */
+    public String getFormat() {
+        return format;
+    }
+
+    /**
+     * @param format The format
+     */
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    /**
+     * @return The height
+     */
+    public int getHeight() {
+        return height;
+    }
+
+    /**
+     * @param height The height
+     */
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    /**
+     * @return The isLicensable
+     */
+    public boolean isIsLicensable() {
+        return isLicensable;
+    }
+
+    /**
+     * @param isLicensable The is_licensable
+     */
+    public void setIsLicensable(boolean isLicensable) {
+        this.isLicensable = isLicensable;
+    }
+
+    /**
+     * @return The width
+     */
+    public int getWidth() {
+        return width;
+    }
+
+    /**
+     * @param width The width
+     */
+    public void setWidth(int width) {
+        this.width = width;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
new file mode 100644
index 0000000..6a09420
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
@@ -0,0 +1,22 @@
+package com.akozlowski.doomvision.service;
+
+import com.akozlowski.doomvision.pojo.Response;
+
+import retrofit.Callback;
+import retrofit.http.GET;
+import retrofit.http.Query;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ * https://api.shutterstock.com/v2/images/search?license=commercial&&&&&&&&&&query=dog&&sort=popular&view=minimal
+ */
+public interface SearchImageService {
+    @GET("/images/search")
+    void search(@Query("query") String query, Callback<Response> cb);
+
+    @GET("/search")
+    void search(@Query("license") String license, @Query("query") String query, Callback<Response> cb);
+
+//    @GET("/search?license=commercial&&&&&&&&&&query={query}")
+//    void search(@Query("query") String query, Callback<Response> cb);
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/ServiceGenerator.java b/app/src/main/java/com/akozlowski/doomvision/service/ServiceGenerator.java
new file mode 100644
index 0000000..b75b0e6
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/ServiceGenerator.java
@@ -0,0 +1,23 @@
+package com.akozlowski.doomvision.service;
+
+import retrofit.RequestInterceptor;
+import retrofit.RestAdapter;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class ServiceGenerator {
+    public static <S> S createService(Class<S> serviceClass, String baseUrl, final String auth) {
+        RestAdapter.Builder builder = new RestAdapter.Builder()
+                .setEndpoint(baseUrl).setRequestInterceptor(new RequestInterceptor() {
+                    @Override
+                    public void intercept(RequestFacade request) {
+                        request.addHeader("Authorization", auth);
+                        request.addHeader("Content-Type", "application/json");
+                        request.addHeader("Accept", "application/json");
+                    }
+                });
+        RestAdapter adapter = builder.build();
+        return adapter.create(serviceClass);
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/TestService.java b/app/src/main/java/com/akozlowski/doomvision/service/TestService.java
new file mode 100644
index 0000000..ff9f510
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/TestService.java
@@ -0,0 +1,14 @@
+package com.akozlowski.doomvision.service;
+
+import com.akozlowski.doomvision.pojo.Response;
+
+import retrofit.Callback;
+import retrofit.http.GET;
+
+/**
+ * Created by akozlowski on 15/08/15.
+ */
+public interface TestService {
+    @GET("/test")
+    void test(Callback<Response> cb);
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/ValidateService.java b/app/src/main/java/com/akozlowski/doomvision/service/ValidateService.java
new file mode 100644
index 0000000..6c52f41
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/ValidateService.java
@@ -0,0 +1,15 @@
+package com.akozlowski.doomvision.service;
+
+import com.akozlowski.doomvision.pojo.Response;
+
+import retrofit.Callback;
+import retrofit.http.GET;
+import retrofit.http.Query;
+
+/**
+ * Created by akozlowski on 15/08/15.
+ */
+public interface ValidateService {
+    @GET("/test/validate")
+    void validate(@Query("id") String id, @Query("tag1") String tag1, @Query("tag2") String tag2, Callback<Response> cb);
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
new file mode 100644
index 0000000..260c8ec
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
@@ -0,0 +1,23 @@
+package com.akozlowski.doomvision.ui;
+
+import android.os.Bundle;
+
+import com.akozlowski.doomvision.R;
+
+import roboguice.activity.RoboActivity;
+import roboguice.inject.ContentView;
+import roboguice.inject.InjectFragment;
+
+@ContentView(R.layout.activity_main)
+public class MainActivity extends RoboActivity {
+
+    @InjectFragment(R.id.fragment)
+    private MainActivityFragment myFragment;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
new file mode 100644
index 0000000..c28ed60
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
@@ -0,0 +1,131 @@
+package com.akozlowski.doomvision.ui;
+
+import android.os.Bundle;
+import android.util.Base64;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.manager.RestManager;
+import com.akozlowski.doomvision.pojo.Response;
+import com.akozlowski.doomvision.util.DebugLog;
+
+import retrofit.Callback;
+import retrofit.RetrofitError;
+import roboguice.RoboGuice;
+import roboguice.fragment.provided.RoboFragment;
+import roboguice.inject.InjectView;
+
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class MainActivityFragment extends RoboFragment {
+    private static final String TAG = MainActivityFragment.class.getSimpleName();
+    private RestManager restManager;
+    @InjectView(R.id.response)
+    private TextView responseTextView;
+    @InjectView(R.id.search_field)
+    private EditText searchEditText;
+    @InjectView(R.id.search_btn)
+    private Button searchBtn;
+
+    private static boolean TEST = false;
+
+    public MainActivityFragment() {
+    }
+
+    public void onViewsInjected() {
+
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_main, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        RoboGuice.getInjector(getActivity()).injectViewMembers(this);
+        restManager = new RestManager(getActivity());
+
+        searchBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                base64Test();
+                if (TEST) {
+                    validate();
+                } else {
+                    search();
+                }
+            }
+        });
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    private void search() {
+        if (searchEditText.getText() != null && searchEditText.getText().length() > 0) {
+            restManager.searchImage("dog", new Callback<Response>() {
+                @Override
+                public void success(Response response, retrofit.client.Response response2) {
+                    DebugLog.d(TAG + " responce: " + response.toString());
+                }
+
+                @Override
+                public void failure(RetrofitError error) {
+                    DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
+                }
+            });
+        }
+    }
+
+    private void test() {
+        restManager.test(new Callback<Response>() {
+            @Override
+            public void success(Response response, retrofit.client.Response response2) {
+                responseTextView.setText("success: " + response2.getStatus() + "; " + response2.getReason().toString() + "; " + response2.getUrl());
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+                responseTextView.setText("error: " + error.getMessage() + ", " + error.getUrl() + "; " + error.getSuccessType().toString());
+            }
+        });
+    }
+
+    private void validate() {
+        restManager.validate("1", "tag1", "tag2", new Callback<Response>() {
+            @Override
+            public void success(Response response, retrofit.client.Response response2) {
+                DebugLog.d(TAG + " responce: " + response.toString());
+            }
+
+            @Override
+            public void failure(RetrofitError error) {
+                DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", " + error.getResponse().getReason());
+            }
+        });
+    }
+
+    //    MTIzNDo0MzIx
+    //    MTIzNDQzMjE
+    private void base64Test() {
+        String clientID = "1234";
+        String clientSecret = "4321";
+        StringBuilder sb = new StringBuilder(clientID).append(clientSecret);
+
+        String encodedID = Base64.encodeToString(sb.toString().getBytes(), Base64.DEFAULT);
+        String encodedSecret = Base64.encodeToString(clientSecret.getBytes(), Base64.DEFAULT);
+
+        String source = clientID + ":" + clientSecret;
+        String ret = "Basic " + Base64.encodeToString(source.getBytes(), Base64.URL_SAFE | Base64.NO_WRAP);
+
+        DebugLog.d(TAG + " Authorization: " + ret);
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/util/DebugLog.java b/app/src/main/java/com/akozlowski/doomvision/util/DebugLog.java
new file mode 100644
index 0000000..18a96ee
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/util/DebugLog.java
@@ -0,0 +1,86 @@
+package com.akozlowski.doomvision.util;
+
+import android.util.Log;
+
+/**
+ * Created by akozlowski on 14/08/15.
+ */
+public class DebugLog {
+    private static boolean SHOW_LOG = true;
+    public static final String LOG_TAG = "DOOM:LOG";
+
+    public static void enableLog(boolean enable) {
+        SHOW_LOG = enable;
+    }
+
+    /**
+     * Logs a debug message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void d(String message) {
+        if (SHOW_LOG)
+            Log.d(LOG_TAG, message);
+    }
+
+    /**
+     * Logs an error message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void e(String message) {
+        if (SHOW_LOG)
+            Log.e(LOG_TAG, message);
+    }
+
+    /**
+     * Logs an error message in the application log.
+     *
+     * @param message   the message to be logged
+     * @param throwable the {@link Throwable} to be logged
+     */
+    public static void e(String message, Throwable throwable) {
+        if (SHOW_LOG)
+            Log.e(LOG_TAG, message, throwable);
+    }
+
+    /**
+     * Logs an information message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void i(String message) {
+        if (SHOW_LOG)
+            Log.i(LOG_TAG, message);
+    }
+
+    /**
+     * Logs a verbose message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void v(String message) {
+        if (SHOW_LOG)
+            Log.v(LOG_TAG, message);
+    }
+
+    /**
+     * Logs a warning message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void w(String message) {
+        if (SHOW_LOG)
+            Log.w(LOG_TAG, message);
+    }
+
+    /**
+     * Logs a WTF message in the application log.
+     *
+     * @param message the message to be logged
+     */
+    public static void wtf(String message) {
+        if (SHOW_LOG)
+            Log.wtf(LOG_TAG, message);
+    }
+}

From fb5767a0cae86fd72c87924273b8923a646e16a1 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Tue, 18 Aug 2015 19:58:59 +0200
Subject: [PATCH 04/10] add viewpager

---
 app/app.iml                                   |  71 ++++---
 app/build.gradle                              |  10 +-
 .../doomvision/ApplicationTest.java           |  13 --
 app/src/main/AndroidManifest.xml              |   4 +
 .../doomvision/DoomVisionApplication.java     |   6 +-
 .../doomvision/manager/DataManager.java       |  21 ++
 .../doomvision/manager/RestManager.java       |  19 +-
 .../akozlowski/doomvision/pojo/EchoTest.java  |  26 +++
 .../service/InternetConnectivityReceiver.java |  96 +++++++++
 .../doomvision/service/TestService.java       |   6 +-
 .../ui/GalleryFragmentLandscape.java          | 107 ++++++++++
 .../ui/GalleryFragmentPortrait.java           | 192 ++++++++++++++++++
 .../doomvision/ui/ImageViewPageFragment.java  |  61 ++++++
 .../doomvision/ui/IndicatorView.java          |  99 +++++++++
 .../doomvision/ui/MainActivity.java           | 127 +++++++++++-
 .../doomvision/ui/MainActivityFragment.java   | 131 ------------
 .../doomvision/ui/listView/CustomAdapter.java |  50 +++++
 .../doomvision/ui/listView/Item.java          |  18 ++
 .../akozlowski/doomvision/util/Density.java   |  25 +++
 .../res/drawable-hdpi/bg_tile_thumb.9.png     | Bin 0 -> 636 bytes
 .../res/drawable-xhdpi/bg_tile_thumb.9.png    | Bin 0 -> 805 bytes
 .../res/drawable-xxhdpi/bg_tile_thumb.9.png   | Bin 0 -> 1011 bytes
 .../main/res/drawable/btn_search_selector.xml |   8 +
 .../res/drawable/main_background_gradiant.xml |  25 +++
 app/src/main/res/layout/activity_main.xml     |   4 +-
 .../res/layout/gallery_fragment_landscape.xml |  25 +++
 ...main.xml => gallery_fragment_portrait.xml} |  33 ++-
 app/src/main/res/layout/image_item.xml        |   7 +
 .../res/layout/image_view_pager_fragment.xml  |  17 ++
 app/src/main/res/layout/list_view_content.xml |   9 +
 app/src/main/res/values/colors.xml            |   6 +
 app/src/main/res/values/dimens.xml            |   3 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   2 +-
 34 files changed, 1028 insertions(+), 194 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/akozlowski/doomvision/ApplicationTest.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/pojo/EchoTest.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/InternetConnectivityReceiver.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/IndicatorView.java
 delete mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/listView/CustomAdapter.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/listView/Item.java
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/util/Density.java
 create mode 100644 app/src/main/res/drawable-hdpi/bg_tile_thumb.9.png
 create mode 100644 app/src/main/res/drawable-xhdpi/bg_tile_thumb.9.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/bg_tile_thumb.9.png
 create mode 100644 app/src/main/res/drawable/btn_search_selector.xml
 create mode 100644 app/src/main/res/drawable/main_background_gradiant.xml
 create mode 100644 app/src/main/res/layout/gallery_fragment_landscape.xml
 rename app/src/main/res/layout/{fragment_main.xml => gallery_fragment_portrait.xml} (58%)
 create mode 100644 app/src/main/res/layout/image_item.xml
 create mode 100644 app/src/main/res/layout/image_view_pager_fragment.xml
 create mode 100644 app/src/main/res/layout/list_view_content.xml
 create mode 100644 app/src/main/res/values/colors.xml

diff --git a/app/app.iml b/app/app.iml
index 2c50ed9..7634017 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,14 +9,15 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
+          <task>mockableAndroidJar</task>
+          <task>prepareDebugUnitTestDependencies</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -28,7 +29,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,12 +38,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -50,6 +45,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -57,13 +59,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -71,6 +73,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -89,19 +93,38 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="roboguice-3.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
+    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
+    <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-mockito-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
     <orderEntry type="library" exported="" name="roboblender-3.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="commons-lang-2.4" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
-    <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index dbb31ab..e3e6f70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,12 +22,20 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.1'
+
+    compile 'com.squareup.picasso:picasso:2.5.2'
+
     compile 'org.roboguice:roboguice:3.+'
     provided 'org.roboguice:roboblender:3.+'
     compile 'com.squareup.retrofit:retrofit:1.9.0'
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.9.5'
+
+    testCompile 'org.mockito:mockito-core:1.10.19'
     androidTestCompile 'org.mockito:mockito-core:1.9.5'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'
+    testCompile "org.robolectric:robolectric:3.0"
+
+//    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+    compile 'com.android.support:support-v4:22.2.1'
 }
diff --git a/app/src/androidTest/java/com/akozlowski/doomvision/ApplicationTest.java b/app/src/androidTest/java/com/akozlowski/doomvision/ApplicationTest.java
deleted file mode 100644
index 4f70688..0000000
--- a/app/src/androidTest/java/com/akozlowski/doomvision/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.akozlowski.doomvision;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f03ac95..79fe886 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,12 @@
     package="com.akozlowski.doomvision">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
+        android:name=".DoomVisionApplication"
         android:allowBackup="true"
+        android:configChanges="keyboardHidden|orientation|screenSize"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
diff --git a/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
index 925b513..e2471f7 100644
--- a/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
+++ b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
@@ -2,6 +2,9 @@
 
 import android.app.Application;
 
+import com.akozlowski.doomvision.service.InternetConnectivityReceiver;
+import com.akozlowski.doomvision.util.DebugLog;
+
 /**
  * Created by akozlowski on 14/08/15.
  */
@@ -9,6 +12,7 @@ public class DoomVisionApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-//        RestManager.createInstance(this);
+        DebugLog.d("DoomVisionApplication onCreate()");
+        InternetConnectivityReceiver.createInstance(this);
     }
 }
diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
new file mode 100644
index 0000000..2c11399
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
@@ -0,0 +1,21 @@
+package com.akozlowski.doomvision.manager;
+
+import com.akozlowski.doomvision.pojo.Response;
+
+import javax.inject.Singleton;
+
+/**
+ * Created by akozlowski on 17/08/15.
+ */
+@Singleton
+public class DataManager {
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+
+    public Response getResponse() {
+        return response;
+    }
+
+    private Response response;
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
index 5dc1665..638d459 100644
--- a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
@@ -4,6 +4,7 @@
 import android.util.Base64;
 
 import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.pojo.EchoTest;
 import com.akozlowski.doomvision.pojo.Response;
 import com.akozlowski.doomvision.service.SearchImageService;
 import com.akozlowski.doomvision.service.ServiceGenerator;
@@ -26,13 +27,18 @@ public class RestManager {
     private RestAdapter restAdapter;
     private String clientID;
     private String clientSecret;
+    private String authBase64;
 
-    //"https://${client_id}:${client_secret}@api.shutterstock.com/v2"
-    //https://8f80cdd74ddbef680339:d1cc912295e23669be555fcadb02b4442b53be9e@api.shutterstock.com/v2/images/search?query=donkey
     public RestManager(Context context) {
         this.context = context;
         this.clientID = context.getString(R.string.client_id);
         this.clientSecret = context.getString(R.string.client_secret);
+        this.authBase64 = getAuthBase64();
+    }
+
+    public RestManager(Context context, String authBase64) {
+        this.context = context;
+        this.authBase64 = authBase64;
     }
 
     private void createRestAdapter() {
@@ -51,20 +57,17 @@ private String getAuthBase64() {
     }
 
     private String getEndPoint() {
-        //https://api.shutterstock.com/v2/images/search?license=commercial&&&&&&&&&&query=dog&&sort=popular&view=minimal
         return "https://api.shutterstock.com/v2";
-//        return "https://" + clientID + ":" + clientSecret + "@api.shutterstock.com/v2";
     }
 
     public void searchImage(String query, Callback<Response> cb) {
-//        SearchImageService service = restAdapter.create(SearchImageService.class);
-        SearchImageService service = ServiceGenerator.createService(SearchImageService.class, getEndPoint(), getAuthBase64());
+        SearchImageService service = ServiceGenerator.createService(SearchImageService.class, getEndPoint(), authBase64);
         service.search(query, cb);
     }
 
-    public void test(Callback<Response> cb) {
+    public EchoTest test(String testText) {
         TestService service = ServiceGenerator.createService(TestService.class, getEndPoint(), getAuthBase64());
-        service.test(cb);
+        return service.test(testText);
     }
 
     public void validate(String id, String tag1, String tag2, Callback<Response> cb) {
diff --git a/app/src/main/java/com/akozlowski/doomvision/pojo/EchoTest.java b/app/src/main/java/com/akozlowski/doomvision/pojo/EchoTest.java
new file mode 100644
index 0000000..877e296
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/pojo/EchoTest.java
@@ -0,0 +1,26 @@
+package com.akozlowski.doomvision.pojo;
+
+import com.google.gson.annotations.Expose;
+
+/**
+ * Created by akozlowski on 16/08/15.
+ */
+public class EchoTest {
+
+    @Expose
+    private String text;
+
+    /**
+     * @return The text
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * @param text The text
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/InternetConnectivityReceiver.java b/app/src/main/java/com/akozlowski/doomvision/service/InternetConnectivityReceiver.java
new file mode 100644
index 0000000..900a5a2
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/InternetConnectivityReceiver.java
@@ -0,0 +1,96 @@
+package com.akozlowski.doomvision.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by akozlowski on 15/08/15.
+ */
+public class InternetConnectivityReceiver {
+    private List<InternetConnectivityListener> callbacks = new ArrayList<InternetConnectivityListener>();
+    private volatile boolean isReceiverRegistered = false;
+    private ConnectivityManager connectivityManager;
+    private Context context;
+    private static InternetConnectivityReceiver instance;
+
+    public static InternetConnectivityReceiver getInstance() {
+        return instance;
+    }
+
+    public static synchronized InternetConnectivityReceiver createInstance(Context context) {
+        instance = new InternetConnectivityReceiver(context);
+        return instance;
+    }
+
+    private InternetConnectivityReceiver(Context context) {
+        this.context = context;
+        connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    }
+
+    private void addInternetConnectivityListener(InternetConnectivityListener internetConnectivityListener) {
+        synchronized (callbacks) {
+            if (!callbacks.contains(internetConnectivityListener)) {
+                callbacks.add(internetConnectivityListener);
+            }
+        }
+    }
+
+    public boolean isOnline() {
+        NetworkInfo info = connectivityManager.getActiveNetworkInfo();
+        return info != null && info.isConnected() && info.isAvailable();
+    }
+
+    public void removeInternetConnectivityListener(InternetConnectivityListener connectivityListener) {
+        synchronized (callbacks) {
+            callbacks.remove(connectivityListener);
+        }
+    }
+
+    private void notifyListeners() {
+        synchronized (callbacks) {
+            for (InternetConnectivityListener internetConnectivityListener : callbacks) {
+                internetConnectivityListener.onInternetConnectivityCallback();
+            }
+        }
+    }
+
+    private BroadcastReceiver receiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
+                boolean lackOfConnectivity = intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
+                if (!lackOfConnectivity && isOnline()) {
+                    notifyListeners();
+                }
+            }
+        }
+    };
+
+    /**
+     * register receiver CONNECTIVITY_ACTION from {@link ConnectivityManager}
+     *
+     * @param internetConnectivityListener pass it to get call if connectivity status will get change
+     */
+    public void registerConnectivityReceiver(InternetConnectivityListener
+                                                     internetConnectivityListener) {
+        addInternetConnectivityListener(internetConnectivityListener);
+        if (isReceiverRegistered) {
+            return;
+        }
+        IntentFilter filterInternet = new IntentFilter();
+        filterInternet.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(receiver, filterInternet);
+        isReceiverRegistered = true;
+    }
+
+    public interface InternetConnectivityListener {
+        void onInternetConnectivityCallback();
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/TestService.java b/app/src/main/java/com/akozlowski/doomvision/service/TestService.java
index ff9f510..9a218a7 100644
--- a/app/src/main/java/com/akozlowski/doomvision/service/TestService.java
+++ b/app/src/main/java/com/akozlowski/doomvision/service/TestService.java
@@ -1,14 +1,14 @@
 package com.akozlowski.doomvision.service;
 
-import com.akozlowski.doomvision.pojo.Response;
+import com.akozlowski.doomvision.pojo.EchoTest;
 
-import retrofit.Callback;
 import retrofit.http.GET;
+import retrofit.http.Query;
 
 /**
  * Created by akozlowski on 15/08/15.
  */
 public interface TestService {
     @GET("/test")
-    void test(Callback<Response> cb);
+    EchoTest test(@Query("test") String testText);
 }
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
new file mode 100644
index 0000000..1950995
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
@@ -0,0 +1,107 @@
+package com.akozlowski.doomvision.ui;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.manager.DataManager;
+import com.akozlowski.doomvision.pojo.Response;
+import com.akozlowski.doomvision.util.DebugLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import roboguice.fragment.RoboFragment;
+import roboguice.inject.InjectView;
+
+/**
+ * Created by akozlowski on 17/08/15.
+ */
+public class GalleryFragmentLandscape extends RoboFragment {
+    private static final String TAG = GalleryFragmentLandscape.class.getSimpleName();
+    @InjectView(R.id.gallery_image_view_pager)
+    private ViewPager viewPager;
+    @Inject
+    private DataManager dataManager;
+    private List<roboguice.fragment.RoboFragment> slides = new ArrayList<>();
+
+    @InjectView(R.id.gallery_image_indicator_layout)
+    private LinearLayout indicatorsLayout;
+    private List<IndicatorView> circleIndicators = new ArrayList<IndicatorView>();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.gallery_fragment_landscape, container, false);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        createViewPager();
+    }
+
+    private void createViewPager() {
+        CustomScreenSlideAdapter pagerAdapter = new CustomScreenSlideAdapter(getActivity().getSupportFragmentManager());
+        pagerAdapter.notifyDataSetChanged();
+        viewPager.setAdapter(pagerAdapter);
+        Response response = dataManager.getResponse();
+        if (response == null) {
+            return;
+        }
+        indicatorsLayout.removeAllViews();
+        slides.clear();
+
+        for (int i = 0; i < response.getData().size(); i++) {
+            createCircleIndicator(true, (LinearLayout.LayoutParams) indicatorsLayout.getLayoutParams());
+            slides.add(ImageViewPageFragment.createInstance(i));
+        }
+    }
+
+    private void createCircleIndicator(boolean isSelected, LinearLayout.LayoutParams params) {
+        DebugLog.d(TAG + " createCircleIndicator()..isSelected: " + isSelected);
+        IndicatorView circleIndicatorView = new IndicatorView(getActivity(), R.color.getting_started_circle_indicator_stroke_color);
+        indicatorsLayout.addView(circleIndicatorView);
+        circleIndicatorView.getLayoutParams().width = (int) getActivity().getResources().getDimension(R.dimen.view_pager_page_width);//40;
+        circleIndicatorView.getLayoutParams().height = (int) getActivity().getResources().getDimension(R.dimen.view_pager_page_height);//40;
+        circleIndicatorView.setIsSelected(isSelected);
+        circleIndicators.add(circleIndicatorView);
+    }
+
+    class CustomScreenSlideAdapter extends FragmentStatePagerAdapter {
+
+        public CustomScreenSlideAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public android.support.v4.app.Fragment getItem(int position) {
+            return slides.get(position);
+        }
+
+        @Override
+        public int getCount() {
+            return slides.size();
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
new file mode 100644
index 0000000..183b656
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
@@ -0,0 +1,192 @@
+package com.akozlowski.doomvision.ui;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ArrayAdapter;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.manager.DataManager;
+import com.akozlowski.doomvision.manager.RestManager;
+import com.akozlowski.doomvision.pojo.Category;
+import com.akozlowski.doomvision.pojo.Data;
+import com.akozlowski.doomvision.pojo.Response;
+import com.akozlowski.doomvision.service.InternetConnectivityReceiver;
+import com.akozlowski.doomvision.ui.listView.CustomAdapter;
+import com.akozlowski.doomvision.ui.listView.Item;
+import com.akozlowski.doomvision.util.DebugLog;
+import com.squareup.picasso.Picasso;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import retrofit.Callback;
+import retrofit.RetrofitError;
+import roboguice.RoboGuice;
+import roboguice.fragment.RoboFragment;
+import roboguice.inject.InjectView;
+
+
+/**
+ * A placeholder fragment containing a simple view.
+ */
+public class GalleryFragmentPortrait extends RoboFragment {
+    private static final String TAG = GalleryFragmentPortrait.class.getSimpleName();
+    private RestManager restManager;
+    @InjectView(R.id.response)
+    private TextView responseTextView;
+    @InjectView(R.id.search_field)
+    private EditText searchEditText;
+    @InjectView(R.id.search_btn)
+    private ImageView searchBtn;
+    @InjectView(R.id.listview)
+    private ListView listView;
+    private List<Item> items = new ArrayList<Item>();
+    @InjectView(R.id.search_progress)
+    private ProgressBar progressBar;
+    @Inject
+    private DataManager dataManager;
+
+
+    public GalleryFragmentPortrait() {
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.gallery_fragment_portrait, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        RoboGuice.getInjector(getActivity()).injectViewMembers(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        restManager = new RestManager(getActivity());
+        createListView();
+        if (dataManager.getResponse() != null) {
+            createItems(dataManager.getResponse());
+        }
+        searchBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                hideKeyboard();
+                progressBar.setVisibility(View.VISIBLE);
+                search();
+            }
+        });
+    }
+
+    private void createListView() {
+        CustomAdapter customAdapter = new CustomAdapter(getActivity(), R.layout.list_view_content, items);
+        listView.setAdapter(customAdapter);
+    }
+
+    private void createItems(Response response) {
+        List<Data> dataList = response.getData();
+        items.clear();
+        dataManager.setResponse(response);
+        for (Data data : dataList) {
+            items.add(new ImageItem(data.getAssets().getPreview().getUrl()));
+            printCategories(data.getCategories());
+        }
+        ((ArrayAdapter) listView.getAdapter()).notifyDataSetChanged();
+    }
+
+    private void printCategories(List<Category> categories) {
+        for (Category category : categories) {
+            DebugLog.d(TAG + " cat: " + category.getName());
+        }
+    }
+
+    private void hideKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(searchEditText.getWindowToken(), 0);
+        getView().invalidate();
+    }
+
+    private static class ViewItemHolder {
+        ViewItemHolder(ImageView imageView) {
+            this.imageView = imageView;
+        }
+
+        public final ImageView imageView;
+    }
+
+    private class ImageItem implements Item {
+        private String url;
+
+        public ImageItem(String url) {
+            DebugLog.d(TAG + " create Item url: " + url);
+            this.url = url;
+
+        }
+
+        @Override
+        public int getViewType() {
+            return Item.ItemType.values().length;
+        }
+
+        @Override
+        public View getView(LayoutInflater inflater, View convertView, ViewGroup parent) {
+            ViewItemHolder viewItemHolder;
+            if (convertView == null) {
+                convertView = inflater.inflate(R.layout.image_item, parent, false);
+                viewItemHolder = new ViewItemHolder((ImageView) convertView.findViewById(R.id.image));
+                convertView.setTag(viewItemHolder);
+            }
+            viewItemHolder = (ViewItemHolder) convertView.getTag();
+            Picasso.with(getActivity()).load(url).into(viewItemHolder.imageView);
+            return convertView;
+        }
+    }
+
+    private void search() {
+        if (searchEditText.getText() != null && searchEditText.getText().length() > 0) {
+            restManager.searchImage(searchEditText.getText().toString(), new Callback<Response>() {
+                @Override
+                public void success(Response response, retrofit.client.Response response2) {
+                    DebugLog.d(TAG + " responce: " + response.toString());
+
+                    createItems(response);
+                    progressBar.setVisibility(View.GONE);
+                }
+
+                @Override
+                public void failure(RetrofitError error) {
+                    DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
+                    if (error.getKind().equals(RetrofitError.Kind.NETWORK)) {
+                        searchBtn.setEnabled(false);
+                        progressBar.setVisibility(View.GONE);
+                        onNoInternetConnection();
+                    }
+                }
+            });
+        }
+    }
+
+    private void onNoInternetConnection() {
+        Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.no_internet_msg), Toast.LENGTH_LONG);
+        InternetConnectivityReceiver.getInstance().registerConnectivityReceiver(new InternetConnectivityReceiver.InternetConnectivityListener() {
+            @Override
+            public void onInternetConnectivityCallback() {
+                searchBtn.setEnabled(true);
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java b/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
new file mode 100644
index 0000000..d5d154a
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
@@ -0,0 +1,61 @@
+package com.akozlowski.doomvision.ui;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.manager.DataManager;
+import com.akozlowski.doomvision.pojo.Data;
+import com.squareup.picasso.Picasso;
+
+import javax.inject.Inject;
+
+import roboguice.fragment.RoboFragment;
+import roboguice.inject.InjectView;
+
+/**
+ * Created by akozlowski on 17/08/15.
+ */
+public class ImageViewPageFragment extends RoboFragment {
+    @InjectView(R.id.view_pager_image)
+    private ImageView imageView;
+    @Inject
+    private DataManager dataManager;
+
+
+    public static final String EXTRA_INDEX_KEY = "extra_index_key";
+
+    public static ImageViewPageFragment createInstance(int index) {
+        Bundle bundle = new Bundle();
+        bundle.putInt(EXTRA_INDEX_KEY, index);
+        ImageViewPageFragment imageViewPageFragment = new ImageViewPageFragment();
+        imageViewPageFragment.setArguments(bundle);
+        return imageViewPageFragment;
+
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.gallery_fragment_landscape, container, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getArguments() != null && getArguments().containsKey(EXTRA_INDEX_KEY)) {
+            int index = getArguments().getInt(EXTRA_INDEX_KEY);
+            Data data = dataManager.getResponse().getData().get(index);
+            Picasso.with(getActivity()).load(data.getAssets().getPreview().getUrl()).into(imageView);
+        }
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/IndicatorView.java b/app/src/main/java/com/akozlowski/doomvision/ui/IndicatorView.java
new file mode 100644
index 0000000..0d4ea67
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/IndicatorView.java
@@ -0,0 +1,99 @@
+package com.akozlowski.doomvision.ui;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.util.Density;
+
+/**
+ * Created by akozlowski on 17/08/15.
+ */
+public class IndicatorView extends View {
+    private Context context;
+    private float RADIUS = 4f;
+    private boolean isSelected = false;
+    private Paint selectedPaint;
+    private Paint normalPaint;
+    private int selectedResourceColorID = -1;
+
+    /**
+     * @param context
+     */
+    public IndicatorView(Context context) {
+        super(context);
+        this.context = context;
+        init();
+    }
+
+    public IndicatorView(Context context, int selectedResourceColorID) {
+        super(context);
+        this.context = context;
+        this.selectedResourceColorID = selectedResourceColorID;
+        init();
+    }
+
+    /**
+     * @param context
+     * @param attrs
+     */
+    public IndicatorView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.context = context;
+        init();
+    }
+
+    /**
+     * @param context
+     * @param attrs
+     * @param defStyleAttr
+     */
+    public IndicatorView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.context = context;
+        init();
+    }
+
+
+    private void init() {
+        setBackgroundColor(context.getResources().getColor(android.R.color.transparent));
+        RADIUS *= Density.getDensityMultiplier(context);
+
+        selectedPaint = new Paint();
+        if (selectedResourceColorID > 0) {
+            selectedPaint.setColor(getResources().getColor(selectedResourceColorID));
+        } else {
+            selectedPaint.setColor(getResources().getColor(R.color.getting_started_circle_indicator_fill_color));
+        }
+
+        selectedPaint.setAntiAlias(true);
+        selectedPaint.setStyle(Paint.Style.FILL);
+
+        normalPaint = new Paint();
+        normalPaint.setColor(getResources().getColor(R.color.getting_started_circle_indicator_page_color));
+        normalPaint.setAntiAlias(true);
+        normalPaint.setStyle(Paint.Style.FILL);
+    }
+
+    @Override
+    public void onDraw(Canvas canvas) {
+        int width = getWidth();
+        int height = getHeight();
+        if (!isSelected) {
+            canvas.drawCircle(width / 2, height / 2, RADIUS, normalPaint);
+        } else {
+            canvas.drawCircle(width / 2, height / 2, RADIUS, selectedPaint);
+        }
+    }
+
+    /**
+     * @param isSelected
+     */
+    public void setIsSelected(boolean isSelected) {
+        this.isSelected = isSelected;
+        invalidate();
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
index 260c8ec..7a3ee69 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
@@ -1,23 +1,140 @@
 package com.akozlowski.doomvision.ui;
 
+import android.app.Activity;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.WindowManager;
+import android.widget.Toast;
 
 import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.util.DebugLog;
+import com.google.inject.Key;
 
-import roboguice.activity.RoboActivity;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import roboguice.RoboGuice;
+import roboguice.activity.event.OnContentChangedEvent;
+import roboguice.activity.event.OnStopEvent;
+import roboguice.context.event.OnCreateEvent;
+import roboguice.context.event.OnDestroyEvent;
+import roboguice.event.EventManager;
 import roboguice.inject.ContentView;
-import roboguice.inject.InjectFragment;
+import roboguice.inject.ContentViewListener;
+import roboguice.inject.RoboInjector;
+import roboguice.util.RoboContext;
 
 @ContentView(R.layout.activity_main)
-public class MainActivity extends RoboActivity {
+public class MainActivity extends FragmentActivity implements RoboContext {
+
+    private static final String TAG = MainActivity.class.getSimpleName();
+
+    protected EventManager eventManager;
+    protected HashMap<Key<?>, Object> scopedObjects = new HashMap<Key<?>, Object>();
+
+    @Inject
+    ContentViewListener ignored; // BUG find a better place to put this
+
+//    @InjectFragment(R.id.fragment)
+//    private GalleryFragmentPortrait galleryFragmentPortrait;
+//    @InjectFragment(R.id.fragment)
+//    private GalleryFragmentLandscape galleryFragmentLandscape;
+
+    //    @Override
+//    protected void onCreate(Bundle savedInstanceState) {
+//
+////        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+//        super.onCreate(savedInstanceState);
+//        loadFragment();
+//    }
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        DebugLog.d(TAG + " onConfigurationChanged");
+        // Checks the orientation of the screen
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            Toast.makeText(this, "landscape", Toast.LENGTH_SHORT).show();
+        } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+            Toast.makeText(this, "portrait", Toast.LENGTH_SHORT).show();
+        }
+        loadFragment(newConfig);
+    }
 
-    @InjectFragment(R.id.fragment)
-    private MainActivityFragment myFragment;
+    private void loadFragment(Configuration configuration) {
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+//        Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
+//        int orientation = display.getOrientation();
+        FragmentManager fragmentManager = getSupportFragmentManager();
+
+        FragmentTransaction transaction = fragmentManager.beginTransaction();
+        switch (configuration.orientation) {
+            case Configuration.ORIENTATION_PORTRAIT:
+                DebugLog.d(TAG + " ORIENTATION_PORTRAIT");
+                transaction.replace(R.id.fragment, new GalleryFragmentPortrait()).commit();
+                break;
+            case Configuration.ORIENTATION_LANDSCAPE:
+                DebugLog.d(TAG + " ORIENTATION_LANDSCAPE");
+                transaction.replace(R.id.fragment, new GalleryFragmentLandscape()).commit();
+                break;
+        }
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
+        final RoboInjector injector = RoboGuice.getInjector(this);
+        eventManager = injector.getInstance(EventManager.class);
+        injector.injectMembersWithoutViews(this);
         super.onCreate(savedInstanceState);
+        eventManager.fire(new OnCreateEvent<Activity>(this, savedInstanceState));
+        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
     }
 
+    @Override
+    protected void onStop() {
+        try {
+            eventManager.fire(new OnStopEvent(this));
+        } finally {
+            super.onStop();
+        }
+    }
 
+    @Override
+    protected void onDestroy() {
+        try {
+            eventManager.fire(new OnDestroyEvent<Activity>(this));
+        } finally {
+            try {
+                RoboGuice.destroyInjector(this);
+            } finally {
+                super.onDestroy();
+            }
+        }
+    }
+
+    @Override
+    public void onContentChanged() {
+        super.onContentChanged();
+        RoboGuice.getInjector(this).injectViewMembers(this);
+        eventManager.fire(new OnContentChangedEvent(this));
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    public Map<Key<?>, Object> getScopedObjectMap() {
+        return scopedObjects;
+    }
 }
+
+
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
deleted file mode 100644
index c28ed60..0000000
--- a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivityFragment.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.akozlowski.doomvision.ui;
-
-import android.os.Bundle;
-import android.util.Base64;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.akozlowski.doomvision.R;
-import com.akozlowski.doomvision.manager.RestManager;
-import com.akozlowski.doomvision.pojo.Response;
-import com.akozlowski.doomvision.util.DebugLog;
-
-import retrofit.Callback;
-import retrofit.RetrofitError;
-import roboguice.RoboGuice;
-import roboguice.fragment.provided.RoboFragment;
-import roboguice.inject.InjectView;
-
-
-/**
- * A placeholder fragment containing a simple view.
- */
-public class MainActivityFragment extends RoboFragment {
-    private static final String TAG = MainActivityFragment.class.getSimpleName();
-    private RestManager restManager;
-    @InjectView(R.id.response)
-    private TextView responseTextView;
-    @InjectView(R.id.search_field)
-    private EditText searchEditText;
-    @InjectView(R.id.search_btn)
-    private Button searchBtn;
-
-    private static boolean TEST = false;
-
-    public MainActivityFragment() {
-    }
-
-    public void onViewsInjected() {
-
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-
-        return inflater.inflate(R.layout.fragment_main, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        RoboGuice.getInjector(getActivity()).injectViewMembers(this);
-        restManager = new RestManager(getActivity());
-
-        searchBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                base64Test();
-                if (TEST) {
-                    validate();
-                } else {
-                    search();
-                }
-            }
-        });
-        super.onViewCreated(view, savedInstanceState);
-    }
-
-    private void search() {
-        if (searchEditText.getText() != null && searchEditText.getText().length() > 0) {
-            restManager.searchImage("dog", new Callback<Response>() {
-                @Override
-                public void success(Response response, retrofit.client.Response response2) {
-                    DebugLog.d(TAG + " responce: " + response.toString());
-                }
-
-                @Override
-                public void failure(RetrofitError error) {
-                    DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
-                }
-            });
-        }
-    }
-
-    private void test() {
-        restManager.test(new Callback<Response>() {
-            @Override
-            public void success(Response response, retrofit.client.Response response2) {
-                responseTextView.setText("success: " + response2.getStatus() + "; " + response2.getReason().toString() + "; " + response2.getUrl());
-            }
-
-            @Override
-            public void failure(RetrofitError error) {
-                responseTextView.setText("error: " + error.getMessage() + ", " + error.getUrl() + "; " + error.getSuccessType().toString());
-            }
-        });
-    }
-
-    private void validate() {
-        restManager.validate("1", "tag1", "tag2", new Callback<Response>() {
-            @Override
-            public void success(Response response, retrofit.client.Response response2) {
-                DebugLog.d(TAG + " responce: " + response.toString());
-            }
-
-            @Override
-            public void failure(RetrofitError error) {
-                DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", " + error.getResponse().getReason());
-            }
-        });
-    }
-
-    //    MTIzNDo0MzIx
-    //    MTIzNDQzMjE
-    private void base64Test() {
-        String clientID = "1234";
-        String clientSecret = "4321";
-        StringBuilder sb = new StringBuilder(clientID).append(clientSecret);
-
-        String encodedID = Base64.encodeToString(sb.toString().getBytes(), Base64.DEFAULT);
-        String encodedSecret = Base64.encodeToString(clientSecret.getBytes(), Base64.DEFAULT);
-
-        String source = clientID + ":" + clientSecret;
-        String ret = "Basic " + Base64.encodeToString(source.getBytes(), Base64.URL_SAFE | Base64.NO_WRAP);
-
-        DebugLog.d(TAG + " Authorization: " + ret);
-    }
-}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/listView/CustomAdapter.java b/app/src/main/java/com/akozlowski/doomvision/ui/listView/CustomAdapter.java
new file mode 100644
index 0000000..fa708b6
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/listView/CustomAdapter.java
@@ -0,0 +1,50 @@
+package com.akozlowski.doomvision.ui.listView;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+import java.util.List;
+
+/**
+ * Created by akozlowski on 16/08/15.
+ */
+public class CustomAdapter extends ArrayAdapter<Item> {
+    private final Context context;
+    private final int resourceID;
+    private LayoutInflater mInflater;
+
+    public CustomAdapter(Context context, int resource, List<Item> items) {
+        super(context, resource, items);
+        this.context = context;
+        this.mInflater = LayoutInflater.from(context);
+        this.resourceID = resource;
+    }
+
+    @Override
+    public boolean areAllItemsEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isEnabled(int position) {
+        return false;
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return Item.ItemType.values().length;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return getItem(position).getViewType();
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        return getItem(position).getView(mInflater, convertView, parent);
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/listView/Item.java b/app/src/main/java/com/akozlowski/doomvision/ui/listView/Item.java
new file mode 100644
index 0000000..14e9211
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/listView/Item.java
@@ -0,0 +1,18 @@
+package com.akozlowski.doomvision.ui.listView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+/**
+ * Created by akozlowski on 16/08/15.
+ */
+public interface Item {
+    int getViewType();
+
+    View getView(LayoutInflater inflater, View convertView, ViewGroup parent);
+
+    enum ItemType {
+        IMAGE;
+    }
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/util/Density.java b/app/src/main/java/com/akozlowski/doomvision/util/Density.java
new file mode 100644
index 0000000..86fe07c
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/util/Density.java
@@ -0,0 +1,25 @@
+package com.akozlowski.doomvision.util;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+/**
+ * Created by akozlowski on 17/08/15.
+ */
+public class Density {
+    public static float getDensityMultiplier(Context context) {
+        float densityMultiplier;
+        float densityScale = 1.0f / DisplayMetrics.DENSITY_DEFAULT;
+
+        try {
+            densityMultiplier = densityScale * context.getResources().getDisplayMetrics().densityDpi;
+        } catch (NullPointerException e) {
+            DebugLog.e("Nullpointer", e);
+            return 1;
+        }
+
+        DebugLog.i("DENSITY: multiplier: " + densityMultiplier);
+
+        return densityMultiplier;
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/bg_tile_thumb.9.png b/app/src/main/res/drawable-hdpi/bg_tile_thumb.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f64c9bf97ae3d1e3743f43497badeefbbf6937
GIT binary patch
literal 636
zcmV-?0)zdDP)<h;3K|Lk000e1NJLTq001cf001Zm0{{R3RN^CH00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#Z%|BBMNDaNOiWBvR8&$@Qd3h?Q&UqxK|v=cCpR}Y
zLqkJQP*7M{SmWd4R#sM4R#sP6S5{V5xVX4hR#yK0{`dFy`uh6i<>hm8bA5e%>+9><
z+S<dz!`a!{y}iBg@bKm3<+r!D$jHd0rKSJ>{{R30kP<T(0000ZbW%=J01qP>5*-Wz
z1_~81nJYg_CyF=t;?Z(WNsOCEQY(L_gmQ9LC&T;z00DeSL_t(I%iY!4c7q@g24Gnu
z5G=*0(Im~H@BfTtapF?3=k&7wO>Vvn3<t(6TV$9gOXsl8p30|eYf!?6a~^&{uc1>M
z(Rq;jL%yV;o<O&+s_dtf)z=M)P}lbgP;gq$*@$b(MWmzju<f_fMjE9r$?3J<&Xw{|
zbQnugQYB<XXeb(`K=RV3a*;@Y^d;-0tV2;J2fs_n+N5lm^g9hwAcBucdBnso@1<XS
zU;5=o$;^&4><`j4q<5qaEk#Lxk@TO+ES!?*lCm@7DP{5GpGo<IlaH6qs4@XdWeCV{
zm()EW?+Wgce;i0+eLii%(^+GQ!u^Dn)FwThRcr`ehg)9Trd#i|>>8{6;`#e+hN8A;
zUXRZyk5^OJvE(6x!GIjqwkSU4DGI9{L;@sGtd({69cz`w3mE4Tk_2O;wSs7EFeVWm
zvIV7*FovfvMkHOrkvdDIBoHax1Qja?6Vy#(G{sNmJpVDjXG0z)_tx-Ue_n>IkIgrn
WgLc{)6{rOO0000<MNUMnLSTZ4r67X<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/bg_tile_thumb.9.png b/app/src/main/res/drawable-xhdpi/bg_tile_thumb.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..be0c4516787f35cead590c5f161a83ce9d06e7a6
GIT binary patch
literal 805
zcmV+=1KRwFP)<h;3K|Lk000e1NJLTq001@s001-y0{{R3_ES6L00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#fly3TMNDaNP*6}*R8&w<P(3|8Jv}{CR8%i7F8}}l
zKtMoMRaI0}R8mq>OiWBxR#v~izfn<9S65e8S65e8SNi(;S65g5{{F+m!;g=TUS3}P
z{r&az_44xa`uh6i<>jxhuk-Ws+1c6q`}@bo$MNy;!^6Xxnwr?y*j!v(|Ns90001I$
zFh~FZ04a1*PE!CHA`uG(69WMUEG8BWHD(?{OH;%;{9IBr^r^=0wKUg=;X;aYWl1dN
z<AC@800Iq3L_t(Y$L-eJa+@#^24EcwP6asFEeCOM?AS>L-v0r+D<LGnMofCw$$y8(
z-z*5UD?%3O=OG*N@-SYrhXi{k>f*UH1oCSV{N*WC2*D1Mj8T_}6<jEd6yThPW8gyJ
z0WOqA{C2PZ%u?TP+(7Mms{%mbSCe-Sk~d!=z`(fPt;NH8)jdgd54o+^532#Im+-jm
zR#L}2fmK!O(htSpv3PvV*I0gyIXs{$H?RQiFn+7L)l_fb;5H4zVo6Br&XbzLx<EP2
zOtE(#dmqbbri$HKA8T*AoMk*ti`>WZBE@ow^>~j7r>y9_DHz3<uz%5Pm&99Hoa|hd
zMz4PM8l@A)w=-^-T7D+BFu~L-(A9v^t&FOr)C}I*W)>zt?7v|C{pK)YKCYtjv8u2i
z7crl5>F*__{gjE>II{7vM%s--%r=!Do`=gnq}`^(GzF2J*V#D}wkZ(Pf`lwDYwA);
zVO!AH@FJ0|xl5Ue$TqyOy)tpg%5(d8zP0BvJE*tjuwW>6$c~@aW-jx#xqco&>0+jt
zo6(`&@pSq<%jtB~Y8)NJ8B~;^Q*atUs9+h*pd#*A#Ck$1=?07xSj&z@G8w`&WeDYA
z5{ZbR8iz2Mj(mhH0_rA;7$SG%lj#8iAx(k0NmGi*Jzy-4GdzY+CwR?g$C-aTJbm}5
j_T7Ww@~rzH<DdTmvcKzjF4|`Q00000NkvXXu0mjf!pnWX

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/bg_tile_thumb.9.png b/app/src/main/res/drawable-xxhdpi/bg_tile_thumb.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a9a72a73c82d83d2bae869b1989ecc34bcbc147
GIT binary patch
literal 1011
zcmV<P0}T9$P)<h;3K|Lk000e1NJLTq002+`002!00{{R328R>c00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#W>8F2MNDaNH#av`RaI72R!B%lNl8gmR8%-PH~;_u
zOiWBxR#sC}Q&v`1S65e9SXfn6RajV9T3T9ISXfwCSXx?I>+9?N{r&s<`~Cg>;o;%+
z_4VW9<HN(l@$vDRnwr|$+W-Im0001!2jb%Z001C#QchC<1O^rg2oVAS4ImpXC^Qo!
zLOWASo9yuWW6`mIye5g?uWif#00RF>L_t(o!|mAFa@#Nr1yH7{Q&&4xE!Gl`^#4B@
z0w5)BvP{*TzWC<N9-jfo%#Z|Q`&stFPUL!+Q0v!0o>evML*$1i@VSN_a%9OLUp!e|
zWgc@H_0x&Q9+1RgagzGI6UnMFcf_?i#PEloJCQ1yvdSHgszXlvt|%gJih@ueW#g`>
zJmNk-qrMs1+w9G)9hyD@lSo}$To1T=)6NHJn>&)0xcI!HKje_?3s=-Y@Q{m|`N=d9
zktph*>3z*l=gSc{5c&<PZ>tfy)<G%|)=zl-9F!hJSVvi+0;yr)-P<s*y^{z{Zy**Z
z7O;qtW)4h~L<KG*lt>`1AT}H&aT^M@aS~C}*z=+~riPP#4o;uQrax8?x0niS!ofzC
zh#M`zwZM1?2ZvZI(Ex>4w&7q~suCqAmQZwzTO4P%aPXGJxY5w_^}4Wy_E>Z*3e4sc
z$wY~wXWC~4%8pNi)UyKDCCt(@V47)*xPisrfrSOaKaJ@4Bv{7qk7I$jg!vgTmy5W8
zxXA#f=fG5gVpkNX_T(hE?#df{gKzK+{x9&%F=~O#0K0IodkCJniul0w2pGe`(K-T{
zaY#+!;A9<A%s57?;6>~z>lkImL7#_TiF50qXU0_|=Yb`5Jh!eQ%(yJ&Rp2U4Rc>9D
zm~ov;^D1bg$0|>)>zsMv6d(_In(<04;d<dTuf!-mUE|1Qfsyx)txBx;^wiFD6R%W(
z7Pvhts6<{jhh*2(+$?Z=Rv0Bpv7W}E+Zz#d!#LH_GYY)APczXpb}h*I&u(hugeMv{
zpJvQ{JVMhX0_j8XW3Ie1HXo17e%^v8x+aoLC!9Fww_F>R&s*j^z@cj>Qjlo+QXvQH
zr@YHHb#O)mLM(|y6vO2o1-?nKJo5Arfo~|15GhPV-K3x)m$+jQpGYK_fI5NCOXBuC
zdk{n<ps1QD0n@pQZ~SGAs*ohq7x)giea{`H(PS?1Mos8^!?b@l?tA?}^7SLr*AI1H
hKX!gJ{(lft_y(FeslM)B{=)zO002ovPDHLkV1l0W)%gGb

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/btn_search_selector.xml b/app/src/main/res/drawable/btn_search_selector.xml
new file mode 100644
index 0000000..289de98
--- /dev/null
+++ b/app/src/main/res/drawable/btn_search_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@android:color/darker_gray" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/main_background_gradiant.xml b/app/src/main/res/drawable/main_background_gradiant.xml
new file mode 100644
index 0000000..4d80f8d
--- /dev/null
+++ b/app/src/main/res/drawable/main_background_gradiant.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="315"
+                android:endColor="#006EAE"
+                android:startColor="#002C54"
+                android:type="linear" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <gradient
+                android:angle="270"
+                android:centerColor="#0071B8DB"
+                android:centerY="0.95"
+                android:endColor="#aa6EB8D9"
+                android:startColor="#0071B8DB"
+                android:type="linear" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8bc5c9a..e81fad8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,7 @@
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/fragment"
-    android:name="com.akozlowski.doomvision.ui.MainActivityFragment"
+    android:name="com.akozlowski.doomvision.ui.GalleryFragmentPortrait"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:layout="@layout/fragment_main" />
+    tools:layout="@layout/gallery_fragment_portrait" />
diff --git a/app/src/main/res/layout/gallery_fragment_landscape.xml b/app/src/main/res/layout/gallery_fragment_landscape.xml
new file mode 100644
index 0000000..cd0db9d
--- /dev/null
+++ b/app/src/main/res/layout/gallery_fragment_landscape.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/gallery_image_view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="20dp"
+        android:orientation="vertical" />
+
+    <LinearLayout
+        android:id="@+id/gallery_image_indicator_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="8dp"
+        android:orientation="horizontal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/gallery_fragment_portrait.xml
similarity index 58%
rename from app/src/main/res/layout/fragment_main.xml
rename to app/src/main/res/layout/gallery_fragment_portrait.xml
index 15a44a8..b47016b 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/gallery_fragment_portrait.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/main_background_gradiant"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -22,17 +23,21 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
             android:layout_below="@+id/btn_search"
-            android:layout_weight="3"
-            android:paddingTop="10dp"
-            android:singleLine="true"
-            android:text="@string/search_field" />
+            android:layout_weight="8"
 
-        <Button
+            android:hint="@string/search_field"
+            android:singleLine="true" />
+
+        <ImageView
             android:id="@+id/search_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_toRightOf="@+id/search_field"
             android:layout_weight="1"
+            android:background="@drawable/btn_search_selector"
+            android:enabled="true"
+            android:src="@drawable/ic_search_black_24dp"
             android:text="@string/btn_search" />
     </LinearLayout>
 
@@ -43,5 +48,23 @@
         android:layout_below="@+id/search_layout"
         android:paddingTop="10dp" />
 
+    <ListView
+        android:id="@+id/listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/response"
+        android:layout_centerHorizontal="true"
+        android:choiceMode="singleChoice"
+        android:focusableInTouchMode="true" />
+
+    <ProgressBar
+        android:id="@+id/search_progress"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/image_item.xml b/app/src/main/res/layout/image_item.xml
new file mode 100644
index 0000000..0dfc221
--- /dev/null
+++ b/app/src/main/res/layout/image_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/image"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:padding="4dp" />
diff --git a/app/src/main/res/layout/image_view_pager_fragment.xml b/app/src/main/res/layout/image_view_pager_fragment.xml
new file mode 100644
index 0000000..e1c8ee8
--- /dev/null
+++ b/app/src/main/res/layout/image_view_pager_fragment.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_tile_thumb"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/view_pager_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="8dp"
+        android:scaleType="fitCenter"
+        tools:ignore="ContentDescription" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_view_content.xml b/app/src/main/res/layout/list_view_content.xml
new file mode 100644
index 0000000..508d80d
--- /dev/null
+++ b/app/src/main/res/layout/list_view_content.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..7067861
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="getting_started_circle_indicator_fill_color">#FFFFFF</color>
+    <color name="getting_started_circle_indicator_page_color">#74aace</color>
+    <color name="getting_started_circle_indicator_stroke_color">#FFDDDDDD</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 47c8224..1e141a1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="view_pager_page_width">20dp</dimen>
+    <dimen name="view_pager_page_height">20dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ba87e99..0bbf554 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,5 @@
     <string name="search_field">search images, vectors and videos .... </string>
     <string name="client_id">8f80cdd74ddbef680339</string>
     <string name="client_secret">d1cc912295e23669be555fcadb02b4442b53be9e</string>
+    <string name='no_internet_msg'>No internet connection</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 766ab99..e14d90d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
+        <!--Customize your theme here.-->
     </style>
 
 </resources>

From 68a2308502b8dab8d09465e58dc6b6872821f181 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Sat, 29 Aug 2015 11:48:42 +0200
Subject: [PATCH 05/10] add image details in to viewpager, change query
 view=full, add landscape orientation support,

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../doomvision/DoomVisionApplication.java     |   2 +
 .../doomvision/manager/DataManager.java       |  19 ++++
 .../doomvision/manager/RestManager.java       |   2 +-
 .../service/SearchImageService.java           |   8 +-
 .../ui/GalleryFragmentLandscape.java          |  75 +++++++++++--
 .../ui/GalleryFragmentPortrait.java           |  75 ++++++++-----
 .../doomvision/ui/ImageViewPageFragment.java  |  11 +-
 .../doomvision/ui/MainActivity.java           | 100 ++++++++++--------
 app/src/main/res/layout/activity_main.xml     |   9 +-
 .../res/layout/gallery_fragment_landscape.xml |  91 +++++++++++++++-
 .../res/layout/image_view_pager_fragment.xml  |   2 +
 app/src/main/res/layout/search_dialog.xml     |  51 +++++++++
 app/src/main/res/values/dimens.xml            |   4 +-
 app/src/main/res/values/strings.xml           |  36 +++++++
 15 files changed, 384 insertions(+), 103 deletions(-)
 create mode 100644 app/src/main/res/layout/search_dialog.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79fe886..0d31906 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,12 +8,12 @@
     <application
         android:name=".DoomVisionApplication"
         android:allowBackup="true"
-        android:configChanges="keyboardHidden|orientation|screenSize"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
             android:name=".ui.MainActivity"
+            android:configChanges="orientation"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
index e2471f7..cf921e4 100644
--- a/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
+++ b/app/src/main/java/com/akozlowski/doomvision/DoomVisionApplication.java
@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
+import com.akozlowski.doomvision.manager.DataManager;
 import com.akozlowski.doomvision.service.InternetConnectivityReceiver;
 import com.akozlowski.doomvision.util.DebugLog;
 
@@ -13,6 +14,7 @@ public class DoomVisionApplication extends Application {
     public void onCreate() {
         super.onCreate();
         DebugLog.d("DoomVisionApplication onCreate()");
+        DataManager.createInstance();
         InternetConnectivityReceiver.createInstance(this);
     }
 }
diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
index 2c11399..34cff09 100644
--- a/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/DataManager.java
@@ -9,6 +9,25 @@
  */
 @Singleton
 public class DataManager {
+    private static DataManager instance;
+
+    private DataManager() {
+    }
+
+    public static DataManager getInstance() {
+        if (instance == null)
+            throw (new IllegalStateException("BrushingStateManager not initialized"));
+        return (instance);
+    }
+
+    public static DataManager createInstance() {
+        if (instance != null) {
+            return instance;
+        }
+        instance = new DataManager();
+        return instance;
+    }
+
     public void setResponse(Response response) {
         this.response = response;
     }
diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
index 638d459..ca89ecf 100644
--- a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
@@ -62,7 +62,7 @@ private String getEndPoint() {
 
     public void searchImage(String query, Callback<Response> cb) {
         SearchImageService service = ServiceGenerator.createService(SearchImageService.class, getEndPoint(), authBase64);
-        service.search(query, cb);
+        service.search(query, "full", cb);
     }
 
     public EchoTest test(String testText) {
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
index 6a09420..ca1d72f 100644
--- a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
+++ b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
@@ -11,11 +11,13 @@
  * https://api.shutterstock.com/v2/images/search?license=commercial&&&&&&&&&&query=dog&&sort=popular&view=minimal
  */
 public interface SearchImageService {
+
+
     @GET("/images/search")
-    void search(@Query("query") String query, Callback<Response> cb);
+    void search(@Query("query") String query, @Query("view") String view, Callback<Response> cb);
 
-    @GET("/search")
-    void search(@Query("license") String license, @Query("query") String query, Callback<Response> cb);
+//    @GET("/search")
+//    void search(@Query("license") String license, @Query("query") String query, Callback<Response> cb);
 
 //    @GET("/search?license=commercial&&&&&&&&&&query={query}")
 //    void search(@Query("query") String query, Callback<Response> cb);
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
index 1950995..834ba11 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
@@ -8,17 +8,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 
 import com.akozlowski.doomvision.R;
 import com.akozlowski.doomvision.manager.DataManager;
+import com.akozlowski.doomvision.pojo.Category;
+import com.akozlowski.doomvision.pojo.Data;
 import com.akozlowski.doomvision.pojo.Response;
 import com.akozlowski.doomvision.util.DebugLog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import roboguice.fragment.RoboFragment;
 import roboguice.inject.InjectView;
 
@@ -29,13 +30,21 @@ public class GalleryFragmentLandscape extends RoboFragment {
     private static final String TAG = GalleryFragmentLandscape.class.getSimpleName();
     @InjectView(R.id.gallery_image_view_pager)
     private ViewPager viewPager;
-    @Inject
-    private DataManager dataManager;
     private List<roboguice.fragment.RoboFragment> slides = new ArrayList<>();
 
     @InjectView(R.id.gallery_image_indicator_layout)
     private LinearLayout indicatorsLayout;
     private List<IndicatorView> circleIndicators = new ArrayList<IndicatorView>();
+    private int currentPagePosition = 0;
+    public static final String PAGE_INDEX_KEY = "page_index_key";
+    @InjectView(R.id.details_description)
+    private TextView textViewDescription;
+    @InjectView(R.id.details_added_date)
+    private TextView textViewAddedDate;
+    @InjectView(R.id.details_image_type)
+    private TextView textViewImageType;
+    @InjectView(R.id.details_categories)
+    private TextView textViewCategories;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -49,22 +58,33 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         return inflater.inflate(R.layout.gallery_fragment_landscape, container, false);
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        if (getArguments() != null) {
+            currentPagePosition = getArguments().getInt(PAGE_INDEX_KEY);
+        }
         createViewPager();
     }
 
+
     private void createViewPager() {
-        CustomScreenSlideAdapter pagerAdapter = new CustomScreenSlideAdapter(getActivity().getSupportFragmentManager());
+        CustomScreenSlideAdapter pagerAdapter = new CustomScreenSlideAdapter(getChildFragmentManager());
         pagerAdapter.notifyDataSetChanged();
         viewPager.setAdapter(pagerAdapter);
-        Response response = dataManager.getResponse();
+        Response response = DataManager.getInstance().getResponse();
         if (response == null) {
             return;
         }
@@ -72,9 +92,13 @@ private void createViewPager() {
         slides.clear();
 
         for (int i = 0; i < response.getData().size(); i++) {
-            createCircleIndicator(true, (LinearLayout.LayoutParams) indicatorsLayout.getLayoutParams());
+            createCircleIndicator(i == currentPagePosition, (LinearLayout.LayoutParams) indicatorsLayout.getLayoutParams());
             slides.add(ImageViewPageFragment.createInstance(i));
         }
+        viewPager.setOnPageChangeListener(createPageListener());
+        viewPager.setCurrentItem(currentPagePosition);
+        pagerAdapter.notifyDataSetChanged();
+        updateDetails(response.getData().get(currentPagePosition));
     }
 
     private void createCircleIndicator(boolean isSelected, LinearLayout.LayoutParams params) {
@@ -87,6 +111,43 @@ private void createCircleIndicator(boolean isSelected, LinearLayout.LayoutParams
         circleIndicators.add(circleIndicatorView);
     }
 
+    private ViewPager.OnPageChangeListener createPageListener() {
+        return new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                circleIndicators.get(currentPagePosition).setIsSelected(false);
+                circleIndicators.get(position).setIsSelected(true);
+                currentPagePosition = position;
+                updateDetails(DataManager.getInstance().getResponse().getData().get(currentPagePosition));
+            }
+
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { /* unused */ }
+
+            @Override
+            public void onPageScrollStateChanged(int state) { /* unused */ }
+        };
+    }
+
+    private void updateDetails(Data data) {
+        textViewAddedDate.setText(data.getAddedDate());
+        setCategories(data.getCategories());
+        textViewDescription.setText(data.getDescription());
+        textViewImageType.setText(data.getImageType());
+
+    }
+
+    private void setCategories(List<Category> categories) {
+        if (categories == null) return;
+
+        StringBuilder sb = new StringBuilder();
+        for (Category category : categories) {
+            sb.append(category.getName());
+            sb.append(" ");
+        }
+        textViewCategories.setText(sb.toString());
+    }
+
     class CustomScreenSlideAdapter extends FragmentStatePagerAdapter {
 
         public CustomScreenSlideAdapter(FragmentManager fm) {
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
index 183b656..3daae87 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
@@ -2,6 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,8 +31,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import retrofit.Callback;
 import retrofit.RetrofitError;
 import roboguice.RoboGuice;
@@ -55,8 +55,6 @@ public class GalleryFragmentPortrait extends RoboFragment {
     private List<Item> items = new ArrayList<Item>();
     @InjectView(R.id.search_progress)
     private ProgressBar progressBar;
-    @Inject
-    private DataManager dataManager;
 
 
     public GalleryFragmentPortrait() {
@@ -79,8 +77,8 @@ public void onResume() {
         super.onResume();
         restManager = new RestManager(getActivity());
         createListView();
-        if (dataManager.getResponse() != null) {
-            createItems(dataManager.getResponse());
+        if (DataManager.getInstance().getResponse() != null) {
+            createItems(DataManager.getInstance().getResponse());
         }
         searchBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -100,10 +98,13 @@ private void createListView() {
     private void createItems(Response response) {
         List<Data> dataList = response.getData();
         items.clear();
-        dataManager.setResponse(response);
+        DataManager.getInstance().setResponse(response);
+
+        int index = 0;
         for (Data data : dataList) {
-            items.add(new ImageItem(data.getAssets().getPreview().getUrl()));
+            items.add(new ImageItem(data.getAssets().getPreview().getUrl(), index));
             printCategories(data.getCategories());
+            index++;
         }
         ((ArrayAdapter) listView.getAdapter()).notifyDataSetChanged();
     }
@@ -129,11 +130,13 @@ private static class ViewItemHolder {
     }
 
     private class ImageItem implements Item {
-        private String url;
+        final private String url;
+        final private int index;
 
-        public ImageItem(String url) {
+        public ImageItem(String url, int index) {
             DebugLog.d(TAG + " create Item url: " + url);
             this.url = url;
+            this.index = index;
 
         }
 
@@ -152,32 +155,48 @@ public View getView(LayoutInflater inflater, View convertView, ViewGroup parent)
             }
             viewItemHolder = (ViewItemHolder) convertView.getTag();
             Picasso.with(getActivity()).load(url).into(viewItemHolder.imageView);
+            viewItemHolder.imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    DebugLog.d(TAG + " onClick index " + index);
+                    FragmentManager fm = getActivity().getSupportFragmentManager();
+                    FragmentTransaction transaction = fm.beginTransaction();
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(GalleryFragmentLandscape.PAGE_INDEX_KEY, index);
+                    GalleryFragmentLandscape galleryFragmentLandscape = new GalleryFragmentLandscape();
+                    galleryFragmentLandscape.setArguments(bundle);
+                    transaction.replace(R.id.fragment_container, galleryFragmentLandscape, GalleryFragmentLandscape.class.getSimpleName()).addToBackStack(null).commit();
+                }
+            });
             return convertView;
         }
     }
 
     private void search() {
-        if (searchEditText.getText() != null && searchEditText.getText().length() > 0) {
-            restManager.searchImage(searchEditText.getText().toString(), new Callback<Response>() {
-                @Override
-                public void success(Response response, retrofit.client.Response response2) {
-                    DebugLog.d(TAG + " responce: " + response.toString());
-
-                    createItems(response);
-                    progressBar.setVisibility(View.GONE);
+        restManager.searchImage(searchEditText.getText().toString(), new Callback<Response>() {
+            @Override
+            public void success(Response response, retrofit.client.Response response2) {
+                DebugLog.d(TAG + " responce: " + response.toString());
+                if (response != null && response.getData() != null && response.getData().size() > 0) {
+                    ((MainActivity) getActivity()).changeRequestedOrientation(true);
+                } else {
+                    ((MainActivity) getActivity()).changeRequestedOrientation(false);
                 }
+                createItems(response);
+                progressBar.setVisibility(View.GONE);
+            }
 
-                @Override
-                public void failure(RetrofitError error) {
-                    DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
-                    if (error.getKind().equals(RetrofitError.Kind.NETWORK)) {
-                        searchBtn.setEnabled(false);
-                        progressBar.setVisibility(View.GONE);
-                        onNoInternetConnection();
-                    }
+            @Override
+            public void failure(RetrofitError error) {
+                DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
+                if (error.getKind().equals(RetrofitError.Kind.NETWORK)) {
+                    searchBtn.setEnabled(false);
+                    progressBar.setVisibility(View.GONE);
+                    onNoInternetConnection();
                 }
-            });
-        }
+            }
+        });
+//        }
     }
 
     private void onNoInternetConnection() {
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java b/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
index d5d154a..cf1c5fa 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/ImageViewPageFragment.java
@@ -1,7 +1,6 @@
 package com.akozlowski.doomvision.ui;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,8 +11,6 @@
 import com.akozlowski.doomvision.pojo.Data;
 import com.squareup.picasso.Picasso;
 
-import javax.inject.Inject;
-
 import roboguice.fragment.RoboFragment;
 import roboguice.inject.InjectView;
 
@@ -23,8 +20,6 @@
 public class ImageViewPageFragment extends RoboFragment {
     @InjectView(R.id.view_pager_image)
     private ImageView imageView;
-    @Inject
-    private DataManager dataManager;
 
 
     public static final String EXTRA_INDEX_KEY = "extra_index_key";
@@ -43,10 +38,10 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
     }
 
-    @Nullable
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.gallery_fragment_landscape, container, false);
+        return inflater.inflate(R.layout.image_view_pager_fragment, container, false);
     }
 
     @Override
@@ -54,7 +49,7 @@ public void onResume() {
         super.onResume();
         if (getArguments() != null && getArguments().containsKey(EXTRA_INDEX_KEY)) {
             int index = getArguments().getInt(EXTRA_INDEX_KEY);
-            Data data = dataManager.getResponse().getData().get(index);
+            Data data = DataManager.getInstance().getResponse().getData().get(index);
             Picasso.with(getActivity()).load(data.getAssets().getPreview().getUrl()).into(imageView);
         }
     }
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
index 7a3ee69..a6b807c 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
@@ -4,13 +4,14 @@
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import com.akozlowski.doomvision.R;
+import com.akozlowski.doomvision.manager.DataManager;
 import com.akozlowski.doomvision.util.DebugLog;
 import com.google.inject.Key;
 
@@ -34,67 +35,57 @@
 public class MainActivity extends FragmentActivity implements RoboContext {
 
     private static final String TAG = MainActivity.class.getSimpleName();
-
     protected EventManager eventManager;
     protected HashMap<Key<?>, Object> scopedObjects = new HashMap<Key<?>, Object>();
+    private static final String STATE_ORIENTATION_KEY = "STATE_ORIENTATION_KEY";
 
     @Inject
     ContentViewListener ignored; // BUG find a better place to put this
 
-//    @InjectFragment(R.id.fragment)
-//    private GalleryFragmentPortrait galleryFragmentPortrait;
-//    @InjectFragment(R.id.fragment)
-//    private GalleryFragmentLandscape galleryFragmentLandscape;
-
-    //    @Override
-//    protected void onCreate(Bundle savedInstanceState) {
-//
-////        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-//        super.onCreate(savedInstanceState);
-//        loadFragment();
-//    }
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        DebugLog.d(TAG + " onConfigurationChanged");
-        // Checks the orientation of the screen
-        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            Toast.makeText(this, "landscape", Toast.LENGTH_SHORT).show();
-        } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-            Toast.makeText(this, "portrait", Toast.LENGTH_SHORT).show();
-        }
-        loadFragment(newConfig);
-    }
-
-    private void loadFragment(Configuration configuration) {
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-//        Display display = ((WindowManager) getSystemService(WINDOW_SERVICE)).getDefaultDisplay();
-//        int orientation = display.getOrientation();
+    private void changeFragment(Fragment fragment, String name) {
         FragmentManager fragmentManager = getSupportFragmentManager();
-
         FragmentTransaction transaction = fragmentManager.beginTransaction();
-        switch (configuration.orientation) {
-            case Configuration.ORIENTATION_PORTRAIT:
-                DebugLog.d(TAG + " ORIENTATION_PORTRAIT");
-                transaction.replace(R.id.fragment, new GalleryFragmentPortrait()).commit();
-                break;
-            case Configuration.ORIENTATION_LANDSCAPE:
-                DebugLog.d(TAG + " ORIENTATION_LANDSCAPE");
-                transaction.replace(R.id.fragment, new GalleryFragmentLandscape()).commit();
-                break;
-        }
+        transaction.replace(R.id.fragment_container, fragment, name).commit();
     }
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
+        DebugLog.d(TAG + " onCreate()...");
+        if (DataManager.getInstance().getResponse() == null) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        } else {
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        }
         final RoboInjector injector = RoboGuice.getInjector(this);
         eventManager = injector.getInstance(EventManager.class);
         injector.injectMembersWithoutViews(this);
         super.onCreate(savedInstanceState);
         eventManager.fire(new OnCreateEvent<Activity>(this, savedInstanceState));
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentTransaction transaction = fragmentManager.beginTransaction();
+        if (savedInstanceState == null) {
+            DebugLog.d(TAG + " onCreate()..savedInstanceState is null");
+            transaction.replace(R.id.fragment_container, new GalleryFragmentPortrait()).addToBackStack(null).commit();
+        } else {
+            if (getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+                DebugLog.d(TAG + " SCREEN_ORIENTATION_PORTRAIT");
+                changeFragment(new GalleryFragmentPortrait(), GalleryFragmentPortrait.class.getSimpleName());
+            } else {
+                DebugLog.d(TAG + " SCREEN_ORIENTATION_LANDSCAPE");
+                changeFragment(new GalleryFragmentLandscape(), GalleryFragmentLandscape.class.getSimpleName());
+            }
+        }
+    }
 
+    public void changeRequestedOrientation(boolean sensorOn) {
+        if (sensorOn) {
+            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        } else {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
     }
 
     @Override
@@ -131,6 +122,27 @@ protected void onResume() {
         super.onResume();
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        DebugLog.d(TAG + " ***** onSaveInstanceState()  ");
+        if (getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
+            outState.putInt(STATE_ORIENTATION_KEY, Configuration.ORIENTATION_PORTRAIT);
+        } else {
+            outState.putInt(STATE_ORIENTATION_KEY, Configuration.ORIENTATION_LANDSCAPE);
+        }
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
+            finish();
+        } else {
+            super.onBackPressed();
+        }
+
+    }
+
     @Override
     public Map<Key<?>, Object> getScopedObjectMap() {
         return scopedObjects;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e81fad8..53fffae 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,7 +1,4 @@
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fragment"
-    android:name="com.akozlowski.doomvision.ui.GalleryFragmentPortrait"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:layout="@layout/gallery_fragment_portrait" />
+    android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/gallery_fragment_landscape.xml b/app/src/main/res/layout/gallery_fragment_landscape.xml
index cd0db9d..cd67d7c 100644
--- a/app/src/main/res/layout/gallery_fragment_landscape.xml
+++ b/app/src/main/res/layout/gallery_fragment_landscape.xml
@@ -4,22 +4,107 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <!--<LinearLayout-->
+    <!--android:layout_width="match_parent"-->
+    <!--android:layout_height="0dp"-->
+    <!--android:layout_weight="1"-->
+    <!--android:orientation="vertical">-->
+
+
     <android.support.v4.view.ViewPager
         android:id="@+id/gallery_image_view_pager"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="0dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginTop="20dp"
+        android:layout_weight="1"
         android:orientation="vertical" />
 
     <LinearLayout
         android:id="@+id/gallery_image_indicator_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
         android:layout_marginTop="8dp"
+        android:gravity="center_horizontal"
         android:orientation="horizontal" />
+    <!--</LinearLayout>-->
+
+    <RelativeLayout
+        android:id="@+id/gallery_details_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="8dp"
+        android:layout_weight="2"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/details_description_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:text="@string/data_description" />
+
+        <TextView
+            android:id="@+id/details_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/details_description_label"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/details_added_date_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/details_description_label"
+            android:text="@string/data_added_date" />
+
+        <TextView
+            android:id="@+id/details_added_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/details_description"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/details_image_type_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/details_added_date_label"
+            android:text="@string/data_image_type" />
+
+        <TextView
+            android:id="@+id/details_image_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/details_added_date"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/details_categories_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/details_image_type_label"
+            android:text="@string/data_categories" />
+
+        <TextView
+            android:id="@+id/details_categories"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/details_image_type"
+            android:gravity="right" />
+    </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image_view_pager_fragment.xml b/app/src/main/res/layout/image_view_pager_fragment.xml
index e1c8ee8..9a49878 100644
--- a/app/src/main/res/layout/image_view_pager_fragment.xml
+++ b/app/src/main/res/layout/image_view_pager_fragment.xml
@@ -3,7 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:layout_gravity="center"
     android:background="@drawable/bg_tile_thumb"
+    android:gravity="center"
     android:orientation="vertical">
 
     <ImageView
diff --git a/app/src/main/res/layout/search_dialog.xml b/app/src/main/res/layout/search_dialog.xml
new file mode 100644
index 0000000..f4f7447
--- /dev/null
+++ b/app/src/main/res/layout/search_dialog.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="10dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/image_type" />
+
+    <Spinner
+        android:id="@+id/spinner_image_type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/license" />
+
+    <Spinner
+        android:id="@+id/spinner_license"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/sort" />
+
+    <Spinner
+        android:id="@+id/spinner_sort"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="8dp"
+        android:text="@string/view" />
+
+    <Spinner
+        android:id="@+id/spinner_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1e141a1..3e784f2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,7 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="view_pager_page_width">20dp</dimen>
-    <dimen name="view_pager_page_height">20dp</dimen>
+    <dimen name="view_pager_page_width">15dp</dimen>
+    <dimen name="view_pager_page_height">15dp</dimen>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0bbf554..e6fc376 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,4 +7,40 @@
     <string name="client_id">8f80cdd74ddbef680339</string>
     <string name="client_secret">d1cc912295e23669be555fcadb02b4442b53be9e</string>
     <string name='no_internet_msg'>No internet connection</string>
+    <string name='image_type'>image type</string>
+    <string name='license'>license</string>
+    <string name='safe'>safe</string>
+    <string name='sort'>sort</string>
+    <string name='view'>view</string>
+    <string name='btn_ok'>ok</string>
+    <string name='btn_cancel'>cancel</string>
+    <string name='search_setting'>search setting</string>
+    <string name="data_description">description:</string>
+    <string name="data_added_date">added Date:</string>
+    <string name="data_categories">categories:</string>
+    <string name="data_empty">---</string>
+    <string name="data_image_type">image type:</string>
+
+    <string-array name="image_type_array">
+        <item>photo</item>
+        <item>ilustration</item>
+        <item>vector</item>
+    </string-array>
+
+    <string-array name="license_array">
+        <item>comercial</item>
+        <item>editorial</item>
+        <item>enhanced</item>
+    </string-array>
+
+    <string-array name="sort_array">
+        <item>popular</item>
+        <item>newest</item>
+        <item>relevance</item>
+        <item>random</item>
+    </string-array>
+    <string-array name="view_array">
+        <item>minimal</item>
+        <item>full</item>
+    </string-array>
 </resources>

From 6d456608e0b9e5f27cffbaefe5816518bd6d1046 Mon Sep 17 00:00:00 2001
From: Andrzej Kozlowski <akozlowski@iconmobile.com>
Date: Sat, 29 Aug 2015 11:50:15 +0200
Subject: [PATCH 06/10] add search dialog

---
 .../ui/dialog/SearchSettingDialog.java        | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/ui/dialog/SearchSettingDialog.java

diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/dialog/SearchSettingDialog.java b/app/src/main/java/com/akozlowski/doomvision/ui/dialog/SearchSettingDialog.java
new file mode 100644
index 0000000..824a119
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/dialog/SearchSettingDialog.java
@@ -0,0 +1,27 @@
+package com.akozlowski.doomvision.ui.dialog;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.akozlowski.doomvision.R;
+
+/**
+ * Created by akozlowski on 27/08/15.
+ */
+public class SearchSettingDialog {
+    public static AlertDialog createDialog(Activity activity, final DialogInterface.OnClickListener onClick) {
+        final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        final LayoutInflater inflater = activity.getLayoutInflater();
+        final View view = inflater.inflate(R.layout.search_dialog, null);
+        
+        final AlertDialog alertDialog = builder.create();
+        builder.setView(view);
+        builder.setTitle(R.string.search_setting)
+                .setPositiveButton(R.string.btn_ok, onClick)
+                .setNegativeButton(R.string.btn_cancel, onClick);
+        return builder.show();
+    }
+}

From 9c3b41a528055038139d3d3846aa8b8a7a470e73 Mon Sep 17 00:00:00 2001
From: andrzej <kozlowski76@yahoo.de>
Date: Tue, 1 Sep 2015 10:06:06 +0200
Subject: [PATCH 07/10] add test class, search asset

---
 app/app.iml                                   |  11 ++--
 app/build.gradle                              |   2 +-
 .../drawable-hdpi/ic_search_black_24dp.png    | Bin 0 -> 390 bytes
 .../drawable-xhdpi/ic_search_black_24dp.png   | Bin 0 -> 464 bytes
 .../drawable-xxhdpi/ic_search_black_24dp.png  | Bin 0 -> 684 bytes
 .../res/layout/gallery_fragment_landscape.xml |  19 +++----
 .../doomvision/manager/RestManagerTest.java   |  47 ++++++++++++++++++
 7 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_search_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png
 create mode 100644 app/src/test/java/com/akozlowski/doomvision/manager/RestManagerTest.java

diff --git a/app/app.iml b/app/app.iml
index 7634017..4a92e04 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="DoomVision" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="doomvision" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -17,7 +17,6 @@
         <afterSyncTasks>
           <task>generateDebugSources</task>
           <task>mockableAndroidJar</task>
-          <task>prepareDebugUnitTestDependencies</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -73,8 +72,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -99,17 +96,17 @@
     <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
     <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index e3e6f70..5c57de8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "23.0.0 rc3"
+    buildToolsVersion "23.0.0"
 
     defaultConfig {
         applicationId "com.akozlowski.doomvision"
diff --git a/app/src/main/res/drawable-hdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c593e7ad854f5c28ca21f59916bef001daf91141
GIT binary patch
literal 390
zcmV;10eSw3P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003^Nkl<ZcmeIu
zuc|6h6vy$eGB76Z$sz`e#U~J%a+_UWK@5V)awiU)ZV*hy^8(jD<ubm5V3{TeVlo&+
z#5u57={UpQI>Ie}b{Y0>&5zCE?P(?24DspFz~M>13AquYhXVmc9#mjToN#t{kJbFs
zAFr$!5in(|H)mQ{)7S7t1yqg>d$~PPv)ql={NblEkt88jLVZn=Iu}Ws7?rrmZYm_3
zNYNOhwhXRF<4L~8Xefgt(iC;!M!pONq;Vv_V$_qtDQT*b?=fn~;FcW8x{@z3ayZCn
zCneoT+Q&kmk1uoYQ?er;Sop<G#v|$o<!DXJ081Wc`QgF@k0K6Lx@@#2B9FBeC*s5t
z>9Soc)d=rOjtt1__rksknv7X<;>w;SeO>WVtLC_5Qg~gJ%R;MW*{kNSulk$4YNk~_
kWUtZ}Wv}va`9I#i0Rr;B7AuwXp#T5?07*qoM6N<$f}W+V0ssI2

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6381902686163ea2671b9ce56e275afe393accae
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004(Nkl<ZcmeIx
z&q^Cn6oBz>qmm|Br0Z<*XWN7<f{38>ITU>j{~Prc+$enwQKUMGw$gnG_yC$`NCG*{
z;&A9<W^V6o@1iijZ+q^X%pF3Z5Lu5i9vCs1HzMJbF8|DDz9A_+v(8`pz!xN^OG<>}
zBR>#FFVw<+y*-{8S8UK=fkm2Za{c>?(6_M5;U|5JT4so77h#`Pw6By&Q{mob*6{Y-
zetnrN6?=;(JoW7E`{Y?cv<_a*^w<?HH#&KOmj^wzfy<Uo-r;4W#~Qe_bn*=^6Fs(o
z%aTrx!xk+5@q%gC6*X~b>*PCL5<Rww%eGD?csbQ$*SOs3<Nz;SL|Z1$s?B}E)3Y8N
zQXxx~SDkvq+d87%XRN5&-*Lt&0WJ}3$V$rPydv5;K}x(J)(u;<Sen;nn_I-1P$y7L
zSL9@W$>Y$sxIi+SaZVl4jtI2I6Oz)Sep;~(3D)6+JKh*G<(-599TWq^Iv|SU_$!VO
zYo90%5o?bq4iIZM{)!!<*pI(rFZKf1jre%AGp|tiAN>M}3sYaXitA<o0000<MNUMn
GLSTZ)j?<(7

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_search_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ae490ef9be0c727cdea0ff907723362d0ccf021
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0007WNkl<ZcmeI#
z%}N_#6vpwtWRYnxY1FMIU50uAMWL&TUVxaO7a*b_2;PU_S0Pxf;9A8C5Cs>u)P;0e
zzc7B_qFO`{h4JmKoWoR{mmZD6{LcD0JY?p5NBJL#L?V%BqRbR)9C1a+6;;-lq(mb%
z(8UV3xPQ(q%XIRDKJXp);C!W>C-902F6P`ZO~9in@B`;H+vIsP?>NSJPn9B%qCm9H
zFDjHMQcsF{ij<k*oM@#M%)O30tYi8~6P0FwlgNV$uoZcgKa=5pS>|zSrmYXUK0U)c
zY=k?NX~U4dcZP{)M5Q({(}jLm@#zQGfsqyUDrboA4W}Zzh>0fk&FaU`pvd0PfPu2Q
zchdL?xDfen3`~iI75vSL`~(Kp#KIE(dPRN}14m+E5r3^Be~5uAv9KP08IixlKqwZb
z@Rt(#@HzZKS&_fSK-K;ovO8sE{Pl_aItC`i!WsO{iTpSQN@C%;|4q$rk?+AkqxzN&
z;AcpE%W{}l7E4da5?_upkzK+_Cr->4;#*M3kC^$U7LO3ms7h^Ms9pbk9IMi(%7nbf
z)F+&pd9vIu#{y2x7{&s&acWK(Bp@nah%=m;Ez+3FQ^o1wf?0ZLB}0lVt@JS`?j8Ai
z)?tsLuH-!j6fl-&+q1-$`d4V*zEZ$6cQMO^jFF}eCuWZV=GxedQD@`tL3g?mdF;`_
zA~*L`xnW7&$_GzV2^#2Tf>jQ=B;=Yy))}XV9NJssN(Kt-<J9av$4V`=uC$j_dQd)6
zX{Yv;b|aOVlS&#bFQL-U+E?1KFJxEAqK<)PcFgM-RI;sOP^p<0ERjeg5`O@V-TTkU
Sp+`6X0000<MNUMnLSTZqh)B`^

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/gallery_fragment_landscape.xml b/app/src/main/res/layout/gallery_fragment_landscape.xml
index cd67d7c..ac19afa 100644
--- a/app/src/main/res/layout/gallery_fragment_landscape.xml
+++ b/app/src/main/res/layout/gallery_fragment_landscape.xml
@@ -31,7 +31,6 @@
         android:layout_marginTop="8dp"
         android:gravity="center_horizontal"
         android:orientation="horizontal" />
-    <!--</LinearLayout>-->
 
     <RelativeLayout
         android:id="@+id/gallery_details_layout"
@@ -44,27 +43,23 @@
         android:layout_weight="2"
         android:orientation="vertical">
 
-        <TextView
-            android:id="@+id/details_description_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:text="@string/data_description" />
-
         <TextView
             android:id="@+id/details_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_toRightOf="@+id/details_description_label"
-            android:gravity="right" />
+            android:layout_alignParentLeft="true"
+            android:textSize="16dp"
+            android:textStyle="bold"
+            android:paddingBottom="4dp"
+            android:gravity="center_horizontal"
+             />
 
         <TextView
             android:id="@+id/details_added_date_label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
-            android:layout_below="@+id/details_description_label"
+            android:layout_below="@+id/details_description"
             android:text="@string/data_added_date" />
 
         <TextView
diff --git a/app/src/test/java/com/akozlowski/doomvision/manager/RestManagerTest.java b/app/src/test/java/com/akozlowski/doomvision/manager/RestManagerTest.java
new file mode 100644
index 0000000..7b50ed7
--- /dev/null
+++ b/app/src/test/java/com/akozlowski/doomvision/manager/RestManagerTest.java
@@ -0,0 +1,47 @@
+package com.akozlowski.doomvision.manager;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Base64;
+
+import com.akozlowski.doomvision.BuildConfig;
+import com.akozlowski.doomvision.pojo.EchoTest;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Created by akozlowski on 16/08/15.
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(constants = BuildConfig.class, manifest = "app/src/main/AndroidManifest.xml", sdk = Build.VERSION_CODES.JELLY_BEAN)
+public class RestManagerTest {
+
+    private static final String TEXT_TEST = "text test";
+    @Mock
+    Base64 base64;
+    @Mock
+    Context mMockContext;
+    RestManager restManager;
+    private static final String CLIENT_ID = "8f80cdd74ddbef680339";
+    private static final String CLIENT_SECRET = "d1cc912295e23669be555fcadb02b4442b53be9e";
+
+    @Before
+    public void setUp() throws Exception {
+        String source = CLIENT_ID + ":" + CLIENT_SECRET;
+
+        restManager = new RestManager(mMockContext, Base64.encodeToString(source.getBytes(), Base64.URL_SAFE | Base64.NO_WRAP));
+    }
+
+    @Test
+    public void testEcho() {
+        EchoTest echoTest = restManager.test(TEXT_TEST);
+        Assert.assertNotNull(echoTest);
+    }
+}
\ No newline at end of file

From c47a09a0742f316a58eac269848b14e435a8f76b Mon Sep 17 00:00:00 2001
From: andrzej <kozlowski76@yahoo.de>
Date: Thu, 10 Sep 2015 14:33:43 +0200
Subject: [PATCH 08/10] add test class, search asset

---
 app/app.iml      | 8 +++++---
 app/build.gradle | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 4a92e04..5855d78 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -89,15 +89,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="rxandroid-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="roboguice-3.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-1.0.14" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
@@ -110,10 +112,10 @@
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
     <orderEntry type="library" exported="" name="roboblender-3.0.1" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 5c57de8..315783f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,4 +38,9 @@ dependencies {
 
 //    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.android.support:support-v4:22.2.1'
+
+    compile 'io.reactivex:rxandroid:1.0.1'
+    // Because RxAndroid releases are few and far between, it is recommended you also
+// explicitly depend on RxJava's latest version for bug fixes and new features.
+    compile 'io.reactivex:rxjava:1.0.14'
 }

From 0c5fc3e59525a7b1e480cb90d8581d56cf3a7a56 Mon Sep 17 00:00:00 2001
From: andrzej <kozlowski76@yahoo.de>
Date: Fri, 11 Sep 2015 11:45:29 +0200
Subject: [PATCH 09/10] refactor ,add search with RxAndroid

---
 .../doomvision/manager/RestManager.java       |  7 ++
 .../service/SearchImageService.java           |  1 +
 .../service/SearchImageServiceRx.java         | 16 ++++
 ...rait.java => ListViewGalleryFragment.java} | 74 ++++++++++---------
 .../doomvision/ui/MainActivity.java           |  6 +-
 ...dscape.java => SlidesGalleryFragment.java} |  8 +-
 ...ait.xml => list_view_gallery_fragment.xml} |  0
 ...dscape.xml => slides_gallery_fragment.xml} |  2 +-
 8 files changed, 72 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/java/com/akozlowski/doomvision/service/SearchImageServiceRx.java
 rename app/src/main/java/com/akozlowski/doomvision/ui/{GalleryFragmentPortrait.java => ListViewGalleryFragment.java} (76%)
 rename app/src/main/java/com/akozlowski/doomvision/ui/{GalleryFragmentLandscape.java => SlidesGalleryFragment.java} (95%)
 rename app/src/main/res/layout/{gallery_fragment_portrait.xml => list_view_gallery_fragment.xml} (100%)
 rename app/src/main/res/layout/{gallery_fragment_landscape.xml => slides_gallery_fragment.xml} (98%)

diff --git a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
index ca89ecf..cf4124a 100644
--- a/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
+++ b/app/src/main/java/com/akozlowski/doomvision/manager/RestManager.java
@@ -7,6 +7,7 @@
 import com.akozlowski.doomvision.pojo.EchoTest;
 import com.akozlowski.doomvision.pojo.Response;
 import com.akozlowski.doomvision.service.SearchImageService;
+import com.akozlowski.doomvision.service.SearchImageServiceRx;
 import com.akozlowski.doomvision.service.ServiceGenerator;
 import com.akozlowski.doomvision.service.TestService;
 import com.akozlowski.doomvision.service.ValidateService;
@@ -14,6 +15,7 @@
 
 import retrofit.Callback;
 import retrofit.RestAdapter;
+import rx.Observable;
 
 /**
  * Created by akozlowski on 14/08/15.
@@ -65,6 +67,11 @@ public void searchImage(String query, Callback<Response> cb) {
         service.search(query, "full", cb);
     }
 
+    public Observable<Response> searchImage(String query) {
+        SearchImageServiceRx service = ServiceGenerator.createService(SearchImageServiceRx.class, getEndPoint(), authBase64);
+        return service.search(query, "full");
+    }
+
     public EchoTest test(String testText) {
         TestService service = ServiceGenerator.createService(TestService.class, getEndPoint(), getAuthBase64());
         return service.test(testText);
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
index ca1d72f..cf6f6b7 100644
--- a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
+++ b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageService.java
@@ -5,6 +5,7 @@
 import retrofit.Callback;
 import retrofit.http.GET;
 import retrofit.http.Query;
+import rx.Observable;
 
 /**
  * Created by akozlowski on 14/08/15.
diff --git a/app/src/main/java/com/akozlowski/doomvision/service/SearchImageServiceRx.java b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageServiceRx.java
new file mode 100644
index 0000000..f951d59
--- /dev/null
+++ b/app/src/main/java/com/akozlowski/doomvision/service/SearchImageServiceRx.java
@@ -0,0 +1,16 @@
+package com.akozlowski.doomvision.service;
+
+import com.akozlowski.doomvision.pojo.Response;
+
+import retrofit.Callback;
+import retrofit.http.GET;
+import retrofit.http.Query;
+import rx.Observable;
+
+/**
+ * Created by and on 10.09.15.
+ */
+public interface SearchImageServiceRx {
+    @GET("/images/search")
+    Observable<Response> search(@Query("query") String query, @Query("view") String view);
+}
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java b/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
similarity index 76%
rename from app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
rename to app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
index 3daae87..8030c6d 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentPortrait.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
@@ -31,18 +31,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import retrofit.Callback;
-import retrofit.RetrofitError;
 import roboguice.RoboGuice;
 import roboguice.fragment.RoboFragment;
 import roboguice.inject.InjectView;
+import rx.Observer;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 
 /**
  * A placeholder fragment containing a simple view.
  */
-public class GalleryFragmentPortrait extends RoboFragment {
-    private static final String TAG = GalleryFragmentPortrait.class.getSimpleName();
+public class ListViewGalleryFragment extends RoboFragment {
+    private static final String TAG = ListViewGalleryFragment.class.getSimpleName();
     private RestManager restManager;
     @InjectView(R.id.response)
     private TextView responseTextView;
@@ -57,13 +58,13 @@ public class GalleryFragmentPortrait extends RoboFragment {
     private ProgressBar progressBar;
 
 
-    public GalleryFragmentPortrait() {
+    public ListViewGalleryFragment() {
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-        return inflater.inflate(R.layout.gallery_fragment_portrait, container, false);
+        return inflater.inflate(R.layout.list_view_gallery_fragment, container, false);
     }
 
     @Override
@@ -162,43 +163,48 @@ public void onClick(View v) {
                     FragmentManager fm = getActivity().getSupportFragmentManager();
                     FragmentTransaction transaction = fm.beginTransaction();
                     Bundle bundle = new Bundle();
-                    bundle.putInt(GalleryFragmentLandscape.PAGE_INDEX_KEY, index);
-                    GalleryFragmentLandscape galleryFragmentLandscape = new GalleryFragmentLandscape();
-                    galleryFragmentLandscape.setArguments(bundle);
-                    transaction.replace(R.id.fragment_container, galleryFragmentLandscape, GalleryFragmentLandscape.class.getSimpleName()).addToBackStack(null).commit();
+                    bundle.putInt(SlidesGalleryFragment.PAGE_INDEX_KEY, index);
+                    SlidesGalleryFragment slidesGalleryFragment = new SlidesGalleryFragment();
+                    slidesGalleryFragment.setArguments(bundle);
+                    transaction.replace(R.id.fragment_container, slidesGalleryFragment, SlidesGalleryFragment.class.getSimpleName()).addToBackStack(null).commit();
                 }
             });
             return convertView;
         }
     }
 
-    private void search() {
-        restManager.searchImage(searchEditText.getText().toString(), new Callback<Response>() {
-            @Override
-            public void success(Response response, retrofit.client.Response response2) {
-                DebugLog.d(TAG + " responce: " + response.toString());
-                if (response != null && response.getData() != null && response.getData().size() > 0) {
-                    ((MainActivity) getActivity()).changeRequestedOrientation(true);
-                } else {
-                    ((MainActivity) getActivity()).changeRequestedOrientation(false);
-                }
-                createItems(response);
-                progressBar.setVisibility(View.GONE);
-            }
+private void search() {
+    restManager.searchImage(searchEditText.getText().toString()).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Observer<Response>() {
+        @Override
+        public void onCompleted() {
 
-            @Override
-            public void failure(RetrofitError error) {
-                DebugLog.d(TAG + " error: " + error.toString() + ", " + error.getUrl() + ", ");
-                if (error.getKind().equals(RetrofitError.Kind.NETWORK)) {
-                    searchBtn.setEnabled(false);
-                    progressBar.setVisibility(View.GONE);
-                    onNoInternetConnection();
-                }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            DebugLog.d(TAG + " error: " + e.toString() + ", " + e.getMessage() + ", ");
+//            if (e.getKind().equals(RetrofitError.Kind.NETWORK)) {
+//                searchBtn.setEnabled(false);
+//                progressBar.setVisibility(View.GONE);
+//                onNoInternetConnection();
+//            }
+        }
+
+        @Override
+        public void onNext(Response response) {
+            DebugLog.d(TAG + " responce: " + response.toString());
+            if (response != null && response.getData() != null && response.getData().size() > 0) {
+                ((MainActivity) getActivity()).changeRequestedOrientation(true);
+            } else {
+                ((MainActivity) getActivity()).changeRequestedOrientation(false);
             }
-        });
-//        }
-    }
+            createItems(response);
+            progressBar.setVisibility(View.GONE);
+        }
+    });
 
+//        }
+}
     private void onNoInternetConnection() {
         Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.no_internet_msg), Toast.LENGTH_LONG);
         InternetConnectivityReceiver.getInstance().registerConnectivityReceiver(new InternetConnectivityReceiver.InternetConnectivityListener() {
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
index a6b807c..5c3d379 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/MainActivity.java
@@ -67,14 +67,14 @@ protected void onCreate(Bundle savedInstanceState) {
         FragmentTransaction transaction = fragmentManager.beginTransaction();
         if (savedInstanceState == null) {
             DebugLog.d(TAG + " onCreate()..savedInstanceState is null");
-            transaction.replace(R.id.fragment_container, new GalleryFragmentPortrait()).addToBackStack(null).commit();
+            transaction.replace(R.id.fragment_container, new ListViewGalleryFragment()).addToBackStack(null).commit();
         } else {
             if (getResources().getConfiguration().orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
                 DebugLog.d(TAG + " SCREEN_ORIENTATION_PORTRAIT");
-                changeFragment(new GalleryFragmentPortrait(), GalleryFragmentPortrait.class.getSimpleName());
+                changeFragment(new ListViewGalleryFragment(), ListViewGalleryFragment.class.getSimpleName());
             } else {
                 DebugLog.d(TAG + " SCREEN_ORIENTATION_LANDSCAPE");
-                changeFragment(new GalleryFragmentLandscape(), GalleryFragmentLandscape.class.getSimpleName());
+                changeFragment(new SlidesGalleryFragment(), SlidesGalleryFragment.class.getSimpleName());
             }
         }
     }
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java b/app/src/main/java/com/akozlowski/doomvision/ui/SlidesGalleryFragment.java
similarity index 95%
rename from app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
rename to app/src/main/java/com/akozlowski/doomvision/ui/SlidesGalleryFragment.java
index 834ba11..8b029d8 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/GalleryFragmentLandscape.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/SlidesGalleryFragment.java
@@ -26,9 +26,9 @@
 /**
  * Created by akozlowski on 17/08/15.
  */
-public class GalleryFragmentLandscape extends RoboFragment {
-    private static final String TAG = GalleryFragmentLandscape.class.getSimpleName();
-    @InjectView(R.id.gallery_image_view_pager)
+public class SlidesGalleryFragment extends RoboFragment {
+    private static final String TAG = SlidesGalleryFragment.class.getSimpleName();
+    @InjectView(R.id.gallery_view_pager)
     private ViewPager viewPager;
     private List<roboguice.fragment.RoboFragment> slides = new ArrayList<>();
 
@@ -55,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
-        return inflater.inflate(R.layout.gallery_fragment_landscape, container, false);
+        return inflater.inflate(R.layout.slides_gallery_fragment, container, false);
     }
 
     @Override
diff --git a/app/src/main/res/layout/gallery_fragment_portrait.xml b/app/src/main/res/layout/list_view_gallery_fragment.xml
similarity index 100%
rename from app/src/main/res/layout/gallery_fragment_portrait.xml
rename to app/src/main/res/layout/list_view_gallery_fragment.xml
diff --git a/app/src/main/res/layout/gallery_fragment_landscape.xml b/app/src/main/res/layout/slides_gallery_fragment.xml
similarity index 98%
rename from app/src/main/res/layout/gallery_fragment_landscape.xml
rename to app/src/main/res/layout/slides_gallery_fragment.xml
index ac19afa..8830fcb 100644
--- a/app/src/main/res/layout/gallery_fragment_landscape.xml
+++ b/app/src/main/res/layout/slides_gallery_fragment.xml
@@ -12,7 +12,7 @@
 
 
     <android.support.v4.view.ViewPager
-        android:id="@+id/gallery_image_view_pager"
+        android:id="@+id/gallery_view_pager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginLeft="20dp"

From c37ba5c72515771cf530065e4795435d7f55ce85 Mon Sep 17 00:00:00 2001
From: andrzej <kozlowski76@yahoo.de>
Date: Fri, 11 Sep 2015 13:15:57 +0200
Subject: [PATCH 10/10] add error message on rx callback

---
 app/app.iml                                   | 69 +++++++------------
 .../ui/ListViewGalleryFragment.java           | 11 +--
 2 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index 5855d78..2c78c1b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,14 +9,14 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <afterSyncTasks>
+          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
-          <task>mockableAndroidJar</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -28,7 +28,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,6 +37,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -44,13 +50,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -58,13 +57,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -91,39 +90,21 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="rxandroid-1.0.1" level="project" />
     <orderEntry type="library" exported="" name="roboguice-3.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
-    <orderEntry type="library" exported="" name="rxjava-1.0.14" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
-    <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
     <orderEntry type="library" exported="" name="commons-collections-3.2.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-mockito-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-1.0.14" level="project" />
     <orderEntry type="library" exported="" name="roboblender-3.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
     <orderEntry type="library" exported="" name="commons-lang-2.4" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="dexmaker-1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
+    <orderEntry type="library" exported="" name="velocity-1.7" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java b/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
index 8030c6d..6b7f0c6 100644
--- a/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
+++ b/app/src/main/java/com/akozlowski/doomvision/ui/ListViewGalleryFragment.java
@@ -182,11 +182,14 @@ public void onCompleted() {
 
         @Override
         public void onError(Throwable e) {
-            DebugLog.d(TAG + " error: " + e.toString() + ", " + e.getMessage() + ", ");
+            if(e != null && e.getMessage() != null) {
+                DebugLog.d(TAG + " error: " + e.toString() + ", " + e.getMessage() + ", ");
+                Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
+            }
 //            if (e.getKind().equals(RetrofitError.Kind.NETWORK)) {
-//                searchBtn.setEnabled(false);
-//                progressBar.setVisibility(View.GONE);
-//                onNoInternetConnection();
+                searchBtn.setEnabled(false);
+                progressBar.setVisibility(View.GONE);
+                onNoInternetConnection();
 //            }
         }