Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .idea/encodings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .idea/statistic.xml

This file was deleted.

11 changes: 6 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -27,12 +27,13 @@ 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:appcompat-v7:25.3.1'
compile 'com.android.support:recyclerview-v7:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha8'
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.squareup.picasso:picasso:2.5.2'
testCompile 'junit:junit:4.12'
}
repositories {
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,18 @@
<activity android:name=".activities.UsersActivity" />
<activity android:name=".activities.PostsActivity" />
<activity android:name=".activities.CommentsActivity" />
<activity android:name=".activities.TodosActivity" />
<activity android:name=".activities.AlbumActivity" />
<activity android:name=".activities.PhotosActivity" />
<activity android:name=".activities.Temporary" />
<activity android:name=".MainActivity">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".activities.TodosActivity"></activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.codingblocks.restapiretrofitjson


import android.content.Intent
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import com.codingblocks.restapiretrofitjson.activities.AlbumActivity
import com.codingblocks.restapiretrofitjson.activities.PostsActivity
import com.codingblocks.restapiretrofitjson.activities.TodosActivity
import com.codingblocks.restapiretrofitjson.activities.UsersActivity
Expand All @@ -26,7 +28,10 @@ class MainActivity : AppCompatActivity() {
btnTodos.setOnClickListener({
startActivity(Intent(this@MainActivity, TodosActivity::class.java))
})
btnAlbums.setOnClickListener({
startActivity(Intent(this@MainActivity, AlbumActivity::class.java))
})


}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
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;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ public class API {
private PostsAPI postsAPI;
private UsersAPI usersAPI;
private CommentsAPI commentsAPI;
private TodosAPI todosAPI;
private TodosAPI todoAPI;
private AlbumAPI albumAPI;
private PhotosAPI photoAPI;

public PostsAPI getPostsAPI() {
return postsAPI;
Expand All @@ -28,11 +30,19 @@ public CommentsAPI getCommentsAPI() {
return commentsAPI;
}

public TodosAPI getTodosAPI() {
return todosAPI;
public TodosAPI getTodoAPI() {
return todoAPI;
}

private API() {
public AlbumAPI getAlbumAPI() {
return albumAPI;
}

public PhotosAPI getPhotoAPI() {
return photoAPI;
}

private API () {
Retrofit retrofit = new Retrofit.Builder()
.baseUrl("https://jsonplaceholder.typicode.com")
.addConverterFactory(
Expand All @@ -43,10 +53,12 @@ private API() {
postsAPI = retrofit.create(PostsAPI.class);
usersAPI = retrofit.create(UsersAPI.class);
commentsAPI = retrofit.create(CommentsAPI.class);
todosAPI = retrofit.create(TodosAPI.class);
todoAPI=retrofit.create(TodosAPI.class);
albumAPI=retrofit.create(AlbumAPI.class);
photoAPI=retrofit.create(PhotosAPI.class);
}

public static API getInstance() {
public static API getInstance () {
if (apiInstance == null) {
apiInstance = new API();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import retrofit2.Call;
import retrofit2.http.GET;
import retrofit2.http.Path;
import retrofit2.http.Query;

/**
Expand All @@ -17,10 +18,17 @@

public interface TodosAPI {

@GET("/todos")
Call<ArrayList<Todo>> getTodos(
@Nullable
@Query("userId") Integer userId
@GET ("/todos")
Call<ArrayList<Todo>> getTodos();

@GET ("/todos")
Call<ArrayList<Todo>> getTodoByUserId(
@Query("userId")int userId
);

@GET ("/todos/{id}")
Call<ArrayList<Todo>> getTodoById(
@Path("id") int id
);


Expand Down