Issue 2938 - Hide the beta community first run slide

mobile/android/thirdparty/org/adblockplus/browser/StartPane.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 31 matching lines @@
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public class StartPane extends DialogFragment implements OnClickListener, OnKeyListener
 {
   private static final String TAG = "AdblockBrowser.StartPane";
-  private int currentStep = 1;
-  private static final int NUMBER_OF_STEPS = 3;
+  private int currentStep = 0;
+  private static final boolean SKIP_BETA_COMMUNITY_PAGE = true;
   private static final HashMap<String, Integer> FONTS = new HashMap<String, Integer>();
   private HashMap<String, Typeface> loadedFonts = new HashMap<String, Typeface>();
 
+  private static final int[] BETA_RESOURCE_LIST =
+  {
+    R.layout.abb_start_pane_step_1, R.string.abb_frp_button_1,
+    R.layout.abb_start_pane_step_2, R.string.abb_frp_button_2,
+    R.layout.abb_start_pane_step_3, R.string.abb_frp_button_3
+  };
+
+  private static final int[] RELEASE_RESOURCE_LIST =
+  {
+    R.layout.abb_start_pane_step_1, R.string.abb_frp_button_2,
+    R.layout.abb_start_pane_step_2, R.string.abb_frp_button_3
+  };
+
+  private static final int[] PAGES_RESOURCE_LIST = SKIP_BETA_COMMUNITY_PAGE ?
+      RELEASE_RESOURCE_LIST : BETA_RESOURCE_LIST;
+
   static
   {
     FONTS.put("ttf_opensans_light", R.raw.opensans_light);
     FONTS.put("ttf_opensans_semibold", R.raw.opensans_semibold);
   }
 
   static Typeface typefaceFromResource(final Context context, final int resId)
   {
     Typeface ret = null;
     try
@@ skipping 64 matching lines @@
   {
     super.onActivityCreated(savedInstanceState);
     final Window window = getDialog().getWindow();
     window.setBackgroundDrawable(null);
     window.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
   }
 
   @Override
   public void onClick(View v)
   {
-    if (this.currentStep < NUMBER_OF_STEPS)
+    final int nextStep = this.currentStep + 1;
+    if (nextStep * 2 < PAGES_RESOURCE_LIST.length)
     {
-      this.currentStep++;
+      this.currentStep = nextStep;
       this.updateContents(this.getView());
     }
     else
     {
       this.dismissAllowingStateLoss();
     }
   }
 
   @Override
   public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event)
   {
     if (keyCode == KeyEvent.KEYCODE_BACK)
     {
-      if (event.getAction() == KeyEvent.ACTION_DOWN && this.currentStep > 1)
+      if (event.getAction() == KeyEvent.ACTION_DOWN && this.currentStep > 0)
       {
         this.currentStep--;
         this.updateContents(this.getView());
       }
       return true;
     }
     return false;
   }
 
   private static List<View> listViews(final View parent)
@@ skipping 17 matching lines @@
     }
   }
 
   private void updateContents(final View view)
   {
     final LinearLayout ll = (LinearLayout) view.findViewById(R.id.abb_main_content);
     ll.removeAllViews();
 
     final LayoutInflater inflater = (LayoutInflater) this.getActivity()
         .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(
-        this.getResources().getIdentifier("abb_start_pane_step_" + this.currentStep,
-            "layout",
-            this.getActivity().getPackageName()), ll, true);
-
-    this.setButtonText(view, R.id.abb_frp_button,
-        this.getResources().getIdentifier("abb_frp_button_" + this.currentStep,
-            "string",
-            this.getActivity().getPackageName()));
+    inflater.inflate(PAGES_RESOURCE_LIST[this.currentStep * 2], ll, true);
+    this.setButtonText(view, R.id.abb_frp_button, PAGES_RESOURCE_LIST[this.currentStep * 2 + 1]);
 
     final List<View> views = listViews(view);
     for (View v : views)
     {
       final Object tag = v.getTag();
       if (tag != null)
       {
         Typeface t = this.loadedFonts.get(tag.toString());
         if (t != null)
         {
           if (v instanceof TextView)
           {
             ((TextView) v).setTypeface(t);
           }
           else if (v instanceof Button)
           {
             ((Button) v).setTypeface(t);
           }
         }
       }
     }
   }
 
   private void setButtonText(final View view, final int viewId, final int resId)
   {
     final Button button = (Button) view.findViewById(viewId);
     button.setText(this.getString(resId));
   }
 }