its over

CDRomatron · CDRomatron · commit b51a72d46235 · 2017-11-16T02:32:40.000Z
diff --git a/app/src/main/java/com/github/hintofbasil/crabbler/Questions/QuestionExpanders/ModeChooseExpander.java b/app/src/main/java/com/github/hintofbasil/crabbler/Questions/QuestionExpanders/ModeChooseExpander.java
@@ -57,14 +57,6 @@ public void expandLayout() throws JSONException {
         choiceOneTitleTwo.setText(getRichTextQuestionString("choiceOneTextTwo"));
         choiceTwoTitleTwo.setText(getRichTextQuestionString("choiceTwoTextTwo"));
 
-        TextView pageof = (TextView) activity.findViewById(R.id.page_of);
-        pageof.setVisibility(View.GONE);
-
-        TextView backText = (TextView) activity.findViewById(R.id.backText);
-        TextView forwardText = (TextView) activity.findViewById(R.id.forwardText);
-        backText.setText(getRichTextQuestionString("backText"));
-        forwardText.setText(getRichTextQuestionString("forwardText"));
-
         chosenMode = -1;
 
         try {
@@ -92,8 +84,7 @@ public void onClick(View v) {
                 chosenMode = 0;
                 choiceTwoButton.setBackgroundResource(R.color.questionBackground);
                 choiceOneButton.setBackgroundResource(R.color.questionSelectedBackground);
-                enableDisableNext();
-                //nextQuestion(0);
+                nextQuestion(0);
             }
         });
 
@@ -104,31 +95,14 @@ public void onClick(View v) {
                 chosenMode = 1;
                 choiceOneButton.setBackgroundResource(R.color.questionBackground);
                 choiceTwoButton.setBackgroundResource(R.color.questionSelectedBackground);
-                enableDisableNext();
-                //nextQuestion(0);
+                nextQuestion(0);
             }
         });
     }
 
     @Override
     protected void setPreviousAnswer(JSONArray answer) {
-        try {
-            Integer i = answer.getInt(0);
-            switch(i) {
-                case 0:
-                    choiceOneButton.setBackgroundResource(R.color.questionSelectedBackground);
-                    break;
-                case 1:
-                    choiceTwoButton.setBackgroundResource(R.color.questionSelectedBackground);
-                    break;
-                default:
-                    Log.d("TwoPictureLayoutExpande", "Invalid previous answer");
-            }
-            chosenMode = i;
-        } catch (JSONException e) {
-            Log.d("QuestionActivity", "No previous answer");
-            return;
-        }
+
     }
 
     @Override
diff --git a/app/src/main/res/drawable/naper_ufsb.png b/app/src/main/res/drawable/naper_ufsb.png
diff --git a/app/src/main/res/layout/expander_auto.xml b/app/src/main/res/layout/expander_auto.xml
@@ -40,6 +40,7 @@
                         android:singleLine="true"
                         android:layout_gravity="center_horizontal"
                         android:textAlignment="center"
+                        android:layout_marginTop="20dp"
                         android:textSize="45sp"
                         android:textColor="@color/questionOfQuestionText"
                         android:text="@string/app_name"
diff --git a/app/src/main/res/layout/expander_modechoose.xml b/app/src/main/res/layout/expander_modechoose.xml
@@ -81,7 +81,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/question_select_margin"
-                android:padding="@dimen/question_select_padding"
                 android:layout_marginRight="@dimen/question_select_outside_margin"
                 android:layout_centerHorizontal="true"
                 android:orientation="horizontal"
@@ -176,6 +175,7 @@
         android:layout_alignParentBottom="true"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:visibility="gone"
         />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/expander_two_picture_choice.xml b/app/src/main/res/layout/expander_two_picture_choice.xml
@@ -65,7 +65,7 @@
                         android:singleLine="true"
                         android:layout_gravity="center_horizontal"
                         android:textAlignment="center"
-                        android:textSize="28sp"
+                        android:textSize="25sp"
                         android:textColor="@color/questionOfQuestionText"
                         android:text=""
                         />
@@ -95,7 +95,7 @@
                         android:singleLine="true"
                         android:layout_gravity="center_horizontal"
                         android:textAlignment="center"
