Preparing release v0.7.5, Bugfix for 2 dialogs

Due to the update of the compab. library the dialog options were much wider, not all were visible :(
chaosbastler · Feb 24, 2015 · 9aea4e4 · 9aea4e4
1 parent 088340c
commit 9aea4e4
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 49 deletions.
diff --git a/app/res/values-de/strings_activity_create_workout.xml b/app/res/values-de/strings_activity_create_workout.xml
@@ -36,9 +36,9 @@
 
 
     <!-- DialogWorkoutOverviewFragment -->
-    <string name="save_workout">Workout speichern</string>
+    <string name="save_workout">Speichern</string>
     <string name="add_more_exercises">Mehr Übungen hinzufügen</string>
-    <string name="discard">Workout verwerfen</string>
+    <string name="discard">Verwerfen</string>
     <string name="title_exercise_detail">Übungsdetails</string>
     <string name="title_exercise_list">Übungen</string>
     <string name="override">Überschreiben</string>

diff --git a/app/res/values/strings_activity_create_workout.xml b/app/res/values/strings_activity_create_workout.xml
@@ -37,9 +37,9 @@
 
 
     <!-- DialogWorkoutOverviewFragment -->
-    <string name="save_workout">Save workout</string>
+    <string name="save_workout">Save</string>
     <string name="add_more_exercises">Add more exercises</string>
-    <string name="discard">"Discard workout</string>
+    <string name="discard">"Discard</string>
     <string name="title_exercise_detail">Exercise Detail</string>
     <string name="title_exercise_list">Exercise</string>
     <string name="override">Override</string>

diff --git a/app/res/xml-de/changelog.xml b/app/res/xml-de/changelog.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.7.5" versioncode="31" summary="Dialog Bugfix" date="02/24/2015">
+        <change>Behebt einen Fehler bei 2 Dialogen (es waren nicht alle Optionen sichtbar)</change>
+    </release>
     <release version="0.7.4" versioncode="30" summary="Charts" date="02/23/2015">
         <change>Statt mit einer Tabelle wird der Trainingsverlauf nun mit einem Diagramm dargestellt</change>
         <change>Keine Unterstützung mehr für Android 2.x und 3.x (aufgrund der verwendeten Bibliothek für Diagramme)</change>

diff --git a/app/res/xml/changelog.xml b/app/res/xml/changelog.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.7.5" versioncode="31" summary="Dialog Bugfix" date="02/24/2015">
+        <change>Fixes a bug concerning two dialogs (not all options were visible)</change>
+    </release>
     <release version="0.7.4" versioncode="30" summary="Charts" date="02/23/2015">
         <change>The training history is now visualized by a chart (instead of a table)</change>
         <change>No support anymore for Android 2.x and 3.x (due to the used chart library)</change>

diff --git a/app/src/de/skubware/opentraining/activity/create_exercise/CreateExerciseActivity.java b/app/src/de/skubware/opentraining/activity/create_exercise/CreateExerciseActivity.java
@@ -275,12 +275,6 @@ public void onClick(DialogInterface dialog, int which) {
 					finish();
 				}
 			})
-			.setNeutralButton(getString(R.string.cancel), new OnClickListener(){
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					dialog.dismiss();
-				}
-			})			
 			.setPositiveButton(getString(R.string.save), new OnClickListener(){
 				@Override
 				public void onClick(DialogInterface dialog, int which) {

diff --git a/app/src/de/skubware/opentraining/activity/create_workout/DialogWorkoutOverviewFragment.java b/app/src/de/skubware/opentraining/activity/create_workout/DialogWorkoutOverviewFragment.java
@@ -43,6 +43,7 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Toast;
@@ -123,40 +124,36 @@ public void onClick(DialogInterface dialog, int which) {
 						}).create().show();
 			}
 		});
-
+
+
 
 		return new AlertDialog.Builder(getActivity()).setTitle(mWorkout.getName()).setView(v).setCancelable(true)
-				.setPositiveButton(getString(R.string.save_workout), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						// check if name is empty
-						final String workoutName = mEditTextWorkoutName.getText().toString();
-						if (workoutName.equals("") || workoutName.replaceAll(" ", "").equals("")){
-							Toast.makeText(getActivity(), getString(R.string.workout_name_cannot_be_empty), Toast.LENGTH_LONG).show();
-							return;
-						}
-
-						// check if file already exists
-						if (fileAlreadyExists(workoutName)) {
-							showOverrideDialog();	
-							return;
-						}
-
-
-						saveWorkout(getActivity());
-					}
-				}).setNeutralButton(getString(R.string.add_more_exercises), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						continueAddingExercises();
-					}
-				}).setNegativeButton(getString(R.string.discard), new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						finishActivities(getActivity());
-					}
-				}).create();
-	}
+                .setPositiveButton(getString(R.string.save_workout), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        // check if name is empty
+                        final String workoutName = mEditTextWorkoutName.getText().toString();
+                        if (workoutName.equals("") || workoutName.replaceAll(" ", "").equals("")){
+                            Toast.makeText(getActivity(), getString(R.string.workout_name_cannot_be_empty), Toast.LENGTH_LONG).show();
+                            return;
+                        }
+
+                        // check if file already exists
+                        if (fileAlreadyExists(workoutName)) {
+                            showOverrideDialog();
+                            return;
+                        }
+
+
+                        saveWorkout(getActivity());
+                    }
+                }).setNegativeButton(getString(R.string.discard), new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        finishActivities(getActivity());
+                    }
+                }).create();
+    }
 
 
 
@@ -173,11 +170,7 @@ private void removeExerciseFromWorkout(FitnessExercise fEx) {
 
 
 
-	/**
-	 * Saves the Workout with the given name.
-	 * 
-	 * @param workoutName The name of the Workout.
-	 */
+
 	private void saveWorkout(Activity activity){
 		if(mWorkout.getFitnessExercises().isEmpty()){
 			Log.w(TAG, "User tried to save an empty Workout. Will skip saving.");

diff --git a/build.gradle b/build.gradle
@@ -22,8 +22,8 @@ android {
   defaultConfig {
     minSdkVersion 14
     targetSdkVersion 21
-    versionCode 30
-    versionName "0.7.4"
+    versionCode 31
+    versionName "0.7.5"
   }
 
   sourceSets {