isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v1.7.3' into dev

Browse Source 
1.7.3
pull/183/merge
Alinson S. Xavier 8 years ago
parent d2f367678f 534e6c2d9d
commit 0393e58d3b
17 changed files with 232 additions and 79 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -22,3 +22,4 @@ docs/
gen/
local.properties
crowdin.yaml
local

5
CHANGELOG.md
Unescape View File

@ -1,5 +1,10 @@
# Changelog
### 1.7.3 (May 30, 2017)
* Improve performance of 'sort by score'
* Other minor bug fixes
### 1.7.2 (May 27, 2017)
* Fix crash at startup

15
app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
Unescape View File

@ -33,6 +33,7 @@ import org.isoron.uhabits.tasks.*;
import org.isoron.uhabits.utils.*;
import org.junit.*;
import java.io.*;
import java.util.*;
import java.util.concurrent.*;
@ -153,4 +154,18 @@ public class BaseAndroidTest
fail();
}
}
protected void startTracing()
{
File dir = FileUtils.getFilesDir(targetContext, "Profile");
assertNotNull(dir);
String tracePath = dir.getAbsolutePath() + "/performance.trace";
Log.d("PerformanceTest", String.format("Saving trace file to %s", tracePath));
Debug.startMethodTracingSampling(tracePath, 0, 1000);
}
protected void stopTracing()
{
Debug.stopMethodTracing();
}
}

9
app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
Unescape View File

