diff --git a/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.java b/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.java
index 1830843c3cc85a358f8207ade5bef337be42c205..7c2d16706cf08f9fe460d21ea4b41c2c2a60cf70 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/about/AboutDetailsFragment.java
@@ -91,7 +91,7 @@ public class AboutDetailsFragment extends DetailsFragment {
card);
// Add images and action buttons to the details view
- detailsOverview.setImageDrawable(res.getDrawable(R.drawable.ic_logo_ring_white));
+ detailsOverview.setImageDrawable(res.getDrawable(R.drawable.ic_jami));
mRowsAdapter.add(detailsOverview);
setAdapter(mRowsAdapter);
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
index 1ce1441859657c28820275764a9216dc8b2cf418..af4f243e064fca24ae0d8d2175ed16589040bd49 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVHomeAccountCreationFragment.java
@@ -72,18 +72,14 @@ public class TVHomeAccountCreationFragment
String title = getString(R.string.account_creation_home);
String breadcrumb = "";
String description = getString(R.string.help_ring);
- Drawable icon = getActivity().getResources().getDrawable(R.drawable.ic_logo_ring_white);
+ Drawable icon = getResources().getDrawable(R.drawable.ic_jami);
return new GuidanceStylist.Guidance(title, description, breadcrumb, icon);
}
@Override
public void onCreateActions(@NonNull List<GuidedAction> actions, Bundle savedInstanceState) {
- addAction(getActivity(), actions, LINK_ACCOUNT,
- getString(R.string.account_link_button),
- "",true);
- addAction(getActivity(), actions, CREATE_ACCOUNT,
- getString(R.string.account_create_title),
- "",true);
+ addAction(getActivity(), actions, LINK_ACCOUNT, getString(R.string.account_link_button), "",true);
+ addAction(getActivity(), actions, CREATE_ACCOUNT, getString(R.string.account_create_title), "",true);
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
index e03df9f1864a0eac14bc41be40d2ce27ead6925f..fd0f1c6267ac6d40d848e778d6013b74a604823b 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVRingAccountCreationFragment.java
@@ -33,7 +33,6 @@ import java.util.List;
import cx.ring.R;
import cx.ring.account.AccountCreationModelImpl;
-import cx.ring.account.RingAccountCreationFragment;
import cx.ring.account.RingAccountCreationPresenter;
import cx.ring.account.RingAccountCreationView;
import cx.ring.application.RingApplication;
@@ -93,7 +92,6 @@ public class TVRingAccountCreationFragment
presenter.init(model);
presenter.ringCheckChanged(false);
- getGuidanceStylist().getIconView().setImageResource(R.drawable.logo_ring);
}
@Override
diff --git a/ring-android/app/src/main/res/drawable/ic_logo_ring_white.xml b/ring-android/app/src/main/res/drawable/ic_logo_ring_white.xml
deleted file mode 100644
index 133290253b65e7533138253392adc40af1e9ad34..0000000000000000000000000000000000000000
--- a/ring-android/app/src/main/res/drawable/ic_logo_ring_white.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="590dp"
- android:height="216dp"
- android:viewportWidth="590.4"
- android:viewportHeight="216.0">
- <path
- android:pathData="M343.78,154.28h22.16l-33.59,-46.5l2.14,-0.64c4.25,-1.26 7.98,-3.06 11.08,-5.32c3.07,-2.25 5.53,-4.83 7.29,-7.67c1.79,-2.88 3.13,-5.9 3.95,-8.99c0.83,-3.11 1.25,-6.43 1.25,-9.88c0,-4.01 -0.48,-7.67 -1.45,-10.87c-0.94,-3.18 -2.17,-5.83 -3.62,-7.88c-1.45,-2.04 -3.3,-3.85 -5.5,-5.38c-2.25,-1.57 -4.44,-2.76 -6.5,-3.56c-2.09,-0.81 -4.53,-1.46 -7.26,-1.95c-2.75,-0.49 -5.13,-0.8 -7.06,-0.93c-1.96,-0.13 -4.14,-0.19 -6.45,-0.19h-46.5v109.76h16.86v-43.79h21.55L343.78,154.28zM290.61,95.22V59.71h23.75c17.24,0 25.98,5.85 25.98,17.4c0,3.05 -0.61,5.76 -1.81,8.05c-1.2,2.29 -2.76,4.11 -4.63,5.41c-1.81,1.27 -4.14,2.27 -6.91,2.98c-2.66,0.68 -5.29,1.14 -7.81,1.36c-2.46,0.22 -5.34,0.32 -8.56,0.32h-20.02V95.22z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M378.11,44.52l0,18.37l18.77,0l0,-10.74l0,-7.63z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M379.31,78.93h16.38v75.35h-16.38z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M461.75,93.69c2.49,0.85 4.33,1.85 5.61,3.04c1.28,1.19 2.3,2.73 3.02,4.56c0.69,1.75 1.1,3.2 1.25,4.43c0.14,1.17 0.21,2.53 0.21,4.05v44.51h16.38v-44.75c0,-3.5 -0.18,-6.69 -0.54,-9.49c-0.35,-2.71 -1.14,-5.61 -2.33,-8.64c-1.16,-2.93 -2.73,-5.38 -4.68,-7.28c-1.95,-1.9 -4.7,-3.52 -8.19,-4.81c-3.52,-1.31 -7.77,-1.97 -12.64,-1.97c-9.12,0 -19.15,2.31 -29.81,6.86l-1.37,0.58l-2.93,-5.86h-11.11v75.35h16.38V97.32l1.01,-0.39c7.73,-2.97 14.88,-4.47 21.24,-4.47C456.48,92.45 459.34,92.87 461.75,93.69z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M570.33,187.29c2.25,-2.07 4.1,-4.26 5.49,-6.51c1.41,-2.27 2.59,-4.78 3.5,-7.46c0.92,-2.7 1.56,-5.35 1.92,-7.86c0.36,-2.54 0.54,-5.2 0.54,-7.92V78.93h-11.99l-1.37,3.94l-1.55,-0.65c-7.77,-3.24 -15.08,-4.89 -21.72,-4.89c-3.58,0 -7.25,0.4 -10.91,1.2c-3.63,0.79 -7.42,2.18 -11.25,4.15c-3.81,1.96 -7.22,4.41 -10.14,7.31c-2.88,2.85 -5.27,6.63 -7.11,11.23c-1.85,4.61 -2.79,9.86 -2.79,15.62c0,5.57 0.8,10.66 2.37,15.13c1.57,4.44 3.67,8.16 6.24,11.03c2.6,2.9 5.71,5.37 9.25,7.34c3.56,1.98 7.26,3.41 11.02,4.25c9.81,2.19 20.92,1.55 31.47,-2.21l2.12,-0.76v2.96c0,2.87 -0.18,5.52 -0.54,7.9c-0.37,2.44 -1.17,5.01 -2.4,7.63c-1.25,2.68 -2.97,4.96 -5.09,6.78c-2.12,1.8 -5.02,3.29 -8.61,4.44c-3.56,1.13 -7.8,1.7 -12.6,1.7c-6.86,0 -13.92,-1.18 -21,-3.5l-1.85,-0.67l-4.85,12.55l1.54,0.67c8.83,3.44 18.32,5.2 28.14,5.2c5.01,0 9.65,-0.43 13.78,-1.28c4.11,-0.84 7.69,-2 10.63,-3.45C565.48,191.12 568.1,189.35 570.33,187.29zM564.35,138.84c-5.45,1.96 -10.98,2.95 -16.43,2.95c-8.88,0 -15.84,-2.5 -20.68,-7.43c-4.83,-4.92 -7.29,-11.27 -7.29,-18.87c0,-7.32 2.43,-13.26 7.23,-17.66c4.76,-4.36 11.12,-6.57 18.91,-6.57c5.05,0 11.16,1.04 18.17,3.08l1.14,0.33v43.79L564.35,138.84z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M41.07,66.24c0,0 21.22,-3.9 36.63,-4.61c0,0 -11.93,-24.26 -11.94,-45.38l-28.44,18.57C37.31,34.82 32.83,42.33 41.07,66.24z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M72.19,12.88c0,0 -2.68,16.45 11.8,47.66c0,0 12.53,-17.08 20.33,-25.39C104.32,35.16 86.06,14.84 72.19,12.88z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M91.41,60.88c0,0 31.49,-44.41 53.48,-48c0,0 2.43,17.8 -12.01,48.4C132.88,61.28 116.24,60.54 91.41,60.88z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M151.34,16.26c0,0 0.21,35.55 -39.1,95.03c0,0 18.05,25.9 22.51,30.3c0,0 54.99,-77.38 45.11,-106.64L151.34,16.26z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M179.92,73.45c0,0 -9.62,22.13 -16.03,33.13c0,0 30.37,4.84 44.51,14.78V87.76C208.4,87.76 206.36,80.02 179.92,73.45z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M166.55,113.33c0,0 30.19,5.33 41.15,15.26c0,0 -7.01,8.67 -27.79,13.03c0,0 -8.07,-19.63 -13.37,-27.85"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M159.86,113.99c0,0 -14.45,23.9 -20.98,32.44c0,0 23.99,28 41.32,32.83C180.2,179.26 187.66,163.38 159.86,113.99z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M63.14,111.47c0,0 33.28,-3.75 39.97,-2.84c0,0 29.11,50.77 71.4,75.15l-28.62,18.44C145.89,202.21 119.98,205.51 63.14,111.47z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M81.78,151.48c0,0 10.75,14.95 22.54,28.44c0,0 -18.3,20.68 -33.08,22.3l-28.7,-18.47C42.54,183.75 58.14,178.59 81.78,151.48z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M71.95,153.03c0,0 -19.9,21.86 -34.7,26.09c0,0 -4.61,-5.91 3.83,-30.28C41.07,148.84 52.22,151.75 71.95,153.03z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M56.5,112.41c0,0 14.9,24.02 22.51,34.81c0,0 -53.75,-1.64 -69.65,-18.63C9.36,128.59 22.15,117.23 56.5,112.41z"
- android:fillColor="#FFFFFF"/>
- <path
- android:pathData="M8.82,87.27v34.11c0,0 24.74,-19.02 101.77,-18.98c0,0 18.74,-30.96 19.48,-35.04C130.06,67.36 30.88,61.78 8.82,87.27z"
- android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/ring-android/app/src/main/res/drawable/logo_ring.png b/ring-android/app/src/main/res/drawable/logo_ring.png
deleted file mode 100644
index b98a12d2fa5d514206ece67f481dc60a697843c1..0000000000000000000000000000000000000000
Binary files a/ring-android/app/src/main/res/drawable/logo_ring.png and /dev/null differ
diff --git a/ring-android/app/src/main/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
index 3a0ec798754f63031338058c18f739c2807939ef..7e29a612080a043d84351e71a58e5f821bc42c4e 100644
--- a/ring-android/app/src/main/res/values/styles.xml
+++ b/ring-android/app/src/main/res/values/styles.xml
@@ -101,27 +101,15 @@
</style>
<!-- AndroidTV Style -->
- <style name="Widget.Ring.Leanback.GuidanceIconStyle" parent="Widget.Leanback.GuidanceIconStyle">
- <item name="android:background">@color/color_primary_light</item>
- </style>
-
- <style name="Widget.Ring.Leanback.FirstStepGuidanceIconStyle" parent="Widget.Leanback.GuidanceIconStyle">
- <item name="android:background">@color/color_primary_light</item>
- </style>
-
<style name="Theme.Ring.Leanback.GuidedStep" parent="Theme.Leanback.GuidedStep">
- <item name="guidanceIconStyle">@style/Widget.Ring.Leanback.GuidanceIconStyle</item>
</style>
<style name="Theme.Ring.Leanback.GuidedStep.First">
- <item name="guidanceIconStyle">@style/Widget.Ring.Leanback.FirstStepGuidanceIconStyle</item>
- <item name="guidedStepBackground">@color/color_primary_light</item>
</style>
<style name="Theme.Ring.LeanbackBrowse" parent="Theme.Leanback.Browse">
<item name="defaultSearchColor">@color/color_primary_light</item>
<item name="searchOrbViewStyle">@style/CustomSearchOrbView</item>
-
</style>
<style name="Theme.Ring.Leanback.CustomTitle" parent="Theme.Ring.LeanbackBrowse">
@@ -136,7 +124,6 @@
<item name="searchOrbIcon">@drawable/ic_personadd</item>
</style>
-
<!-- A default card style. Used in cards example. -->
<style name="DefaultCardImageStyle" parent="Widget.Leanback.ImageCardView.ImageStyle">
<item name="android:layout_width">@dimen/default_image_card_width</item>