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
62 changes: 43 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,41 +1,65 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
compileSdkVersion 28
buildToolsVersion = '28.0.3'

defaultConfig {
applicationId "info.adavis.adeptandroid"
minSdkVersion 15
targetSdkVersion 23
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

lintOptions {
abortOnError false
}

compileOptions {
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
}
}

ext {
supportLibraryVersion = '23.0.1'
okhttpVersion = '2.4.0'
supportLibraryVersion = '28.0.0'
retrofitVersion = '2.5.0'
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile "com.android.support:appcompat-v7:$supportLibraryVersion"
compile "com.android.support:recyclerview-v7:$supportLibraryVersion"
compile "com.android.support:design:$supportLibraryVersion"
compile "com.squareup.okhttp:okhttp:$okhttpVersion"
compile "com.squareup.okhttp:okhttp-urlconnection:$okhttpVersion"
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.jakewharton.timber:timber:3.1.0'
compile 'de.greenrobot:eventbus:2.4.0'
compile 'com.mcxiaoke.volley:library:1.0.18'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'org.immutables:gson:2.1.0.alpha'
// Support Libraries
implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
implementation "com.android.support:design:$supportLibraryVersion"

// REST Interactions
implementation ("com.squareup.retrofit2:retrofit:$retrofitVersion")

// JSON Parsing
implementation 'com.google.code.gson:gson:2.8.5'
implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"

// View Injection
implementation 'com.jakewharton:butterknife:9.0.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0'

// Logging
implementation 'com.jakewharton.timber:timber:4.7.1'

// Events
implementation 'de.greenrobot:eventbus:2.4.0'

// Image Loading
implementation 'com.squareup.picasso:picasso:2.71828@aar'

// Testing
testImplementation 'junit:junit:4.12'
}

This file was deleted.

9 changes: 8 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >

<activity
android:name=".activities.MainActivity"
android:name=".books.BooksActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" >
<intent-filter>
Expand All @@ -20,6 +21,12 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".book.BookActivity"
android:theme="@style/AppTheme.NoActionBar">
</activity>

</application>

</manifest>
9 changes: 9 additions & 0 deletions app/src/main/java/info/adavis/adeptandroid/Constants.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package info.adavis.adeptandroid;

/**
* @author Annyce Davis
*/
public class Constants
{
public static final String BASE_URL = "http://10.0.2.2:8080";
}

This file was deleted.

52 changes: 52 additions & 0 deletions app/src/main/java/info/adavis/adeptandroid/book/BookActivity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package info.adavis.adeptandroid.book;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.widget.TextView;
import android.widget.Toast;

import butterknife.BindView;
import butterknife.ButterKnife;
import info.adavis.adeptandroid.R;
import info.adavis.adeptandroid.di.Injector;
import info.adavis.adeptandroid.models.Book;

public class BookActivity extends AppCompatActivity implements BookContract.View
{
public static final String EXTRA_BOOK_ID = "EXTRA_BOOK_ID";

@BindView(R.id.titleText) TextView titleText;
@BindView(R.id.authorText) TextView authorText;

@Override
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_book);

ButterKnife.bind(this);

BookPresenter bookPresenter = new BookPresenter(this, Injector.provideBookService());
bookPresenter.retrieveBook(getIntent().getLongExtra(EXTRA_BOOK_ID, 1));

configureLayout();
}

@Override
public void showBook(Book book)
{
titleText.setText(book.getTitle());
authorText.setText(book.getAuthor());
}

@Override
public void showErrorMessage()
{
Toast.makeText(this, R.string.book_loading_unsuccessful, Toast.LENGTH_SHORT).show();
}

private void configureLayout() {
setSupportActionBar(findViewById(R.id.toolbar));
}

}
17 changes: 17 additions & 0 deletions app/src/main/java/info/adavis/adeptandroid/book/BookContract.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package info.adavis.adeptandroid.book;

import info.adavis.adeptandroid.models.Book;

/**
* The contract between the view and presenter
*/
public interface BookContract
{
interface View
{
void showErrorMessage();

void showBook(Book book);
}

}
44 changes: 44 additions & 0 deletions app/src/main/java/info/adavis/adeptandroid/book/BookPresenter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package info.adavis.adeptandroid.book;

import info.adavis.adeptandroid.data.BookService;
import info.adavis.adeptandroid.models.Book;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import timber.log.Timber;

class BookPresenter
{
private final BookContract.View bookView;
private final BookService service;

BookPresenter (BookContract.View bookView, BookService service)
{
this.bookView = bookView;
this.service = service;
}

void retrieveBook (long id)
{
service.getBook(id).enqueue(new Callback<Book>()
{
@Override
public void onResponse (Call<Book> call, Response<Book> response)
{
if (response.isSuccessful())
{
bookView.showBook(response.body());
Timber.i("Book data was loaded from API.");
}
}

@Override
public void onFailure(Call<Book> call, Throwable t)
{
bookView.showErrorMessage();
Timber.e(t, "Unable to load the book data from API.");
}
});
}

}
Loading