Merge branch 'release-2.5.8'

AlvaroBrey · AlvaroBrey · commit 0bca126d1cf6 · 2018-08-24T11:55:47.000+02:00
* release-2.5.8: (58 commits) Update versionCode and versionName Sync translations with POEditor README: Fix typo README: use gitlab CI badge Delete circle.yml. Add gitlab-ci.yml Use SupportFragmentManager for Fragments that are launched from another Fragment. Update README Update Gradle plugin to 3.1.4 Update Kotlin version to 1.2.60 Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Update strings_translatable.xml (POEditor.com) Full and short description in Italian (#129) ...
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -0,0 +1,28 @@
+image: circleci/android:api-27-alpha
+
+before_script:
+  - export GRADLE_USER_HOME="$(pwd)/.gradle"
+  - export GRADLE_OPTS='-Dorg.gradle.daemon=false'
+
+cache:
+  paths:
+    - .gradle
+
+stages:
+  - build
+
+build:
+  stage: build
+  script:
+    - ./gradlew assembleCiDebug
+    - ./gradlew testCiDebugUnitTest
+    - ./gradlew jacocoTestReportCiDebug
+    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions, "% covered" }' Calendula/build/reports/jacoco/ciDebug/jacoco.csv
+    - if grep -r '* Created by' Calendula/src/; then exit 1; fi
+  artifacts:
+    paths:
+      - Calendula/build/outputs/
+      - Calendula/build/reports/tests/
+      - Calendula/build/test-results/
+      - Calendula/build/reports/jacoco/
+    expire_in: 1 week
diff --git a/Calendula/build.gradle b/Calendula/build.gradle
@@ -77,8 +77,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 38
-        versionName "2.5.7"
+        versionCode 39
+        versionName "2.5.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         applicationId "es.usc.citius.servando.calendula"
         multiDexEnabled true
diff --git a/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/MedicineCreateOrEditFragment.java b/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/MedicineCreateOrEditFragment.java
@@ -483,7 +483,7 @@ void showStockDialog(int ref) {
                         //.setLabelText(ref == DIALOG_STOCK_ADD ? "Increase stock by" : "Decrease stock by")
                         .setDecimalVisibility(NumberPicker.VISIBLE)
                         .setPlusMinusVisibility(NumberPicker.INVISIBLE)
-                        .setFragmentManager(getChildFragmentManager())
+                        .setFragmentManager(getActivity().getSupportFragmentManager())
                         .setTargetFragment(this).setReference(ref)
                         .setStyleResId(R.style.BetterPickersDialogFragment_Calendula);
         npb.show();
diff --git a/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/RoutineCreateOrEditFragment.java b/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/RoutineCreateOrEditFragment.java
@@ -119,7 +119,7 @@ public void onClick(View v) {
                     timePickerFragment.show(getActivity().getSupportFragmentManager(), "TIME_PICKER_FRAGMENT");
                 } else {
                     TimePickerBuilder tpb = new TimePickerBuilder()
-                            .setFragmentManager(getChildFragmentManager())
+                            .setFragmentManager(getActivity().getSupportFragmentManager())
                             .setStyleResId(R.style.BetterPickersDialogFragment_Light);
                     tpb.addTimePickerDialogHandler(RoutineCreateOrEditFragment.this);
                     tpb.show();
diff --git a/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/ScheduleTimetableFragment.java b/Calendula/src/main/java/es/usc/citius/servando/calendula/fragments/ScheduleTimetableFragment.java
@@ -311,7 +311,7 @@ public void onClick(View v) {
                         new RadialTimePickerDialogFragment()
                                 .setOnTimeSetListener(ScheduleTimetableFragment.this)
                                 .setStartTime(time.getHourOfDay(), time.getMinuteOfHour());
-                timePickerDialog.show(getChildFragmentManager(), "111");
+                timePickerDialog.show(getActivity().getSupportFragmentManager(), "111");
             }
         });
 