-                        android:textSize="28sp"
+                        android:textSize="25sp"
                         android:textColor="@color/questionOfQuestionText"
                         android:text=""
                         />
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/raw-en/about_us.json b/app/src/main/res/raw-en/about_us.json
@@ -21,7 +21,7 @@
   },
   {
     "title": "How can you contribute?",
-    "content": "REMAR does not have the financial resources to count the crabs performing andada in all states and localities in Brazil, therefore we need your help through the smartphone application REMAR<small>_CITIZEN</small>. With this smartphone application you can supply valuable information about the presence or absence of andada, at full or new moons, during the reproductive season of these crabs.  With only 11 clicks (basic version) or 19 clicks (advanced version) you will have the chance to act as a citizen scientist contributing to the sustainable use of these important crabs which form the livelihoods of thousands of fishers."
+    "content": "REMAR does not have the financial resources to count the crabs performing andada in all states and localities in Brazil, therefore we need your help through the smartphone application REMAR<small>_CITIZEN</small>. With this smartphone application you can supply valuable information about the presence or absence of andada, at full or new moons, during the reproductive season of these crabs.  With only 10 clicks (basic version) or 18 clicks (advanced version) you will have the chance to act as a citizen scientist contributing to the sustainable use of these important crabs which form the livelihoods of thousands of fishers."
   },
   {
     "title": "Who are we?",
diff --git a/app/src/main/res/raw-en/questions.json b/app/src/main/res/raw-en/questions.json
@@ -5,14 +5,14 @@
     "questionText": "",
     "choiceOneTitle": "TestVersion",
     "choiceOnePicture": "q0_0",
-    "version": "0.9b"
+    "version": "1.0"
   },
   {
     "questionNumber": 1,
     "questionType": "ModeChoose",
     "questionPicture": "q0_(1:0)",
     "questionTitle": "crab_title_(1:0)",
-    "description": "<b><i>For more information, click on the above yellow field.</i><br><br>Chose one of the below options by tapping with finger.</b>",
+    "description": "<b><i>For more information, click on the above yellow field.</i><br><br><br><br>Chose one of the below options by tapping with finger.</b>",
     "choiceOneText": "<b>Simple<br>version</b>",
     "choiceOneTextTwo": "<b>REMAR<br>Basic</b>",
     "choiceTwoText": "<b>Full<br>version</b>",
@@ -184,19 +184,8 @@
   },
   {
     "questionNumber": 17,
-    "questionType": "UserDetails",
-    "questionPicture": "q0_(2:0)",
-    "questionTitle": "crab_title_(2:0)",
-    "description": "It would be good to know who you are so that we can add your name to the list of citizen-scientists of the REMAR project.<br>How can you be contacted most easily? Touch field and add email address or phone number.",
-    "description2": "Touch field and type your name.",
-    "postAs": "userDetails",
-    "optional": true,
-    "cacheAnswer": true
-  },
-  {
-    "questionNumber": 18,
     "questionType": "Commit",
-    "description": "",
+    "description": "If you want to add your name to the list of citizen-scientists of the REMAR Project, send a message to remar.quest@gmail.com",
     "choiceOneText": "I WANT TO SUBMIT MY ANSWERS",
     "choiceTwoText": "GO BACK TO CHANGE ANSWERS"
   },
diff --git a/app/src/main/res/raw-en/questions2.json b/app/src/main/res/raw-en/questions2.json
@@ -5,14 +5,14 @@
     "questionText": "",
     "choiceOneTitle": "TestVersion",
     "choiceOnePicture": "q0_0",
-    "version": "0.9b"
+    "version": "1.0"
   },
   {
     "questionNumber": 1,
     "questionType": "ModeChoose",
     "questionPicture": "q0_(1:0)",
     "questionTitle": "crab_title_(1:0)",
-    "description": "<b><i>For more information, click on the above yellow field.</i><br><br>Chose one of the below options by tapping with finger.</b>",
+    "description": "<b><i>For more information, click on the above yellow field.</i><br><br><br><br>Chose one of the below options by tapping with finger.</b>",
     "choiceOneText": "<b>Simple<br>version</b>",
     "choiceOneTextTwo": "<b>REMAR<br>Basic</b>",
     "choiceTwoText": "<b>Full<br>version</b>",
@@ -96,19 +96,8 @@
   },
   {
     "questionNumber": 9,
-    "questionType": "UserDetails",
-    "questionPicture": "q0_(2:0)",
-    "questionTitle": "crab_title_(2:0)",
-    "description": "It would be good to know who you are so that we can add your name to the list of citizen-scientists of the REMAR project.<br>How can you be contacted most easily? Touch field and add email address or phone number.",
-    "description2": "Touch field and type your name.",
-    "postAs": "userDetails",
-    "optional": true,
-    "cacheAnswer": true
-  },
-  {
-    "questionNumber": 10,
     "questionType": "Commit",
-    "description": "",
+    "description": "If you want to add your name to the list of citizen-scientists of the REMAR Project, send a message to remar.quest@gmail.com",
     "choiceOneText": "I WANT TO SUBMIT MY ANSWERS",
     "choiceTwoText": "GO BACK TO CHANGE ANSWERS"
   },
