From 7086277f25a78fc43471e9337e067057d39ddeb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 26 Aug 2020 01:21:06 -0400
Subject: [PATCH] update version name and credits
Change-Id: Ic35f35187b5d2a2ece906cfd9379a93d842a0fc7
---
.../ring/about/AboutBottomSheetDialogFragment.java | 2 +-
.../src/main/java/cx/ring/about/AboutFragment.java | 12 ++----------
ring-android/app/src/main/res/values/strings.xml | 4 ++--
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java b/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
index 43ebee60f..937aafcc4 100644
--- a/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/about/AboutBottomSheetDialogFragment.java
@@ -53,7 +53,7 @@ public class AboutBottomSheetDialogFragment extends BottomSheetDialogFragment {
CoordinatorLayout.Behavior behavior = params.getBehavior();
if (behavior instanceof BottomSheetBehavior) {
- ((BottomSheetBehavior) behavior).setBottomSheetCallback(mCallback);
+ ((BottomSheetBehavior) behavior).addBottomSheetCallback(mCallback);
}
}
}
diff --git a/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java b/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
index 03e8572af..3d8e84a2a 100644
--- a/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/about/AboutFragment.java
@@ -21,7 +21,6 @@ package cx.ring.about;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@@ -31,15 +30,9 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
import cx.ring.BuildConfig;
import cx.ring.R;
@@ -47,7 +40,6 @@ import cx.ring.client.HomeActivity;
import cx.ring.databinding.FragAboutBinding;
import cx.ring.mvp.BaseSupportFragment;
import cx.ring.mvp.RootPresenter;
-import cx.ring.utils.DeviceUtils;
public class AboutFragment extends BaseSupportFragment<RootPresenter> {
@@ -120,14 +112,14 @@ public class AboutFragment extends BaseSupportFragment<RootPresenter> {
private void creditsClicked() {
BottomSheetDialogFragment dialog = new AboutBottomSheetDialogFragment();
- dialog.show(getActivity().getSupportFragmentManager(), dialog.getTag());
+ dialog.show(getChildFragmentManager(), dialog.getTag());
}
private void launchSystemIntent(Intent intentToLaunch,
String intentChooserTitle,
String intentMissingTitle) {
// Check if an app can handle this intent
- boolean isResolvable = getActivity().getPackageManager().queryIntentActivities(intentToLaunch,
+ boolean isResolvable = requireContext().getPackageManager().queryIntentActivities(intentToLaunch,
PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
if (isResolvable) {
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index cf569c9ab..3c39f051a 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -23,7 +23,7 @@ along with this program; if not, write to the Free Software
<!-- About -->
<string name="app_name" translatable="false">Jami</string>
<string name="app_author" translatable="false">Savoir-faire Linux Inc.</string>
- <string name="app_release" translatable="false">Free as in Freedom - %1$s</string>
+ <string name="app_release" translatable="false">Together - %1$s</string>
<string name="app_website" translatable="false">https://jami.net</string>
<string name="app_website_contribute" translatable="false"><u>https://jami.net/contribute</u></string>
<string name="gnu_license_website" translatable="false">https://www.gnu.org/licenses/gpl.html</string>
@@ -55,7 +55,7 @@ along with this program; if not, write to the Free Software
<string name="developed_by">Developed by</string>
<string name="designed_by">Designed by</string>
<string name="ringtones_by">Ringtones by</string>
- <string name="credits_developer" translatable="false">Adrien Béraud\nAlexandr Sergheev\nAlexandre Lision\nAlexandre Viau\nAline Bonnet\nAmirHossein Naghshzan\nAndreas Traczyk\nAnthony Léonard\nCyrille Béraud\nEdric Milaret\nÉloi Bail\nEmmanuel Lepage-Vallée\nFrédéric Guimont\nGuillaume Roguez\nHadrien De Sousa\nJulien Grossholtz\nKateryna Kostiuk\nLoïc Siret\nMarianne Forget\nMichel Schmit\nNicolas Jäger\nNicolas Reynaud\nOlivier Gregoire\nOlivier Soldano\nPatrick Keroulas\nPierre Duchemin\nPhilippe Gorley\nRomain Bertozzi\nSaher Azer\nSébastien Blin\nSeva Ivanov\nSilbino Gonçalves Matado\nSimon Désaulniers\nStepan Salenikovich\nSimon Zeni\nThibault Wittemberg</string>
+ <string name="credits_developer" translatable="false">Adrien Béraud\nAlbert Babí\nAlexandr Sergheev\nAlexandre Lision\nAlexandre Viau\nAline Bonnet\nAline Gondim Santos\nAmirHossein Naghshzan\nAndreas Traczyk\nAnthony Léonard\nBrando Tovar\nCyrille Béraud\nEdric Milaret\nÉloi Bail\nEmmanuel Lepage-Vallée\nFrédéric Guimont\nGuillaume Heller\nGuillaume Roguez\nHadrien De Sousa\nJulien Grossholtz\nKateryna Kostiuk\nLoïc Siret\nMarianne Forget\nMichel Schmit\nMingrui Zhang\nMohamed Chibani\nMohamed Amine Younes Bouacida\nNicolas Jäger\nNicolas Reynaud\nOlivier Gregoire\nOlivier Soldano\nPatrick Keroulas\nPeymane Marandi\nPierre Duchemin\nPhilippe Gorley\nRomain Bertozzi\nSaher Azer\nSébastien Blin\nSeva Ivanov\nSilbino Gonçalves Matado\nSimon Désaulniers\nStepan Salenikovich\nSimon Zeni\nThibault Wittemberg</string>
<string name="credits_ringtones" translatable="false">Loïc Bogino</string>
<!-- RingActivity -->
--
GitLab