Issue 2462 - New onboarding slides

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package org.adblockplus.browser;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
 import org.mozilla.gecko.R;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnKeyListener;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.text.Html;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 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 MAXIMUM_STEPS = 3;

[Felix Dahlke, 2015/05/06 07:49:37]

Nit: NUM_STEPS or something rather? We always have the same number, max sounds
more like it could vary and that's the upper limit.

[René Jeschke, 2015/05/06 10:41:56]

Done.

 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
     this.setStyle(DialogFragment.STYLE_NO_TITLE, 0);
   }
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle)
@@ skipping 14 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 < 2)
+    if (this.currentStep < MAXIMUM_STEPS)
     {
       this.currentStep++;
       this.updateContents(this.getView());
     }
     else
     {
       this.dismissAllowingStateLoss();
     }
   }
 
   @Override
   public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event)
   {
     if (keyCode == KeyEvent.KEYCODE_BACK)
     {
-      if (this.currentStep > 1)
+      if (event.getAction() == KeyEvent.ACTION_DOWN && this.currentStep > 1)
       {
         this.currentStep--;
         this.updateContents(this.getView());
       }
       return true;
     }
     return false;
   }
 
   private void updateContents(final View view)
   {
-    switch (this.currentStep)
-    {
-      default:
-      case 1:
-        this.createStepOneContents(view);
-        break;
-      case 2:
-        this.createStepTwoContents(view);
-        break;
-    }
-  }
-
-  private void createStepOneContents(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(R.layout.abb_start_pane_step_one, ll, true);
+    inflater.inflate(
+        this.getResources().getIdentifier("abb_start_pane_step_" + this.currentStep,
+            "layout",
+            this.getActivity().getPackageName()), ll, true);
 
-    setTextViewTextHtml(view, R.id.abb_frp_main_text,
-        this.readRawTextFile(R.raw.abb_frp_acceptable_ads));
-
-    this.setButtonText(view, R.id.abb_frp_button, R.string.abb_frp_button_next);
-  }
-
-  private void createStepTwoContents(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(R.layout.abb_start_pane_step_two, ll, true);
-
-    setTextViewTextHtml(view, R.id.abb_frp_main_text,
-        this.readRawTextFile(R.raw.abb_frp_bug_reports));
-
-    this.setButtonText(view, R.id.abb_frp_button, R.string.abb_frp_button_finish);
+    this.setButtonText(view, R.id.abb_frp_button,
+        this.getResources().getIdentifier("abb_frp_button_" + this.currentStep,
+            "string",
+            this.getActivity().getPackageName()));
   }
 
   private void setTextViewTextHtml(final View view, final int viewId, final String text)
   {
     final TextView tv = (TextView) view.findViewById(viewId);
     tv.setText(Html.fromHtml(text));
   }
 
   private void setButtonText(final View view, final int viewId, final int resId)
   {
     final Button button = (Button) view.findViewById(viewId);
     button.setText(this.getString(resId));
   }
-
-  private String readRawTextFile(final int id)
-  {
-    final StringBuilder text = new StringBuilder();
-    try
-    {
-      final BufferedReader buf = new BufferedReader(new InputStreamReader(this.getResources()
-          .openRawResource(id)));
-
-      try
-      {
-        String line;
-        while ((line = buf.readLine()) != null)
-        {
-          text.append(line);
-          text.append('\n');
-        }
-      }
-      finally
-      {
-        buf.close();
-      }
-    }
-    catch (final Exception e)
-    {
-      Log.e(TAG, "Failed loading raw resource " + id + ": " + e.getMessage(), e);
-    }
-    return text.toString();
-  }
 }
-