add new icons for tethering

2 files changed, 182 insertions, 0 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/fragments/TetheringDialog.java b/app/src/main/java/se/leap/bitmaskclient/fragments/TetheringDialog.java
new file mode 100644
index 00000000..90e3c5a1
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/fragments/TetheringDialog.java
@@ -0,0 +1,76 @@
+package se.leap.bitmaskclient.fragments;
+
+import android.app.Dialog;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatDialogFragment;
+import android.support.v7.widget.AppCompatTextView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+
+import butterknife.ButterKnife;
+import butterknife.InjectView;
+import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.views.IconTextView;
+
+import static se.leap.bitmaskclient.utils.PreferenceHelper.saveShowAlwaysOnDialog;
+
+
+/**
+ * Created by cyberta on 25.02.18.
+ */
+
+
+
+public class TetheringDialog extends AppCompatDialogFragment {
+
+    public final static String TAG = TetheringDialog.class.getName();
+
+    @InjectView(R.id.do_not_show_again)
+    CheckBox doNotShowAgainCheckBox;
+
+    @InjectView(R.id.user_message)
+    IconTextView userMessage;
+
+    @InjectView(R.id.block_vpn_user_message)
+    AppCompatTextView blockVpnUserMessage;
+
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.d_checkbox_confirm, null);
+        ButterKnife.inject(this, view);
+
+        userMessage.setIcon(R.drawable.ic_settings);
+        userMessage.setText(getString(R.string.always_on_vpn_user_message));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            blockVpnUserMessage.setVisibility(View.VISIBLE);
+        }
+
+        builder.setView(view)
+                .setPositiveButton(android.R.string.ok, (dialog, id) -> {
+                    if (doNotShowAgainCheckBox.isChecked()) {
+                        saveShowAlwaysOnDialog(getContext(), false);
+                    }
+                    Intent intent = new Intent("android.net.vpn.SETTINGS");
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
+                })
+                .setNegativeButton(R.string.cancel, (dialog, id) -> dialog.cancel());
+        return builder.create();
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/views/IconCheckboxEntry.java b/app/src/main/java/se/leap/bitmaskclient/views/IconCheckboxEntry.java
new file mode 100644
index 00000000..cd151885
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/views/IconCheckboxEntry.java
@@ -0,0 +1,106 @@
+package se.leap.bitmaskclient.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorRes;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import se.leap.bitmaskclient.R;
+
+
+public class IconTextEntry extends LinearLayout {
+
+    private TextView textView;
+    private ImageView iconView;
+    private TextView subtitleView;
+
+    public IconTextEntry(Context context) {
+        super(context);
+        initLayout(context, null);
+    }
+
+    public IconTextEntry(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initLayout(context, attrs);
+    }
+
+    public IconTextEntry(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initLayout(context, attrs);
+    }
+
+    @TargetApi(21)
+    public IconTextEntry(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initLayout(context, attrs);
+    }
+
+    void initLayout(Context context, AttributeSet attrs) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rootview = inflater.inflate(R.layout.v_icon_text_list_item, this, true);
+        textView = rootview.findViewById(android.R.id.text1);
+        subtitleView = rootview.findViewById(R.id.subtitle);
+        iconView = rootview.findViewById(R.id.material_icon);
+
+        if (attrs != null) {
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.IconTextEntry);
+
+            String entryText = typedArray.getString(R.styleable.IconTextEntry_text);
+            if (entryText != null) {
+                textView.setText(entryText);
+            }
+
+            String subtitle = typedArray.getString(R.styleable.IconTextEntry_subtitle);
+            if (subtitle != null) {
+                subtitleView.setText(subtitle);
+                subtitleView.setVisibility(VISIBLE);
+            }
+
+            Drawable drawable = typedArray.getDrawable(R.styleable.IconTextEntry_icon);
+            if (drawable != null) {
+                iconView.setImageDrawable(drawable);
+            }
+
+            typedArray.recycle();
+        }
+
+
+    }
+
+    public void setText(@StringRes int id) {
+        textView.setText(id);
+    }
+
+    public void setSubtitle(String text) {
+        subtitleView.setText(text);
+        subtitleView.setVisibility(VISIBLE);
+    }
+
+    public void hideSubtitle() {
+        subtitleView.setVisibility(GONE);
+    }
+
+    public void setSubtitleColor(@ColorRes int color) {
+        subtitleView.setTextColor(getContext().getResources().getColor(color));
+    }
+
+    public void setText(CharSequence text) {
+        textView.setText(text);
+    }
+
+    public void setIcon(@DrawableRes int id) {
+        iconView.setImageResource(id);
+    }
+
+}