diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index 6ef5aef95..f6d6d1873 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -80,7 +80,7 @@ - + @@ -121,7 +121,6 @@ - @@ -135,14 +134,14 @@ - + - + @@ -162,5 +161,6 @@ + \ No newline at end of file diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 75568385d..c9577510d 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -70,8 +70,7 @@ dependencies { compile 'com.instabug.library:instabugsupport:+' // Changelog Fragment, minSDK 17 - //compile 'com.github.porokoro.paperboy:paperboy:1.0.0' - compile 'com.github.porokoro:paperboy:364c77b49f' + compile 'com.github.porokoro.paperboy:paperboy:2.0.1' // About View for all dependent Libraries, where are using compile('com.mikepenz:aboutlibraries:5.0.5@aar') { diff --git a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java index 2d5e6a3a1..62b0a0022 100644 --- a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java @@ -10,7 +10,8 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; -import com.github.porokoro.paperboy.PaperboyFragmentBuilder; +import com.github.porokoro.paperboy.ItemTypeBuilder; +import com.github.porokoro.paperboy.PaperboyBuilder; import com.github.porokoro.paperboy.ViewTypes; import com.mikepenz.aboutlibraries.Libs; import com.mikepenz.aboutlibraries.LibsBuilder; @@ -115,18 +116,19 @@ public class AboutActivity extends AppCompatActivity { return tab1; case 1: - PaperboyFragmentBuilder builder = new PaperboyFragmentBuilder(AboutActivity.this) + PaperboyBuilder builder = new PaperboyBuilder(AboutActivity.this) .setViewType(ViewTypes.HEADER) .setFile("paperboy/changelog.json"); - builder.withDefinition(1000, "Note", "n") + + builder.addItemType(new ItemTypeBuilder(AboutActivity.this, 1000, "Note", "n") .setColorRes(R.color.changelog_note) .setTitleSingular("Note") .setTitlePlural("Notes") .setSortOrder(0) - .add(); + .build()); - return builder.build(); + return builder.buildFragment(); default: return null; }