From 955746dc03effa7c32e488950ccde297d3c65698 Mon Sep 17 00:00:00 2001
From: pervy_sage <rohanmaity@outlook.in>
Date: Sun, 2 Jul 2017 22:07:15 +0530
Subject: [PATCH 1/2] Married

---
 app/src/main/res/layout/activity_main.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d7e01c2..a2530a5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,7 +13,7 @@
         android:layout_height="match_parent">
         <Button
             android:id="@+id/btnUsers"
-            android:text="Users"
+            android:text="Users PUI"
             android:layout_weight="1"
             android:layout_width="match_parent"
             android:layout_height="0dp" />

From e624eb749eb99ffffb549dd9d81a6ceb46428f57 Mon Sep 17 00:00:00 2001
From: pervy_sage <rohanmaity@outlook.in>
Date: Mon, 3 Jul 2017 02:45:59 +0530
Subject: [PATCH 2/2] Changes Completed

---
 .idea/misc.xml                                |  15 +--
 .idea/modules.xml                             |   1 +
 app/build.gradle                              |  13 +--
 app/src/main/AndroidManifest.xml              |   3 +
 .../restapiretrofitjson/MainActivity.kt       |  29 +++---
 .../activities/AlbumActivity.kt               |  55 +++++++++++
 .../activities/CommentsActivity.kt            |  12 +--
 .../activities/PhotosActivity.kt              |  58 +++++++++++
 .../activities/PostsActivity.java             |  73 --------------
 .../activities/PostsActivity.kt               |  65 +++++++++++++
 .../activities/TodosActivity.kt               |  14 +--
 .../activities/UsersActivity.java             |  92 ------------------
 .../activities/UsersActivity.kt               |  58 +++++++++++
 .../activities/ViewPhotoActivity.kt           |  24 +++++
 .../adapters/AlbumsAdapter.kt                 |  57 +++++++++++
 .../adapters/CommentAdapter.kt                |   4 +-
 .../adapters/PhotosAdapter.kt                 |  63 ++++++++++++
 .../adapters/PostAdapter.java                 |  90 -----------------
 .../adapters/PostAdapter.kt                   |  68 +++++++++++++
 .../adapters/TodoAdapter.kt                   |   5 +-
 .../adapters/UserAdapter.kt                   |  21 ++--
 .../restapiretrofitjson/api/API.java          |  15 +++
 .../restapiretrofitjson/api/AlbumsApi.java    |  32 ++++++
 .../interfaces/OnPhotoClickListener.java      |   9 ++
 .../restapiretrofitjson/models/Album.kt       |  11 +++
 .../restapiretrofitjson/models/Photos.kt      |  13 +++
 app/src/main/res/drawable/loading.png         | Bin 0 -> 7062 bytes
 app/src/main/res/drawable/my_button_bg.xml    |   6 ++
 app/src/main/res/layout/activity_album.xml    |  34 +++++++
 app/src/main/res/layout/activity_comments.xml |   8 +-
 app/src/main/res/layout/activity_main.xml     |  10 +-
 app/src/main/res/layout/activity_photos.xml   |  19 ++++
 app/src/main/res/layout/activity_posts.xml    |   6 ++
 app/src/main/res/layout/activity_todos.xml    |   6 ++
 app/src/main/res/layout/activity_users.xml    |   7 ++
 .../main/res/layout/activity_view_photo.xml   |  26 +++++
 app/src/main/res/layout/list_item_album.xml   |  24 +++++
 app/src/main/res/layout/list_item_comment.xml |  60 +++++++-----
 app/src/main/res/layout/list_item_photos.xml  |  32 ++++++
 app/src/main/res/layout/list_item_post.xml    |  40 +++++---
 app/src/main/res/layout/list_item_todo.xml    |  39 ++++++--
 app/src/main/res/layout/list_item_user.xml    |   6 +-
 build.gradle                                  |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 44 files changed, 869 insertions(+), 360 deletions(-)
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/AlbumActivity.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PhotosActivity.kt
 delete mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.java
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.kt
 delete mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.java
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/activities/ViewPhotoActivity.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/AlbumsAdapter.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PhotosAdapter.kt
 delete mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.java
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/api/AlbumsApi.java
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/interfaces/OnPhotoClickListener.java
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/models/Album.kt
 create mode 100644 app/src/main/java/com/codingblocks/restapiretrofitjson/models/Photos.kt
 create mode 100644 app/src/main/res/drawable/loading.png
 create mode 100644 app/src/main/res/drawable/my_button_bg.xml
 create mode 100644 app/src/main/res/layout/activity_album.xml
 create mode 100644 app/src/main/res/layout/activity_photos.xml
 create mode 100644 app/src/main/res/layout/activity_view_photo.xml
 create mode 100644 app/src/main/res/layout/list_item_album.xml
 create mode 100644 app/src/main/res/layout/list_item_photos.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..ba7052b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1b3ccab..3bc0ff9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/AndroidSample_Retrofit_RESTAPI.iml" filepath="$PROJECT_DIR$/AndroidSample_Retrofit_RESTAPI.iml" />
       <module fileurl="file://$PROJECT_DIR$/RestAPIRetrofitJSON.iml" filepath="$PROJECT_DIR$/RestAPIRetrofitJSON.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
diff --git a/app/build.gradle b/app/build.gradle
index b963ad0..718aaa7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 25
     buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "com.codingblocks.restapiretrofitjson"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,13 +27,14 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    compile 'com.android.support:appcompat-v7:26.+'
