Update Libraries / "Note" in Changelogs / Fix Crash on first start

This commit is contained in:
Negue 2015-07-07 20:28:57 +02:00
parent 22b1e542cb
commit 1eeaabffa7
12 changed files with 131 additions and 124 deletions

View file

@ -27,7 +27,7 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden|adjustResize">:D
android:windowSoftInputMode="stateHidden|adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -44,7 +44,8 @@
<activity
android:name=".LoginActivity"
android:label="@string/LoginActivityName"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:theme="@style/AppThemeWithActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
@ -69,7 +70,8 @@
android:name="io.fabric.ApiKey"
android:value="2eb3b3edb3b0f4722d37d649a5af366656e46ddd" />
<activity android:name=".AboutActivity" />
<activity android:name=".AboutActivity"
android:theme="@style/AppThemeWithActionBar"/>
</application>
</manifest>

View file

@ -79,9 +79,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/beta/1.1.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics-core/2.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.crashlytics.sdk.android/crashlytics/2.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.florent37/materialviewpager/1.0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.florent37/materialviewpager/1.0.6/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.ksoichiro/android-observablescrollview/1.5.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.negue/paperboy/0d4e14bbb5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.porokoro/paperboy/364c77b49f/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugcore/1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugsupport/1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jpardogo.materialtabstrip/library/1.1.0/jars" />
@ -105,62 +105,64 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/layout-info" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="library-1.0.16" level="project" />
<orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
<orderEntry type="library" exported="" name="antlr4-4.4" level="project" />
<orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
<orderEntry type="library" exported="" name="aboutlibraries-5.0.5" level="project" />
<orderEntry type="library" exported="" name="library-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="instabugsupport-1.4" level="project" />
<orderEntry type="library" exported="" name="antlr4-annotations-4.4" level="project" />
<orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
<orderEntry type="library" exported="" name="library-1.1.0" level="project" />
<orderEntry type="library" exported="" name="DBFlow-2.2.1" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
<orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
<orderEntry type="library" exported="" name="auto-service-1.0-rc2" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="antlr4-runtime-4.4" level="project" />
<orderEntry type="library" exported="" name="materialviewpager-1.0.5" level="project" />
<orderEntry type="library" exported="" name="baseLibrary-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.1" level="project" />
<orderEntry type="library" exported="" name="compiler-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
<orderEntry type="library" exported="" name="gridlayout-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
<orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />
<orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
<orderEntry type="library" exported="" name="design-22.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="DBFlow-Compiler-2.2.1" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="answers-1.2.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="paperboy-0d4e14bbb5" level="project" />
<orderEntry type="library" exported="" name="DBFlow-Core-2.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
<orderEntry type="library" exported="" name="auto-common-0.3" level="project" />
<orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
<orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="library-2.1.4" level="project" />
<orderEntry type="library" exported="" name="instabugcore-1.4" level="project" />
<orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
<orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91" level="project" />
<orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
<orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
<orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
<orderEntry type="library" exported="" name="aboutlibraries-5.0.5" level="project" />
<orderEntry type="library" exported="" name="kotlin-runtime-0.11.91" level="project" />
<orderEntry type="library" exported="" name="library-2.1.4" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
<orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
<orderEntry type="library" exported="" name="auto-common-0.3" level="project" />
<orderEntry type="library" exported="" name="antlr4-annotations-4.4" level="project" />
<orderEntry type="library" exported="" name="materialviewpager-1.0.6" level="project" />
<orderEntry type="library" exported="" name="DBFlow-2.2.1" level="project" />
<orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
<orderEntry type="library" exported="" name="antlr4-4.4" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
<orderEntry type="library" exported="" name="gridlayout-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="baseLibrary-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
<orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
<orderEntry type="library" exported="" name="answers-1.2.0" level="project" />
<orderEntry type="library" exported="" name="library-1.1.0" level="project" />
<orderEntry type="library" exported="" name="library-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="instabugsupport-1.4" level="project" />
<orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="guava-18.0" level="project" />
<orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
<orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="library-1.0.16" level="project" />
<orderEntry type="library" exported="" name="antlr4-runtime-4.4" level="project" />
<orderEntry type="library" exported="" name="DBFlow-Compiler-2.2.1" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.1" level="project" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="paperboy-364c77b49f" level="project" />
<orderEntry type="library" exported="" name="DBFlow-Core-2.2.1" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
<orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91" level="project" />
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
<orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
<orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
<orderEntry type="library" exported="" name="instabugcore-1.4" level="project" />
<orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />
<orderEntry type="library" exported="" name="compiler-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="ST4-4.0.8" level="project" />
<orderEntry type="library" exported="" name="auto-service-1.0-rc2" level="project" />
<orderEntry type="library" exported="" name="crashlytics-2.3.0" level="project" />
<orderEntry type="library" exported="" name="javawriter-2.5.0" level="project" />
</component>
</module>

View file

@ -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') {

View file

@ -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"
/>
</RelativeLayout>

View file

@ -1,3 +0,0 @@
<resources>
</resources>

View file

