Эх сурвалжийг харах

fix lint issues and optimize layout

AndyScherzinger 7 жил өмнө
parent
commit
6b9d270e8e

+ 6 - 5
src/main/java/com/owncloud/android/ui/dialog/ShareLinkToDialog.java

@@ -1,4 +1,4 @@
-/**
+/*
  *   ownCloud Android client application
  *
  *   @author David A. Velasco
@@ -29,6 +29,8 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
@@ -77,6 +79,7 @@ public class ShareLinkToDialog  extends DialogFragment {
     }
     
     @Override
+    @NonNull
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         mIntent = getArguments().getParcelable(ARG_INTENT);
         String[] packagesToExclude = getArguments().getStringArray(ARG_PACKAGES_TO_EXCLUDE);
@@ -84,8 +87,7 @@ public class ShareLinkToDialog  extends DialogFragment {
                 packagesToExclude : new String[0]);
 
         PackageManager pm= getActivity().getPackageManager();
-        List<ResolveInfo> activities = pm.queryIntentActivities(mIntent,
-                PackageManager.MATCH_DEFAULT_ONLY);
+        List<ResolveInfo> activities = pm.queryIntentActivities(mIntent, PackageManager.MATCH_DEFAULT_ONLY);
         Iterator<ResolveInfo> it = activities.iterator();
         ResolveInfo resolveInfo;
         while (it.hasNext()) {
@@ -110,7 +112,6 @@ public class ShareLinkToDialog  extends DialogFragment {
         mAdapter = new ActivityAdapter(getActivity(), pm, activities);
         
         return createSelector(sendAction);
-        
     }
 
     private AlertDialog createSelector(final boolean sendAction) {
@@ -152,7 +153,7 @@ public class ShareLinkToDialog  extends DialogFragment {
         }
         
         @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
+        public @NonNull View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
             if (convertView == null) {
                 convertView = newView(parent);
             }

+ 16 - 26
src/main/res/layout/activity_row.xml

@@ -17,43 +17,33 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<LinearLayout 	xmlns:android="http://schemas.android.com/apk/res/android"
-    			android:id="@+id/list_item"
-				android:layout_width="match_parent"
-				android:layout_height="48dp"
-				android:paddingStart="@dimen/standard_padding_independent"
-				android:paddingEnd="@dimen/standard_padding_independent"
-				android:paddingRight="@dimen/standard_padding_independent"
-				android:paddingLeft="@dimen/standard_padding_independent"
-				android:minWidth="@dimen/activity_row_layout_min_width_independent"
-				android:background="?android:attr/activatedBackgroundIndicator"
-    			android:orientation="vertical" >
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:duplicateParentState="true" >
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:id="@+id/list_item"
+		android:layout_width="match_parent"
+		android:layout_height="48dp"
+		android:paddingStart="@dimen/standard_padding"
+		android:paddingEnd="@dimen/standard_padding"
+		android:paddingRight="@dimen/standard_padding"
+		android:paddingLeft="@dimen/standard_padding"
+		android:minWidth="@dimen/activity_row_layout_min_width_independent"
+		android:background="?android:attr/activatedBackgroundIndicator"
+		android:orientation="horizontal" >
 
 		<ImageView
 			android:id="@+id/icon"
 			android:layout_width="@dimen/user_icon_size_independent"
 			android:layout_height="@dimen/user_icon_size_independent"
 			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="@dimen/standard_half_padding_independent"
-			android:layout_marginRight="@dimen/standard_half_padding_independent"
-			android:duplicateParentState="true" />
+			android:layout_marginEnd="@dimen/standard_padding"
+			android:layout_marginRight="@dimen/standard_padding"/>
 
         <TextView
             android:id="@+id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-            android:duplicateParentState="true"
 			android:singleLine="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:ellipsize="marquee"/>
 
-    </LinearLayout>
-
-</LinearLayout>
+    </LinearLayout>