Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask_android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Akuma
bitmask_android
Commits
f6200adf
Commit
f6200adf
authored
5 years ago
by
cyberta
Browse files
Options
Downloads
Patches
Plain Diff
reduce the always on alert dialog customization for now
parent
db501825
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
+10
-24
10 additions, 24 deletions
.../java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
app/src/main/res/layout/d_checkbox_confirm.xml
+56
-80
56 additions, 80 deletions
app/src/main/res/layout/d_checkbox_confirm.xml
with
66 additions
and
104 deletions
app/src/main/java/se/leap/bitmaskclient/fragments/AlwaysOnDialog.java
+
10
−
24
View file @
f6200adf
package
se.leap.bitmaskclient.fragments
;
import
android.app.Dialog
;
import
android.content.Context
;
import
android.content.DialogInterface
;
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.v4.text.TextUtilsCompat
;
import
android.support.v7.app.AlertDialog
;
import
android.support.v7.app.AppCompatDialogFragment
;
import
android.support.v7.widget.AppCompatTextView
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.CheckBox
;
import
butterknife.ButterKnife
;
import
butterknife.InjectView
;
import
butterknife.OnClick
;
import
se.leap.bitmaskclient.R
;
import
se.leap.bitmaskclient.views.IconTextView
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
PreferenceHelper
.
saveShowAlwaysOnDialog
;
import
static
se
.
leap
.
bitmaskclient
.
utils
.
ViewHelper
.
convertDimensionToPx
;
/**
...
...
@@ -68,23 +61,16 @@ public class AlwaysOnDialog extends AppCompatDialogFragment {
blockVpnUserMessage
.
setVisibility
(
View
.
VISIBLE
);
}
builder
.
setView
(
view
);
return
builder
.
create
();
}
@OnClick
(
R
.
id
.
button_ok
)
public
void
onOkClicked
()
{
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
);
dismiss
();
}
@OnClick
(
R
.
id
.
button_cancel
)
public
void
onCancelClicked
()
{
dismiss
();
})
.
setNegativeButton
(
R
.
string
.
cancel
,
(
dialog
,
id
)
->
dialog
.
cancel
());
return
builder
.
create
();
}
}
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/d_checkbox_confirm.xml
+
56
−
80
View file @
f6200adf
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:orientation=
"vertical"
>
...
...
@@ -12,16 +16,16 @@
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/standard_margin"
android:layout_marginTop=
"@dimen/add_button_margin"
android:gravity=
"center"
android:layout_marginLeft=
"@dimen/activity_horizontal_margin"
android:layout_marginRight=
"@dimen/activity_horizontal_margin"
android:text=
"@string/always_on_vpn"
android:textAllCaps=
"true"
android:text
Color=
"@color/colorPrimary
"
android:textS
ize=
"28sp
"
android:textStyle=
"bold"
/>
android:text
Appearance=
"@style/TextAppearance.AppCompat.Title
"
android:textS
tyle=
"bold
"
/>
<se.leap.bitmaskclient.views.IconTextView
android:id=
"@+id/user_message"
android:textAppearance=
"@style/TextAppearance.AppCompat.Small"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/activity_horizontal_margin"
...
...
@@ -29,13 +33,13 @@
android:layout_marginBottom=
"0dp"
android:autoLink=
"web"
tools:text=
"@string/always_on_vpn_user_message"
android:textSize=
"17sp"
/>
<android.support.v7.widget.AppCompatTextView
android:id=
"@+id/block_vpn_user_message"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:textAppearance=
"@style/TextAppearance.AppCompat.Small"
android:layout_marginLeft=
"@dimen/activity_horizontal_margin"
android:layout_marginRight=
"@dimen/activity_horizontal_margin"
android:layout_marginTop=
"@dimen/standard_margin"
...
...
@@ -43,45 +47,17 @@
android:text=
"@string/always_on_blocking_vpn_user_message"
android:visibility=
"gone"
tools:visibility=
"visible"
android:textSize=
"17sp"
/>
<CheckBox
android:id=
"@+id/do_not_show_again"
android:textAppearance=
"@style/TextAppearance.AppCompat
.Small
"
android:textAppearance=
"@style/TextAppearance.AppCompat"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"@dimen/stdpadding"
android:text=
"@string/do_not_show_again"
/>
<LinearLayout
android:orientation=
"horizontal"
android:layout_width=
"match_parent"
android:gravity=
"end"
android:layout_gravity=
"end"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"@dimen/activity_horizontal_margin"
android:layout_marginRight=
"@dimen/activity_horizontal_margin"
android:layout_marginLeft=
"@dimen/activity_horizontal_margin"
>
<android.support.v7.widget.AppCompatButton
android:id=
"@+id/button_cancel"
android:layout_width=
"100dp"
android:layout_height=
"38dp"
android:layout_marginRight=
"@dimen/standard_margin"
android:background=
"@drawable/cust_button_secondary"
android:text=
"@android:string/cancel"
android:textColor=
"@android:color/tab_indicator_text"
android:textStyle=
"bold"
/>
<android.support.v7.widget.AppCompatButton
android:id=
"@+id/button_ok"
android:layout_width=
"100dp"
android:layout_height=
"38dp"
android:background=
"@drawable/cust_button_primary"
android:text=
"@android:string/ok"
android:textColor=
"@color/white"
android:textStyle=
"bold"
/>
</LinearLayout>
</LinearLayout>
</ScrollView>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment