diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 1c581f69c..dd3a2b530 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -27,7 +27,7 @@ :D + android:windowSoftInputMode="stateHidden|adjustResize"> @@ -44,7 +44,8 @@ + android:windowSoftInputMode="adjustResize" + android:theme="@style/AppThemeWithActionBar"> @@ -69,7 +70,8 @@ android:name="io.fabric.ApiKey" android:value="2eb3b3edb3b0f4722d37d649a5af366656e46ddd" /> - + diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml index 6d28ae96e..557ae917d 100644 --- a/Habitica/Habitica.iml +++ b/Habitica/Habitica.iml @@ -79,9 +79,9 @@ - + - + @@ -105,62 +105,64 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/build.gradle b/Habitica/build.gradle index f0e1fa983..67e5e500d 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -47,7 +47,7 @@ dependencies { transitive = true } - compile('com.github.florent37:materialviewpager:1.0.5@aar') { + compile('com.github.florent37:materialviewpager:1.0.6@aar') { transitive = true } @@ -68,7 +68,7 @@ dependencies { // Changelog Fragment, minSDK 17 //compile 'com.github.porokoro.paperboy:paperboy:1.0.0' - compile 'com.github.negue:paperboy:0d4e14bbb5' + compile 'com.github.porokoro:paperboy:364c77b49f' // About View for all dependent Libraries, where are using compile('com.mikepenz:aboutlibraries:5.0.5@aar') { diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml index 11d4c28cc..d7edadf30 100644 --- a/Habitica/res/layout/activity_about.xml +++ b/Habitica/res/layout/activity_about.xml @@ -20,6 +20,8 @@ android:id="@+id/pager" android:layout_width="match_parent" android:layout_height="fill_parent" - android:layout_below="@id/tab_layout" /> + android:layout_below="@id/tab_layout" + android:background="@color/material_drawer_background" + /> \ No newline at end of file diff --git a/Habitica/res/values-v11/styles.xml b/Habitica/res/values-v11/styles.xml deleted file mode 100644 index 6b30d8d9d..000000000 --- a/Habitica/res/values-v11/styles.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Habitica/res/values-v14/styles.xml b/Habitica/res/values-v14/styles.xml deleted file mode 100644 index 6b30d8d9d..000000000 --- a/Habitica/res/values-v14/styles.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml index b80f20322..8074824a8 100644 --- a/Habitica/res/values/colors.xml +++ b/Habitica/res/values/colors.xml @@ -35,6 +35,8 @@ #D9D9D9 #989898 + #ffcf42 + #dddddd #66000000 diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml index 45c40ceb4..9b13c98cb 100644 --- a/Habitica/res/values/styles.xml +++ b/Habitica/res/values/styles.xml @@ -5,11 +5,16 @@ + - - \ No newline at end of file diff --git a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java index b141c5323..2d5e6a3a1 100644 --- a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java @@ -10,8 +10,7 @@ import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.view.MenuItem; -import com.github.porokoro.paperboy.PaperboyFragment; -import com.github.porokoro.paperboy.Themes; +import com.github.porokoro.paperboy.PaperboyFragmentBuilder; import com.github.porokoro.paperboy.ViewTypes; import com.mikepenz.aboutlibraries.Libs; import com.mikepenz.aboutlibraries.LibsBuilder; @@ -19,7 +18,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder; import butterknife.ButterKnife; import butterknife.InjectView; -public class AboutActivity extends AppCompatActivity { +public class AboutActivity extends AppCompatActivity { @InjectView(R.id.pager) ViewPager pager; @@ -43,6 +42,7 @@ public class AboutActivity extends AppCompatActivity { actionBar.setDisplayShowTitleEnabled(true); actionBar.setDisplayUseLogoEnabled(false); actionBar.setHomeButtonEnabled(false); + actionBar.setElevation(0); } tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); @@ -100,10 +100,9 @@ public class AboutActivity extends AppCompatActivity { switch (position) { case 0: - Fragment tab1 = new LibsBuilder() + Fragment tab1 = new LibsBuilder() //Pass the fields of your application to the lib so it can find all external lib information .withFields(R.string.class.getFields()) - //provide a style (optional) (LIGHT, DARK, LIGHT_DARK_TOOLBAR) .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR) .withAboutAppName(getString(R.string.app_name)) .withAboutDescription("

Used Libraries

") @@ -116,13 +115,18 @@ public class AboutActivity extends AppCompatActivity { return tab1; case 1: - PaperboyFragment tab2 = new PaperboyFragment.Builder(AboutActivity.this) - .setTheme(Themes.DARK) - .setViewType(ViewTypes.HEADER) - .setFile("paperboy/changelog.json") - .build(); + PaperboyFragmentBuilder builder = new PaperboyFragmentBuilder(AboutActivity.this) + .setViewType(ViewTypes.HEADER) + .setFile("paperboy/changelog.json"); - return tab2; + builder.withDefinition(1000, "Note", "n") + .setColorRes(R.color.changelog_note) + .setTitleSingular("Note") + .setTitlePlural("Notes") + .setSortOrder(0) + .add(); + + return builder.build(); default: return null; } @@ -130,7 +134,7 @@ public class AboutActivity extends AppCompatActivity { @Override public CharSequence getPageTitle(int position) { - if(position == 0) + if (position == 0) return getString(R.string.about_title); return getString(R.string.about_versionhistory); diff --git a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java index 468a834f6..6fc57767b 100644 --- a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java @@ -8,6 +8,7 @@ import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.text.SpannableString; import android.text.method.LinkMovementMethod; import android.text.util.Linkify; @@ -17,6 +18,8 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.Window; +import android.view.WindowManager; import android.view.animation.Animation; import android.view.animation.Transformation; import android.widget.Button; @@ -45,7 +48,8 @@ import retrofit.client.Response; /** * @author Mickael Goubin */ -public class LoginActivity extends ActionBarActivity implements Callback,HabitRPGUserCallback.OnUserReceived { +public class LoginActivity extends AppCompatActivity + implements Callback,HabitRPGUserCallback.OnUserReceived { private final static String TAG_ADDRESS="address"; private final static String TAG_USERID="user"; private final static String TAG_APIKEY="key"; @@ -64,6 +68,7 @@ public class LoginActivity extends ActionBarActivity implements Callback aClass, BaseModel.Action action, String s, String s1) { User = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle(); - updateHeader(); + + SetUserData(); + } + + private void SetUserData() { + if (User != null) { + runOnUiThread(new Runnable() { + @Override + public void run() { + loadTaskLists(); + FillTagFilterDrawer(); + updateHeader(); + } + }); + } } } \ No newline at end of file diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java index fa9e95e13..b576828ab 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/api/TypeAdapter/TagsAdapter.java @@ -28,7 +28,7 @@ public class TagsAdapter extends TypeAdapter{ out.value(true); } out.endObject(); - Log.d("TagsAdapter", "Finished tagging"); + //Log.d("TagsAdapter", "Finished tagging"); } @Override @@ -45,7 +45,7 @@ public class TagsAdapter extends TypeAdapter{ if(in.nextBoolean()) { tags.add(tag); } - Log.d("TagsAdapter", "Added tag " + tag); + //Log.d("TagsAdapter", "Added tag " + tag); break; case END_OBJECT: in.endObject();