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

Changes due to Codacy

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 6 жил өмнө
parent
commit
f16742abaf

+ 3 - 1
src/main/java/com/owncloud/android/ui/fragment/FeatureWebFragment.java

@@ -1,6 +1,7 @@
 package com.owncloud.android.ui.fragment;
 
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -30,6 +31,7 @@ public class FeatureWebFragment extends Fragment {
         mWebUrl = getArguments() != null ? getArguments().getString("url") : null;
     }
 
+    @SuppressLint("SetJavaScriptEnabled")
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater,
@@ -46,4 +48,4 @@ public class FeatureWebFragment extends Fragment {
 
         return v;
     }
-}
+}

+ 1 - 1
src/main/res/layout/first_run_activity.xml

@@ -34,7 +34,7 @@
         <android.support.v4.view.ViewPager
             android:id="@+id/contentPanel"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_weight="1"/>
 
         <com.owncloud.android.ui.whatsnew.ProgressIndicator

+ 1 - 1
src/main/res/layout/whats_new_element.xml

@@ -48,7 +48,7 @@
         android:layout_marginRight="@dimen/standard_margin"
         android:layout_marginStart="@dimen/standard_margin"
         android:gravity="center"
-        android:text="@string/welcome_feature_1_title"
+        android:text=""
         android:textAppearance="@style/NextcloudTextAppearanceHeadline"
         android:textColor="@color/white"
         android:textStyle="bold"/>

+ 0 - 18
src/main/res/values/strings.xml

@@ -602,24 +602,6 @@
 
     <!-- What's new feature and texts to show -->
     <string name="whats_new_title">New in %1$s</string>
-
-    <!-- Welcome to Nc intro features -->
-    <string name="welcome_feature_1_title">A safe home for all your data</string>
-    <string name="welcome_feature_1_text">Access, share and protect your files at home and at work</string>
-
-    <string name="welcome_feature_2_title">Multi account</string>
-    <string name="welcome_feature_2_text">Connect to all your clouds</string>
-
-    <string name="welcome_feature_3_title">Auto upload</string>
-    <string name="welcome_feature_3_text">Keep your photos safe</string>
-
-    <string name="whats_new_end_to_end_encryption_title">End-to-end encryption</string>
-    <string name="whats_new_end_to_end_encryption_content">Tap to encrypt, from any client. Add new ones by copying 12 words over.</string>
-    <string name="whats_new_resized_images_title">Adaptive images</string>
-    <string name="whats_new_resized_images_content">Small images are fast and work great for sharing. Zoom in to download a full version.</string>
-    <string name="whats_new_ipv6_title">IPv6 support</string>
-    <string name="whats_new_ipv6_content">IPv6 when the server supports it, IPv4 if not.</string>
-
     <string name="whats_new_skip">Skip</string>
 
     <!-- User information -->