diff --git a/app/src/main/res/raw/about_us.json b/app/src/main/res/raw/about_us.json
@@ -21,7 +21,7 @@
   },
   {
     "title": "Como você pode contribuir?",
-    "content": "A REMAR não tem recursos para contar os caranguejos durante a andada em todos estados e localidades do Brasil, por isso precisamos da sua ajuda para, através do aplicativo REMAR<small>_CIDADÃO</small>, fornecer preciosas informações sobre presença e ausência de andadas após lua cheia e lua nova nos meses de reprodução dos caranguejos. Assim, com apenas 11 cliques (versão básico) ou 19 cliques (versão avançado), você terá a chance de atuar como um verdadeiro pesquisador e ainda contribuir para o uso sustentável de um importante recurso pesqueiro e para melhorar a qualidade de vida dos extrativistas."
+    "content": "A REMAR não tem recursos para contar os caranguejos durante a andada em todos estados e localidades do Brasil, por isso precisamos da sua ajuda para, através do aplicativo REMAR<small>_CIDADÃO</small>, fornecer preciosas informações sobre presença e ausência de andadas após lua cheia e lua nova nos meses de reprodução dos caranguejos. Assim, com apenas 10 cliques (versão básico) ou 18 cliques (versão avançado), você terá a chance de atuar como um verdadeiro pesquisador e ainda contribuir para o uso sustentável de um importante recurso pesqueiro e para melhorar a qualidade de vida dos extrativistas."
   },
   {
     "title": "Quem somos?",
diff --git a/app/src/main/res/raw/questions.json b/app/src/main/res/raw/questions.json
@@ -5,14 +5,14 @@
     "questionText": "",
     "choiceOneTitle": "TestVersion",
     "choiceOnePicture": "q0_0",
-    "version": "0.9b"
+    "version": "1.0"
   },
   {
     "questionNumber": 1,
     "questionType": "ModeChoose",
     "questionPicture": "q0_(1:0)",
     "questionTitle": "crab_title_(1:0)",
-    "description": "<b><i>Para mais informações, toque com dedo no botão amarelo \"Saiba mais\" acima.</i><br><br>Toque com dedo em uma das opções abaixo.</b>",
+    "description": "<b><i>Para mais informações, toque com dedo no botão amarelo \"Saiba mais\" acima.</i><br><br><br><br>Toque com dedo em uma das opções abaixo.</b>",
     "choiceOneText": "<b>Quero<br>simplificar</b>",
     "choiceOneTextTwo": "<b>REMAR<br>Básico</b>",
     "choiceTwoText": "<b>Quero ajudar<br>ao máximo</b>",
@@ -184,19 +184,8 @@
   },
   {
     "questionNumber": 17,
-    "questionType": "UserDetails",
-    "questionPicture": "q0_(2:0)",
-    "questionTitle": "crab_title_(2:0)",
-    "description": "Seria bom saber quem você é para colocarmos o seu nome na lista de pesquisadores cidadãos da REMAR.<br>Qual a melhor forma para entramos em contato? Toque no espaço para escrever o seu email ou telefone (opcional).",
-    "description2": "Toque no espaço para escrever o seu nome (opcional).",
-    "postAs": "userDetails",
-    "optional": true,
-    "cacheAnswer": true
-  },
-  {
-    "questionNumber": 18,
     "questionType": "Commit",
-    "description": "",
+    "description": "Caso queira colocar o seu nome na lista de pesquisadores cidadãos da REMAR, envie uma mensagem para  remar.quest@gmail.com",
     "choiceOneText": "QUERO MANDAR AS MINHAS RESPOSTAS",
     "choiceTwoText": "VOLTE PARA MUDAR AS RESPOSTAS"
   },
diff --git a/app/src/main/res/raw/questions2.json b/app/src/main/res/raw/questions2.json
@@ -5,14 +5,14 @@
     "questionText": "",
     "choiceOneTitle": "TestVersion",
     "choiceOnePicture": "q0_0",