@@ -539,7 +539,7 @@ void showIntervalPickerDIalog() {
                         .setMinNumber(BigDecimal.ONE)
                         .setMaxNumber(BigDecimal.valueOf(31))
                         .setPlusMinusVisibility(NumberPicker.INVISIBLE)
-                        .setFragmentManager(getChildFragmentManager())
+                        .setFragmentManager(getActivity().getSupportFragmentManager())
                         .setTargetFragment(this).setReference(REF_DIALOG_ROUTINE_INTERVAL)
                         .setStyleResId(R.style.BetterPickersDialogFragment_Calendula);
         npb.show();
@@ -551,7 +551,7 @@ void showHourlyPickerDIalog() {
                 .setMinNumber(1)
                 .setMaxNumber(24)
                 .setPlusMinusVisibility(NumberPicker.INVISIBLE)
-                .setFragmentManager(getChildFragmentManager())
+                .setFragmentManager(getActivity().getSupportFragmentManager())
                 .setTargetFragment(this)
                 .setReference(REF_DIALOG_HOURLY_INTERVAL)
                 .setStyleResId(R.style.BetterPickersDialogFragment_Calendula);
@@ -592,7 +592,7 @@ void showRecurrencePickerDialog() {
 
         dialog.setArguments(b);
         dialog.setOnRecurrenceSetListener(this);
-        dialog.show(getChildFragmentManager(), "REC");
+        dialog.show(getActivity().getSupportFragmentManager(), "REC");
     }
 
     void addTimetableEntries(int timesPerDay, List<Routine> routines) {
@@ -1018,7 +1018,7 @@ public void onClick(View v) {
                                 .setMinNumber(BigDecimal.ONE)
                                 .setMaxNumber(BigDecimal.valueOf(100D))
                                 .setPlusMinusVisibility(NumberPicker.INVISIBLE)
-                                .setFragmentManager(getChildFragmentManager())
+                                .setFragmentManager(getActivity().getSupportFragmentManager())
                                 .setTargetFragment(ScheduleTimetableFragment.this)
                                 .setReference(REF_DIALOG_CYCLE_DAYS)
                                 .setStyleResId(R.style.BetterPickersDialogFragment_Calendula);
@@ -1034,7 +1034,7 @@ public void onClick(View v) {
                                 .setMinNumber(BigDecimal.ONE)
                                 .setMaxNumber(BigDecimal.valueOf(100D))
                                 .setPlusMinusVisibility(NumberPicker.INVISIBLE)
-                                .setFragmentManager(getChildFragmentManager())
+                                .setFragmentManager(getActivity().getSupportFragmentManager())
                                 .setTargetFragment(ScheduleTimetableFragment.this)
                                 .setReference(REF_DIALOG_CYCLE_REST)
                                 .setStyleResId(R.style.BetterPickersDialogFragment_Calendula);
diff --git a/Calendula/src/main/res/values-de/strings_translatable.xml b/Calendula/src/main/res/values-de/strings_translatable.xml
@@ -539,4 +539,8 @@ Wollen Sie nun die neue Datenbank installieren?
 <string name="months">"Monate"</string>
 <string name="year">"Jahr"</string>
 <string name="years">"Jahre"</string>
+<string name="channel_meds_name">"Medikamente"</string>
+<string name="channel_meds_description">"Benachrichtigungen bzgl. Medikamente, etwa Einnahmeerinnerungen."</string>
+<string name="channel_default_name">"Standard"</string>
+<string name="channel_default_description">"Sonstige Benachrichtigungen."</string>
 </resources>
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![](https://tec.citius.usc.es/calendula/github-assets/calendula_promo_google_play.png)
-# Calendula [![CircleCI](https://circleci.com/gh/citiususc/calendula/tree/develop.svg?style=shield)](https://circleci.com/gh/citiususc/calendula/tree/develop)
+# Calendula [![Gitlab CI](https://gitlab.com/calendula-ci/calendula/badges/develop/build.svg)](https://gitlab.com/calendula-ci/calendula/pipelines)
 
 Calendula is an Android assistant for personal medication management, aimed at those who have trouble following their medication regimen, forget to take their drugs, or have complex schedules that are difficult to remember.
 
@@ -23,8 +23,8 @@ These instructions will get you a copy of the project up and running on your loc
 We use [Android Studio](https://developer.android.com/studio/index.html) (the official Android IDE) for development, so we recommend it as the IDE to use in your development environment. Once you install Android Studio, you can use the Android SDK Manager to obtain the SDK tools, platforms, and other components you will need to start developing. The most important are:
 
 * Android SDK Tools and Android SDK Platform-tools (upgrade to their last versions is usually a good idea).
-* Android SDK Build-Tools 26.0.2.
-* Android 7.1 (API Level 25) SDK Platform.
+* Android SDK Build-Tools 27.0.3.
+* Android 8.1 (API Level 27) SDK Platform.
 * Android Support Repository
 
 You can also install other packages like emulators for running the app, if you don't have or don't want to use a real device. The minimum supported Android version is *4.1, Jelly Bean (API level 16).*
@@ -100,7 +100,7 @@ If you're not a developer but you want to help, don't worry! You can help [with
 
 ## License
 
-Copyright 2016 CITIUS - USC
+Copyright 2018 CITIUS - USC
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     ext {
-        kotlin_version = '1.2.51'
+        kotlin_version = '1.2.60'
         libVersions = [
                 android: [
                         support: '27.1.1'
@@ -15,7 +15,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.11.0'
     }
diff --git a/circle.yml b/circle.yml

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`ext {`
`9`		`- kotlin_version = '1.2.51'`
	`9`	`+ kotlin_version = '1.2.60'`
`10`	`10`	`libVersions = [`
`11`	`11`	`android: [`
`12`	`12`	`support: '27.1.1'`
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dependencies {`
`18`		`- classpath 'com.android.tools.build:gradle:3.1.3'`
	`18`	`+ classpath 'com.android.tools.build:gradle:3.1.4'`
`19`	`19`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`20`	`20`	`classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.11.0'`
`21`	`21`	`}`