Bugfixes

DreierF · Mar 23, 2015 · cdc1818 · cdc1818
1 parent 34c1296
commit cdc1818
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 13 deletions.
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId 'de.dreier.mytargets'
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 26
-        versionName '2.0.6'
+        versionCode 28
+        versionName '2.0.8'
     }
 
     signingConfigs {

diff --git a/app/src/main/java/de/dreier/mytargets/activities/EditBowActivity.java b/app/src/main/java/de/dreier/mytargets/activities/EditBowActivity.java
@@ -28,6 +28,7 @@
 import de.dreier.mytargets.managers.DatabaseManager;
 import de.dreier.mytargets.models.Bow;
 import de.dreier.mytargets.views.DialogSpinner;
+import de.dreier.mytargets.views.DistanceDialogSpinner;
 
 public class EditBowActivity extends EditWithImageActivity {
 
@@ -247,7 +248,7 @@ public void update() {
     private void addSightSetting(final SightSetting setting, int i) {
         LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
         final View rel = inflater.inflate(R.layout.sight_settings_item, sight_settings, false);
-        setting.distance = (DialogSpinner) findViewById(R.id.distance_spinner);
+        setting.distance = (DistanceDialogSpinner) rel.findViewById(R.id.distance_spinner);
         setting.setting = (EditText) rel.findViewById(R.id.sight_setting);
         ImageButton remove = (ImageButton) rel.findViewById(R.id.remove_sight_setting);
         remove.setOnClickListener(new View.OnClickListener() {

diff --git a/app/src/main/java/de/dreier/mytargets/views/TargetView.java b/app/src/main/java/de/dreier/mytargets/views/TargetView.java
@@ -494,6 +494,14 @@ public void run() {
             }
             invalidate();
             return true;
+        } else {
+            if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
+                if (longPressTimer != null) {
+                    longPressTimer.cancel();
+                    longPressTimer = null;
+                }
+            }
+            mPasseDrawer.setPressed(-1);
         }
         return false;
     }

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -104,7 +104,7 @@
     <string name="outdoor">На улице</string>
     <string name="indoor">В помещении</string>
     <string name="distance">Дистанция</string>
-    <string name="format">Format</string>
+    <string name="format">подход</string>
 
     <!-- x passes with y arrows -->
     <plurals name="passe">
@@ -113,7 +113,7 @@
         <item quantity="few">%d серии</item>
         <item quantity="many">%d серий</item>
     </plurals>
-    <string name="with">with</string>
+    <string name="with">по</string>
     <plurals name="arrow">
         <item quantity="one">%d стрела</item>
         <item quantity="other">%d стрелы</item>
@@ -146,8 +146,8 @@
         <item quantity="few">%d серии отделкой</item>
         <item quantity="many">%d серий отделкой</item>
     </plurals>
-    <string name="passes_finished_now_what">You have finished your round. What would you like to do now?</string>
-    <string name="continue_with_next">Continue</string>
+    <string name="passes_finished_now_what">Вы закончили раунд. Что вы хотите делать дальше?</string>
+    <string name="continue_with_next">Продолжить</string>
 
     <!-- Statistics -->
     <string name="all_trainings">Все тренировки</string>

diff --git a/app/wearable-release.apk b/app/wearable-release.apk
diff --git a/shared/build.gradle b/shared/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 25
-        versionName '2.0.5'
+        versionCode 28
+        versionName '2.0.8'
     }
     buildTypes {
         release {

diff --git a/shared/src/main/java/de/dreier/mytargets/utils/PasseDrawer.java b/shared/src/main/java/de/dreier/mytargets/utils/PasseDrawer.java
@@ -97,9 +97,12 @@ public void draw(Canvas canvas) {
 
         // Draw touch feedback if arrow is pressed
         if (mPressed != NO_SELECTION) {
+            int radius = getRadius(mPressed);
             Coordinate pos = getPosition(mPressed);
-            canvas.drawRect(pos.x - mRadius, pos.y - mRadius,
-                    pos.x + mRadius, pos.y + mRadius, grayBackground);
+            if (radius > 0) {
+                canvas.drawRect(pos.x - radius, pos.y - radius,
+                        pos.x + radius, pos.y + radius, grayBackground);
+            }
         }
 
         // Draw all points of this passe into the given rect

diff --git a/wearable/build.gradle b/wearable/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.dreier.mytargets"
         minSdkVersion 20
         targetSdkVersion 21
-        versionCode 25
-        versionName '2.0.5'
+        versionCode 28
+        versionName '2.0.8'
     }
     buildTypes {
         release {