From fefc72a2b51eb8616d864e728cda7e28754f65cf Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Mon, 4 May 2020 16:08:40 +0300 Subject: [PATCH 1/2] NY-9993: [AN]: Fix sentence, and need to add time zone to the meeting time of the schedule message text --- .../mvp/presenters/ScheduledConferencePresenter.java | 8 +++++++- app/src/main/res/values-en/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ScheduledConferencePresenter.java b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ScheduledConferencePresenter.java index e12ed09e26..2c93b0a551 100644 --- a/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ScheduledConferencePresenter.java +++ b/app/src/main/java/com/nynja/mobile/communicator/mvp/presenters/ScheduledConferencePresenter.java @@ -49,6 +49,7 @@ import java.util.Calendar; import java.util.Date; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.SimpleTimeZone; import java.util.TimeZone; @@ -388,7 +389,12 @@ public class ScheduledConferencePresenter extends BasePresenterTo be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f55d6f169d..e894cc2b5c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1247,7 +1247,7 @@ To be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7b909eb3a9..4ccd9f1754 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1247,7 +1247,7 @@ To be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 9df49b104b..6f9d2ab976 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1247,7 +1247,7 @@ To be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 9df49b104b..6f9d2ab976 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1247,7 +1247,7 @@ To be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4bf45727a7..257a135b1f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1260,7 +1260,7 @@ To be started on the following Date and Time: Invite NYNJA Participants Remind Me via NYNJA - NYNJA will call you if you would like to join in later click the link, url or call link \n\n%1$s + NYNJA will call you! If you would like to join in later click the link, url or call link. \n\n%1$s Description: %1$s is inviting you to a scheduled NYNJA meeting. The meeting will start on %1$s. -- GitLab From 8b03914db08177dc641bfb7222b2784c62926f4e Mon Sep 17 00:00:00 2001 From: Ergyun Syuleyman Date: Tue, 5 May 2020 01:04:20 +0300 Subject: [PATCH 2/2] -build gradle integrated with Firebase Distribution plugin --- app/build.gradle | 6 +++++- build.gradle | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7439189f85..1f60baf084 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,6 +19,8 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'io.fabric' +apply plugin: 'com.google.gms.google-services' +apply plugin: 'com.google.firebase.appdistribution' repositories { google() @@ -547,6 +549,9 @@ dependencies { exclude module: 'support-v4' } + // Add the Firebase SDK for Google Analytics + implementation 'com.google.firebase:firebase-analytics:16.0.6' + //Firebase implementation "com.google.firebase:firebase-storage:16.0.5" implementation "com.google.firebase:firebase-messaging:17.3.4" @@ -727,7 +732,6 @@ dependencies { } -apply plugin: 'com.google.gms.google-services' task printSdkRoot() { def sdkSymbolsRoot = rootProject.hasProperty('sdk_symbols_root') ? rootProject.getProperty('sdk_symbols_root') : "../../mobile-sdk/src" diff --git a/build.gradle b/build.gradle index 015919d59f..33edfc835f 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.google.gms:google-services:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.google.firebase:firebase-appdistribution-gradle:1.3.1' } } -- GitLab