Merge pull request #1967 from nextcloud/removeWhatsNew200

Remove 2.0 what's new features

Author: tobiasKaminsky

lint.xml

@@ -17,6 +17,12 @@
     </issue>
 
     <issue id="ExtraTranslation">
+        <ignore path="**/strings.xml"/>
+        <ignore path="**/values-b+en+001/strings.xml"/>
+    </issue>
+
+    <issue id="UnusedResources">
+        <ignore path="**/values-b+en+001/strings.xml"/>
         <ignore path="**/values-pt-rPT/strings.xml"/>
         <ignore path="**/values-ro/strings.xml"/>
         <ignore path="**/values-zh-rCN/strings.xml"/>

src/main/java/com/owncloud/android/features/FeatureList.java

@@ -39,7 +39,6 @@ public class FeatureList {
     private static final boolean SHOW_ON_UPGRADE = false;
 
     private static final int VERSION_1_0_0 = 10000099;
-    private static final int VERSION_2_0_0 = 20000099;
     private static final int BETA_VERSION_0 = 0;
 
     static final private FeatureItem featuresList[] = {
@@ -53,17 +52,6 @@ public class FeatureList {
             new FeatureItem(R.drawable.whats_new_auto_upload,
                     R.string.welcome_feature_3_title, R.string.welcome_feature_3_text,
                     VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
-            // 2.0.0
-            new FeatureItem(R.drawable.whats_new_auto_upload, R.string.whats_new_auto_upload_title,
-                    R.string.whats_new_auto_upload_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
-            new FeatureItem(R.drawable.whats_new_search, R.string.whats_new_search_title,
-                    R.string.whats_new_search_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
-            new FeatureItem(R.drawable.whats_new_theming, R.string.whats_new_theming_title,
-                    R.string.whats_new_theming_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
-            new FeatureItem(R.drawable.whats_new_notification, R.string.whats_new_notification_title,
-                    R.string.whats_new_notification_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
-            new FeatureItem(R.drawable.whats_new_fingerprint, R.string.whats_new_fingerprint_title,
-                    R.string.whats_new_fingerprint_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false)
     };
 
     static public FeatureItem[] get() {

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

@@ -80,8 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         int fontColor = ThemeUtils.fontColor();
 
-        mProgress = (ProgressIndicator) findViewById(R.id.progressIndicator);
-        mPager = (ViewPager) findViewById(R.id.contentPanel);
+        mProgress = findViewById(R.id.progressIndicator);
+        mPager = findViewById(R.id.contentPanel);
         final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
         String[] urls = getResources().getStringArray(R.array.whatsnew_urls);
 
@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mPager.addOnPageChangeListener(this);
 
 
-        mForwardFinishButton = (ImageButton) findViewById(R.id.forward);
+        mForwardFinishButton = findViewById(R.id.forward);
         ThemeUtils.colorImageButton(mForwardFinishButton, fontColor);
 
         mForwardFinishButton.setOnClickListener(new View.OnClickListener() {
@@ -133,7 +133,7 @@ public void onClick(View view) {
             mForwardFinishButton.setBackgroundDrawable(null);
         }
 
-        mSkipButton = (Button) findViewById(R.id.skip);
+        mSkipButton = findViewById(R.id.skip);
         mSkipButton.setTextColor(fontColor);
         mSkipButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -143,7 +143,7 @@ public void onClick(View view) {
             }
         });
 
-        TextView tv = (TextView) findViewById(R.id.welcomeText);
+        TextView tv = findViewById(R.id.welcomeText);
 
         if (showWebView) {
             tv.setText(R.string.app_name);
@@ -278,7 +278,7 @@ public View onCreateView(LayoutInflater inflater,
                                  @Nullable Bundle savedInstanceState) {
             View v = inflater.inflate(R.layout.whats_new_webview_element, container, false);
 
-            WebView webView = (WebView) v.findViewById(R.id.whatsNewWebView);
+            WebView webView = v.findViewById(R.id.whatsNewWebView);
             webView.getSettings().setJavaScriptEnabled(true);
             webView.getSettings().setDomStorageEnabled(true);
             webView.getSettings().setAllowFileAccess(false);
@@ -334,18 +334,18 @@ public View onCreateView(LayoutInflater inflater,
             View v = inflater.inflate(R.layout.whats_new_element, container, false);
             int fontColor = ThemeUtils.fontColor();
 
-            ImageView iv = (ImageView) v.findViewById(R.id.whatsNewImage);
+            ImageView iv = v.findViewById(R.id.whatsNewImage);
             if (mItem.shouldShowImage()) {
                 iv.setImageResource(mItem.getImage());
             }
 
-            TextView tv2 = (TextView) v.findViewById(R.id.whatsNewTitle);
+            TextView tv2 = v.findViewById(R.id.whatsNewTitle);
             if (mItem.shouldShowTitleText()) {
                 tv2.setText(mItem.getTitleText());
                 tv2.setTextColor(fontColor);
             }
 
-            tv2 = (TextView) v.findViewById(R.id.whatsNewText);
+            tv2 = v.findViewById(R.id.whatsNewText);
             if (mItem.shouldShowContentText()) {
                 tv2.setText(mItem.getContentText());
                 tv2.setTextColor(fontColor);

src/main/res/drawable-hdpi/whats_new_fingerprint.png

@@ -59,5 +59,5 @@
         android:gravity="center"
         android:text="@string/welcome_feature_1_text"
         android:textAppearance="@style/NextcloudTextAppearanceMedium"
-        android:textColor="@color/login_text_hint_color"/>
+        android:textColor="@color/login_text_hint_color" />
 </LinearLayout>

src/main/res/drawable-hdpi/whats_new_notification.png

@@ -601,18 +601,6 @@
     <string name="welcome_feature_3_title">Auto upload</string>
     <string name="welcome_feature_3_text">Keep your photos safe</string>
 
-    <string name="whats_new_auto_upload_title">Enhanced auto upload</string>
-    <string name="whats_new_auto_upload_content">\u2022 for all Android versions\n\u2022 less battery consumption\n\u2022 more reliable, but not instant\n\u2022 separation of images &amp; videos</string>
-
-    <string name="whats_new_search_title">Full server search</string>
-    <string name="whats_new_search_content">\u2022 Not only in current folder\n\u2022 Returns results from complete server\n\u2022 Directly open files/folders\n\u2022 Supported in NC12 and above</string>
-
-    <string name="whats_new_theming_title">Theming support</string>
-    <string name="whats_new_theming_content">If enabled on server, app will show\n\u2022 background image\n\u2022 server name\n\u2022 use color to distinguish accounts</string>
-
-    <string name="whats_new_notification_title">Notification support</string>
-    <string name="whats_new_notification_content">Get notifications like\n\u2022 new remote share\n\u2022 comment mentions\n\u2022 admin announcements</string>
-
     <string name="whats_new_skip">Skip</string>
 
     <string name="fingerprint_scan_finger">Please scan your finger</string>
@@ -665,8 +653,6 @@
     <string name="test_server_button">Test server connection</string>
     <string name="info_separator" translatable="false">,</string>
     <string name="resharing_is_not_allowed">Resharing is not allowed</string>
-    <string name="whats_new_fingerprint_title">Unlock with fingerprint</string>
-    <string name="whats_new_fingerprint_content">Use your fingerprint to unlock the app</string>
     <string name="fallback_weblogin_back">Back</string>
     <string name="fallback_weblogin_text">Revert to old login method</string>