@ -1,3 +0,0 @@
<resources>
</resources>

View file

@ -35,6 +35,8 @@
<color name="completed">#D9D9D9</color>
<color name="completed_btn">#989898</color>
<color name="changelog.note">#ffcf42</color>
<!-- Cards -->
<color name="stroke">#dddddd</color>
<color name="text_light">#66000000</color>

View file

@ -5,11 +5,16 @@
<!-- Application theme. -->
<style name="AppTheme" parent="@style/MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
<item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:windowContentOverlay">@null</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<!-- ...and here we setting appcompats color theming attrs -->
<item name="colorPrimary">@color/brand</item>
<item name="colorPrimaryDark">@color/brand</item>
@ -28,6 +33,13 @@
<item name="material_drawer_header_selection_text">@color/material_drawer_header_selection_text</item>
</style>
<style name="AppThemeWithActionBar" parent="AppTheme">
<item name="windowActionBar">true</item>
<item name="windowNoTitle">false</item>
<item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="21">false</item>
<item name="android:windowTranslucentStatus" tools:targetApi="21">false</item>
</style>
<style name="TextReservedToPremium">
<item name="android:textStyle">italic</item>
@ -90,8 +102,4 @@
<item name="spinBars">true</item>
<item name="color">@color/drawerArrowColor</item>
</style>
<style name="CustomTheme" parent="">
</style>
</resources>

View file

@ -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("<h2>Used Libraries</h2>")
@ -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);

View file

@ -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<UserAuthResponse>,HabitRPGUserCallback.OnUserReceived {
public class LoginActivity extends AppCompatActivity
implements Callback<UserAuthResponse>,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<User
super.onCreate(savedInstanceState);
setContentView(R.layout.login_screen);
mRegisterBtn = (Button) this.findViewById(R.id.register_btn);
mLoginNormalBtn = (Button) this.findViewById(R.id.login_normal_btn);
mLoginTokensBtn = (Button) this.findViewById(R.id.login_tokens_btn);

View file

@ -86,7 +86,7 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
android.support.v4.view.ViewPager viewPager;
// just to test the view
public HabitRPGUser User = null;
private HabitRPGUser User;
AvatarWithBarsViewModel avatarInHeader;
@ -101,10 +101,12 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
ButterKnife.inject(this);
this.hostConfig = PrefsActivity.fromContext(this);
if(hostConfig==null|| hostConfig.getApi()==null || hostConfig.getApi().equals("") || hostConfig.getUser() == null ||hostConfig.getUser().equals("")) {
startActivity(new Intent(MainActivity.this, LoginActivity.class));
if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) {
startActivity(new Intent(this, LoginActivity.class));
finish();
return;
}
toolbar = materialViewPager.getToolbar();
if (toolbar != null) {
@ -112,7 +114,7 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
ActionBar actionBar = getSupportActionBar();
if(actionBar != null) {
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowHomeEnabled(false);
actionBar.setDisplayShowTitleEnabled(true);
@ -198,31 +200,6 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
viewPager = materialViewPager.getViewPager();
viewPager.setOffscreenPageLimit(6);
viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {}
@Override
public void onPageSelected(int position) {
Log.d("PageSelected", "P=" + position);
RecyclerViewFragment fragment = ViewFragmentsDictionary.get(position);
if (fragment == null || fragment.mRecyclerView == null)
return;
// fragment.mRecyclerView.smoothScrollToPosition(r.nextInt(fragment.mRecyclerView.getAdapter().getItemCount()));
}
@Override
public void onPageScrollStateChanged(int state) {
}
});
materialViewPager.getViewPager().setCurrentItem(0);
User = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle();
@ -231,9 +208,7 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
this.observer.addSpecificModelChangeListener(this);
this.loadTaskLists();
FillTagFilterDrawer();
updateHeader();
SetUserData();
}
@Override
@ -247,12 +222,14 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
@Override
protected void onDestroy() {
this.observer.unregisterForContentChanges(this.getApplicationContext());
if (observer != null) {
this.observer.unregisterForContentChanges(this.getApplicationContext());
}
super.onDestroy();
}
public void loadTaskLists()
{
public void loadTaskLists() {
android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
@ -329,8 +306,6 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
new PrimaryDrawerItem().withName(t.getName()).withBadge("" + CountTagUsedInTasks(t.getId()))
);
}
}
/**
@ -387,8 +362,7 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
return super.onOptionsItemSelected(item);
}
private void updateUserAvatars()
{
private void updateUserAvatars() {
avatarInHeader.UpdateData(User);
}
@ -475,6 +449,20 @@ public class MainActivity extends InstabugAppCompatActivity implements OnTaskCre
@Override
public void onModelStateChanged(Class<? extends Model> 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();
}
});
}
}
}

View file

@ -28,7 +28,7 @@ public class TagsAdapter extends TypeAdapter<Tags>{
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<Tags>{
if(in.nextBoolean()) {
tags.add(tag);
}
Log.d("TagsAdapter", "Added tag " + tag);
//Log.d("TagsAdapter", "Added tag " + tag);
break;
case END_OBJECT:
in.endObject();