app: rename to Jami
Change-Id: Ifbc85e43e87c247efd61109c645058405d59b673
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 b07a9ac..e1483e0 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
@@ -25,15 +25,11 @@
import android.os.Bundle;
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
-import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
import android.widget.TextView;
import butterknife.BindView;
@@ -43,36 +39,13 @@
import cx.ring.client.HomeActivity;
import cx.ring.dependencyinjection.RingInjectionComponent;
import cx.ring.mvp.BaseSupportFragment;
+import cx.ring.mvp.RootPresenter;
-public class AboutFragment extends BaseSupportFragment<AboutPresenter> implements AboutView {
-
- @BindView(R.id.logo_ring_beta2)
- ImageView mImageViewLogo;
+public class AboutFragment extends BaseSupportFragment<RootPresenter> {
@BindView(R.id.release)
TextView mTextViewRelease;
- @BindView(R.id.web_site)
- TextView mTextViewWebSite;
-
- @BindView(R.id.copyright)
- TextView mTextViewCopyright;
-
- @BindView(R.id.license)
- TextView mTextViewLicense;
-
- @BindView(R.id.email_report)
- TextView mTextViewEmailReport;
-
- @BindView(R.id.developped_by)
- TextView mTextViewDeveloppedBy;
-
- @BindView(R.id.logo)
- ImageView mImageViewSFLLogo;
-
- @BindView(R.id.credits)
- Button mCredits;
-
@Override
public int getLayout() {
return R.layout.frag_about;
@@ -80,22 +53,23 @@
@Override
public void injectFragment(RingInjectionComponent component) {
- component.inject(this);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
- setHasOptionsMenu(true);
return super.onCreateView(inflater, parent, savedInstanceState);
}
@Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ setHasOptionsMenu(true);
+ mTextViewRelease.setText(getString(R.string.app_release, BuildConfig.VERSION_NAME));
+ }
+
+ @Override
public void onResume() {
super.onResume();
((HomeActivity) getActivity()).setToolbarState(false, R.string.menu_item_about);
-
- // fonctional stuff
- presenter.loadAbout();
}
@Override
@@ -134,14 +108,14 @@
@OnClick(R.id.email_report_container)
public void sendFeedbackEmail() {
Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:" + "ring@gnu.org"));
- emailIntent.putExtra(Intent.EXTRA_SUBJECT, "[Ring Android - " + BuildConfig.VERSION_NAME + "]");
+ emailIntent.putExtra(Intent.EXTRA_SUBJECT, "[" + getText(R.string.app_name) + " Android - " + BuildConfig.VERSION_NAME + "]");
launchSystemIntent(emailIntent, getString(R.string.email_chooser_title), getString(R.string.no_email_app_installed));
}
@OnClick(R.id.credits)
public void creditsClicked() {
BottomSheetDialogFragment dialog = new AboutBottomSheetDialogFragment();
- dialog.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(), dialog.getTag());
+ dialog.show(getActivity().getSupportFragmentManager(), dialog.getTag());
}
private void launchSystemIntent(Intent intentToLaunch,
@@ -160,46 +134,4 @@
}
}
}
-
- //region View Methods Implementation
- @Override
- public void showRingLogo(byte[] image) {
- mImageViewLogo.setImageResource(R.drawable.logo_ring);
- }
-
- @Override
- public void showSavoirFaireLinuxLogo(byte[] image) {
- mImageViewSFLLogo.setImageResource(R.drawable.logo_sfl_coul_rgb);
- }
-
- @Override
- public void showRelease(String release) {
- mTextViewRelease.setText(getString(R.string.app_release, BuildConfig.VERSION_NAME));
- }
-
- @Override
- public void showContribute(String contribute) {
- mTextViewWebSite.setText(Html.fromHtml(getString(R.string.app_website_contribute)));
- }
-
- @Override
- public void showCopyright(String copyright) {
- mTextViewCopyright.setText(getString(R.string.copyright));
- }
-
- @Override
- public void showLicense(String license) {
- mTextViewLicense.setText(Html.fromHtml(getString(R.string.license)));
- }
-
- @Override
- public void showFeedback(String feedback) {
- mTextViewEmailReport.setText(Html.fromHtml(getString(R.string.report)));
- }
-
- @Override
- public void showSupport(String support) {
- mTextViewDeveloppedBy.setText(getString(R.string.sponsor_section));
- }
- //endregion
}
diff --git a/ring-android/app/src/main/java/cx/ring/dependencyinjection/RingInjectionComponent.java b/ring-android/app/src/main/java/cx/ring/dependencyinjection/RingInjectionComponent.java
index 4a99f00..aee07c9 100755
--- a/ring-android/app/src/main/java/cx/ring/dependencyinjection/RingInjectionComponent.java
+++ b/ring-android/app/src/main/java/cx/ring/dependencyinjection/RingInjectionComponent.java
@@ -105,8 +105,6 @@
void inject(CallFragment fragment);
- void inject(AboutFragment fragment);
-
void inject(SmartListFragment fragment);
void inject(RingAccountCreationFragment fragment);
diff --git a/ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.java b/ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.java
index c710200..f7f6aac 100644
--- a/ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/mvp/BaseSupportFragment.java
@@ -69,14 +69,16 @@
super.onViewCreated(view, savedInstanceState);
//Be sure to do the injection in onCreateView method
- presenter.bindView(this);
+ if (presenter != null)
+ presenter.bindView(this);
initPresenter(presenter);
}
@Override
public void onDestroyView() {
super.onDestroyView();
- presenter.unbindView();
+ if (presenter != null)
+ presenter.unbindView();
// Butterknife unbinding
if (mUnbinder != null) {
mUnbinder.unbind();
diff --git a/ring-android/app/src/main/res/drawable/ic_jami.xml b/ring-android/app/src/main/res/drawable/ic_jami.xml
new file mode 100644
index 0000000..df2d566
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/ic_jami.xml
@@ -0,0 +1,386 @@
+<vector android:height="116dp" android:viewportHeight="116.3"
+ android:viewportWidth="116" android:width="116dp"
+ xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:pathData="M54.9,55.8l7.1,-0.2l-3.6,6.6z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="56.3581" android:endY="54.437"
+ android:startX="60.9474" android:startY="59.7912" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M85.5,57.5c26.1,4.2 29.8,10.7 29.8,10.7c0,0.4 0,0.8 0,1.2c0,0.2 -0.1,0.4 -0.2,0.7c-0.1,0.3 -2.7,5.7 -19.6,9.3L85.5,57.5z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="100.4486" android:endY="98.8994"
+ android:startX="100.4486" android:startY="62.1" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2D4576" android:offset="0.0704"/>
+ <item android:color="#FF2E5589" android:offset="0.2165"/>
+ <item android:color="#FF2B5E97" android:offset="0.3608"/>
+ <item android:color="#FF29629C" android:offset="0.5"/>
+ <item android:color="#FF2B5E97" android:offset="0.6392"/>
+ <item android:color="#FF2E5589" android:offset="0.7835"/>
+ <item android:color="#FF2D4576" android:offset="0.9296"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M19.8,78.5c-5.9,15.7 -2.9,20.6 -2.7,21c0.1,0.2 0.2,0.4 0.4,0.5c0.4,0 0.8,-0.1 1.2,-0.2c0,0 10.7,-0.5 23.2,-18.3L19.8,78.5z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="30.623701" android:endY="80.4345"
+ android:startX="18.6832" android:startY="101.694496" android:type="linear">
+ <item android:color="#FF252B59" android:offset="0"/>
+ <item android:color="#FF2B3A69" android:offset="0.0859"/>
+ <item android:color="#FF2E4A7C" android:offset="0.2267"/>
+ <item android:color="#FF2E5487" android:offset="0.3658"/>
+ <item android:color="#FF2D578C" android:offset="0.5"/>
+ <item android:color="#FF2E5487" android:offset="0.6342"/>
+ <item android:color="#FF2E4A7C" android:offset="0.7733"/>
+ <item android:color="#FF2B3A69" android:offset="0.9141"/>
+ <item android:color="#FF252B59" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M58.8,18.6C44.5,2.9 37.5,3.8 37.1,3.9c-0.2,0 -0.5,0.1 -0.7,0.2c-0.5,0.2 -1,1.8 -1,1.8s-3,8.7 9.1,31.9L58.8,18.6z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="33.0018" android:endY="6.457199"
+ android:startX="52.7658" android:startY="29.515299" android:type="linear">
+ <item android:color="#FF181844" android:offset="0"/>
+ <item android:color="#FF1E1E4C" android:offset="0.0284"/>
+ <item android:color="#FF283261" android:offset="0.1353"/>
+ <item android:color="#FF2D4172" android:offset="0.2468"/>
+ <item android:color="#FF2E4A7C" android:offset="0.3647"/>
+ <item android:color="#FF2E4D7F" android:offset="0.5"/>
+ <item android:color="#FF2D4576" android:offset="0.6177"/>
+ <item android:color="#FF273160" android:offset="0.8125"/>
+ <item android:color="#FF181844" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M71.2,78.8C90.6,101 97.4,99.8 97.4,99.8c0.4,0.1 0.9,0.2 1.3,0.2c0.2,-0.1 0.3,-0.3 0.4,-0.5c0.3,-0.4 5.8,-9.4 -12.8,-41.8L71.2,78.8z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="76.6182" android:endY="55.0331"
+ android:startX="91.8867" android:startY="104.2193" android:type="linear">
+ <item android:color="#FF181844" android:offset="0"/>
+ <item android:color="#FF1E1E4C" android:offset="0.0284"/>
+ <item android:color="#FF283261" android:offset="0.1353"/>
+ <item android:color="#FF2D4172" android:offset="0.2468"/>
+ <item android:color="#FF2E4A7C" android:offset="0.3647"/>
+ <item android:color="#FF2E4D7F" android:offset="0.5"/>
+ <item android:color="#FF2D4576" android:offset="0.6177"/>
+ <item android:color="#FF273160" android:offset="0.8125"/>
+ <item android:color="#FF181844" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M46.1,82.2c-40,-1.7 -44.8,-11.6 -45,-12.1C1.1,69.9 1,69.7 1,69.5c0.1,-0.7 1.5,-2 1.5,-2s10.6,-6.5 28.3,-10L46.1,82.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="23.5593" android:endY="98.8984"
+ android:startX="23.5593" android:startY="62.0998" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2D4576" android:offset="0.0704"/>
+ <item android:color="#FF2E5589" android:offset="0.2165"/>
+ <item android:color="#FF2B5E97" android:offset="0.3608"/>
+ <item android:color="#FF29629C" android:offset="0.5"/>
+ <item android:color="#FF2B5E97" android:offset="0.6392"/>
+ <item android:color="#FF2E5589" android:offset="0.7835"/>
+ <item android:color="#FF2D4576" android:offset="0.9296"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:fillAlpha="0.4"
+ android:pathData="M57.6,17.4c-5,5.4 -9.6,11.2 -13.8,17.2h1c3.1,-3.9 10.8,-13.7 13.4,-16.5L57.6,17.4z" android:strokeAlpha="0.4">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="58.251602" android:endY="25.9903"
+ android:startX="43.8052" android:startY="25.9903" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M73.8,35.4C84.2,10.7 80.2,5 80.2,5c-0.1,-0.3 -0.2,-0.7 -0.3,-1c-0.2,-0.1 -0.4,-0.1 -0.7,-0.2c-0.5,-0.1 -11.4,-1.5 -34.4,30.7L73.8,35.4z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="62.8855" android:endY="6.5574994"
+ android:startX="62.8855" android:startY="41.267" android:type="linear">
+ <item android:color="#FF252B59" android:offset="0"/>
+ <item android:color="#FF2D578C" android:offset="0.5"/>
+ <item android:color="#FF2D5588" android:offset="0.6934"/>
+ <item android:color="#FF2E4F80" android:offset="0.8038"/>
+ <item android:color="#FF2D4474" android:offset="0.8932"/>
+ <item android:color="#FF283463" android:offset="0.971"/>
+ <item android:color="#FF252B59" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M58,97.4c-14.2,15.4 -21,14.5 -21.4,14.5c-0.6,-0.2 -1.2,-0.5 -1.7,-0.8l-17.3,-11c7.3,-1.6 16.3,-10.2 25.7,-21.3L58,97.4z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="94.591" android:endY="12.783899"
+ android:startX="31.1815" android:startY="108.6321" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF177EBC" android:offset="0.08239999"/>
+ <item android:color="#FF0E91D1" android:offset="0.1675"/>
+ <item android:color="#FF10A2E1" android:offset="0.2527"/>
+ <item android:color="#FF18ACEA" android:offset="0.337"/>
+ <item android:color="#FF24B1ED" android:offset="0.42"/>
+ <item android:color="#FF28B1ED" android:offset="0.5"/>
+ <item android:color="#FF24B1ED" android:offset="0.58"/>
+ <item android:color="#FF18ACEA" android:offset="0.663"/>
+ <item android:color="#FF10A2E1" android:offset="0.7473"/>
+ <item android:color="#FF0E91D1" android:offset="0.8325"/>
+ <item android:color="#FF177EBC" android:offset="0.9176"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M58.6,98c-14.2,15.4 -21,14.5 -21.4,14.5c-0.6,-0.2 -1.2,-0.5 -1.7,-0.8L17.6,100c7.3,-1.6 16.9,-9.6 26.3,-20.7L58.6,98z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="50.5976" android:endY="88.0674"
+ android:startX="25.482601" android:startY="110.554" android:type="linear">
+ <item android:color="#FF2C5D95" android:offset="0"/>
+ <item android:color="#FF246EAB" android:offset="0.08220001"/>
+ <item android:color="#FF1B79B9" android:offset="0.1808"/>
+ <item android:color="#FF1080C2" android:offset="0.3007"/>
+ <item android:color="#FF0E81C5" android:offset="0.5"/>
+ <item android:color="#FF1080C2" android:offset="0.6993"/>
+ <item android:color="#FF1B79B9" android:offset="0.8192"/>
+ <item android:color="#FF246EAB" android:offset="0.9178"/>
+ <item android:color="#FF2C5D95" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M20.7,38c-6.3,-16.2 -3.2,-21.3 -3,-21.6c0.4,-0.5 0.9,-0.9 1.4,-1.2l17.3,-11c-1.5,7.1 2.3,18 8.2,30.7L20.7,38z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="81.5545" android:endY="109.3235"
+ android:startX="23.2358" android:startY="12.125799" android:type="linear">
+ <item android:color="#FF2C5D95" android:offset="0"/>
+ <item android:color="#FF2A6199" android:offset="0.0176"/>
+ <item android:color="#FF1C79B7" android:offset="0.1407"/>
+ <item android:color="#FF0A8CCA" android:offset="0.2631"/>
+ <item android:color="#FF0B97D4" android:offset="0.3837"/>
+ <item android:color="#FF0E9AD8" android:offset="0.5"/>
+ <item android:color="#FF0B97D4" android:offset="0.6163"/>
+ <item android:color="#FF0A8CCA" android:offset="0.7369"/>
+ <item android:color="#FF1C79B7" android:offset="0.8593"/>
+ <item android:color="#FF2A6199" android:offset="0.9824"/>
+ <item android:color="#FF2C5D95" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M57.2,57.2c-8.7,0 -17.4,0.7 -26,1.9c0.3,0.5 4.3,7.2 7.2,11.7c27.8,42.8 40.8,41.1 41.4,41c0.6,-0.2 1.2,-0.5 1.7,-0.8l17.3,-11C87,97.5 70.6,78.2 57.2,57.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="48.8184" android:endY="61.5006"
+ android:startX="86.3174" android:startY="108.7322" android:type="linear">
+ <item android:color="#FF2C5D95" android:offset="0"/>
+ <item android:color="#FF2A6199" android:offset="0.0257"/>
+ <item android:color="#FF1C79B7" android:offset="0.2053"/>
+ <item android:color="#FF0A8CCA" android:offset="0.384"/>
+ <item android:color="#FF0B97D4" android:offset="0.5599"/>
+ <item android:color="#FF0E9AD8" android:offset="0.7296"/>
+ <item android:color="#FF0B97D4" android:offset="0.7925"/>
+ <item android:color="#FF0A8CCA" android:offset="0.8577"/>
+ <item android:color="#FF1C79B7" android:offset="0.9239"/>
+ <item android:color="#FF2A6199" android:offset="0.9905"/>
+ <item android:color="#FF2C5D95" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M20.1,38.5c-6.3,-16.2 -3.2,-21.3 -3,-21.6c0.4,-0.5 0.9,-0.9 1.4,-1.2L36.5,4.1c-1.5,7.1 1.7,18.6 7.6,31.2L20.1,38.5z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="24.831001" android:endY="9.655299"
+ android:startX="32.1321" android:startY="35.9391" android:type="linear">
+ <item android:color="#FF2C5D95" android:offset="0"/>
+ <item android:color="#FF246EAB" android:offset="0.08220001"/>
+ <item android:color="#FF1B79B9" android:offset="0.1808"/>
+ <item android:color="#FF1080C2" android:offset="0.3007"/>
+ <item android:color="#FF0E81C5" android:offset="0.5"/>
+ <item android:color="#FF1080C2" android:offset="0.6993"/>
+ <item android:color="#FF1B79B9" android:offset="0.8192"/>
+ <item android:color="#FF246EAB" android:offset="0.9178"/>
+ <item android:color="#FF2C5D95" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M85.5,59.6c13.5,1.9 24.7,4.7 29.8,9.8V48.9c0,-0.6 -0.1,-1.3 -0.2,-1.9c-0.1,-0.3 -2.7,-5.6 -19,-9.1L85.5,59.6z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="1.0625004" android:endY="53.6638"
+ android:startX="114.8171" android:startY="53.6638" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF256BA7" android:offset="0.0128"/>
+ <item android:color="#FF0B83C3" android:offset="0.1121"/>
+ <item android:color="#FF1797D8" android:offset="0.2115"/>
+ <item android:color="#FF25A3E2" android:offset="0.3099"/>
+ <item android:color="#FF27ABE7" android:offset="0.4066"/>
+ <item android:color="#FF2AAEEA" android:offset="0.5"/>
+ <item android:color="#FF27ABE7" android:offset="0.5934"/>
+ <item android:color="#FF25A3E2" android:offset="0.6901"/>
+ <item android:color="#FF1797D8" android:offset="0.7885"/>
+ <item android:color="#FF0B83C3" android:offset="0.8879"/>
+ <item android:color="#FF256BA7" android:offset="0.9872"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M85.5,58.8c13.5,1.9 24.7,5.5 29.8,10.6V48.1c0,-0.6 -0.1,-1.3 -0.2,-1.9c-0.1,-0.3 -2.7,-5.6 -19,-9.1L85.5,58.8z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="114.722" android:endY="53.7551"
+ android:startX="82.2087" android:startY="52.0029" android:type="linear">
+ <item android:color="#FF2E5284" android:offset="0"/>
+ <item android:color="#FF2E5486" android:offset="0.0061"/>
+ <item android:color="#FF29649D" android:offset="0.0912"/>
+ <item android:color="#FF236FAD" android:offset="0.1876"/>
+ <item android:color="#FF1D77B6" android:offset="0.3049"/>
+ <item android:color="#FF1C78B9" android:offset="0.5"/>
+ <item android:color="#FF1D77B6" android:offset="0.6951"/>
+ <item android:color="#FF236FAD" android:offset="0.8124"/>
+ <item android:color="#FF29649D" android:offset="0.9088"/>
+ <item android:color="#FF2E5486" android:offset="0.9939"/>
+ <item android:color="#FF2E5284" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M73.2,35.1c-3,-0.1 -9.5,-0.4 -15.1,-0.4C7.1,34.7 1.4,46.5 1.2,47C1,47.6 1,48.3 1,48.9v20.6c5,-5 15.9,-7.7 29.2,-9.7c8.6,-1.2 17.2,-1.9 25.9,-2c1.6,0 3.2,0 4.8,0C60.8,57.8 76.3,35.2 73.2,35.1z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="59.6332" android:endY="52.0579"
+ android:startX="0.97230035" android:startY="52.0579" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF256BA7" android:offset="0.0225"/>
+ <item android:color="#FF0B83C3" android:offset="0.1971"/>
+ <item android:color="#FF1797D8" android:offset="0.3718"/>
+ <item android:color="#FF25A3E2" android:offset="0.5447"/>
+ <item android:color="#FF27ABE7" android:offset="0.7147"/>
+ <item android:color="#FF2AAEEA" android:offset="0.8788"/>
+ <item android:color="#FF27ABE7" android:offset="0.9015"/>
+ <item android:color="#FF25A3E2" android:offset="0.9249"/>
+ <item android:color="#FF1797D8" android:offset="0.9487"/>
+ <item android:color="#FF0B83C3" android:offset="0.9728"/>
+ <item android:color="#FF256BA7" android:offset="0.9969"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:fillAlpha="0.2"
+ android:pathData="M44.1,33.5c-10.7,0.5 -18.4,1.3 -24.8,3.1l0.3,0.8c0.6,-0.1 1.3,-0.3 1.9,-0.4c7.7,-1.2 15.4,-2 23.1,-2.3L44.1,33.5z" android:strokeAlpha="0.2">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="20.181" android:endY="33.777298"
+ android:startX="42.2272" android:startY="36.8775" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M73.2,34.3c-3,-0.1 -9.5,-0.4 -15.1,-0.4c-51.1,0 -56.7,11.8 -57,12.4C1,46.8 1,47.5 1,48.1v21.4c5,-5 15.9,-8.5 29.2,-10.5c8.6,-1.2 17.2,-1.9 25.9,-2c1.6,0 3.2,0 4.8,0C63.2,57.1 76.3,34.4 73.2,34.3z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="2.3581004" android:endY="46.972298"
+ android:startX="64.6597" android:startY="55.7336" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF2174B1" android:offset="0.0382"/>
+ <item android:color="#FF0B86C4" android:offset="0.1177"/>
+ <item android:color="#FF0A94D2" android:offset="0.2081"/>
+ <item android:color="#FF0C9BDB" android:offset="0.3177"/>
+ <item android:color="#FF109EDE" android:offset="0.5"/>
+ <item android:color="#FF0C9BDB" android:offset="0.6823"/>
+ <item android:color="#FF0A94D2" android:offset="0.7919"/>
+ <item android:color="#FF0B86C4" android:offset="0.8823"/>
+ <item android:color="#FF2174B1" android:offset="0.9618"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M58.2,58.8C72.1,37.9 82.4,16 79.8,4.1l17.3,11c0.5,0.3 1,0.7 1.4,1.2c0.3,0.5 7.1,11.7 -20.7,54.5c-2,3.2 -3.9,6.9 -4.6,7.2c-4.1,-4 -12.6,-15.6 -14.7,-18.5C58.3,59.1 58.2,58.8 58.2,58.8z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="63.9079" android:endY="63.6238"
+ android:startX="93.5348" android:startY="12.599699" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF177EBC" android:offset="0.1238"/>
+ <item android:color="#FF0E91D1" android:offset="0.2516"/>
+ <item android:color="#FF10A2E1" android:offset="0.3797"/>
+ <item android:color="#FF18ACEA" android:offset="0.5064"/>
+ <item android:color="#FF24B1ED" android:offset="0.631"/>
+ <item android:color="#FF28B1ED" android:offset="0.7513"/>
+ <item android:color="#FF24B1ED" android:offset="0.7911"/>
+ <item android:color="#FF18ACEA" android:offset="0.8324"/>
+ <item android:color="#FF10A2E1" android:offset="0.8743"/>
+ <item android:color="#FF0E91D1" android:offset="0.9167"/>
+ <item android:color="#FF177EBC" android:offset="0.959"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:fillAlpha="0.25"
+ android:pathData="M96.6,37.2c-3.1,7.8 -6.8,15.3 -11.1,22.4l1.3,0.2c5.5,-9.5 8.7,-16.5 10.9,-22.4L96.6,37.2z" android:strokeAlpha="0.25">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="86.4721" android:endY="58.5083"
+ android:startX="97.2591" android:startY="38.2655" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M78.5,71.4c27.8,-42.8 21,-54 20.7,-54.5c-0.4,-0.5 -0.9,-0.9 -1.4,-1.2L79.8,4.1c2.5,11.8 -7.4,34.6 -21.2,55.5c4.6,7.1 9.4,14 14.5,19.9C74.1,78.3 76.7,74.3 78.5,71.4z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="62.8416" android:endY="69.4942"
+ android:startX="92.5625" android:startY="13.719999" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF2174B1" android:offset="0.0382"/>
+ <item android:color="#FF0B86C4" android:offset="0.1177"/>
+ <item android:color="#FF0A94D2" android:offset="0.2081"/>
+ <item android:color="#FF0C9BDB" android:offset="0.3177"/>
+ <item android:color="#FF109EDE" android:offset="0.5"/>
+ <item android:color="#FF0C9BDB" android:offset="0.6823"/>
+ <item android:color="#FF0A94D2" android:offset="0.7919"/>
+ <item android:color="#FF0B86C4" android:offset="0.8823"/>
+ <item android:color="#FF2174B1" android:offset="0.9618"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M72.6,80.2c0.1,-0.1 0.2,-0.1 0.2,-0.2c-5.3,-6.2 -10.2,-12.8 -14.7,-19.7c-0.1,0.1 -0.2,0.2 -0.2,0.4C57.9,60.6 67.6,75.9 72.6,80.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="64.886" android:endY="71.2417"
+ android:startX="94.8685" android:startY="14.976399" android:type="linear">
+ <item android:color="#FF2867A2" android:offset="0"/>
+ <item android:color="#FF2174B1" android:offset="0.0382"/>
+ <item android:color="#FF0B86C4" android:offset="0.1177"/>
+ <item android:color="#FF0A94D2" android:offset="0.2081"/>
+ <item android:color="#FF0C9BDB" android:offset="0.3177"/>
+ <item android:color="#FF109EDE" android:offset="0.5"/>
+ <item android:color="#FF0C9BDB" android:offset="0.6823"/>
+ <item android:color="#FF0A94D2" android:offset="0.7919"/>
+ <item android:color="#FF0B86C4" android:offset="0.8823"/>
+ <item android:color="#FF2174B1" android:offset="0.9618"/>
+ <item android:color="#FF2867A2" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:fillAlpha="0.2"
+ android:pathData="M58.2,98.4C57.9,98.1 47.7,86.1 43.1,79l-0.8,0.9C46.9,86.6 52,93 57.6,99L58.2,98.4z" android:strokeAlpha="0.2">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="54.168602" android:endY="99.7864"
+ android:startX="46.478302" android:startY="78.9521" android:type="linear">
+ <item android:color="#FF2B3B6A" android:offset="0"/>
+ <item android:color="#FF2B3B6A" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path android:pathData="M72.9,79.9c-5.3,-6.2 -10.2,-12.8 -14.7,-19.7c-0.5,-0.8 -1.1,-1.6 -1.6,-2.4c-8.7,0 -17.4,0.7 -26,1.9c0.3,0.5 4.3,7.2 7.2,11.7c27.8,42.8 40.8,41.1 41.4,41c0.6,-0.2 1.2,-0.5 1.7,-0.8L98.8,100C91.4,98.4 82.1,90.6 72.9,79.9z">
+ <aapt:attr name="android:fillColor">
+ <gradient android:endX="70.1355" android:endY="113.8892"
+ android:startX="61.082" android:startY="57.5242" android:type="linear">
+ <item android:color="#FF2E5284" android:offset="0"/>
+ <item android:color="#FF2C5C92" android:offset="0.0244"/>
+ <item android:color="#FF2075B1" android:offset="0.0888"/>
+ <item android:color="#FF0B86C4" android:offset="0.1599"/>
+ <item android:color="#FF0A94D2" android:offset="0.2403"/>
+ <item android:color="#FF0E9CDA" android:offset="0.3378"/>
+ <item android:color="#FF109EDE" android:offset="0.5"/>
+ <item android:color="#FF0C9BDB" android:offset="0.6718"/>
+ <item android:color="#FF0A94D2" android:offset="0.7751"/>
+ <item android:color="#FF0B86C4" android:offset="0.8603"/>
+ <item android:color="#FF2174B1" android:offset="0.9351"/>
+ <item android:color="#FF2C5D95" android:offset="1"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/ic_jami_full_logo.xml b/ring-android/app/src/main/res/drawable/ic_jami_full_logo.xml
new file mode 100644
index 0000000..8d0e4be
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/ic_jami_full_logo.xml
@@ -0,0 +1,557 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="400dp"
+ android:height="144dp"
+ android:viewportWidth="400"
+ android:viewportHeight="144">
+ <path
+ android:pathData="M218.6,106.7l-1.2,-2.6h-5.6l-1.2,2.6H209l4.9,-10.7h1.4l5,10.7H218.6zM212.3,102.8h4.5l-2.3,-5.1L212.3,102.8z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M237.6,101v5c-0.5,0.2 -1.1,0.4 -1.8,0.5c-0.7,0.1 -1.4,0.2 -2.2,0.2c-1.1,0 -2.1,-0.2 -2.9,-0.7c-0.8,-0.4 -1.4,-1.1 -1.9,-1.9c-0.4,-0.8 -0.6,-1.8 -0.6,-2.9c0,-1.1 0.2,-2.1 0.6,-2.9c0.4,-0.8 1.1,-1.4 1.9,-1.9c0.8,-0.4 1.8,-0.7 2.8,-0.7c0.8,0 1.5,0.1 2.2,0.3c0.7,0.2 1.2,0.5 1.7,1l-0.6,1.2c-0.5,-0.4 -1,-0.7 -1.6,-0.9c-0.5,-0.2 -1.1,-0.3 -1.7,-0.3c-1.2,0 -2.1,0.4 -2.8,1.1c-0.6,0.7 -0.9,1.7 -0.9,3.1c0,1.4 0.3,2.4 1,3.2s1.6,1.1 2.9,1.1c0.8,0 1.7,-0.1 2.4,-0.4v-3h-2.6V101H237.6z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M249,96h1.5v10.7h-1.2l-6.4,-8.1v8.1h-1.5V96h1.2l6.4,8.1V96z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M255.6,105.7c-0.8,-0.7 -1.1,-1.8 -1.1,-3.3V96h1.6v6.5c0,1 0.2,1.7 0.7,2.2s1.2,0.8 2.2,0.8c1,0 1.7,-0.3 2.2,-0.8c0.5,-0.5 0.7,-1.3 0.7,-2.2V96h1.6v6.4c0,1.4 -0.4,2.5 -1.1,3.3c-0.8,0.7 -1.9,1.1 -3.4,1.1C257.4,106.8 256.3,106.5 255.6,105.7z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M278.7,99.5c0.5,0.3 0.9,0.8 1.2,1.4c0.3,0.6 0.4,1.3 0.4,2.1c0,0.8 -0.1,1.5 -0.4,2s-0.7,1 -1.2,1.4s-1.1,0.5 -1.8,0.5c-0.6,0 -1.1,-0.1 -1.6,-0.4s-0.8,-0.6 -1,-1.1v4.6h-1.6v-8.7c0,-0.8 0,-1.5 -0.1,-2.1h1.5l0.2,1.4c0.2,-0.5 0.5,-0.9 1,-1.2c0.5,-0.3 1,-0.4 1.7,-0.4C277.6,99 278.2,99.1 278.7,99.5zM278.2,104.9c0.4,-0.5 0.6,-1.1 0.6,-2c0,-0.9 -0.2,-1.5 -0.6,-2c-0.4,-0.5 -0.9,-0.7 -1.7,-0.7c-0.7,0 -1.3,0.2 -1.7,0.7c-0.4,0.5 -0.6,1.1 -0.6,2c0,0.9 0.2,1.5 0.6,2c0.4,0.5 0.9,0.7 1.7,0.7C277.2,105.6 277.8,105.4 278.2,104.9z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M290.8,99.2v7.6h-1.6v-1.3c-0.2,0.5 -0.6,0.8 -1,1c-0.5,0.2 -1,0.4 -1.6,0.4c-0.7,0 -1.3,-0.2 -1.8,-0.5s-0.9,-0.8 -1.2,-1.4s-0.4,-1.3 -0.4,-2c0,-0.8 0.1,-1.5 0.4,-2.1c0.3,-0.6 0.7,-1.1 1.2,-1.4s1.1,-0.5 1.8,-0.5c0.6,0 1.1,0.1 1.6,0.4c0.4,0.2 0.8,0.6 1,1v-1.2H290.8zM288.6,104.9c0.4,-0.5 0.6,-1.1 0.6,-2c0,-0.9 -0.2,-1.5 -0.6,-2c-0.4,-0.5 -0.9,-0.7 -1.7,-0.7c-0.7,0 -1.3,0.2 -1.7,0.7c-0.4,0.5 -0.6,1.2 -0.6,2c0,0.9 0.2,1.5 0.6,2s1,0.7 1.7,0.7C287.7,105.6 288.2,105.4 288.6,104.9z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M295.8,106.3c-0.6,-0.3 -1,-0.8 -1.3,-1.4c-0.3,-0.6 -0.5,-1.3 -0.5,-2c0,-0.8 0.2,-1.5 0.5,-2.1c0.3,-0.6 0.8,-1.1 1.4,-1.4s1.3,-0.5 2.1,-0.5c0.6,0 1.1,0.1 1.6,0.3c0.5,0.2 0.9,0.4 1.2,0.7l-0.5,1.1c-0.7,-0.6 -1.5,-0.8 -2.2,-0.8c-0.8,0 -1.4,0.2 -1.8,0.7c-0.4,0.5 -0.6,1.1 -0.6,2s0.2,1.5 0.6,2s1,0.7 1.8,0.7c0.8,0 1.5,-0.3 2.2,-0.8l0.5,1.1c-0.3,0.3 -0.8,0.5 -1.3,0.7s-1.1,0.3 -1.6,0.3C297.1,106.8 296.4,106.7 295.8,106.3z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M310.9,106.7h-2l-3.8,-3.6v3.6h-1.6v-11h1.6v6.9l3.5,-3.4h2l-3.8,3.6L310.9,106.7z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M320.3,99.2v7.6h-1.6v-1.3c-0.2,0.5 -0.6,0.8 -1,1c-0.5,0.2 -1,0.4 -1.6,0.4c-0.7,0 -1.3,-0.2 -1.8,-0.5s-0.9,-0.8 -1.2,-1.4s-0.4,-1.3 -0.4,-2c0,-0.8 0.1,-1.5 0.4,-2.1c0.3,-0.6 0.7,-1.1 1.2,-1.4s1.1,-0.5 1.8,-0.5c0.6,0 1.1,0.1 1.6,0.4c0.4,0.2 0.8,0.6 1,1v-1.2H320.3zM318.2,104.9c0.4,-0.5 0.6,-1.1 0.6,-2c0,-0.9 -0.2,-1.5 -0.6,-2c-0.4,-0.5 -0.9,-0.7 -1.7,-0.7c-0.7,0 -1.3,0.2 -1.7,0.7c-0.4,0.5 -0.6,1.2 -0.6,2c0,0.9 0.2,1.5 0.6,2s1,0.7 1.7,0.7C317.3,105.6 317.8,105.4 318.2,104.9z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M331.3,99.2v7.4c0,1.1 -0.3,2 -0.9,2.6c-0.6,0.6 -1.6,0.9 -2.8,0.9c-1.2,0 -2.2,-0.2 -3.1,-0.8l0.3,-1.2c0.5,0.2 1,0.4 1.4,0.6c0.5,0.1 0.9,0.2 1.4,0.2c1.5,0 2.2,-0.7 2.2,-2.2v-1.6c-0.2,0.4 -0.6,0.8 -1,1c-0.5,0.3 -1,0.4 -1.6,0.4c-0.7,0 -1.3,-0.2 -1.8,-0.5c-0.5,-0.3 -1,-0.8 -1.2,-1.3c-0.3,-0.6 -0.4,-1.2 -0.4,-2s0.1,-1.4 0.4,-2c0.3,-0.6 0.7,-1 1.2,-1.3c0.5,-0.3 1.1,-0.5 1.8,-0.5c0.6,0 1.1,0.1 1.6,0.4c0.5,0.2 0.8,0.6 1,1v-1.2H331.3zM329.1,104.6c0.4,-0.5 0.6,-1.1 0.6,-1.9s-0.2,-1.4 -0.6,-1.9s-1,-0.7 -1.7,-0.7c-0.7,0 -1.3,0.2 -1.7,0.7s-0.6,1.1 -0.6,1.9c0,0.8 0.2,1.4 0.6,1.9s1,0.7 1.7,0.7C328.1,105.3 328.7,105.1 329.1,104.6z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M341.7,103H336c0.1,1.8 0.9,2.7 2.5,2.7c0.9,0 1.7,-0.3 2.5,-0.9l0.5,1.1c-0.4,0.3 -0.8,0.5 -1.3,0.7c-0.5,0.2 -1.1,0.3 -1.6,0.3c-1.3,0 -2.2,-0.3 -3,-1s-1.1,-1.6 -1.1,-2.9c0,-0.8 0.2,-1.5 0.5,-2.1c0.3,-0.6 0.8,-1.1 1.3,-1.4c0.6,-0.3 1.2,-0.5 2,-0.5c1.1,0 1.9,0.3 2.5,1s0.9,1.6 0.9,2.7V103zM336.8,100.6c-0.4,0.3 -0.6,0.8 -0.7,1.5h4.2c-0.1,-0.6 -0.3,-1.1 -0.6,-1.5c-0.3,-0.3 -0.8,-0.5 -1.4,-0.5C337.7,100.1 337.2,100.3 336.8,100.6z"
+ android:fillColor="#000747"/>
+ <path
+ android:pathData="M84.7,56.8l7.1,-0.3l-3.5,6.7z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="60.730198"
+ android:startX="90.7751"
+ android:endY="55.376"
+ android:endX="86.1858"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M115.4,58.4c26.1,4.2 29.8,10.7 29.8,10.7c0,0.4 0,0.8 0,1.2c0,0.2 -0.1,0.4 -0.2,0.7c-0.1,0.3 -2.7,5.7 -19.6,9.3L115.4,58.4z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="63.038998"
+ android:startX="130.2763"
+ android:endY="99.8384"
+ android:endX="130.2763"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="0.0704" android:color="#FF2D4576"/>
+ <item android:offset="0.2165" android:color="#FF2E5589"/>
+ <item android:offset="0.3608" android:color="#FF2B5E97"/>
+ <item android:offset="0.5" android:color="#FF29629C"/>
+ <item android:offset="0.6392" android:color="#FF2B5E97"/>
+ <item android:offset="0.7835" android:color="#FF2E5589"/>
+ <item android:offset="0.9296" android:color="#FF2D4576"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M49.6,79.4c-5.9,15.7 -2.9,20.6 -2.7,21c0.1,0.2 0.2,0.4 0.4,0.5c0.4,0 0.8,-0.1 1.2,-0.2c0,0 10.7,-0.5 23.2,-18.3L49.6,79.4z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="102.6335"
+ android:startX="48.5109"
+ android:endY="81.3735"
+ android:endX="60.4514"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF252B59"/>
+ <item android:offset="0.0859" android:color="#FF2B3A69"/>
+ <item android:offset="0.2267" android:color="#FF2E4A7C"/>
+ <item android:offset="0.3658" android:color="#FF2E5487"/>
+ <item android:offset="0.5" android:color="#FF2D578C"/>
+ <item android:offset="0.6342" android:color="#FF2E5487"/>
+ <item android:offset="0.7733" android:color="#FF2E4A7C"/>
+ <item android:offset="0.9141" android:color="#FF2B3A69"/>
+ <item android:offset="1" android:color="#FF252B59"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M88.6,19.5C74.3,3.9 67.4,4.8 67,4.8c-0.2,0 -0.5,0.1 -0.7,0.2c-0.5,0.2 -1,1.8 -1,1.8s-3,8.7 9.1,31.9L88.6,19.5z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="30.4543"
+ android:startX="82.5935"
+ android:endY="7.396099"
+ android:endX="62.829502"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF181844"/>
+ <item android:offset="0.0284" android:color="#FF1E1E4C"/>
+ <item android:offset="0.1353" android:color="#FF283261"/>
+ <item android:offset="0.2468" android:color="#FF2D4172"/>
+ <item android:offset="0.3647" android:color="#FF2E4A7C"/>
+ <item android:offset="0.5" android:color="#FF2E4D7F"/>
+ <item android:offset="0.6177" android:color="#FF2D4576"/>
+ <item android:offset="0.8125" android:color="#FF273160"/>
+ <item android:offset="1" android:color="#FF181844"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M101.1,79.8c19.4,22.2 26.2,20.9 26.2,20.9c0.4,0.1 0.9,0.2 1.3,0.2c0.2,-0.1 0.3,-0.3 0.4,-0.5c0.3,-0.4 5.8,-9.4 -12.8,-41.8L101.1,79.8z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="105.1583"
+ android:startX="121.7144"
+ android:endY="55.9721"
+ android:endX="106.4459"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF181844"/>
+ <item android:offset="0.0284" android:color="#FF1E1E4C"/>
+ <item android:offset="0.1353" android:color="#FF283261"/>
+ <item android:offset="0.2468" android:color="#FF2D4172"/>
+ <item android:offset="0.3647" android:color="#FF2E4A7C"/>
+ <item android:offset="0.5" android:color="#FF2E4D7F"/>
+ <item android:offset="0.6177" android:color="#FF2D4576"/>
+ <item android:offset="0.8125" android:color="#FF273160"/>
+ <item android:offset="1" android:color="#FF181844"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M76,83.2C36,81.5 31.2,71.5 31,71c-0.1,-0.2 -0.2,-0.4 -0.2,-0.7c0.1,-0.7 1.5,-2 1.5,-2s10.6,-6.5 28.3,-10L76,83.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="63.0388"
+ android:startX="53.387"
+ android:endY="99.8374"
+ android:endX="53.387"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="0.0704" android:color="#FF2D4576"/>
+ <item android:offset="0.2165" android:color="#FF2E5589"/>
+ <item android:offset="0.3608" android:color="#FF2B5E97"/>
+ <item android:offset="0.5" android:color="#FF29629C"/>
+ <item android:offset="0.6392" android:color="#FF2B5E97"/>
+ <item android:offset="0.7835" android:color="#FF2E5589"/>
+ <item android:offset="0.9296" android:color="#FF2D4576"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M87.5,18.3c-5,5.4 -9.6,11.2 -13.8,17.2h1c3.1,-3.9 10.8,-13.7 13.4,-16.5L87.5,18.3z"
+ android:strokeAlpha="0.4"
+ android:fillAlpha="0.4">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="26.929298"
+ android:startX="73.632904"
+ android:endY="26.929298"
+ android:endX="88.0793"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M103.6,36.3C114.1,11.6 110,6 110,6c-0.1,-0.3 -0.2,-0.7 -0.3,-1c-0.2,-0.1 -0.4,-0.1 -0.7,-0.2c-0.5,-0.1 -11.4,-1.5 -34.4,30.7L103.6,36.3z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="42.205997"
+ android:startX="92.7132"
+ android:endY="7.496499"
+ android:endX="92.7132"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF252B59"/>
+ <item android:offset="0.5" android:color="#FF2D578C"/>
+ <item android:offset="0.6934" android:color="#FF2D5588"/>
+ <item android:offset="0.8038" android:color="#FF2E4F80"/>
+ <item android:offset="0.8932" android:color="#FF2D4474"/>
+ <item android:offset="0.971" android:color="#FF283463"/>
+ <item android:offset="1" android:color="#FF252B59"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M87.8,98.3c-14.2,15.4 -21,14.5 -21.4,14.5c-0.6,-0.2 -1.2,-0.5 -1.7,-0.8l-17.3,-11c7.3,-1.6 16.3,-10.2 25.7,-21.3L87.8,98.3z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="109.571"
+ android:startX="61.0092"
+ android:endY="13.722899"
+ android:endX="124.4187"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.08239999" android:color="#FF177EBC"/>
+ <item android:offset="0.1675" android:color="#FF0E91D1"/>
+ <item android:offset="0.2527" android:color="#FF10A2E1"/>
+ <item android:offset="0.337" android:color="#FF18ACEA"/>
+ <item android:offset="0.42" android:color="#FF24B1ED"/>
+ <item android:offset="0.5" android:color="#FF28B1ED"/>
+ <item android:offset="0.58" android:color="#FF24B1ED"/>
+ <item android:offset="0.663" android:color="#FF18ACEA"/>
+ <item android:offset="0.7473" android:color="#FF10A2E1"/>
+ <item android:offset="0.8325" android:color="#FF0E91D1"/>
+ <item android:offset="0.9176" android:color="#FF177EBC"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M88.4,98.9c-14.2,15.4 -21,14.5 -21.4,14.5c-0.6,-0.2 -1.2,-0.5 -1.7,-0.8l-17.9,-11.6c7.3,-1.6 16.9,-9.6 26.3,-20.7L88.4,98.9z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="111.493"
+ android:startX="55.3103"
+ android:endY="89.0063"
+ android:endX="80.4253"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2C5D95"/>
+ <item android:offset="0.08220001" android:color="#FF246EAB"/>
+ <item android:offset="0.1808" android:color="#FF1B79B9"/>
+ <item android:offset="0.3007" android:color="#FF1080C2"/>
+ <item android:offset="0.5" android:color="#FF0E81C5"/>
+ <item android:offset="0.6993" android:color="#FF1080C2"/>
+ <item android:offset="0.8192" android:color="#FF1B79B9"/>
+ <item android:offset="0.9178" android:color="#FF246EAB"/>
+ <item android:offset="1" android:color="#FF2C5D95"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M50.5,38.9c-6.3,-16.2 -3.2,-21.3 -3,-21.6c0.4,-0.5 0.9,-0.9 1.4,-1.2L66.3,5c-1.5,7.1 2.3,18 8.2,30.7L50.5,38.9z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="13.064799"
+ android:startX="53.0635"
+ android:endY="110.2625"
+ android:endX="111.3822"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2C5D95"/>
+ <item android:offset="0.0176" android:color="#FF2A6199"/>
+ <item android:offset="0.1407" android:color="#FF1C79B7"/>
+ <item android:offset="0.2631" android:color="#FF0A8CCA"/>
+ <item android:offset="0.3837" android:color="#FF0B97D4"/>
+ <item android:offset="0.5" android:color="#FF0E9AD8"/>
+ <item android:offset="0.6163" android:color="#FF0B97D4"/>
+ <item android:offset="0.7369" android:color="#FF0A8CCA"/>
+ <item android:offset="0.8593" android:color="#FF1C79B7"/>
+ <item android:offset="0.9824" android:color="#FF2A6199"/>
+ <item android:offset="1" android:color="#FF2C5D95"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M87,58.2c-8.7,0 -17.4,0.7 -26,1.9c0.3,0.5 4.3,7.2 7.2,11.7c27.8,42.8 40.8,41.1 41.4,41c0.6,-0.2 1.2,-0.5 1.7,-0.8l17.3,-11C116.8,98.4 100.4,79.2 87,58.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="109.671196"
+ android:startX="116.1451"
+ android:endY="62.439598"
+ android:endX="78.6461"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2C5D95"/>
+ <item android:offset="0.0257" android:color="#FF2A6199"/>
+ <item android:offset="0.2053" android:color="#FF1C79B7"/>
+ <item android:offset="0.384" android:color="#FF0A8CCA"/>
+ <item android:offset="0.5599" android:color="#FF0B97D4"/>
+ <item android:offset="0.7296" android:color="#FF0E9AD8"/>
+ <item android:offset="0.7925" android:color="#FF0B97D4"/>
+ <item android:offset="0.8577" android:color="#FF0A8CCA"/>
+ <item android:offset="0.9239" android:color="#FF1C79B7"/>
+ <item android:offset="0.9905" android:color="#FF2A6199"/>
+ <item android:offset="1" android:color="#FF2C5D95"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M49.9,39.5c-6.3,-16.2 -3.2,-21.3 -3,-21.6c0.4,-0.5 0.9,-0.9 1.4,-1.2L66.3,5c-1.5,7.1 1.7,18.6 7.6,31.2L49.9,39.5z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="36.878098"
+ android:startX="61.9598"
+ android:endY="10.594299"
+ android:endX="54.6587"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2C5D95"/>
+ <item android:offset="0.08220001" android:color="#FF246EAB"/>
+ <item android:offset="0.1808" android:color="#FF1B79B9"/>
+ <item android:offset="0.3007" android:color="#FF1080C2"/>
+ <item android:offset="0.5" android:color="#FF0E81C5"/>
+ <item android:offset="0.6993" android:color="#FF1080C2"/>
+ <item android:offset="0.8192" android:color="#FF1B79B9"/>
+ <item android:offset="0.9178" android:color="#FF246EAB"/>
+ <item android:offset="1" android:color="#FF2C5D95"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M115.3,60.6c13.5,1.9 24.7,4.7 29.8,9.8V49.8c0,-0.6 -0.1,-1.3 -0.2,-1.9c-0.1,-0.3 -2.7,-5.6 -19,-9.1L115.3,60.6z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="54.6028"
+ android:startX="144.6448"
+ android:endY="54.6028"
+ android:endX="30.8902"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.0128" android:color="#FF256BA7"/>
+ <item android:offset="0.1121" android:color="#FF0B83C3"/>
+ <item android:offset="0.2115" android:color="#FF1797D8"/>
+ <item android:offset="0.3099" android:color="#FF25A3E2"/>
+ <item android:offset="0.4066" android:color="#FF27ABE7"/>
+ <item android:offset="0.5" android:color="#FF2AAEEA"/>
+ <item android:offset="0.5934" android:color="#FF27ABE7"/>
+ <item android:offset="0.6901" android:color="#FF25A3E2"/>
+ <item android:offset="0.7885" android:color="#FF1797D8"/>
+ <item android:offset="0.8879" android:color="#FF0B83C3"/>
+ <item android:offset="0.9872" android:color="#FF256BA7"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M115.3,59.8c13.5,1.9 24.7,5.5 29.8,10.6V49c0,-0.6 -0.1,-1.3 -0.2,-1.9c-0.1,-0.3 -2.7,-5.6 -19,-9.1L115.3,59.8z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="52.9419"
+ android:startX="112.0363"
+ android:endY="54.6941"
+ android:endX="144.5497"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2E5284"/>
+ <item android:offset="0.0061" android:color="#FF2E5486"/>
+ <item android:offset="0.0912" android:color="#FF29649D"/>
+ <item android:offset="0.1876" android:color="#FF236FAD"/>
+ <item android:offset="0.3049" android:color="#FF1D77B6"/>
+ <item android:offset="0.5" android:color="#FF1C78B9"/>
+ <item android:offset="0.6951" android:color="#FF1D77B6"/>
+ <item android:offset="0.8124" android:color="#FF236FAD"/>
+ <item android:offset="0.9088" android:color="#FF29649D"/>
+ <item android:offset="0.9939" android:color="#FF2E5486"/>
+ <item android:offset="1" android:color="#FF2E5284"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M103.1,36c-3,-0.1 -9.5,-0.4 -15.1,-0.4c-51.1,0 -56.7,11.8 -57,12.4c-0.2,0.6 -0.2,1.2 -0.2,1.9v20.6c5,-5 15.9,-7.7 29.2,-9.7c8.6,-1.2 17.2,-1.9 25.9,-2c1.6,0 3.2,0 4.8,0C90.7,58.8 106.1,36.1 103.1,36z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="52.9969"
+ android:startX="30.7999"
+ android:endY="52.9969"
+ android:endX="89.4609"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.0225" android:color="#FF256BA7"/>
+ <item android:offset="0.1971" android:color="#FF0B83C3"/>
+ <item android:offset="0.3718" android:color="#FF1797D8"/>
+ <item android:offset="0.5447" android:color="#FF25A3E2"/>
+ <item android:offset="0.7147" android:color="#FF27ABE7"/>
+ <item android:offset="0.8788" android:color="#FF2AAEEA"/>
+ <item android:offset="0.9015" android:color="#FF27ABE7"/>
+ <item android:offset="0.9249" android:color="#FF25A3E2"/>
+ <item android:offset="0.9487" android:color="#FF1797D8"/>
+ <item android:offset="0.9728" android:color="#FF0B83C3"/>
+ <item android:offset="0.9969" android:color="#FF256BA7"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M73.9,34.4c-10.7,0.5 -18.4,1.3 -24.8,3.1l0.3,0.8c0.6,-0.1 1.3,-0.3 1.9,-0.4c7.7,-1.2 15.4,-2 23.1,-2.3L73.9,34.4z"
+ android:strokeAlpha="0.2"
+ android:fillAlpha="0.2">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="37.816498"
+ android:startX="72.0549"
+ android:endY="34.716198"
+ android:endX="50.0087"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M103.1,35.2c-3,-0.1 -9.5,-0.4 -15.1,-0.4c-51.1,0 -56.7,11.8 -57,12.4c-0.2,0.6 -0.2,1.2 -0.2,1.9v21.4c5,-5 15.9,-8.5 29.2,-10.5c8.6,-1.2 17.2,-1.9 25.9,-2c1.6,0 3.2,0 4.8,0C93,58 106.1,35.4 103.1,35.2z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="56.6725"
+ android:startX="94.487404"
+ android:endY="47.9113"
+ android:endX="32.1858"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.0382" android:color="#FF2174B1"/>
+ <item android:offset="0.1177" android:color="#FF0B86C4"/>
+ <item android:offset="0.2081" android:color="#FF0A94D2"/>
+ <item android:offset="0.3177" android:color="#FF0C9BDB"/>
+ <item android:offset="0.5" android:color="#FF109EDE"/>
+ <item android:offset="0.6823" android:color="#FF0C9BDB"/>
+ <item android:offset="0.7919" android:color="#FF0A94D2"/>
+ <item android:offset="0.8823" android:color="#FF0B86C4"/>
+ <item android:offset="0.9618" android:color="#FF2174B1"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M88,59.7c13.9,-20.9 24.2,-42.8 21.7,-54.7l17.3,11c0.5,0.3 1,0.7 1.4,1.2c0.3,0.5 7.1,11.7 -20.7,54.5c-2,3.2 -3.9,6.9 -4.6,7.2c-4.1,-4 -12.6,-15.6 -14.7,-18.5C88.1,60 88,59.7 88,59.7z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="13.538699"
+ android:startX="123.3625"
+ android:endY="64.5629"
+ android:endX="93.7356"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.1238" android:color="#FF177EBC"/>
+ <item android:offset="0.2516" android:color="#FF0E91D1"/>
+ <item android:offset="0.3797" android:color="#FF10A2E1"/>
+ <item android:offset="0.5064" android:color="#FF18ACEA"/>
+ <item android:offset="0.631" android:color="#FF24B1ED"/>
+ <item android:offset="0.7513" android:color="#FF28B1ED"/>
+ <item android:offset="0.7911" android:color="#FF24B1ED"/>
+ <item android:offset="0.8324" android:color="#FF18ACEA"/>
+ <item android:offset="0.8743" android:color="#FF10A2E1"/>
+ <item android:offset="0.9167" android:color="#FF0E91D1"/>
+ <item android:offset="0.959" android:color="#FF177EBC"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M126.5,38.1c-3.1,7.8 -6.8,15.3 -11.1,22.4l1.3,0.2c5.5,-9.5 8.7,-16.5 10.9,-22.4L126.5,38.1z"
+ android:strokeAlpha="0.25"
+ android:fillAlpha="0.25">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="39.2045"
+ android:startX="127.0867"
+ android:endY="59.4473"
+ android:endX="116.2998"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M108.4,72.3c27.8,-42.8 21,-54 20.7,-54.5c-0.4,-0.5 -0.9,-0.9 -1.4,-1.2L109.7,5c2.5,11.8 -7.4,34.6 -21.2,55.5c4.6,7.1 9.4,14 14.5,19.9C104,79.3 106.5,75.2 108.4,72.3z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="14.658999"
+ android:startX="122.3902"
+ android:endY="70.4332"
+ android:endX="92.669304"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.0382" android:color="#FF2174B1"/>
+ <item android:offset="0.1177" android:color="#FF0B86C4"/>
+ <item android:offset="0.2081" android:color="#FF0A94D2"/>
+ <item android:offset="0.3177" android:color="#FF0C9BDB"/>
+ <item android:offset="0.5" android:color="#FF109EDE"/>
+ <item android:offset="0.6823" android:color="#FF0C9BDB"/>
+ <item android:offset="0.7919" android:color="#FF0A94D2"/>
+ <item android:offset="0.8823" android:color="#FF0B86C4"/>
+ <item android:offset="0.9618" android:color="#FF2174B1"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M102.5,81.1c0.1,-0.1 0.2,-0.1 0.2,-0.2C97.4,74.6 92.5,68.1 88,61.2c-0.1,0.1 -0.2,0.2 -0.2,0.4C87.7,61.6 97.4,76.9 102.5,81.1z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="15.9154"
+ android:startX="124.6962"
+ android:endY="72.1807"
+ android:endX="94.7137"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2867A2"/>
+ <item android:offset="0.0382" android:color="#FF2174B1"/>
+ <item android:offset="0.1177" android:color="#FF0B86C4"/>
+ <item android:offset="0.2081" android:color="#FF0A94D2"/>
+ <item android:offset="0.3177" android:color="#FF0C9BDB"/>
+ <item android:offset="0.5" android:color="#FF109EDE"/>
+ <item android:offset="0.6823" android:color="#FF0C9BDB"/>
+ <item android:offset="0.7919" android:color="#FF0A94D2"/>
+ <item android:offset="0.8823" android:color="#FF0B86C4"/>
+ <item android:offset="0.9618" android:color="#FF2174B1"/>
+ <item android:offset="1" android:color="#FF2867A2"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M88,99.3C87.8,99.1 77.5,87 72.9,79.9l-0.8,0.9c4.6,6.7 9.7,13.1 15.3,19.2L88,99.3z"
+ android:strokeAlpha="0.2"
+ android:fillAlpha="0.2">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="79.8911"
+ android:startX="76.306"
+ android:endY="100.7254"
+ android:endX="83.9963"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2B3B6A"/>
+ <item android:offset="1" android:color="#FF2B3B6A"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M102.7,80.9C97.4,74.6 92.5,68.1 88,61.2c-0.5,-0.8 -1.1,-1.6 -1.6,-2.4c-8.7,0 -17.4,0.7 -26,1.9c0.3,0.5 4.3,7.2 7.2,11.7c27.8,42.8 40.8,41.1 41.4,41c0.6,-0.2 1.2,-0.5 1.7,-0.8l17.9,-11.6C121.3,99.4 111.9,91.6 102.7,80.9z">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:startY="58.4632"
+ android:startX="90.9097"
+ android:endY="114.8282"
+ android:endX="99.9632"
+ android:type="linear">
+ <item android:offset="0" android:color="#FF2E5284"/>
+ <item android:offset="0.0244" android:color="#FF2C5C92"/>
+ <item android:offset="0.0888" android:color="#FF2075B1"/>
+ <item android:offset="0.1599" android:color="#FF0B86C4"/>
+ <item android:offset="0.2403" android:color="#FF0A94D2"/>
+ <item android:offset="0.3378" android:color="#FF0E9CDA"/>
+ <item android:offset="0.5" android:color="#FF109EDE"/>
+ <item android:offset="0.6718" android:color="#FF0C9BDB"/>
+ <item android:offset="0.7751" android:color="#FF0A94D2"/>
+ <item android:offset="0.8603" android:color="#FF0B86C4"/>
+ <item android:offset="0.9351" android:color="#FF2174B1"/>
+ <item android:offset="1" android:color="#FF2C5D95"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ <path
+ android:pathData="M201.1,37.5c3.2,0 5.6,-0.7 7.3,-2.3c1.5,-1.5 2.3,-4 2.3,-7.4c0,-4 -2.3,-6 -6.8,-6c-3.2,0 -5.6,0.8 -7.2,2.4c-1.5,1.5 -2.3,4.1 -2.3,7.5C194.3,35.6 196.6,37.5 201.1,37.5z"
+ android:fillColor="#000747"
+ android:fillType="evenOdd"/>
+ <path
+ android:fillColor="#000747"
+ android:pathData="M232.5,71.2c-1.4,1.5 -3.1,2.3 -5.1,2.3c-1.9,0 -3.3,-0.5 -4.1,-1.3c-0.8,-0.8 -1.2,-1.6 -1.2,-2.5c0,-0.8 0.1,-1.5 0.2,-2l1,-6.1c0.7,-4 3.2,-6 7.3,-6c2.2,0 3.6,0.7 4.2,2L232.5,71.2zM175.9,119.1c-2.7,4.8 -5.1,7.2 -7.3,7.1c-2.3,-0.1 -3.4,-1.7 -3.3,-4.9c0.1,-3.3 1.6,-7.1 4.5,-11.4c2.9,-4.3 7.5,-9 13.9,-14.2C181.1,106.5 178.5,114.3 175.9,119.1zM336,71.3c0,-0.3 0,-0.6 0.1,-0.9l4.5,-25.5h-13.8L322,72.4c0,0.2 -0.1,0.3 -0.1,0.5c-1,0.5 -2.1,0.8 -3.2,0.8c-1.6,0 -2.4,-0.7 -2.6,-2.3c0,-0.3 0,-0.6 0.1,-0.9l2,-12.1c0.3,-1.6 0.4,-3.4 0.4,-5.4c0,-2 -0.5,-3.8 -1.6,-5.5c-1.6,-2.4 -5.2,-3.6 -10.6,-3.6c-5.5,0 -9.9,2.3 -13.1,6.9c-0.9,-4.6 -4.9,-6.9 -12,-6.9c-5.1,0 -9.2,2 -12.4,6l0.9,-4.8H257l-5,28c-1,0.4 -2.1,0.8 -3.5,0.8c-1.4,0 -2.1,-0.7 -2.1,-2.1c0,-0.4 0.1,-0.7 0.1,-1l4.5,-25.5h-12.4l-0.4,2.4c-1.7,-2.3 -5.2,-3.5 -10.1,-3.5s-9.1,1.4 -12.2,4.4c-3.1,2.9 -5.1,6.8 -5.9,11.7l-1.5,8c-2.2,1.2 -4.3,2.5 -6.3,3.8c0.1,-0.5 0.2,-1 0.3,-1.6l4.4,-25.3h-13.8l-6.3,36.4c-12.8,9.4 -21.5,17.4 -26.2,23.9c-4.7,6.6 -7.2,12.7 -7.3,18.6c-0.1,4.2 1.1,7.6 3.7,10.3c2.5,2.6 5.9,4 10.2,4.2c8.9,0.3 16.3,-5.8 22,-18.1c4.4,-9.4 7.9,-21.3 10.8,-35.9c2.9,-2.2 5.8,-4.4 8.6,-6.4c1.5,4.8 5.7,7.2 12.7,7.2c5.3,0 9.3,-2.2 12,-6.6c0.6,4.4 3.9,6.6 9.9,6.6c2.6,0 5,-0.7 7.2,-2l-0.2,1h13.8l4.5,-25.8c1.7,-1.8 3.8,-2.7 6,-2.7c2.9,0 4.5,1.3 4.5,3.9c0,1 0,1.9 -0.2,2.9l-3.8,21.7h13.8l4.5,-25.1c1.7,-2.2 3.9,-3.3 6.7,-3.3c2.8,0 4.2,1.3 4.2,3.9c0,1 0,1.9 -0.2,2.9l-1.7,10c-0.2,1.3 -0.3,2.4 -0.3,3.5c0,6.1 3.8,9.3 11.1,9.3c2,0 3.9,-0.4 5.7,-1.3c0.1,0 0.1,-0.1 0.2,-0.1c1.8,-0.9 3.1,-1.9 4,-2.7c0.1,0.2 0.2,0.4 0.3,0.6c1.4,2.3 4.6,3.4 9.5,3.4c3.2,0 6.1,-1 8.7,-3.1l0.4,-9.2c-1,0.5 -2.1,0.8 -3.3,0.8C336.8,73.7 336.1,72.9 336,71.3z"/>
+ <path
+ android:pathData="M338,21.8c-3.2,0 -5.6,0.8 -7.2,2.4c-1.5,1.5 -2.3,4.1 -2.3,7.5c0,3.8 2.2,5.9 6.7,5.9c3.3,0 5.8,-0.7 7.3,-2.3c1.5,-1.5 2.3,-4 2.3,-7.4C344.8,23.9 342.4,21.8 338,21.8z"
+ android:fillColor="#000747"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
index d534dda..09dbb83 100644
--- a/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout-land/frag_acc_profile_create.xml
@@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:theme="@style/Wizard"
- tools:background="@color/color_primary_dark">
+ android:theme="@style/Wizard">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -32,7 +31,7 @@
android:layout_marginBottom="@dimen/activity_vertical_margin"
android:gravity="center"
android:text="@string/account_creation_profile"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
@@ -117,8 +116,7 @@
android:inputType="textCapWords"
android:maxLines="1"
android:textAlignment="center"
- android:textColor="@color/text_color_primary_dark"
- android:textColorHint="@color/text_color_secondary_dark" />
+ android:textColor="@color/text_color_primary" />
</cx.ring.views.BoundedRelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/activity_launch.xml b/ring-android/app/src/main/res/layout/activity_launch.xml
index 29f6bc0..71b0568 100644
--- a/ring-android/app/src/main/res/layout/activity_launch.xml
+++ b/ring-android/app/src/main/res/layout/activity_launch.xml
@@ -1,25 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_primary_light"
+ android:background="@color/white"
android:orientation="vertical"
android:padding="88dp">
<ImageView
android:id="@+id/logo_ring"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
+ android:layout_width="128dp"
+ android:layout_height="128dp"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:layout_margin="16dp"
android:contentDescription="@string/app_name"
- app:srcCompat="@drawable/ic_logo_ring_white" />
+ android:src="@drawable/ic_jami" />
<ProgressBar
android:id="@+id/loading_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/logo_ring"
- android:layout_centerInParent="true" />
+ android:layout_below="@id/logo_ring"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:layout_margin="16dp" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/activity_wizard.xml b/ring-android/app/src/main/res/layout/activity_wizard.xml
index a2b7939..d6b2dee 100644
--- a/ring-android/app/src/main/res/layout/activity_wizard.xml
+++ b/ring-android/app/src/main/res/layout/activity_wizard.xml
@@ -1,7 +1,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_primary_dark"
+ android:background="@color/white"
android:orientation="vertical">
<FrameLayout
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index c9caa06..65e0898 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -18,6 +18,7 @@
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -25,30 +26,30 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/padding_small">
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp">
<ImageView
- android:id="@+id/logo_ring_beta2"
android:layout_width="wrap_content"
android:layout_height="80dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:contentDescription="@string/app_name"
android:maxWidth="250dp"
- android:scaleType="fitCenter" />
+ android:scaleType="fitCenter"
+ app:srcCompat="@drawable/ic_jami_full_logo" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginTop="16dp"
+ android:layout_margin="16dp"
android:text="@string/description"
android:textAlignment="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -67,16 +68,11 @@
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/darker_gray" />
-
<LinearLayout
android:id="@+id/contribute_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
@@ -94,19 +90,15 @@
android:id="@+id/web_site"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@string/app_website_contribute"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/darker_gray" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -121,20 +113,16 @@
android:id="@+id/copyright"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@string/copyright"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/darker_gray" />
-
<LinearLayout
android:id="@+id/license_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
@@ -152,20 +140,16 @@
android:id="@+id/license"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:singleLine="false" />
+ android:singleLine="false"
+ android:text="@string/license" />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/darker_gray" />
-
<LinearLayout
android:id="@+id/email_report_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
@@ -184,19 +168,15 @@
android:id="@+id/email_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:clickable="false" />
+ android:clickable="false"
+ android:text="@string/report" />
</LinearLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/darker_gray" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="5dp"
+ android:padding="@dimen/padding_small"
android:gravity="center_vertical"
android:orientation="vertical">
@@ -205,6 +185,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
+ android:text="@string/sponsor_section"
android:textColor="@color/color_primary_dark"
android:textSize="15sp" />
@@ -216,7 +197,8 @@
android:layout_marginTop="5dp"
android:contentDescription="@string/app_author"
android:maxWidth="250dp"
- android:scaleType="fitCenter" />
+ android:scaleType="fitCenter"
+ android:src="@drawable/logo_sfl_coul_rgb" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
index b708371..24e27e1 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
@@ -1,69 +1,61 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_primary_light"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
tools:context=".account.AccountWizardActivity">
- <LinearLayout
- android:layout_width="match_parent"
+ <ScrollView
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:animateLayoutChanges="true"
- android:orientation="vertical"
- android:paddingBottom="16dp">
+ android:layout_centerVertical="true">
- <ImageView
- android:id="@+id/imageView6"
- android:layout_width="200dp"
- android:layout_height="80dp"
- android:layout_gravity="center"
- android:layout_margin="16dp"
- android:contentDescription="@string/app_name"
- app:srcCompat="@drawable/ic_logo_ring_white" />
-
- <TextView
- android:id="@+id/ring_acc_title_txt"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:text="@string/account_creation_home"
- android:textColor="@color/text_color_primary_dark"
- android:textSize="24sp" />
-
- <TextView
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingLeft="16dp"
- android:paddingTop="24dp"
- android:paddingRight="16dp"
- android:paddingBottom="24dp"
- android:text="@string/help_ring"
- android:textColor="@color/text_color_primary_dark"
- android:textSize="14sp" />
+ android:animateLayoutChanges="true"
+ android:orientation="vertical"
+ android:paddingBottom="16dp">
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ring_add_account"
- android:layout_width="300dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_marginBottom="16dp"
- android:text="@string/account_link_button"
- android:theme="@style/ButtonColored" />
+ <ImageView
+ android:id="@+id/imageView6"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_margin="16dp"
+ android:contentDescription="@string/app_name"
+ app:srcCompat="@drawable/ic_jami_full_logo" />
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:paddingLeft="16dp"
+ android:paddingTop="24dp"
+ android:paddingRight="16dp"
+ android:paddingBottom="24dp"
+ android:text="@string/help_ring"
+ android:textColor="@color/text_color_primary"
+ android:textSize="14sp" />
- <com.google.android.material.button.MaterialButton
- android:id="@+id/ring_create_btn"
- android:layout_width="300dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:text="@string/account_new_button"
- android:theme="@style/ButtonColored" />
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/ring_create_btn"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="16dp"
+ android:text="@string/account_new_button"
+ android:theme="@style/ButtonColored" />
- </LinearLayout>
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/ring_add_account"
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/account_link_button"
+ android:theme="@style/ButtonColored" />
-</ScrollView>
\ No newline at end of file
+ </LinearLayout>
+
+ </ScrollView>
+</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
index ec0d891..a95b4bd 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
@@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:theme="@style/Wizard"
- tools:background="@color/color_primary_dark">
+ android:theme="@style/Wizard">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -32,7 +31,7 @@
android:layout_marginTop="24dp"
android:gravity="center"
android:text="@string/account_creation_profile"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
@@ -107,8 +106,8 @@
android:paddingStart="16dp"
android:paddingTop="16dp"
android:textAlignment="center"
- android:textColor="@color/text_color_primary_dark"
- android:textColorHint="@color/text_color_secondary_dark" />
+ android:textColor="@color/text_color_primary"
+ android:textColorHint="@color/text_color_primary" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
index 8c29b5d..541a4dc 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
@@ -5,16 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Wizard"
- tools:background="@color/color_primary_dark"
tools:context="cx.ring.account.AccountWizardActivity">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/create_account"
- android:layout_alignParentTop="true"
+ android:layout_height="match_parent"
android:layout_centerHorizontal="true"
+ android:layout_marginBottom="80dp"
app:bounded_width="500dp">
<LinearLayout
@@ -23,15 +21,18 @@
android:animateLayoutChanges="true"
android:orientation="vertical"
android:paddingStart="@dimen/activity_horizontal_margin"
- android:paddingEnd="@dimen/activity_horizontal_margin">
+ android:paddingTop="24dp"
+ android:paddingEnd="@dimen/activity_horizontal_margin"
+ android:paddingBottom="24dp">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="24dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="24dp"
android:text="@string/account_creation_ring"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<Switch
@@ -42,7 +43,7 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/register_username"
- android:textColor="@color/text_color_primary_dark" />
+ android:textColor="@color/text_color_primary" />
<LinearLayout
android:id="@+id/ring_username_box"
@@ -83,7 +84,7 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="Choose a password for enhanced security"
- android:textColor="@color/text_color_primary_dark" />
+ android:textColor="@color/text_color_primary" />
<LinearLayout
android:id="@+id/ring_password_box"
@@ -98,7 +99,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:text="@string/help_password_choose"
- android:textColor="@color/text_color_primary_dark" />
+ android:textColor="@color/text_color_primary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ring_password_txt_box"
@@ -141,7 +142,7 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="Use push notifications"
- android:textColor="@color/text_color_primary_dark" />
+ android:textColor="@color/text_color_primary" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
index afa667e..beefc98 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
@@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:theme="@style/Wizard"
- tools:background="@color/color_primary_dark">
+ android:theme="@style/Wizard">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -28,29 +27,28 @@
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="24dp"
- android:gravity="center"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="24dp"
+ android:paddingStart="4dp"
android:text="@string/account_link_title"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingEnd="16dp"
- android:paddingStart="16dp"
+ android:paddingStart="4dp"
android:paddingTop="16dp"
+ android:paddingEnd="4dp"
+ android:paddingBottom="8dp"
android:text="@string/help_password_enter"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/ring_password_txt_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@@ -65,19 +63,17 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="8dp"
- android:paddingEnd="16dp"
- android:paddingStart="16dp"
+ android:paddingStart="4dp"
android:paddingTop="16dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="8dp"
android:text="@string/help_pin_enter"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
app:passwordToggleEnabled="true">
<com.google.android.material.textfield.TextInputEditText
@@ -87,7 +83,7 @@
android:hint="@string/account_link_prompt_pin"
android:imeOptions="actionDone"
android:inputType="textNoSuggestions"
- android:singleLine="true"/>
+ android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
index 0f255a4..941b521 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
@@ -25,8 +25,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/Wizard"
- android:orientation="vertical"
- tools:background="@color/color_primary_dark">
+ android:orientation="vertical">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -40,25 +39,26 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="@dimen/activity_horizontal_margin"
- android:paddingLeft="16dp"
+ android:paddingTop="24dp"
android:paddingEnd="@dimen/activity_horizontal_margin"
- android:paddingRight="16dp">
+ android:paddingBottom="64dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="24dp"
- android:gravity="center"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="16dp"
android:text="@string/help_sip_title"
+ android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingTop="16dp"
- android:paddingBottom="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="16dp"
android:text="@string/help_sip"
+ android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
@@ -136,7 +136,6 @@
android:layout_height="wrap_content"
android:layout_alignEnd="@id/scrollview"
android:layout_alignParentBottom="true"
- android:layout_gravity="end"
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginBottom="24dp"
diff --git a/ring-android/app/src/main/res/values/colors.xml b/ring-android/app/src/main/res/values/colors.xml
index fb70976..285350d 100644
--- a/ring-android/app/src/main/res/values/colors.xml
+++ b/ring-android/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="color_primary_light">#3ac0d2</color>
- <color name="color_primary_dark">#004C60</color>
+ <color name="color_primary_light">#28B1ED</color>
+ <color name="color_primary_dark">#000747</color>
<color name="darker_gray">#aaaaaa</color>
<color name="lighter_gray">#d3d3d3</color>
diff --git a/ring-android/app/src/main/res/values/strings.xml b/ring-android/app/src/main/res/values/strings.xml
index 89e6177..89f8f99 100644
--- a/ring-android/app/src/main/res/values/strings.xml
+++ b/ring-android/app/src/main/res/values/strings.xml
@@ -21,18 +21,18 @@
<resources>
<!-- About -->
- <string name="app_name" translatable="false">Ring</string>
+ <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">Live Free or Die - %1$s</string>
- <string name="app_website_contribute" translatable="false"><u>https://ring.cx/contribute</u></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>
- <string name="ring_contribute_website" translatable="false">https://ring.cx/contribute</string>
+ <string name="ring_contribute_website" translatable="false">https://jami.net/contribute</string>
<string name="copyright" translatable="false">2004–2018 Savoir-faire Linux Inc.</string>
<string name="feedback_section">Feedback</string>
- <string name="report"><u>Send us an email</u></string>
+ <string name="report"><u>Send us an email</u></string>
<string name="section_license">License</string>
- <string name="sponsor_section">Ring is a free software developed and supported by</string>
+ <string name="sponsor_section">Jami is a free software developed and supported by</string>
<string name="copyright_section">Copyright</string>
<string name="contribute_section">Contribute</string>
<string name="version_section">Version</string>
@@ -40,9 +40,8 @@
<string name="no_browser_app_installed">No web browser app found, install one to view this page</string>
<string name="email_chooser_title">Send mail using…</string>
<string name="website_chooser_title">View website using…</string>
- <string name="license">This software is provided \"as is\", without warranty of any kind. For details, see
-<u>GNU General Public License version 3 or later</u></string>
- <string name="description">Ring is free software for universal communication which respects the freedoms and privacy of its users.</string>
+ <string name="license">This software is provided \"as is\", without warranty of any kind. For details, see <u>GNU General Public License version 3 or later</u></string>
+ <string name="description">Jami is free software for universal communication which respects the freedoms and privacy of its users.</string>
<string name="credits">Credits</string>
<!-- About dialog -->
@@ -69,7 +68,7 @@
<string name="menu_item_account">Manage account</string>
<string name="menu_item_settings">Settings</string>
<string name="menu_item_share">Share my contact</string>
- <string name="menu_item_about">About Ring</string>
+ <string name="menu_item_about">About Jami</string>
<!-- Dialing Fragment -->
<string name="dial_number">Dial a number</string>
@@ -109,7 +108,7 @@
<string name="notif_channel_file_transfer">File transfer</string>
<string name="notif_channel_background_service">Background service</string>
<string name="notif_channel_background_service_descr">Allows receiving calls and messages anytime.</string>
- <string name="notif_background_service">Ring is currently running in background</string>
+ <string name="notif_background_service">Jami is currently running in background</string>
<string name="notif_mark_as_read">Mark as read</string>
<string name="notif_dismiss">Dismiss</string>
<string name="notif_reply">Reply</string>
@@ -126,8 +125,8 @@
<string name="ongoing_call">Ongoing call</string>
<string name="hist_in_call">Incoming call of %1$s</string>
<string name="hist_out_call">Outgoing call of %1$s</string>
- <string name="start_error_title">Can\'t start Ring !</string>
- <string name="start_error_mic_required">Ring requires the microphone permission to work.</string>
+ <string name="start_error_title">Can\'t start Jami !</string>
+ <string name="start_error_mic_required">Jami requires the microphone permission to work.</string>
<string name="action_call_accept">Take call</string>
<string name="action_call_decline">Decline</string>
<string name="action_call_mic_mute">Mute microphone</string>
@@ -161,10 +160,10 @@
<string name="ringtone_error_size_too_big">This file is too big. The maximum size is %1$dkB.</string>
<!-- Read contacts permission -->
- <string name="permission_dialog_read_contacts_message">Ring needs the "Read contacts" permission to enable this feature. Please grant it.</string>
+ <string name="permission_dialog_read_contacts_message">Jami needs the "Read contacts" permission to enable this feature. Please grant it.</string>
<!-- Write call log permission -->
- <string name="permission_dialog_write_call_log_message">Ring needs the "Write call log" permission to enable this feature. Please grant it.</string>
+ <string name="permission_dialog_write_call_log_message">Jami needs the "Write call log" permission to enable this feature. Please grant it.</string>
<!-- QRCode Scan -->
<string name="scan_qr_account_message">Scan the QR Code of the account you want to add.</string>
@@ -198,11 +197,11 @@
<string name="prompt_new_password">New password</string>
<string name="prompt_new_password_optional">New password (optional)</string>
<string name="prompt_new_password_repeat">Repeat new password</string>
- <string name="account_create_title">Create a Ring account</string>
+ <string name="account_create_title">Create a Jami account</string>
<string name="prompt_new_username">Enter new username</string>
- <string name="help_password_choose">Choose a strong password you will remember to protect your Ring account.</string>
- <string name="help_password_enter">Enter your main Ring account password</string>
- <string name="help_pin_enter">Enter the PIN from another configured Ring account. Use the \"export account on Ring\" feature to obtain a PIN.</string>
+ <string name="help_password_choose">Choose a strong password you will remember to protect your Jami account.</string>
+ <string name="help_password_enter">Enter your main Jami account password</string>
+ <string name="help_pin_enter">Enter the PIN from another configured Jami account. Use the \"export Jami account\" feature to obtain a PIN.</string>
<string name="wizard_next">Next</string>
<string name="wizard_back">Back</string>
<string name="wizard_skip">Skip</string>
@@ -215,7 +214,7 @@
<string name="profile_name_hint">Enter your name (optional)</string>
<!-- Share fragment -->
- <string name="share_message">Scan this code with Ring</string>
+ <string name="share_message">Scan this code with Jami</string>
<string name="share_message_no_account">Please select an account to share.</string>
<string name="share_your_account_information">Share my contact information</string>
<string name="generic_error_migration">Error</string>
diff --git a/ring-android/app/src/main/res/values/strings_account.xml b/ring-android/app/src/main/res/values/strings_account.xml
index e730486..40335e4 100644
--- a/ring-android/app/src/main/res/values/strings_account.xml
+++ b/ring-android/app/src/main/res/values/strings_account.xml
@@ -26,7 +26,7 @@
<string name="ic_blacklist_menu">Blocked contacts</string>
<!-- Strings related to account creation -->
- <string name="add_ring_account_title">Add Ring account</string>
+ <string name="add_ring_account_title">Add Jami account</string>
<string name="add_sip_account_title">Add SIP account</string>
<string name="ring_account_default_name">Ring account %1$s</string>
@@ -51,7 +51,7 @@
You can edit your account later</string>
<string name="account_type_ip2ip">IP account</string>
- <string name="help_ring">A Ring account allows you to reach people securely in peer to peer through a fully distributed network.</string>
+ <string name="help_ring">A Jami account allows you to reach people securely in peer to peer through a fully distributed network.</string>
<string name="help_sip_title">Add your SIP account</string>
<string name="help_sip">Configure an existing SIP account.</string>
@@ -64,7 +64,7 @@
<!-- AccountManagementFragment -->
<string name="empty_account_list">No account registered</string>
<string name="normal_accounts_titles">Accounts</string>
- <string name="normal_devices_titles">Known devices linked to this Ring account</string>
+ <string name="normal_devices_titles">Known devices linked to this Jami account</string>
<string name="account_device_revoke">Revoke device</string>
<string name="account_device_revocation_success_title">Success</string>
<string name="account_device_revocation_success">Device is now revoked!</string>
@@ -162,25 +162,25 @@
<string name="account_export_end_error_title">Error</string>
<string name="account_export_end_error_message">Couldn\'t export account. An unknown error occurred.</string>
<string name="account_enter_password">Enter password</string>
- <string name="account_share_body">Contact me using \'%1$s\' on the Ring distributed communication platform: https://ring.cx</string>
- <string name="account_share_body_with_username">Contact me using \'%1$s\' or my public username \'%2$s\' on the Ring distributed communication platform: https://ring.cx</string>
- <string name="account_contact_me">Contact me on Ring !</string>
+ <string name="account_share_body">Contact me using \'%1$s\' on the Jami distributed communication platform: https://ring.cx</string>
+ <string name="account_share_body_with_username">Contact me using \'%1$s\' or my public username \'%2$s\' on the Jami distributed communication platform: https://ring.cx</string>
+ <string name="account_contact_me">Contact me on Jami !</string>
<string name="update_account">Update account</string>
- <string name="account_migration">Your Ring account can be updated.\nPlease enter your password.</string>
+ <string name="account_migration">Your Jami account can be updated.\nPlease enter your password.</string>
<string name="ring_account">Ring account</string>
<string name="ring_account_identity">Identity</string>
<string name="account_migration_title_dialog">Account migration</string>
<string name="account_migration_message_dialog">Your accounts need to be updated. Do you want to go the Account management screen to perform this operation ?</string>
<string name="account_update_needed">Update needed</string>
<string name="account_cannot_be_found_title">Can\'t find account</string>
- <string name="account_cannot_be_found_message">Account couldn\'t be found on the Ring network.\nMake sure it was exported on Ring from an existing device, and that provided credentials are correct.</string>
+ <string name="account_cannot_be_found_message">Account couldn\'t be found on the Jami network.\nMake sure it was exported on Jami from an existing device, and that provided credentials are correct.</string>
<string name="account_sip_cannot_be_registered_message">You can continue with the account creation process or edit your information here. Edition is still possible later in the account settings.</string>
<string name="account_no_network_title">Can\'t connect to the network</string>
- <string name="account_no_network_message">Could not add account because Ring coudn\'t connect to the distributed network. Check your device connectivity.</string>
+ <string name="account_no_network_message">Could not add account because Jami coudn\'t connect to the distributed network. Check your device connectivity.</string>
<string name="account_device_added_title">Account device added</string>
- <string name="account_device_added_message">You have successfully setup your Ring account on this device.</string>
+ <string name="account_device_added_message">You have successfully setup your Jami account on this device.</string>
<string name="account_device_updated_title">Account device updated</string>
- <string name="account_device_updated_message">You have successfully updated your Ring account.</string>
+ <string name="account_device_updated_message">You have successfully updated your Jami account.</string>
<string name="account_cannot_be_updated_message">Account device couldn\'t be update. Please check your password.</string>
<string name="account_sip_success_title">Sip account registered</string>
<string name="account_sip_success_message">You have successfully registered your Sip account.</string>
@@ -188,13 +188,13 @@
<string name="account_link_button">Link this device to an account</string>
<string name="account_link_prompt_pin">Enter PIN</string>
- <string name="account_new_button">Create a Ring account</string>
+ <string name="account_new_button">Create a Jami account</string>
<string name="account_link_export_button">Link another device to this account</string>
- <string name="account_link_export_info">To use this account on other devices, you must first expose it on Ring. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
+ <string name="account_link_export_info">To use this account on other devices, you must first expose it on Jami. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
<string name="account_start_export_button">Generate PIN</string>
<string name="account_end_export_button">close</string>
- <string name="account_end_export_infos">Your PIN is:\n\n%%\n\nTo complete the process, you need to open Ring on the new device. Create a new account with \"Link this device to an account\". Your PIN is valid for 10 minutes.</string>
- <string name="account_link_export_info_light">To use this account on other devices, you must first expose it on Ring. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
+ <string name="account_end_export_infos">Your PIN is:\n\n%%\n\nTo complete the process, you need to open Jami on the new device. Create a new account with \"Link this device to an account\". Your PIN is valid for 10 minutes.</string>
+ <string name="account_link_export_info_light">To use this account on other devices, you must first expose it on Jami. This will generate a PIN code that you must enter on the new device to set up the account. The PIN is valid for 10 minutes.</string>
<string name="account_export_title">Add devices</string>
<!-- Name registration -->
@@ -214,9 +214,9 @@
<string name="account_status_offline">Offline</string>
<!-- Create account -->
- <string name="account_creation_home">Welcome to Ring</string>
+ <string name="account_creation_home">Welcome to Jami</string>
<string name="account_creation_profile">Create your profile</string>
- <string name="account_creation_ring">Create your Ring account</string>
+ <string name="account_creation_ring">Create your Jami account</string>
<string name="account_link_title">Link this device</string>
<string name="account_sip_cannot_be_registered">Can\'t register account</string>
@@ -231,7 +231,7 @@
<string name="revoke_device_wait_title">Please wait…</string>
<string name="revoke_device_wait_message">Revoking device</string>
<string name="rename_device_title">Rename this device</string>
- <string name="rename_device_message">Choose a new name to identify this device in your Ring account</string>
+ <string name="rename_device_message">Choose a new name to identify this device in your Jami account</string>
<string name="rename_device_button">Rename device</string>
<string name="account_rename_device_hint">Choose new device name</string>
<string name="account_device_name_empty">Device name can\'t be empty</string>
diff --git a/ring-android/app/src/main/res/values/strings_preferences.xml b/ring-android/app/src/main/res/values/strings_preferences.xml
index bc91ced..f6be7c4 100644
--- a/ring-android/app/src/main/res/values/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values/strings_preferences.xml
@@ -6,7 +6,7 @@
<string name="pref_category_privacy">Privacy</string>
<string name="pref_mobileData_title">Mobile data</string>
- <string name="pref_mobileData_summary">Allow Ring on 3G/LTE networks additionally to Wi-Fi</string>
+ <string name="pref_mobileData_summary">Allow Jami on 3G/LTE networks additionally to Wi-Fi</string>
<string name="pref_pushNotifications_title">Push notifications</string>
<string name="pref_pushNotifications_summary">Use Google servers to allow receiving calls/messages in the background</string>
@@ -21,11 +21,11 @@
<string name="pref_systemCamera_key" translatable="false">pref_systemCamera</string>
<string name="pref_systemDialer_key" translatable="false">pref_systemDialer</string>
- <string name="pref_systemDialer_title">Place system calls using Ring</string>
- <string name="pref_systemDialer_summary">Use Ring to place system calls when possible.</string>
+ <string name="pref_systemDialer_title">Place system calls using Jami</string>
+ <string name="pref_systemDialer_summary">Use Jami to place system calls when possible.</string>
- <string name="pref_startOnBoot_title">Start Ring on startup</string>
- <string name="pref_startOnBoot_summary">Run Ring in the background when the system starts.</string>
+ <string name="pref_startOnBoot_title">Start Jami on startup</string>
+ <string name="pref_startOnBoot_summary">Run Jami in the background when the system starts.</string>
<string name="pref_clearHistory_title">Clear history</string>
<string name="pref_clearHistory_summary">Clear all the conversations history. This action can not be undone.</string>
diff --git a/ring-android/app/src/main/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
index 99203c9..3a0ec79 100644
--- a/ring-android/app/src/main/res/values/styles.xml
+++ b/ring-android/app/src/main/res/values/styles.xml
@@ -71,10 +71,10 @@
<item name="android:textColor">@color/text_color_secondary</item>
</style>
- <style name="Wizard" parent="Theme.MaterialComponents">
+ <style name="Wizard" parent="Theme.MaterialComponents.Light">
<item name="colorAccent">@color/color_primary_light</item>
- <item name="colorPrimary">@color/color_primary_dark</item>
- <item name="colorPrimaryDark">@color/color_primary_light</item>
+ <item name="colorPrimary">@color/color_primary_light</item>
+ <item name="colorPrimaryDark">@color/color_primary_dark</item>
</style>
<style name="WizardNavButton" parent="Widget.AppCompat.Button.Borderless.Colored">
@@ -96,7 +96,7 @@
</style>
<style name="ButtonColored" parent="Widget.AppCompat.Button.Colored">
- <item name="colorButtonNormal">@color/color_primary_dark</item>
+ <item name="colorButtonNormal">@color/color_primary_light</item>
<item name="android:textColor">@color/text_color_primary_dark</item>
</style>