[Android] Rename variables to avoid collisions

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Mon Jun 19 17:27:08 2017 +0200| [05c76e9d801d2e5e008bbcbd63a8535f07d0460f] | committer: Geoffrey Métais

Rename variables to avoid collisions

> https://code.videolan.org/videolan/vlc-android/commit/05c76e9d801d2e5e008bbcbd63a8535f07d0460f
---

 vlc-android/res/layout/info_activity.xml               | 16 ++++++++--------
 vlc-android/src/org/videolan/vlc/gui/InfoActivity.java | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/vlc-android/res/layout/info_activity.xml b/vlc-android/res/layout/info_activity.xml
index 93cbba071..b32c8f4d5 100644
--- a/vlc-android/res/layout/info_activity.xml
+++ b/vlc-android/res/layout/info_activity.xml
@@ -17,16 +17,16 @@
             name="path"
             type="String" />
         <variable
-            name="sizeTitle"
+            name="sizeTitleText"
             type="String" />
         <variable
-            name="extraTitle"
+            name="extraTitleText"
             type="String" />
         <variable
-            name="sizeValue"
+            name="sizeValueText"
             type="String" />
         <variable
-            name="extraValue"
+            name="extraValueText"
             type="String" />
         <variable
             name="progress"
@@ -136,7 +136,7 @@
                 vlc:layout_constraintTop_toBottomOf="@+id/length_title"
                 vlc:layout_constraintStart_toStartOf="parent"
                 android:layout_marginTop="@dimen/half_default_margin"
-                android:text="@{sizeTitle}"
+                android:text="@{sizeTitleText}"
                 android:textColor="?attr/font_light"
                 android:visibility="@{sizeValue != null ? View.VISIBLE : View.INVISIBLE}" />
             <TextView
@@ -147,7 +147,7 @@
                 vlc:layout_constraintStart_toStartOf="@+id/barrier"
                 android:layout_margin="@dimen/half_default_margin"
                 android:textColor="?attr/font_light"
-                android:text="@{sizeValue}"
+                android:text="@{sizeValueText}"
                 android:visibility="@{sizeValue != null ? View.VISIBLE : View.INVISIBLE}" />
             <android.support.constraint.Barrier
                 android:id="@+id/barrier"
@@ -165,7 +165,7 @@
                 vlc:layout_constraintStart_toStartOf="parent"
                 android:layout_marginTop="@dimen/half_default_margin"
                 android:textColor="?attr/font_light"
-                android:text="@{extraTitle}"
+                android:text="@{extraTitleText}"
                 android:visibility="@{extraValue != null ? View.VISIBLE : View.INVISIBLE}" />
             <TextView
                 android:id="@+id/extra_value"
@@ -175,7 +175,7 @@
                 vlc:layout_constraintStart_toEndOf="@+id/extra_title"
                 android:layout_margin="@dimen/half_default_margin"
                 android:textColor="?attr/font_light"
-                android:text="@{extraValue}"
+                android:text="@{extraValueText}"
                 android:visibility="@{extraValue != null ? View.VISIBLE : View.INVISIBLE}"/>
             <ImageView
                 android:id="@+id/info_subtitles"
diff --git a/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java b/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
index 3842e7609..d3810190a 100644
--- a/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/InfoActivity.java
@@ -125,18 +125,18 @@ public class InfoActivity extends AudioPlayerContainerActivity implements View.O
             MediaWrapper media = (MediaWrapper) mItem;
             mBinding.setPath(Uri.decode(media.getUri().getPath()));
             mBinding.setProgress(media.getLength() == 0 ? 0 : (int) ((long) 100 * media.getTime() / length));
-            mBinding.setSizeTitle(getString(R.string.file_size));
+            mBinding.setSizeTitleText(getString(R.string.file_size));
         } else if (mItem.getItemType() == MediaLibraryItem.TYPE_ARTIST) {
             Medialibrary ml = VLCApplication.getMLInstance();
             Album[] albums = ((Artist)mItem).getAlbums(ml);
             int nbAlbums = albums == null ? 0 : albums.length;
-            mBinding.setSizeTitle(getString(R.string.albums));
-            mBinding.setSizeValue(String.valueOf(nbAlbums));
-            mBinding.setExtraTitle(getString(R.string.tracks));
-            mBinding.setExtraValue(String.valueOf(nbTracks));
+            mBinding.setSizeTitleText(getString(R.string.albums));
+            mBinding.setSizeValueText(String.valueOf(nbAlbums));
+            mBinding.setExtraTitleText(getString(R.string.tracks));
+            mBinding.setExtraValueText(String.valueOf(nbTracks));
         } else {
-            mBinding.setSizeTitle(getString(R.string.tracks));
-            mBinding.setSizeValue(String.valueOf(nbTracks));
+            mBinding.setSizeTitleText(getString(R.string.tracks));
+            mBinding.setSizeValueText(String.valueOf(nbTracks));
         }
     }
 
@@ -240,7 +240,7 @@ public class InfoActivity extends AudioPlayerContainerActivity implements View.O
                 return null;
             if (((MediaWrapper)mItem).getType() == MediaWrapper.TYPE_VIDEO)
                 checkSubtitles(itemFile);
-            mBinding.setSizeValue(Strings.readableFileSize(itemFile.length()));
+            mBinding.setSizeValueText(Strings.readableFileSize(itemFile.length()));
             return null;
         }