Merge branch 'release/v0.2.0-Beta5'

pluscubed · Jan 8, 2015 · 8f83807 · 8f83807
2 parents ac57279 + 4cab782
commit 8f83807
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 39 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 16
-        versionName '0.2.0-Beta4'
+        versionCode 17
+        versionName '0.2.0-Beta5'
     }
 
     if (project.hasProperty("RELEASE_STORE_FILE")) {

diff --git a/app/src/main/java/com/pluscubed/plustimer/model/PuzzleType.java b/app/src/main/java/com/pluscubed/plustimer/model/PuzzleType.java
@@ -151,8 +151,20 @@ private synchronized void init(Context context) {
             //AFTER UPDATING APP////////////
             int savedVersionCode = defaultSharedPreferences.getInt(Util.PREF_VERSION_CODE, 10);
 
-            if (savedVersionCode <= 15) {
-                Util.updateData(context, historyFileName);
+            if (savedVersionCode <= 10) {
+                //Version <=10: Set up history sessions with old
+                // name first
+                if (!scramblerSpec.equals("333") || name().equals("THREE")) {
+                    mHistorySessions.setFilename(scramblerSpec + ".json");
+                    mHistorySessions.init(context);
+                    mHistorySessions.setFilename(historyFileName);
+                    if (mHistorySessions.getList().size() > 0) {
+                        mHistorySessions.save(context);
+                    }
+                    File oldFile = new File(context.getFilesDir(),
+                            scramblerSpec + ".json");
+                    oldFile.delete();
+                }
             }
 
             if (savedVersionCode <= 13) {
@@ -186,21 +198,6 @@ public ScrambleAndSvg deserialize(JsonElement json, Type typeOfT,
                 Util.updateData(context, currentSessionFileName, gson);
             }
 
-            if (savedVersionCode <= 10) {
-                //Version <=10: Set up history sessions with old
-                // name first
-                if (!scramblerSpec.equals("333") || name().equals("THREE")) {
-                    mHistorySessions.setFilename(scramblerSpec + ".json");
-                    mHistorySessions.init(context);
-                    mHistorySessions.setFilename(historyFileName);
-                    if (mHistorySessions.getList().size() > 0) {
-                        mHistorySessions.save(context);
-                    }
-                    File oldFile = new File(context.getFilesDir(),
-                            scramblerSpec + ".json");
-                    oldFile.delete();
-                }
-            }
             ////////////////////////////
 
             mHistorySessions.init(context);

diff --git a/app/src/main/java/com/pluscubed/plustimer/ui/CurrentSessionTimerFragment.java b/app/src/main/java/com/pluscubed/plustimer/ui/CurrentSessionTimerFragment.java
@@ -65,28 +65,28 @@ public class CurrentSessionTimerFragment extends Fragment {
     private final Session.Observer sessionObserver = new Session.Observer() {
         @Override
         public void onSolveAdded() {
-            onSessionSolvesChanged();
+            updateStatsAndTimer();
             SolveRecyclerAdapter adapter = (SolveRecyclerAdapter) mTimeBarRecycler.getAdapter();
             adapter.updateSolvesList(-1, ObservedMode.ADD);
         }
 
         @Override
         public void onSolveChanged(int index) {
-            onSessionSolvesChanged();
+            updateStatsAndTimer();
             SolveRecyclerAdapter adapter = (SolveRecyclerAdapter) mTimeBarRecycler.getAdapter();
             adapter.updateSolvesList(index, ObservedMode.SINGLE_CHANGE);
         }
 
         @Override
         public void onSolveRemoved(int index) {
-            onSessionSolvesChanged();
+            updateStatsAndTimer();
             SolveRecyclerAdapter adapter = (SolveRecyclerAdapter) mTimeBarRecycler.getAdapter();
             adapter.updateSolvesList(index, ObservedMode.REMOVE);
         }
 
         @Override
         public void onReset() {
-            onSessionSolvesChanged();
+            updateStatsAndTimer();
             SolveRecyclerAdapter adapter = (SolveRecyclerAdapter) mTimeBarRecycler.getAdapter();
             adapter.updateSolvesList(-1, ObservedMode.RESET);
         }
@@ -195,7 +195,7 @@ public void run() {
         @Override
         public void onPuzzleTypeChanged() {
             //Update quick stats and hlistview
-            onSessionSolvesUpdated();
+            onSessionSolvesChanged();
 
             //Set timer text to ready, scramble text to scrambling
             mScrambleText.setText(R.string.scrambling);
@@ -376,15 +376,15 @@ public void onDestroy() {
         PuzzleType.unregisterObserver(puzzleTypeObserver);
     }
 
-    public void onSessionSolvesUpdated() {
-        onSessionSolvesChanged();
+    public void onSessionSolvesChanged() {
+        updateStatsAndTimer();
 
         //Update RecyclerView
         SolveRecyclerAdapter adapter = (SolveRecyclerAdapter) mTimeBarRecycler.getAdapter();
         adapter.updateSolvesList(-1, ObservedMode.UPDATE_ALL);
     }
 
-    private void onSessionSolvesChanged() {
+    private void updateStatsAndTimer() {
         //Update stats
         mStatsSolvesText.setText(getString(R.string.solves) + PuzzleType
                 .getCurrent().getSession(PuzzleType.CURRENT_SESSION)
@@ -418,6 +418,8 @@ public void onResume() {
                     .FLAG_KEEP_SCREEN_ON);
         }
 
+        //When Settings change
+        onSessionSolvesChanged();
     }
 
     public void initSharedPrefs() {
@@ -754,7 +756,7 @@ public void onClick(View v) {
 
         mBldMode = PuzzleType.getCurrent().name().contains("BLD");
 
-        onSessionSolvesUpdated();
+        onSessionSolvesChanged();
 
         return v;
     }

diff --git a/app/src/main/java/com/pluscubed/plustimer/ui/SolveListFragment.java b/app/src/main/java/com/pluscubed/plustimer/ui/SolveListFragment.java
@@ -108,6 +108,9 @@ public static SolveListFragment newInstance(boolean current,
     public void onResume() {
         super.onResume();
         initSharedPrefs();
+
+        //When Settings change
+        onSessionSolvesChanged();
     }
 
     private void initSharedPrefs() {

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -21,6 +21,7 @@
     <string name="session_reset">Se ha reiniciado la sesión.</string>
     <string name="reset_warning">¿Reiniciar sesión?</string>
     <string name="reset_warning_message">¡Perderás todos los tiempos guardados en esta sesión!</string>
+    <string name="inspecting">Inspeccionando&#8230;</string>
     <string name="scrambling">Mezclando&#8230;</string>
     <string name="scramble_image">Imagen del Scramble</string>
     <string name="session_no_solves">¡La sesión está vacía!\n¡Ve a hacer algunos tiempos!</string>
@@ -70,6 +71,12 @@
     <string name="pref_sign_title">Usar Notación SiGN</string>
     <string name="puzzle_types_setup">Mostrar/Ocultar Tipos de puzzle</string>
     <string name="no_disable_all_puzzletypes">¡No puedes ocultar todos los tipos de puzzle!</string>
+    <string name="pref_theme_title">Estilo</string>
+    <string-array name="pref_theme_list_entries">
+        <item>Claro</item>
+        <item>Oscuro</item>
+        <item>Negro</item>
+    </string-array>
     <string name="current_session">Sesión Actual</string>
     <string name="history">Historial</string>
     <string name="current">Actual</string>
@@ -86,14 +93,7 @@
     <string name="rate">Puntuar en la Play Store</string>
     <string name="manual_add_solve">Agregar Tiempo</string>
     <string name="share">Compartir</string>
-    <string name="share_dialog_title">Compartir tiempos via&#8230;</string>
-    <string name="inspecting">es:[Inspecting…]</string>
-    <string name="pref_theme_title">es:[Theme]</string>
-    <string-array name="pref_theme_list_entries">
-        <item>es:[Light]</item>
-        <item>es:[Dark]</item>
-        <item>es:[Black]</item>
-    </string-array>
-    <string name="send_email">es:[Send email to the developer using...]</string>
-    <string name="email_developer_history_data">es:[Email History Data to Developer]</string>
+    <string name="share_dialog_title">Compartir tiempos vía&#8230;</string>
+    <string name="send_email">Enviar email al desarrollador usando&#8230;</string>
+    <string name="email_developer_history_data">Enviar Datos del Historial al Desarrollador</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -129,7 +129,7 @@
     <string name="manual_add_solve">Add Solve</string>
     <string name="share">Share</string>
     <string name="share_dialog_title">Share times via…</string>
-    <string name="send_email">Send email to the developer using...</string>
+    <string name="send_email">Send email to the developer using…</string>
     <string name="email_developer_history_data">Email History Data to Developer</string>
 
 </resources>