From 1571576804ea833c5d063e286d5b4d548b472229 Mon Sep 17 00:00:00 2001 From: Joaquin Date: Tue, 9 May 2017 11:35:45 -0400 Subject: [PATCH] Issues #11  with sonar Analysis --- .idea/.name | 1 - .idea/gradle.xml | 7 +---- .idea/misc.xml | 1 - .idea/modules.xml | 1 + .sonar/.sonar_lock | 0 .sonar/report-task.txt | 5 ++++ app/build.gradle | 2 +- .../ana/exampleapp/RegisterActivity.java | 10 ++++++- .../com/example/ana/exampleapp/Variables.java | 16 ++++++---- app/src/main/res/layout/finish_activity.xml | 29 ++++++++++++------- app/src/main/res/layout/profile_activity.xml | 4 +-- app/src/main/res/layout/register_activity.xml | 4 +-- app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- sonar-project.properties | 7 +++++ 17 files changed, 62 insertions(+), 33 deletions(-) delete mode 100644 .idea/.name create mode 100644 .sonar/.sonar_lock create mode 100644 .sonar/report-task.txt create mode 100644 sonar-project.properties diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 2d5ff14..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -medical-data-android \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 508b3d9..7ac24c7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,12 +11,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index b29500a..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,7 +38,6 @@ - diff --git a/.idea/modules.xml b/.idea/modules.xml index 95c25fb..ee402d6 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + diff --git a/.sonar/.sonar_lock b/.sonar/.sonar_lock new file mode 100644 index 0000000..e69de29 diff --git a/.sonar/report-task.txt b/.sonar/report-task.txt new file mode 100644 index 0000000..c0d6552 --- /dev/null +++ b/.sonar/report-task.txt @@ -0,0 +1,5 @@ +projectKey=bip4cast +serverUrl=http://localhost:9000 +dashboardUrl=http://localhost:9000/dashboard/index/bip4cast +ceTaskId=AVvt1qSuMi7_G9x4RzoD +ceTaskUrl=http://localhost:9000/api/ce/task?id=AVvt1qSuMi7_G9x4RzoD diff --git a/app/build.gradle b/app/build.gradle index bb3f69e..476c058 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.example.ana.exampleapp" diff --git a/app/src/main/java/com/example/ana/exampleapp/RegisterActivity.java b/app/src/main/java/com/example/ana/exampleapp/RegisterActivity.java index dca17f4..34ad181 100644 --- a/app/src/main/java/com/example/ana/exampleapp/RegisterActivity.java +++ b/app/src/main/java/com/example/ana/exampleapp/RegisterActivity.java @@ -27,6 +27,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; +import static android.R.attr.y; import static com.mongodb.client.model.Filters.eq; @@ -44,7 +45,7 @@ public class RegisterActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.register_activity); - + setInitialDateBirth(); // Allow a part of the terms and conditions text to be clickable. TextView tv = (TextView) findViewById(R.id.terms_text); String terms1 = getString(R.string.terms1); @@ -68,6 +69,13 @@ protected void onCreate(Bundle savedInstanceState) { * @see TextView#setError(CharSequence) * @see EditText#setError(CharSequence) */ + + public void setInitialDateBirth(){ + DatePicker date_picker = (DatePicker) findViewById(R.id.age_answer); + //Values pretended by @author... + date_picker.init(1985, 3, 10, null); + } + public void btnFinish(View view) { String email_text; String name_text; diff --git a/app/src/main/java/com/example/ana/exampleapp/Variables.java b/app/src/main/java/com/example/ana/exampleapp/Variables.java index a70e8ef..929f039 100644 --- a/app/src/main/java/com/example/ana/exampleapp/Variables.java +++ b/app/src/main/java/com/example/ana/exampleapp/Variables.java @@ -17,15 +17,14 @@ */ public final class Variables { // The server IP - private static final String IP = "IP"; + private static final String IP = "192.168.0.21"; // MongoDB server... + private String ip = System.getProperty("myapplication.ip"); //solution proposal of sonar-runner... private static final String PORT = "27017"; // MongoDB uri with the IP, authentication (user, password and mechanism), database, etc. - public static final String mongo_uri = "mongodb://androidUser:password@" + IP + ":" + PORT + - "/bipolarDatabase?authMechanism=MONGODB-CR"; - + //public static final String mongo_uri = "mongodb://androidUser:password@" + IP + ":" + PORT + + //"/bipolarDatabase?authMechanism=MONGODB-CR"; //used for test purpose! - //public static final String mongo_uri = "mongodb://" + IP + ":" + PORT + "/test"; - + public static final String mongo_uri = "mongodb://" + IP + ":" + PORT + "/test"; // Name of shared preferences file; public static final String PREFS_NAME = "MyPrefsFile"; // Regular expression to check email correction @@ -35,6 +34,11 @@ public final class Variables { * Final class: to prevent someone from accidentally instantiating the class, we give it an * empty constructor. */ + public void ipfromsystem(){ + String ip = System.getProperty("myapplication.ip"); + Log.i("Ip found", ip); + } + public Variables() { } diff --git a/app/src/main/res/layout/finish_activity.xml b/app/src/main/res/layout/finish_activity.xml index 83a5acf..0e83676 100644 --- a/app/src/main/res/layout/finish_activity.xml +++ b/app/src/main/res/layout/finish_activity.xml @@ -12,7 +12,7 @@ + android:text="@string/thanks" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + @@ -49,10 +59,9 @@ android:layout_height="wrap_content" android:text="@string/change" android:id="@+id/button_finish" - android:layout_below="@+id/thanks_box" - android:layout_centerHorizontal="true" - android:layout_marginTop="80dp" - android:onClick="btnChange"/> + android:onClick="btnChange" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" /> diff --git a/app/src/main/res/layout/profile_activity.xml b/app/src/main/res/layout/profile_activity.xml index c2315be..edbc3a6 100644 --- a/app/src/main/res/layout/profile_activity.xml +++ b/app/src/main/res/layout/profile_activity.xml @@ -78,8 +78,8 @@ android:layout_height="wrap_content" android:layout_below="@+id/age" android:layout_centerHorizontal="true" - android:datePickerMode = "spinner" - android:calendarViewShown="false"/> + android:calendarViewShown="false" + android:datePickerMode="spinner" /> + android:calendarViewShown="false" + android:datePickerMode="spinner" /> ¡Gracias! Los datos se han enviado correctamente + Puedes cambiar las respuestas más adelante !! ACEPTAR diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 76045cd..1ea9bf5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,6 +95,7 @@ Thanks! Your answers have been correctly sent + You may change the answers later !! ACCEPT diff --git a/build.gradle b/build.gradle index e0b366a..b78a0b8 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..fa029e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Tue May 09 11:23:12 PYT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..69cbf9f --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,7 @@ +sonar.projectKey=bip4cast +sonar.projectName=Bip4Cast +sonar.projectVersion=1.0 + +sonar.sources=app/src/main/java/com/example/ana/exampleapp +sonar.language=java +sonar.sourceEncoding=UTF-8 \ No newline at end of file