generic: link, progressBar, percentage

modified: percentage, progressbar, link

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -165,7 +165,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
     /**
      * text view of the quota view.
      */
-    private TextView mQuotaTextView;
+    private TextView mQuotaTextPercentage;
+    private TextView mQuotaTextLink;
 
     /**
      * runnable that will be executed after the drawer has been closed.
@@ -273,7 +274,8 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
     private void setupQuotaElement() {
         mQuotaView = (LinearLayout) findViewById(R.id.drawer_quota);
         mQuotaProgressBar = (ProgressBar) findViewById(R.id.drawer_quota_ProgressBar);
-        mQuotaTextView = (TextView) findViewById(R.id.drawer_quota_text);
+        mQuotaTextPercentage = (TextView) findViewById(R.id.drawer_quota_percentage);
+        mQuotaTextLink = (TextView) findViewById(R.id.drawer_quota_link);
         DisplayUtils.colorPreLollipopHorizontalProgressBar(mQuotaProgressBar);
     }
 
@@ -771,9 +773,9 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
 
             if (quotas.size() > 0) {
                 final ExternalLink firstQuota = quotas.get(0);
-                mQuotaTextView.setText(firstQuota.name);
-                mQuotaTextView.setClickable(true);
-                mQuotaTextView.setOnClickListener(new View.OnClickListener() {
+                mQuotaTextLink.setText(firstQuota.name);
+                mQuotaTextLink.setClickable(true);
+                mQuotaTextLink.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         Intent externalWebViewIntent = new Intent(getApplicationContext(), ExternalSiteWebView.class);
@@ -789,7 +791,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
                 SimpleTarget target = new SimpleTarget<PictureDrawable>() {
                     @Override
                     public void onResourceReady(PictureDrawable resource, GlideAnimation glideAnimation) {
-                        mQuotaTextView.setCompoundDrawablesWithIntrinsicBounds(resource.getCurrent(), null,
+                        mQuotaTextLink.setCompoundDrawablesWithIntrinsicBounds(resource.getCurrent(), null,
                                 null, null);
                     }
 
@@ -797,25 +799,24 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
                     public void onLoadFailed(Exception e, Drawable errorDrawable) {
                         super.onLoadFailed(e, errorDrawable);
 
-                        mQuotaTextView.setCompoundDrawablesWithIntrinsicBounds(errorDrawable, null, null, null);
+                        mQuotaTextLink.setCompoundDrawablesWithIntrinsicBounds(errorDrawable, null, null, null);
                     }
                 };
 
                 externalLinksProvider.downloadIcon(this, firstQuota.iconUrl, target, R.drawable.ic_link_grey);
 
             } else {
-                mQuotaTextView.setText(String.format(
-                        getString(R.string.drawer_quota),
-                        DisplayUtils.bytesToHumanReadable(usedSpace),
-                        DisplayUtils.bytesToHumanReadable(totalSpace)));
+                mQuotaTextLink.setVisibility(View.INVISIBLE);
             }
         } else {
-            mQuotaTextView.setText(String.format(
-                    getString(R.string.drawer_quota),
-                    DisplayUtils.bytesToHumanReadable(usedSpace),
-                    DisplayUtils.bytesToHumanReadable(totalSpace)));
+            mQuotaTextLink.setVisibility(View.INVISIBLE);
         }
 
+        mQuotaTextPercentage.setText(String.format(
+                getString(R.string.drawer_quota),
+                DisplayUtils.bytesToHumanReadable(usedSpace),
+                DisplayUtils.bytesToHumanReadable(totalSpace)));
+
         showQuota(true);
     }
 

src/main/res/layout/drawer.xml

@@ -46,6 +46,13 @@
             android:paddingTop="@dimen/standard_half_padding"
             android:visibility="gone">
 
+            <TextView
+                android:id="@+id/drawer_quota_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawablePadding="5dp"
+                />
+
             <ProgressBar
                 android:id="@+id/drawer_quota_ProgressBar"
                 style="?android:attr/progressBarStyleHorizontal"
@@ -57,7 +64,7 @@
                 />
 
             <TextView
-                android:id="@+id/drawer_quota_text"
+                android:id="@+id/drawer_quota_percentage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:drawablePadding="5dp"

src/modified/res/layout/drawer.xml

@@ -47,7 +47,7 @@
             android:visibility="gone">
 
             <TextView
-                android:id="@+id/drawer_quota_text"
+                android:id="@+id/drawer_quota_percentage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/drawer_quota"/>
@@ -62,6 +62,13 @@
                 android:text="@string/drawer_quota"
                 />
 
+            <TextView
+                android:id="@+id/drawer_quota_link"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawablePadding="5dp"
+                />
+
         </LinearLayout>
 
     </android.support.design.widget.NavigationView>

src/modified/res/values/setup.xml

@@ -33,6 +33,7 @@
     <string name = "send_files_to_other_apps">on</string>
     <bool name = "share_via_link_feature">true</bool>
     <bool name = "share_with_users_feature">true</bool>
+    <bool name="show_external_links">true</bool>
 
     <!-- Colors -->
     <color name="login_text_color">@color/white</color>