-    "version": "0.9b"
+    "version": "1.0"
   },
   {
     "questionNumber": 1,
     "questionType": "ModeChoose",
     "questionPicture": "q0_(1:0)",
     "questionTitle": "crab_title_(1:0)",
-    "description": "<b><i>Para mais informações, toque com dedo no botão amarelo \"Saiba mais\" acima.</i><br><br>Toque com dedo em uma das opções abaixo.</b>",
+    "description": "<b><i>Para mais informações, toque com dedo no botão amarelo \"Saiba mais\" acima.</i><br><br><br><br>Toque com dedo em uma das opções abaixo.</b>",
     "choiceOneText": "<b>Quero<br>simplificar</b>",
     "choiceOneTextTwo": "<b>REMAR<br>Básico</b>",
     "choiceTwoText": "<b>Quero ajudar<br>ao máximo</b>",
@@ -96,19 +96,8 @@
   },
   {
     "questionNumber": 9,
-    "questionType": "UserDetails",
-    "questionPicture": "q0_(2:0)",
-    "questionTitle": "crab_title_(2:0)",
-    "description": "Seria bom saber quem você é para colocarmos o seu nome na lista de pesquisadores cidadãos da REMAR.<br>Qual a melhor forma para entramos em contato? Toque no espaço para escrever o seu email ou telefone (opcional).",
-    "description2": "Toque no espaço para escrever o seu nome (opcional).",
-    "postAs": "userDetails",
-    "optional": true,
-    "cacheAnswer": true
-  },
-  {
-    "questionNumber": 10,
     "questionType": "Commit",
-    "description": "",
+    "description": "Caso queira colocar o seu nome na lista de pesquisadores cidadãos da REMAR, envie uma mensagem para  remar.quest@gmail.com",
     "choiceOneText": "QUERO MANDAR AS MINHAS RESPOSTAS",
     "choiceTwoText": "VOLTE PARA MUDAR AS RESPOSTAS"
   },
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -1,12 +1,17 @@
 <resources>
-    <string name="app_name">REMAR_Citizen</string>
+    <string name="app_name">REMAR Citizen</string>
     <string name="description">Monitoring Mass Mating Events of Mangrove Crabs</string>
 
     <string name="toolbar_app_name">REMAR_</string>
     <string name="toolbar_app_sub_name">CITIZEN</string>
 
     <string name="internal_error">An internal error occurred.  Please restart.</string>
 
+    <string name="back_button">Previous</string>
+    <string name="forward_button">Forward</string>
+    <string name="about_us">About Us</string>
+    <string name="settings">Settings</string>
+
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="maybe">I don\'t know</string>
@@ -45,6 +50,29 @@
         <item>December</item>
     </string-array>
 
+    <string-array name="years">
+        <item>2016</item>
+        <item>2017</item>
+        <item>2018</item>
+        <item>2019</item>
+        <item>2020</item>
+        <item>2021</item>
+        <item>2022</item>
+        <item>2023</item>
+        <item>2024</item>
+        <item>2025</item>
+    </string-array>
+
+    <string-array name="pref_postFrequency_values">
+        <item>60000</item>
+        <item>300000</item>
+        <item>900000</item>
+        <item>3600000</item>
+        <item>10800000</item>
+        <item>86400000</item>
+    </string-array>
+    <string name="pref_postFrequency_default">3600000</string>
+
     <string name="pref_postFrequency_title">Post Frequency</string>
     <string name="pref_postFrequency_summary">The frequency with which the app attempts to post answers to the web.</string>
     <string-array name="pref_postFrequency_entries">
@@ -69,12 +97,10 @@
 
     <string name="protectedText">Touch field and type the name of the protected area where you observed andada</string>
 
-    <string name="lo">Low</string>
-    <string name="mid">Intermediate</string>
-    <string name="high">High</string>
+    <string name="url_login">http://40180582.pythonanywhere.com/static/login</string>
+    <string name="preference_session_id">session_id</string>
 
     <string name="back_next_description_text"></string>
-    <string name="becomescience"></string>
 	
 	<string name="TestVersion">TEST Version</string>
 	<string name="test2">This is a test! Two</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">REMAR_Cidadão</string>
+    <string name="app_name">REMAR Cidadão</string>
     <string name="description">Monitoramento de andadas reprodutivas de caranguejos de manguezal</string>
 
     <string name="toolbar_app_name">REMAR_</string>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`},`
`22`	`22`	`{`
`23`	`23`	`"title": "How can you contribute?",`
`24`		- "content": "REMAR does not have the financial resources to count the crabs performing andada in all states and localities in Brazil, therefore we need your help through the smartphone application REMAR<small>_CITIZEN</small>. With this smartphone application you can supply valuable information about the presence or absence of andada, at full or new moons, during the reproductive season of these crabs. With only 11 clicks (basic version) or 19 clicks (advanced version) you will have the chance to act as a citizen scientist contributing to the sustainable use of these important crabs which form the livelihoods of thousands of fishers."
	`24`	+ "content": "REMAR does not have the financial resources to count the crabs performing andada in all states and localities in Brazil, therefore we need your help through the smartphone application REMAR<small>_CITIZEN</small>. With this smartphone application you can supply valuable information about the presence or absence of andada, at full or new moons, during the reproductive season of these crabs. With only 10 clicks (basic version) or 18 clicks (advanced version) you will have the chance to act as a citizen scientist contributing to the sustainable use of these important crabs which form the livelihoods of thousands of fishers."
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"title": "Who are we?",`