-    compile 'com.android.support:recyclerview-v7:26.+'
-    compile 'com.android.support:cardview-v7:26.+'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha8'
+    compile 'com.android.support:appcompat-v7:25.+'
+    compile 'com.android.support:recyclerview-v7:25.+'
+    compile 'com.android.support:cardview-v7:25.+'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
     testCompile 'junit:junit:4.12'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
 }
 repositories {
     mavenCentral()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 363fe63..9b5a9ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
         <activity android:name=".activities.UsersActivity" />
         <activity android:name=".activities.PostsActivity" />
         <activity android:name=".activities.CommentsActivity" />
+        <activity android:name=".activities.AlbumActivity"/>
+        <activity android:name=".activities.PhotosActivity"/>
+        <activity android:name=".activities.ViewPhotoActivity"/>
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/MainActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/MainActivity.kt
index f8ad985..501a262 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/MainActivity.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/MainActivity.kt
@@ -3,30 +3,31 @@ package com.codingblocks.restapiretrofitjson
 import android.content.Intent
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
+import com.codingblocks.restapiretrofitjson.activities.AlbumActivity
 import com.codingblocks.restapiretrofitjson.activities.PostsActivity
 import com.codingblocks.restapiretrofitjson.activities.TodosActivity
 import com.codingblocks.restapiretrofitjson.activities.UsersActivity
 
 import kotlinx.android.synthetic.main.activity_main.*
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), View.OnClickListener {
+    override fun onClick(v: View) {
+        when(v.id){
+            R.id.btnAlbums->startActivity(Intent(this@MainActivity,AlbumActivity::class.java))
+            R.id.btnPosts->startActivity(Intent(this@MainActivity,PostsActivity::class.java))
+            R.id.btnUsers->startActivity(Intent(this@MainActivity,UsersActivity::class.java))
+            R.id.btnTodos->startActivity(Intent(this@MainActivity,TodosActivity::class.java))
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        btnPosts.setOnClickListener({
-            startActivity(Intent(this@MainActivity, PostsActivity::class.java))
-        })
-
-        btnUsers.setOnClickListener({
-            startActivity(Intent(this@MainActivity, UsersActivity::class.java))
-        })
-
-        btnTodos.setOnClickListener({
-            startActivity(Intent(this@MainActivity, TodosActivity::class.java))
-        })
-
-
+        btnAlbums.setOnClickListener(this)
+        btnPosts.setOnClickListener(this)
+        btnUsers.setOnClickListener(this)
+        btnTodos.setOnClickListener(this)
     }
 }
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/AlbumActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/AlbumActivity.kt
new file mode 100644
index 0000000..3f2ed0d
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/AlbumActivity.kt
@@ -0,0 +1,55 @@
+package com.codingblocks.restapiretrofitjson.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.view.View
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.adapters.AlbumsAdapter
+import com.codingblocks.restapiretrofitjson.api.API
+import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener
+import com.codingblocks.restapiretrofitjson.models.Album
+import kotlinx.android.synthetic.main.activity_album.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+class AlbumActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_album)
+
+        rvAlbumsView.layoutManager = LinearLayoutManager(this)
+        val albumsAdapter = AlbumsAdapter(ArrayList<Album>(), this)
+        rvAlbumsView.adapter = albumsAdapter
+        pbProgress.visibility = View.VISIBLE
+        btnShowAllPhotos.setOnClickListener { startActivity(Intent(this@AlbumActivity, PhotosActivity::class.java)) }
+        albumsAdapter.setOnItemClickListener(OnItemClickListener { itemid, view ->
+            val i = Intent(this@AlbumActivity, PhotosActivity::class.java)
+            i.putExtra("albumId", itemid)
+            startActivity(i)
+        })
+        val receivedId = intent.getIntExtra("userId", -1)
+        supportActionBar!!.title = "Albums"
+        val albumsApi = API.getInstance().albumsApi
+        val receiveAlbums = object : Callback<ArrayList<Album>> {
+            override fun onResponse(call: Call<ArrayList<Album>>, response: Response<ArrayList<Album>>) {
+                albumsAdapter.updateAlbums(response.body()!!, pbProgress)
+            }
+
+            override fun onFailure(call: Call<ArrayList<Album>>, t: Throwable) {
+
+            }
+        }
+
+        if (receivedId != -1) {
+            albumsApi.getAlbumsbyUserId(receivedId).enqueue(receiveAlbums)
+        } else {
+            albumsApi.getAlbumsbyUserId(null).enqueue(receiveAlbums)
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/CommentsActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/CommentsActivity.kt
index a5607aa..9f0e7b0 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/CommentsActivity.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/CommentsActivity.kt
@@ -1,20 +1,17 @@
 package com.codingblocks.restapiretrofitjson.activities
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
-
+import android.view.View
 import com.codingblocks.restapiretrofitjson.R
 import com.codingblocks.restapiretrofitjson.adapters.CommentAdapter
 import com.codingblocks.restapiretrofitjson.api.API
 import com.codingblocks.restapiretrofitjson.models.Comment
 import kotlinx.android.synthetic.main.activity_comments.*
-
-import kotlinx.android.synthetic.main.activity_comments.view.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import retrofit2.Retrofit
 
 class CommentsActivity : AppCompatActivity() {
 
@@ -25,6 +22,9 @@ class CommentsActivity : AppCompatActivity() {
         val commentAdapter =  CommentAdapter(this, ArrayList<Comment>())
         rvCommentsList.layoutManager = LinearLayoutManager(this)
         rvCommentsList.adapter = commentAdapter
+        pbProgress.visibility= View.VISIBLE
+
+        supportActionBar!!.title="Comments"
 
 
 
@@ -36,7 +36,7 @@ class CommentsActivity : AppCompatActivity() {
 
             override fun onResponse(call: Call<ArrayList<Comment>>?, response: Response<ArrayList<Comment>>?) {
                 //
-                commentAdapter.updateComments(response!!.body()!!)
+                commentAdapter.updateComments(response!!.body()!!,pbProgress)
             }
         })
     }
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PhotosActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PhotosActivity.kt
new file mode 100644
index 0000000..cb22914
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PhotosActivity.kt
@@ -0,0 +1,58 @@
+package com.codingblocks.restapiretrofitjson.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.view.View
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.adapters.PhotosAdapter
+import com.codingblocks.restapiretrofitjson.api.API
+import com.codingblocks.restapiretrofitjson.interfaces.OnPhotoClickListener
+import com.codingblocks.restapiretrofitjson.models.Photos
+import kotlinx.android.synthetic.main.activity_photos.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+class PhotosActivity : AppCompatActivity() {
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_photos)
+        rvPhotosView.layoutManager = LinearLayoutManager(this)
+        val photosAdapter = PhotosAdapter(ArrayList<Photos>(), this)
+        rvPhotosView.adapter = photosAdapter
+        pbProgress.visibility = View.VISIBLE
+
+        photosAdapter.setOnPhotoClickListener(OnPhotoClickListener { url, title ->
+            val i = Intent(this@PhotosActivity, ViewPhotoActivity::class.java)
+            i.putExtra("url", url)
+            i.putExtra("title", title)
+            startActivity(i)
+        })
+
+        val receivedId = intent.getIntExtra("albumId", -1)
+
+        supportActionBar!!.title = "Photos"
+
+        val photosApi = API.getInstance().photosApi
+
+        val receivePhotos = object : Callback<ArrayList<Photos>> {
+            override fun onResponse(call: Call<ArrayList<Photos>>, response: Response<ArrayList<Photos>>) {
+                photosAdapter.updateAlbums(response.body()!!, pbProgress)
+            }
+
+            override fun onFailure(call: Call<ArrayList<Photos>>, t: Throwable) {
+
+            }
+        }
+        if (receivedId != -1) {
+            photosApi.getPhotosOfAlbumId(receivedId).enqueue(receivePhotos)
+        } else {
+            photosApi.photos.enqueue(receivePhotos)
+        }
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.java
deleted file mode 100644
index b244f79..0000000
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.codingblocks.restapiretrofitjson.activities;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.View;
-
-import com.codingblocks.restapiretrofitjson.MainActivity;
-import com.codingblocks.restapiretrofitjson.R;
-import com.codingblocks.restapiretrofitjson.adapters.PostAdapter;
-import com.codingblocks.restapiretrofitjson.api.API;
-import com.codingblocks.restapiretrofitjson.api.PostsAPI;
-import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener;
-import com.codingblocks.restapiretrofitjson.models.Post;
-
-import java.util.ArrayList;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class PostsActivity extends AppCompatActivity {
-
-    public static final String TAG = "PA";
-
-    RecyclerView rvPostsList;
-    PostAdapter postAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_posts);
-
-        rvPostsList = (RecyclerView) findViewById(R.id.rvPostsList);
-        rvPostsList.setLayoutManager(new LinearLayoutManager(this));
-        postAdapter = new PostAdapter(this, new ArrayList<Post>());
-        rvPostsList.setAdapter(postAdapter);
-        postAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(int itemId, View view) {
-                Intent i = new Intent(PostsActivity.this, CommentsActivity.class);
-                i.putExtra("postId", itemId);
-                startActivity(i);
-            }
-        });
-
-
-        PostsAPI postsAPI = API.getInstance().getPostsAPI();
-        Callback<ArrayList<Post>> postCallback = new Callback<ArrayList<Post>>() {
-
-            @Override
-            public void onResponse(Call<ArrayList<Post>> call, Response<ArrayList<Post>> response) {
-                Log.d(TAG, "onResponse: ");
-                postAdapter.updatePosts(response.body());
-            }
-
-            @Override
-            public void onFailure(Call<ArrayList<Post>> call, Throwable t) {
-
-            }
-        };
-        int userIdReceived = getIntent().getIntExtra("userId", -1);
-        if (userIdReceived != -1) {
-            postsAPI.getPostsByUserId(userIdReceived).enqueue(postCallback);
-        } else {
-            postsAPI.getPosts().enqueue(postCallback);
-        }
-
-    }
-}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.kt
new file mode 100644
index 0000000..04a7628
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/PostsActivity.kt
@@ -0,0 +1,65 @@
+package com.codingblocks.restapiretrofitjson.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.util.Log
+import android.view.View
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.adapters.PostAdapter
+import com.codingblocks.restapiretrofitjson.api.API
+import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener
+import com.codingblocks.restapiretrofitjson.models.Post
+import kotlinx.android.synthetic.main.activity_posts.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+class PostsActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_posts)
+
+        rvPostsList.layoutManager = LinearLayoutManager(this)
+        val postAdapter = PostAdapter(this, ArrayList<Post>())
+        rvPostsList.adapter = postAdapter
+        pbProgress.visibility = View.VISIBLE
+        postAdapter.setOnItemClickListener(OnItemClickListener { itemId, view ->
+            val i = Intent(this@PostsActivity, CommentsActivity::class.java)
+            i.putExtra("postId", itemId)
+            startActivity(i)
+        })
+
+
+        val postsAPI = API.getInstance().postsAPI
+        val postCallback = object : Callback<ArrayList<Post>> {
+
+            override fun onResponse(call: Call<ArrayList<Post>>, response: Response<ArrayList<Post>>) {
+                Log.d(TAG, "onResponse: ")
+                postAdapter.updatePosts(response.body()!!, pbProgress)
+            }
+
+            override fun onFailure(call: Call<ArrayList<Post>>, t: Throwable) {
+
+            }
+        }
+        val userIdReceived = intent.getIntExtra("userId", -1)
+        val username = intent.getStringExtra("username")
+        if (userIdReceived != -1) {
+            postsAPI.getPostsByUserId(userIdReceived).enqueue(postCallback)
+            supportActionBar!!.title = "Posts by " + username
+        } else {
+            postsAPI.posts.enqueue(postCallback)
+            supportActionBar!!.title = "Posts"
+        }
+
+    }
+
+    companion object {
+
+        val TAG = "PA"
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/TodosActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/TodosActivity.kt
index b7c7813..788afa0 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/TodosActivity.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/TodosActivity.kt
@@ -1,16 +1,14 @@
 package com.codingblocks.restapiretrofitjson.activities
 
-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
-import android.util.Log
-
-import kotlinx.android.synthetic.main.activity_todos.*
-
+import android.view.View
 import com.codingblocks.restapiretrofitjson.R
 import com.codingblocks.restapiretrofitjson.adapters.TodoAdapter
 import com.codingblocks.restapiretrofitjson.api.API
 import com.codingblocks.restapiretrofitjson.models.Todo
+import kotlinx.android.synthetic.main.activity_todos.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -24,22 +22,26 @@ class TodosActivity : AppCompatActivity() {
         rvTodosList.layoutManager = LinearLayoutManager(this)
         var todoAdapter = TodoAdapter(ArrayList<Todo>())
         rvTodosList.adapter = todoAdapter
+        pbProgress.visibility = View.VISIBLE
 
         var todoCallback = object:  Callback<ArrayList<Todo>> {
             override fun onFailure(call: Call<ArrayList<Todo>>?, t: Throwable?) {
             }
 
             override fun onResponse(call: Call<ArrayList<Todo>>?, response: Response<ArrayList<Todo>>?) {
-                todoAdapter.updateTodos(response!!.body()!!)
+                todoAdapter.updateTodos(response!!.body()!!,pbProgress)
             }
 
         }
         var userId = intent.getIntExtra("userId", -1)
+        var username=intent.getStringExtra("username")
         if (userId != -1) {
             API.getInstance().todosAPI.getTodos(userId).enqueue(todoCallback)
+            supportActionBar!!.title="Todos by "+username
 
         } else {
             API.getInstance().todosAPI.getTodos(null).enqueue(todoCallback)
+            supportActionBar!!.title="Todos"
         }
 
 
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.java
deleted file mode 100644
index f70648e..0000000
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.codingblocks.restapiretrofitjson.activities;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.Button;
-
-import com.codingblocks.restapiretrofitjson.R;
-import com.codingblocks.restapiretrofitjson.adapters.UserAdapter;
-import com.codingblocks.restapiretrofitjson.api.API;
-import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener;
-import com.codingblocks.restapiretrofitjson.models.User;
-
-import java.util.ArrayList;
-
-import retrofit2.Call;
-import retrofit2.Callback;
-import retrofit2.Response;
-
-public class UsersActivity extends AppCompatActivity {
-
-    public static final String TAG = "USERS";
-
-    RecyclerView rvUserList;
-    UserAdapter userAdapter;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_users);
-
-        rvUserList = (RecyclerView) findViewById(R.id.rvUserList);
-        rvUserList.setLayoutManager(new LinearLayoutManager(this));
-        userAdapter = new UserAdapter(this, new ArrayList<User>());
-        rvUserList.setAdapter(userAdapter);
-        userAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(int itemId, View view) {
-
-                switch (view.getId()) {
-                    case R.id.btnUserComments:
-                        Intent todosActIntent = new Intent(UsersActivity.this,
-                                TodosActivity.class);
-                        todosActIntent.putExtra("userId", itemId);
-                        startActivity(todosActIntent);
-                        break;
-                    case R.id.btnUserPosts:
-                        Intent postActIntent = new Intent(UsersActivity.this,
-                                PostsActivity.class);
-
-                        postActIntent.putExtra("userId", itemId);
-                        startActivity(postActIntent);
-                        break;
-                }
-
-
-            }
-        });
-
-        ((Button) findViewById(R.id.btnAllPosts)).setOnClickListener(
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        startActivity(new Intent(
-                                UsersActivity.this,
-                                PostsActivity.class
-                        ));
-                    }
-                }
-        );
-
-
-        API.getInstance().getUsersAPI().getUsers().enqueue(new Callback<ArrayList<User>>() {
-            @Override
-            public void onResponse(Call<ArrayList<User>> call,
-                                   Response<ArrayList<User>> response) {
-                userAdapter.updateUsers(response.body());
-            }
-
-            @Override
-            public void onFailure(Call<ArrayList<User>> call, Throwable t) {
-
-            }
-        });
-
-    }
-
-
-}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.kt
new file mode 100644
index 0000000..f322c27
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/UsersActivity.kt
@@ -0,0 +1,58 @@
+package com.codingblocks.restapiretrofitjson.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.LinearLayoutManager
+import android.view.View
+import android.widget.Button
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.adapters.UserAdapter
+import com.codingblocks.restapiretrofitjson.api.API
+import com.codingblocks.restapiretrofitjson.models.User
+import kotlinx.android.synthetic.main.activity_users.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+class UsersActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_users)
+
+        rvUserList.layoutManager = LinearLayoutManager(this)
+        val userAdapter = UserAdapter(this, ArrayList<User>())
+        rvUserList.adapter = userAdapter
+        pbProgress.visibility = View.VISIBLE
+        supportActionBar!!.title = "Users"
+
+        (findViewById(R.id.btnAllPosts) as Button).setOnClickListener {
+            startActivity(Intent(
+                    this@UsersActivity,
+                    PostsActivity::class.java
+            ))
+        }
+
+
+        API.getInstance().usersAPI.users.enqueue(object : Callback<ArrayList<User>> {
+            override fun onResponse(call: Call<ArrayList<User>>,
+                                    response: Response<ArrayList<User>>) {
+                userAdapter.updateUsers(response.body()!!, pbProgress)
+            }
+
+            override fun onFailure(call: Call<ArrayList<User>>, t: Throwable) {
+
+            }
+        })
+
+    }
+
+    companion object {
+
+        val TAG = "USERS"
+    }
+
+
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/ViewPhotoActivity.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/ViewPhotoActivity.kt
new file mode 100644
index 0000000..7708ddb
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/activities/ViewPhotoActivity.kt
@@ -0,0 +1,24 @@
+package com.codingblocks.restapiretrofitjson.activities
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import com.codingblocks.restapiretrofitjson.R
+import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.activity_view_photo.*
+
+class ViewPhotoActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_view_photo)
+        val url = intent.getStringExtra("url")
+        val title = intent.getStringExtra("title")
+
+        supportActionBar!!.title = "View Photo"
+
+        tvTitle.text = title
+        Picasso.with(this).load(url).error(R.drawable.loading)
+                .placeholder(R.drawable.loading)
+                .into(ivImage)
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/AlbumsAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/AlbumsAdapter.kt
new file mode 100644
index 0000000..4d01049
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/AlbumsAdapter.kt
@@ -0,0 +1,57 @@
+package com.codingblocks.restapiretrofitjson.adapters
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ProgressBar
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener
+import com.codingblocks.restapiretrofitjson.models.Album
+import kotlinx.android.synthetic.main.list_item_album.view.*
+import java.util.*
+
+/**
+ * Created by pervy_sage on 30/6/17.
+ */
+
+class AlbumsAdapter(internal var albums: ArrayList<Album>, internal var mContext: Context) : RecyclerView.Adapter<AlbumsAdapter.AlbumsViewHolder>() {
+
+    internal var onItemClickListener: OnItemClickListener? = null
+    fun setOnItemClickListener(onItemClickListener: OnItemClickListener) {
+        this.onItemClickListener = onItemClickListener
+    }
+
+    fun updateAlbums(albums: ArrayList<Album>, progressBar: ProgressBar) {
+
+        this.albums = albums
+        progressBar.visibility = View.INVISIBLE
+        progressBar.visibility = View.GONE
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AlbumsViewHolder {
+        val li = mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val itemView = li.inflate(R.layout.list_item_album, parent, false)
+        return AlbumsViewHolder(itemView)
+    }
+
+    override fun onBindViewHolder(holder: AlbumsViewHolder, position: Int) {
+        holder.bindAlbum(albums[position])
+    }
+
+    override fun getItemCount(): Int {
+        return albums.size
+    }
+
+    inner class AlbumsViewHolder(internal var rootView: View)
+        : RecyclerView.ViewHolder(rootView) {
+       fun bindAlbum(thisAlbum : Album){
+           rootView.tvTitle.text=thisAlbum.title
+           rootView.setOnClickListener {
+               onItemClickListener!!.onItemClick(thisAlbum.id,rootView)
+           }
+       }
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/CommentAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/CommentAdapter.kt
index 01c70e7..edffd01 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/CommentAdapter.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/CommentAdapter.kt
@@ -5,6 +5,7 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ProgressBar
 import android.widget.TextView
 import com.codingblocks.restapiretrofitjson.R
 import com.codingblocks.restapiretrofitjson.models.Comment
@@ -19,8 +20,9 @@ class CommentAdapter(private val context: Context,
                      private var comments: ArrayList<Comment>)
     : RecyclerView.Adapter<CommentAdapter.CommentViewHolder>() {
 
-    fun updateComments(comments: ArrayList<Comment>) {
+    fun updateComments(comments: ArrayList<Comment>,progressBar: ProgressBar) {
         this.comments = comments;
+        progressBar.visibility=View.INVISIBLE
         notifyDataSetChanged();
     }
 
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PhotosAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PhotosAdapter.kt
new file mode 100644
index 0000000..9869a85
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PhotosAdapter.kt
@@ -0,0 +1,63 @@
+package com.codingblocks.restapiretrofitjson.adapters
+
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ProgressBar
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.interfaces.OnPhotoClickListener
+import com.codingblocks.restapiretrofitjson.models.Photos
+import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.list_item_photos.view.*
+import java.util.*
+
+/**
+ * Created by pervy_sage on 30/6/17.
+ */
+
+class PhotosAdapter(internal var photos: ArrayList<Photos>, internal var mContext: Context) : RecyclerView.Adapter<PhotosAdapter.PhotosViewHolder>() {
+
+    internal var onPhotoClickListener: OnPhotoClickListener? = null
+    fun setOnPhotoClickListener(onPhotoClickListener: OnPhotoClickListener) {
+        this.onPhotoClickListener = onPhotoClickListener
+    }
+
+    fun updateAlbums(photos: ArrayList<Photos>, progressBar: ProgressBar) {
+        this.photos = photos
+        progressBar.visibility = View.INVISIBLE
+        progressBar.visibility = View.GONE
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PhotosViewHolder {
+        val li = mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val itemView = li.inflate(R.layout.list_item_photos, parent, false)
+        return PhotosViewHolder(itemView)
+    }
+
+    override fun onBindViewHolder(holder: PhotosViewHolder, position: Int) {
+        holder.bindPhoto(photos[position])
+    }
+
+    override fun getItemCount(): Int {
+        return photos.size
+    }
+
+    inner class PhotosViewHolder(internal var rootView: View)
+        : RecyclerView.ViewHolder(rootView) {
+        fun bindPhoto(thisPhoto : Photos){
+            rootView.tvTitle.text=thisPhoto.title
+            Picasso.with(mContext)
+                    .load(thisPhoto.thumbnailUrl)
+                    .error(R.drawable.loading)
+                    .placeholder(R.drawable.loading)
+                    .into(rootView.ivThumbnail)
+            rootView.setOnClickListener {
+                onPhotoClickListener!!.onClick(thisPhoto.thumbnailUrl,thisPhoto.title)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.java
deleted file mode 100644
index 5a6fdef..0000000
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.codingblocks.restapiretrofitjson.adapters;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.codingblocks.restapiretrofitjson.R;
-import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener;
-import com.codingblocks.restapiretrofitjson.models.Post;
-
-import java.util.ArrayList;
-
-/**
- * Created by championswimmer on 29/06/17.
- */
-
-public class PostAdapter
-        extends RecyclerView.Adapter<PostAdapter.PostViewHolder> {
-
-    public static final String TAG = "PADPTR";
-
-    private Context context;
-    private ArrayList<Post> posts;
-
-    private OnItemClickListener onItemClickListener;
-
-    public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
-        this.onItemClickListener = onItemClickListener;
-    }
-
-    public PostAdapter(Context context, ArrayList<Post> posts) {
-        this.context = context;
-        this.posts = posts;
-    }
-
-    public void updatePosts(ArrayList<Post> posts) {
-        this.posts = posts;
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public PostViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        Log.d(TAG, "onCreateViewHolder: ");
-        LayoutInflater li =
-                (LayoutInflater) context.getSystemService(
-                        Context.LAYOUT_INFLATER_SERVICE);
-        View itemView = li.inflate(R.layout.list_item_post, parent, false);
-
-        return new PostViewHolder(itemView);
-    }
-
-    @Override
-    public void onBindViewHolder(PostViewHolder holder, int position) {
-        Log.d(TAG, "onBindViewHolder: ");
-        final Post thisPost = posts.get(position);
-
-        holder.tvPostTitle.setText(thisPost.getTitle());
-        holder.tvPostBody.setText(thisPost.getBody());
-        holder.thisView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (onItemClickListener != null) {
-                    onItemClickListener.onItemClick(thisPost.getId(), view);
-                }
-            }
-        });
-    }
-
-    @Override
-    public int getItemCount() {
-        return posts.size();
-    }
-
-    class PostViewHolder extends RecyclerView.ViewHolder {
-
-        TextView tvPostBody, tvPostTitle;
-        View thisView;
-
-        public PostViewHolder(View itemView) {
-            super(itemView);
-            thisView = itemView;
-            tvPostBody = (TextView) itemView.findViewById(R.id.tvPostBody);
-            tvPostTitle = (TextView) itemView.findViewById(R.id.tvPostTitle);
-        }
-    }
-}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.kt
new file mode 100644
index 0000000..23b18c9
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/PostAdapter.kt
@@ -0,0 +1,68 @@
+package com.codingblocks.restapiretrofitjson.adapters
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ProgressBar
+import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener
+import com.codingblocks.restapiretrofitjson.models.Post
+import kotlinx.android.synthetic.main.list_item_post.view.*
+import java.util.*
+
+/**
+ * Created by championswimmer on 29/06/17.
+ */
+
+internal class PostAdapter(private val context: Context, private var posts: ArrayList<Post>?) : RecyclerView.Adapter<PostAdapter.PostViewHolder>() {
+
+    private var onItemClickListener: OnItemClickListener? = null
+
+    fun setOnItemClickListener(onItemClickListener: OnItemClickListener) {
+        this.onItemClickListener = onItemClickListener
+    }
+
+    fun updatePosts(posts: ArrayList<Post>, progressBar: ProgressBar) {
+        this.posts = posts
+        progressBar.visibility = View.INVISIBLE
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder {
+        Log.d(TAG, "onCreateViewHolder: ")
+        val li = context.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+        val itemView = li.inflate(R.layout.list_item_post, parent, false)
+
+        return PostViewHolder(itemView)
+    }
+
+    override fun onBindViewHolder(holder: PostViewHolder, position: Int) {
+        Log.d(TAG, "onBindViewHolder: ")
+        holder.bindPost(posts!![position])
+
+    }
+
+    override fun getItemCount(): Int {
+        return posts!!.size
+    }
+
+    inner class PostViewHolder(var thisView: View)
+        : RecyclerView.ViewHolder(thisView) {
+        fun bindPost(thispost : Post){
+            thisView.tvPostBody.text=thispost.body
+            thisView.tvPostTitle.text=thispost.title
+            thisView.setOnClickListener {
+                onItemClickListener!!.onItemClick(thispost.id,thisView)
+            }
+        }
+    }
+
+    companion object {
+
+        val TAG = "PADPTR"
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/TodoAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/TodoAdapter.kt
index c0bb9b6..19577d4 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/TodoAdapter.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/TodoAdapter.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ProgressBar
 import com.codingblocks.restapiretrofitjson.R
 import com.codingblocks.restapiretrofitjson.models.Todo
 
@@ -17,8 +18,9 @@ public class TodoAdapter (
         var todos: ArrayList<Todo>
 ) : RecyclerView.Adapter<TodoAdapter.TodoViewHolder>() {
 
-    fun updateTodos(todos: ArrayList<Todo>) {
+    fun updateTodos(todos: ArrayList<Todo>,pbProgressBar: ProgressBar) {
         this.todos = todos
+        pbProgressBar.visibility=View.INVISIBLE
         notifyDataSetChanged()
     }
 
@@ -48,6 +50,7 @@ public class TodoAdapter (
 
         fun bindTodo(todo: Todo) {
             itemView.tvTodoTitle.text = todo.title;
+            if(todo.completed)itemView.cbCompleted.isChecked=true;
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/UserAdapter.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/UserAdapter.kt
index f9c5e79..fba4828 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/UserAdapter.kt
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/adapters/UserAdapter.kt
@@ -1,11 +1,15 @@
 package com.codingblocks.restapiretrofitjson.adapters
 
 import android.content.Context
+import android.content.Intent
 import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ProgressBar
 import com.codingblocks.restapiretrofitjson.R
+import com.codingblocks.restapiretrofitjson.activities.PostsActivity
+import com.codingblocks.restapiretrofitjson.activities.TodosActivity
 import com.codingblocks.restapiretrofitjson.interfaces.OnItemClickListener
 import com.codingblocks.restapiretrofitjson.models.User
 import kotlinx.android.synthetic.main.list_item_user.view.*
@@ -24,8 +28,9 @@ class UserAdapter(private val context: Context,
         this.onItemClickListener = onItemClickListener
     }
 
-    fun updateUsers(newUserList: ArrayList<User>) {
+    fun updateUsers(newUserList: ArrayList<User>,progressBar: ProgressBar) {
         this.users = newUserList
+        progressBar.visibility=View.INVISIBLE
         notifyDataSetChanged()
     }
 
@@ -54,12 +59,16 @@ class UserAdapter(private val context: Context,
             thisView.tvUserPhone.text = user.phone
             thisView.tvUserEmail.text = user.email
             thisView.btnUserPosts.setOnClickListener {
-                onItemClickListener?.onItemClick(user.id,
-                        itemView.btnUserPosts)
+                val i = Intent(context, PostsActivity::class.java)
+                i.putExtra("userId", user.id)
+                i.putExtra("username", user.username)
+                context.startActivity(i)
             }
-            thisView.btnUserComments.setOnClickListener {
-                onItemClickListener?.onItemClick(user.id,
-                        itemView.btnUserComments)
+            thisView.btnUserTodos.setOnClickListener {
+                val i = Intent(context, TodosActivity::class.java)
+                i.putExtra("userId", user.id)
+                i.putExtra("username", user.username)
+                context.startActivity(i)
             }
 
         }
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/api/API.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/api/API.java
index 771fdc2..a461b05 100644
--- a/app/src/main/java/com/codingblocks/restapiretrofitjson/api/API.java
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/api/API.java
@@ -1,5 +1,7 @@
 package com.codingblocks.restapiretrofitjson.api;
 
+import com.codingblocks.restapiretrofitjson.models.Photos;
+
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
@@ -15,6 +17,8 @@ public class API {
     private UsersAPI usersAPI;
     private CommentsAPI commentsAPI;
     private TodosAPI todosAPI;
+    private AlbumsApi albumsApi;
+    private AlbumsApi.PhotosApi photosApi;
 
     public PostsAPI getPostsAPI() {
         return postsAPI;
@@ -32,6 +36,14 @@ public TodosAPI getTodosAPI() {
         return todosAPI;
     }
 
+    public AlbumsApi getAlbumsApi() {
+        return albumsApi;
+    }
+
+    public AlbumsApi.PhotosApi getPhotosApi() {
+        return photosApi;
+    }
+
     private API() {
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl("https://jsonplaceholder.typicode.com")
@@ -44,6 +56,9 @@ private API() {
         usersAPI = retrofit.create(UsersAPI.class);
         commentsAPI = retrofit.create(CommentsAPI.class);
         todosAPI = retrofit.create(TodosAPI.class);
+        albumsApi=retrofit.create(AlbumsApi.class);
+        photosApi=retrofit.create(AlbumsApi.PhotosApi.class);
+
     }
 
     public static API getInstance() {
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/api/AlbumsApi.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/api/AlbumsApi.java
new file mode 100644
index 0000000..3353731
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/api/AlbumsApi.java
@@ -0,0 +1,32 @@
+package com.codingblocks.restapiretrofitjson.api;
+
+import com.codingblocks.restapiretrofitjson.models.Album;
+import com.codingblocks.restapiretrofitjson.models.Photos;
+
+import java.util.ArrayList;
+import com.codingblocks.restapiretrofitjson.models.Album;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+
+/**
+ * Created by pervy_sage on 1/7/17.
+ */
+
+public interface AlbumsApi {
+    @GET("/albums")
+    Call<ArrayList<Album>>getAlbumsbyUserId(
+            @Query("userId") Integer userId
+    );
+
+    interface PhotosApi{
+        @GET("/photos")
+        Call<ArrayList<Photos>>getPhotos();
+
+        @GET("/albums/{id}/photos")
+        Call<ArrayList<Photos>>getPhotosOfAlbumId(
+                @Path("id")int id
+        );
+    }
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/interfaces/OnPhotoClickListener.java b/app/src/main/java/com/codingblocks/restapiretrofitjson/interfaces/OnPhotoClickListener.java
new file mode 100644
index 0000000..6bbe23e
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/interfaces/OnPhotoClickListener.java
@@ -0,0 +1,9 @@
+package com.codingblocks.restapiretrofitjson.interfaces;
+
+/**
+ * Created by pervy_sage on 1/7/17.
+ */
+
+public interface OnPhotoClickListener {
+    void onClick(String url,String title);
+}
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Album.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Album.kt
new file mode 100644
index 0000000..e96182d
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Album.kt
@@ -0,0 +1,11 @@
+package com.codingblocks.restapiretrofitjson.models
+
+/**
+ * Created by pervy_sage on 1/7/17.
+ */
+
+data class Album(
+        val userId: Int,
+        val id: Int,
+        val title:String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Photos.kt b/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Photos.kt
new file mode 100644
index 0000000..5d4c48e
--- /dev/null
+++ b/app/src/main/java/com/codingblocks/restapiretrofitjson/models/Photos.kt
@@ -0,0 +1,13 @@
+package com.codingblocks.restapiretrofitjson.models
+
+/**
+ * Created by pervy_sage on 1/7/17.
+ */
+
+data class Photos(
+        val albumId:Int,
+        val id:Int,
+        val title:String,
+        val url:String,
+        val thumbnailUrl:String
+)
\ No newline at end of file
diff --git a/app/src/main/res/drawable/loading.png b/app/src/main/res/drawable/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdb7ad22e3224bdbcc7d558aca4abbc1f2dbbbd9
GIT binary patch
literal 7062
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
GkpB-3{Z_RA

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/my_button_bg.xml b/app/src/main/res/drawable/my_button_bg.xml
new file mode 100644
index 0000000..03f4e4d
--- /dev/null
+++ b/app/src/main/res/drawable/my_button_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="3dp" />
+    <stroke android:width="5px" android:color="@color/colorPrimary" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
new file mode 100644
index 0000000..916e269
--- /dev/null
+++ b/app/src/main/res/layout/activity_album.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.codingblocks.restapiretrofitjson.activities.AlbumActivity">
+
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <android.support.v7.widget.RecyclerView
+
+        android:layout_marginBottom="60sp"
+        android:id="@+id/rvAlbumsView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </android.support.v7.widget.RecyclerView>
+
+    <Button
+        android:id="@+id/btnShowAllPhotos"
+        android:text="Show All Photos"
+        android:background="@drawable/my_button_bg"
+        android:textColor="@color/colorPrimaryDark"
+        android:layout_gravity="bottom"
+        android:padding="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+    
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_comments.xml b/app/src/main/res/layout/activity_comments.xml
index 79b765b..75859bd 100644
--- a/app/src/main/res/layout/activity_comments.xml
+++ b/app/src/main/res/layout/activity_comments.xml
@@ -5,7 +5,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.codingblocks.restapiretrofitjson.activities.CommentsActivity">
-    
+
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rvCommentsList"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a2530a5..b04b5db 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,14 +13,18 @@
         android:layout_height="match_parent">
         <Button
             android:id="@+id/btnUsers"
-            android:text="Users PUI"
+            android:text="Users"
             android:layout_weight="1"
+            android:background="@drawable/my_button_bg"
+            android:textColor="@color/colorPrimaryDark"
             android:layout_width="match_parent"
             android:layout_height="0dp" />
         <Button
             android:id="@+id/btnPosts"
             android:text="Posts"
             android:layout_weight="1"
+            android:background="@drawable/my_button_bg"
+            android:textColor="@color/colorPrimaryDark"
             android:layout_width="match_parent"
             android:layout_height="0dp" />
 
@@ -34,12 +38,16 @@
             android:id="@+id/btnAlbums"
             android:text="Albums"
             android:layout_weight="1"
+            android:background="@drawable/my_button_bg"
+            android:textColor="@color/colorPrimaryDark"
             android:layout_width="match_parent"
             android:layout_height="0dp" />
         <Button
             android:id="@+id/btnTodos"
             android:text="Todos"
             android:layout_weight="1"
+            android:background="@drawable/my_button_bg"
+            android:textColor="@color/colorPrimaryDark"
             android:layout_width="match_parent"
             android:layout_height="0dp" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_photos.xml b/app/src/main/res/layout/activity_photos.xml
new file mode 100644
index 0000000..f5b0015
--- /dev/null
+++ b/app/src/main/res/layout/activity_photos.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.codingblocks.restapiretrofitjson.activities.PhotosActivity">
+
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/rvPhotosView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+</FrameLayout>
diff --git a/app/src/main/res/layout/activity_posts.xml b/app/src/main/res/layout/activity_posts.xml
index a2f599c..2f293d0 100644
--- a/app/src/main/res/layout/activity_posts.xml
+++ b/app/src/main/res/layout/activity_posts.xml
@@ -6,6 +6,12 @@
     android:layout_height="match_parent"
     tools:context="com.codingblocks.restapiretrofitjson.activities.PostsActivity">
 
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rvPostsList"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_todos.xml b/app/src/main/res/layout/activity_todos.xml
index a2f6577..09fe2a8 100644
--- a/app/src/main/res/layout/activity_todos.xml
+++ b/app/src/main/res/layout/activity_todos.xml
@@ -5,6 +5,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.codingblocks.restapiretrofitjson.activities.TodosActivity">
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rvTodosList"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_users.xml b/app/src/main/res/layout/activity_users.xml
index 8d689ef..5fb3bfc 100644
--- a/app/src/main/res/layout/activity_users.xml
+++ b/app/src/main/res/layout/activity_users.xml
@@ -9,6 +9,13 @@
         android:id="@+id/btnAllPosts"
         android:layout_gravity="bottom"
         android:text="Show All Posts"
+        android:background="@drawable/my_button_bg"
+        android:textColor="@color/colorPrimaryDark"
+        android:layout_width="match_parent"
+        android:layout_height="40dp" />
+    <ProgressBar
+        android:id="@+id/pbProgress"
+        android:layout_gravity="center"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/app/src/main/res/layout/activity_view_photo.xml b/app/src/main/res/layout/activity_view_photo.xml
new file mode 100644
index 0000000..f560653
--- /dev/null
+++ b/app/src/main/res/layout/activity_view_photo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="30sp"
+    tools:context="com.codingblocks.restapiretrofitjson.activities.ViewPhotoActivity">
+
+
+    <ImageView
+        android:id="@+id/ivImage"
+        android:layout_width="match_parent"
+        android:layout_height="300sp" />
+    <TextView
+        android:id="@+id/tvTitle"
+        android:layout_marginTop="5sp"
+        android:text="Image Title"
+        android:textAlignment="center"
+        android:textSize="30sp"
+        android:padding="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_item_album.xml b/app/src/main/res/layout/list_item_album.xml
new file mode 100644
index 0000000..cd7248e
--- /dev/null
+++ b/app/src/main/res/layout/list_item_album.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardElevation="7sp"
+    app:cardCornerRadius="12sp"
+    android:layout_margin="5sp">
+
+    <LinearLayout
+        android:padding="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:text="Title"
+            android:padding="15sp"
+            android:textSize="21sp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_comment.xml b/app/src/main/res/layout/list_item_comment.xml
index f4df93b..8e62ad5 100644
--- a/app/src/main/res/layout/list_item_comment.xml
+++ b/app/src/main/res/layout/list_item_comment.xml
@@ -1,34 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardElevation="7sp"
+    app:cardCornerRadius="7sp"
     android:padding="20dp"
+    android:layout_margin="5sp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <TextView
-        android:text="Some body text goes here \nabout comment"
-        android:textSize="18sp"
-        android:id="@+id/tvCommentBody"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <TextView
-            android:textSize="15sp"
-            android:text="Users Name"
-            android:id="@+id/tvCommentName"
-            android:layout_weight="1"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:padding="10sp"
+        android:orientation="vertical">
+
         <TextView
-            android:textSize="15sp"
-            android:text="email@domain.com"
-            android:id="@+id/tvCommentEmail"
-            android:layout_weight="1"
-            android:layout_width="0dp"
+            android:text="Some body text goes here \nabout comment"
+            android:textSize="18sp"
+            android:id="@+id/tvCommentBody"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10sp">
+            <TextView
+                android:textSize="15sp"
+                android:text="Users Name"
+                android:id="@+id/tvCommentName"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content" />
+            <TextView
+                android:textSize="15sp"
+                android:text="email@domain.com"
+                android:id="@+id/tvCommentEmail"
+                android:layout_weight="1"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+
+
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_photos.xml b/app/src/main/res/layout/list_item_photos.xml
new file mode 100644
index 0000000..34d9f49
--- /dev/null
+++ b/app/src/main/res/layout/list_item_photos.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardElevation="7sp"
+    app:cardCornerRadius="12sp"
+    android:layout_margin="5sp">
+
+    <LinearLayout
+        android:padding="20sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/ivThumbnail"
+            android:padding="10sp"
+            android:layout_gravity="center"
+            android:layout_width="70sp"
+            android:layout_height="70sp" />
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:text="Title"
+            android:layout_marginLeft="20sp"
+            android:padding="15sp"
+            android:textSize="21sp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_post.xml b/app/src/main/res/layout/list_item_post.xml
index e6f9cce..15f7e8c 100644
--- a/app/src/main/res/layout/list_item_post.xml
+++ b/app/src/main/res/layout/list_item_post.xml
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardCornerRadius="15sp"
+    app:cardElevation="7sp"
+    android:layout_margin="5sp"
     android:padding="20dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <TextView
-        android:text="Title"
-        android:textSize="30sp"
-        android:id="@+id/tvPostTitle"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-    <TextView
-        android:textSize="15sp"
-        android:text="Some Body Goes Here"
-        android:id="@+id/tvPostBody"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:padding="10sp"
+        android:orientation="vertical">
+
+        <TextView
+            android:text="Title"
+            android:textSize="30sp"
+            android:id="@+id/tvPostTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:textSize="15sp"
+            android:text="Some Body Goes Here"
+            android:id="@+id/tvPostBody"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+
+
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_todo.xml b/app/src/main/res/layout/list_item_todo.xml
index 7dd7af1..a3491d7 100644
--- a/app/src/main/res/layout/list_item_todo.xml
+++ b/app/src/main/res/layout/list_item_todo.xml
@@ -1,12 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:cardElevation="5sp"
+    app:cardCornerRadius="7sp"
+    android:layout_margin="5sp"
     android:layout_height="wrap_content">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10sp">
 
-    <TextView
-        android:text="Sample Todo Text"
-        android:id="@+id/tvTodoTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <CheckBox
+            android:id="@+id/cbCompleted"
+            android:padding="5sp"
+            android:checked="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleX="1.2"
+            android:scaleY="1.2" />
 
-</LinearLayout>
\ No newline at end of file
+        <TextView
+            android:text="Sample Todo Text"
+            android:id="@+id/tvTodoTitle"
+            android:padding="15sp"
+            android:textSize="21sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+
+
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_user.xml b/app/src/main/res/layout/list_item_user.xml
index 2f6f59d..634aea4 100644
--- a/app/src/main/res/layout/list_item_user.xml
+++ b/app/src/main/res/layout/list_item_user.xml
@@ -53,15 +53,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <Button
-                android:id="@+id/btnUserComments"
+                android:id="@+id/btnUserTodos"
                 android:text="Show Todos"
                 android:layout_weight="1"
                 android:layout_width="0dp"
+                android:background="@drawable/my_button_bg"
+                android:textColor="@color/colorPrimaryDark"
                 android:layout_height="wrap_content" />
             <Button
                 android:id="@+id/btnUserPosts"
                 android:text="Show Posts"
                 android:layout_weight="1"
+                android:background="@drawable/my_button_bg"
+                android:textColor="@color/colorPrimaryDark"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content" />
         </LinearLayout>
diff --git a/build.gradle b/build.gradle
index 333dbf4..2dc9148 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 578b70a..4de2a9d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jun 29 10:37:46 IST 2017
+#Sun Jul 02 22:16:48 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-rc-1-all.zip