Skip to content
This repository has been archived by the owner on Apr 26, 2020. It is now read-only.

Commit

Permalink
Fixed some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
DreierF committed Jun 8, 2016
1 parent c7f4fad commit 600da30
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ private void remove(List<Integer> positions) {
public void onDismissed(Snackbar snackbar, int event) {
for (Pair<Integer, T> item : deleted) {
dataSource.delete(item.getSecond());
}
if(isAdded()) {
getLoaderManager().restartLoader(0, null, EditableFragmentBase.this);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ protected Shot getShotFromPos(float x, float y) {
if (zoneSelectionMode) {
if (x > contentWidth - 60 * density) {
int i = (int) (y * selectableZones.size() / (float) contentHeight);
i = Math.min(Math.max(0, i), selectableZones.size() - 1);
s.zone = selectableZones.get(i).zone;
} else {
return null;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,6 @@
<string name="show_signature">Unterschrift</string>
<string name="witness">Zeuge</string>
<string name="archer">Bogenschütze</string>
<string name="hits">Hits</string>
<string name="misses">Misses</string>
<string name="hits">Treffer</string>
<string name="misses">Nicht-Treffer</string>
</resources>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ ext {
supportLibVersion = '23.4.0'
playServiceVersion = '9.0.2'
parcelerVersion = '1.1.5'
appVersionName = '2.2.1'
appVersionCode = 39
appVersionName = '2.2.2-RC1'
appVersionCode = 40
}

allprojects {
Expand Down
8 changes: 7 additions & 1 deletion proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,10 @@
}

# Okio
-dontwarn okio.**
-dontwarn okio.**

## Joda Time 2.3
-dontwarn org.joda.convert.**
-dontwarn org.joda.time.**
-keep class org.joda.time.** { *; }
-keep interface org.joda.time.** { *; }

0 comments on commit 600da30

Please sign in to comment.