@ -28,6 +28,10 @@ import org.isoron.uhabits.models.*;
import org.junit.*;
import org.junit.runner.*;
import java.util.*;
import static org.isoron.uhabits.utils.DateUtils.*;
@RunWith(AndroidJUnit4.class)
@MediumTest
public class HistoryCardTest extends BaseViewTest
@ -44,6 +48,11 @@ public class HistoryCardTest extends BaseViewTest
{
super.setUp();
habit = fixtures.createLongHabit();
List<Repetition> reps = habit
.getRepetitions()
.getByInterval(getStartOfToday() - 30 * millisecondsInOneDay,
getStartOfToday());
int[] values = habit.getCheckmarks().getAllValues();
view = (HistoryCard) LayoutInflater
.from(targetContext)

21
app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionListTest.java
Unescape View File

@ -34,9 +34,9 @@ import org.junit.runner.*;
import java.util.*;
import static org.hamcrest.MatcherAssert.*;
import static junit.framework.Assert.*;
import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.core.IsNot.not;
import static org.hamcrest.MatcherAssert.*;
import static org.isoron.uhabits.models.Checkmark.*;
@RunWith(AndroidJUnit4.class)
@ -66,13 +66,14 @@ public class SQLiteRepetitionListTest extends BaseAndroidTest
public void testAdd()
{
RepetitionRecord record = getByTimestamp(today + day);
assertThat(record, is(nullValue()));
assertNull(record);
Repetition rep = new Repetition(today + day, CHECKED_EXPLICITLY);
habit.getRepetitions().add(rep);
record = getByTimestamp(today + day);
assertThat(record, is(not(nullValue())));
assertNotNull(record);
assertThat(record.value, equalTo(CHECKED_EXPLICITLY));
}
@Test
@ -91,18 +92,18 @@ public class SQLiteRepetitionListTest extends BaseAndroidTest
public void testGetByTimestamp()
{
Repetition rep = repetitions.getByTimestamp(today);
assertThat(rep, is(not(nullValue())));
assertNotNull(rep);
assertThat(rep.getTimestamp(), equalTo(today));
rep = repetitions.getByTimestamp(today - 2 * day);
assertThat(rep, is(nullValue()));
assertNull(rep);
}
@Test
public void testGetOldest()
{
Repetition rep = repetitions.getOldest();
assertThat(rep, is(not(nullValue())));
assertNotNull(rep);
assertThat(rep.getTimestamp(), equalTo(today - 120 * day));
}
@ -111,20 +112,20 @@ public class SQLiteRepetitionListTest extends BaseAndroidTest
{
Habit empty = fixtures.createEmptyHabit();
Repetition rep = empty.getRepetitions().getOldest();
assertThat(rep, is(nullValue()));
assertNull(rep);
}
@Test
public void testRemove()
{
RepetitionRecord record = getByTimestamp(today);
assertThat(record, is(not(nullValue())));
assertNotNull(record);
Repetition rep = record.toRepetition();
repetitions.remove(rep);
record = getByTimestamp(today);
assertThat(record, is(nullValue()));
assertNull(record);
}
@Nullable

50
app/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
Unescape View File

@ -0,0 +1,50 @@
/*
* Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
*
* This file is part of Loop Habit Tracker.
*
* Loop Habit Tracker is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* Loop Habit Tracker is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.isoron.uhabits.performance;
import android.support.test.filters.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.models.*;
import org.junit.*;
@MediumTest
public class PerformanceTest extends BaseAndroidTest
{
private Habit habit;
@Override
public void setUp()
{
super.setUp();
habit = fixtures.createLongHabit();
}
@Test(timeout = 1000)
public void testRepeatedGetTodayValue()
{
for (int i = 0; i < 100000; i++)
{
habit.getScores().getTodayValue();
habit.getCheckmarks().getTodayValue();
}
}
}

4
app/src/main/AndroidManifest.xml
Unescape View File

@ -20,8 +20,8 @@
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="29"
android:versionName="1.7.2">
android:versionCode="30"
android:versionName="1.7.3">
<uses-permission android:name="android.permission.VIBRATE"/>

13
app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
Unescape View File

@ -20,16 +20,19 @@
package org.isoron.uhabits.activities.common.views;
import android.os.*;
import android.support.v4.os.*;
public class BundleSavedState extends android.support.v4.view.AbsSavedState
{
public static final Parcelable.Creator<BundleSavedState> CREATOR =
new Parcelable.Creator<BundleSavedState>()
ParcelableCompat.newCreator(
new ParcelableCompatCreatorCallbacks<BundleSavedState>()
{
@Override
public BundleSavedState createFromParcel(Parcel source)
public BundleSavedState createFromParcel(Parcel source,
ClassLoader loader)
{
return new BundleSavedState(source, getClass().getClassLoader());
return new BundleSavedState(source, loader);
}
@Override
@ -37,7 +40,7 @@ public class BundleSavedState extends android.support.v4.view.AbsSavedState
{
return new BundleSavedState[size];
}
};
});
public final Bundle bundle;
@ -50,7 +53,7 @@ public class BundleSavedState extends android.support.v4.view.AbsSavedState
public BundleSavedState(Parcel source, ClassLoader loader)
{
super(source, loader);
this.bundle = source.readBundle(getClass().getClassLoader());
this.bundle = source.readBundle(loader);
}
@Override

6
app/src/main/java/org/isoron/uhabits/activities/common/views/ScrollableChart.java
Unescape View File

@ -107,6 +107,12 @@ public abstract class ScrollableChart extends View
@Override
public void onRestoreInstanceState(Parcelable state)
{
if(!(state instanceof BundleSavedState))
{
super.onRestoreInstanceState(state);
return;
}
BundleSavedState bss = (BundleSavedState) state;
int x = bss.bundle.getInt("x");
int y = bss.bundle.getInt("y");

6
app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.java
Unescape View File

@ -155,6 +155,12 @@ public class HabitCardListView extends RecyclerView
@Override
protected void onRestoreInstanceState(Parcelable state)
{
if(!(state instanceof BundleSavedState))
{
super.onRestoreInstanceState(state);
return;
}
BundleSavedState bss = (BundleSavedState) state;
dataOffset = bss.bundle.getInt("dataOffset");
super.onRestoreInstanceState(bss.getSuperState());

6
app/src/main/java/org/isoron/uhabits/models/CheckmarkList.java
Unescape View File

@ -113,7 +113,7 @@ public abstract class CheckmarkList
*
* @return value of today's checkmark
*/
public synchronized final int getTodayValue()
public synchronized int getTodayValue()
{
Checkmark today = getToday();
if (today != null) return today.getValue();
@ -202,7 +202,7 @@ public abstract class CheckmarkList
Checkmark newest = getNewestComputed();
Checkmark oldest = getOldestComputed();
if (newest == null)
if (newest == null || oldest == null)
{
forceRecompute(from, to);
}
@ -218,6 +218,7 @@ public abstract class CheckmarkList
*
* @return oldest checkmark already computed
*/
@Nullable
protected abstract Checkmark getOldestComputed();
/**
@ -295,5 +296,6 @@ public abstract class CheckmarkList
*
* @return newest checkmark already computed
*/
@Nullable
protected abstract Checkmark getNewestComputed();
}

2
app/src/main/java/org/isoron/uhabits/models/memory/MemoryCheckmarkList.java
Unescape View File

@ -72,6 +72,7 @@ public class MemoryCheckmarkList extends CheckmarkList
}
@Override
@Nullable
protected Checkmark getOldestComputed()
{
if(list.isEmpty()) return null;
@ -79,6 +80,7 @@ public class MemoryCheckmarkList extends CheckmarkList
}
@Override
@Nullable
protected Checkmark getNewestComputed()
{
if(list.isEmpty()) return null;

57
app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
Unescape View File

@ -24,7 +24,6 @@ import android.support.annotation.*;
import android.support.annotation.Nullable;
import com.activeandroid.*;
import com.activeandroid.query.*;
import org.isoron.uhabits.models.*;
import org.isoron.uhabits.models.sqlite.records.*;
@ -38,38 +37,54 @@ import java.util.*;
*/
public class SQLiteCheckmarkList extends CheckmarkList
{
@Nullable
private HabitRecord habitRecord;
@NonNull
private final SQLiteUtils<CheckmarkRecord> sqlite;
@Nullable
private Integer todayValue;
@NonNull
private final SQLiteStatement invalidateStatement;
@NonNull
private final SQLiteStatement addStatement;
@NonNull
private final SQLiteDatabase db;
private static final String ADD_QUERY =
"insert into Checkmarks(habit, timestamp, value) values (?,?,?)";
private static final String INVALIDATE_QUERY =
"delete from Checkmarks where habit = ? and timestamp >= ?";
public SQLiteCheckmarkList(Habit habit)
{
super(habit);
sqlite = new SQLiteUtils<>(CheckmarkRecord.class);
db = Cache.openDatabase();
addStatement = db.compileStatement(ADD_QUERY);
invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
}
@Override
public void add(List<Checkmark> checkmarks)
{
check(habit.getId());
String query =
"insert into Checkmarks(habit, timestamp, value) values (?,?,?)";
SQLiteDatabase db = Cache.openDatabase();
db.beginTransaction();
try
{
SQLiteStatement statement = db.compileStatement(query);
for (Checkmark c : checkmarks)
{
statement.bindLong(1, habit.getId());
statement.bindLong(2, c.getTimestamp());
statement.bindLong(3, c.getValue());
statement.execute();
addStatement.bindLong(1, habit.getId());
addStatement.bindLong(2, c.getTimestamp());
addStatement.bindLong(3, c.getValue());
addStatement.execute();
}
db.setTransactionSuccessful();
@ -115,12 +130,10 @@ public class SQLiteCheckmarkList extends CheckmarkList
@Override
public void invalidateNewerThan(long timestamp)
{
new Delete()
.from(CheckmarkRecord.class)
.where("habit = ?", habit.getId())
.and("timestamp >= ?", timestamp)
.execute();
todayValue = null;
invalidateStatement.bindLong(1, habit.getId());
invalidateStatement.bindLong(2, timestamp);
invalidateStatement.execute();
observable.notifyListeners();
}
@ -140,6 +153,7 @@ public class SQLiteCheckmarkList extends CheckmarkList
}
@Override
@Nullable
protected Checkmark getOldestComputed()
{
check(habit.getId());
@ -179,4 +193,11 @@ public class SQLiteCheckmarkList extends CheckmarkList
for (CheckmarkRecord r : records) checkmarks.add(r.toCheckmark());
return checkmarks;
}
@Override
public int getTodayValue()
{
if(todayValue == null) todayValue = super.getTodayValue();
return todayValue;
}
}

25
app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteRepetitionList.java
Unescape View File

@ -19,12 +19,12 @@
package org.isoron.uhabits.models.sqlite;
import android.database.DatabaseUtils;
import android.database.sqlite.SQLiteDatabase;
import android.database.*;
import android.database.sqlite.*;
import android.support.annotation.*;
import android.support.annotation.Nullable;
import com.activeandroid.Cache;
import com.activeandroid.*;
import com.activeandroid.query.*;
import org.isoron.uhabits.models.*;
@ -38,15 +38,25 @@ import java.util.*;
*/
public class SQLiteRepetitionList extends RepetitionList
{
private final SQLiteUtils<RepetitionRecord> sqlite;
@Nullable
private HabitRecord habitRecord;
private SQLiteStatement addStatement;
public static final String ADD_QUERY =
"insert into repetitions(habit, timestamp, value) " +
"values (?,?,?)";
public SQLiteRepetitionList(@NonNull Habit habit)
{
super(habit);
sqlite = new SQLiteUtils<>(RepetitionRecord.class);
SQLiteDatabase db = Cache.openDatabase();
addStatement = db.compileStatement(ADD_QUERY);
}
/**
@ -61,11 +71,10 @@ public class SQLiteRepetitionList extends RepetitionList
public void add(Repetition rep)
{
check(habit.getId());
RepetitionRecord record = new RepetitionRecord();
record.copyFrom(rep);
record.habit = habitRecord;
record.save();
addStatement.bindLong(1, habit.getId());
addStatement.bindLong(2, rep.getTimestamp());
addStatement.bindLong(3, rep.getValue());
addStatement.execute();
observable.notifyListeners();
}

54
app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
Unescape View File

@ -24,7 +24,6 @@ import android.support.annotation.*;
import android.support.annotation.Nullable;
import com.activeandroid.*;
import com.activeandroid.query.*;
import org.isoron.uhabits.models.*;
import org.isoron.uhabits.models.sqlite.records.*;
@ -37,12 +36,30 @@ import java.util.*;
*/
public class SQLiteScoreList extends ScoreList
{
@Nullable
private HabitRecord habitRecord;
@NonNull
private final SQLiteUtils<ScoreRecord> sqlite;
@Nullable
private Double todayValue;
@NonNull
private final SQLiteStatement invalidateStatement;
@NonNull
private final SQLiteStatement addStatement;
public static final String ADD_QUERY =
"insert into Score(habit, timestamp, score) values (?,?,?)";
public static final String INVALIDATE_QUERY =
"delete from Score where habit = ? " + "and timestamp >= ?";
private final SQLiteDatabase db;
/**
* Constructs a new ScoreList associated with the given habit.
*
@ -52,28 +69,25 @@ public class SQLiteScoreList extends ScoreList
{
super(habit);
sqlite = new SQLiteUtils<>(ScoreRecord.class);
db = Cache.openDatabase();
addStatement = db.compileStatement(ADD_QUERY);
invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
}
@Override
public void add(List<Score> scores)
{
check(habit.getId());
String query =
"insert into Score(habit, timestamp, score) values (?,?,?)";
SQLiteDatabase db = Cache.openDatabase();
db.beginTransaction();
try
{
SQLiteStatement statement = db.compileStatement(query);
for (Score s : scores)
{
statement.bindLong(1, habit.getId());
statement.bindLong(2, s.getTimestamp());
statement.bindDouble(3, s.getValue());
statement.execute();
addStatement.bindLong(1, habit.getId());
addStatement.bindLong(2, s.getTimestamp());
addStatement.bindDouble(3, s.getValue());
addStatement.execute();
}
db.setTransactionSuccessful();
@ -126,13 +140,10 @@ public class SQLiteScoreList extends ScoreList
@Override
public void invalidateNewerThan(long timestamp)
{
new Delete()
.from(ScoreRecord.class)
.where("habit = ?", habit.getId())
.and("timestamp >= ?", timestamp)
.execute();
todayValue = null;
invalidateStatement.bindLong(1, habit.getId());
invalidateStatement.bindLong(2, timestamp);
invalidateStatement.execute();
getObservable().notifyListeners();
}
@ -205,4 +216,11 @@ public class SQLiteScoreList extends ScoreList
for (ScoreRecord r : records) scores.add(r.toScore());
return scores;
}
@Override
public double getTodayValue()
{
if (todayValue == null) todayValue = super.getTodayValue();
return todayValue;
}
}

19
app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
Unescape View File

@ -19,10 +19,11 @@
package org.isoron.uhabits.models.sqlite;
import android.database.sqlite.*;
import android.support.annotation.*;
import android.support.annotation.Nullable;
import com.activeandroid.query.*;
import com.activeandroid.*;
import org.isoron.uhabits.models.*;
import org.isoron.uhabits.models.sqlite.records.*;
@ -41,10 +42,17 @@ public class SQLiteStreakList extends StreakList
@NonNull
private final SQLiteUtils<StreakRecord> sqlite;
private final SQLiteStatement invalidateStatement;
public SQLiteStreakList(Habit habit)
{
super(habit);
sqlite = new SQLiteUtils<>(StreakRecord.class);
SQLiteDatabase db = Cache.openDatabase();
String invalidateQuery = "delete from Streak where habit = ? " +
"and end >= ?";
invalidateStatement = db.compileStatement(invalidateQuery);
}
@Override
@ -73,12 +81,9 @@ public class SQLiteStreakList extends StreakList
@Override
public void invalidateNewerThan(long timestamp)
{
new Delete()
.from(StreakRecord.class)
.where("habit = ?", habit.getId())
.and("end >= ?", timestamp - DateUtils.millisecondsInOneDay)
.execute();
invalidateStatement.bindLong(1, habit.getId());
invalidateStatement.bindLong(2, timestamp - DateUtils.millisecondsInOneDay);
invalidateStatement.execute();
observable.notifyListeners();
}

2
gradle/wrapper/gradle-wrapper.properties vendored
Unescape View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

Write Preview
Loading…
Cancel
Save