Skip to content

Commit ed972c1

Browse files
tux-mindtux-mind
committed
Merge pull request #380 from fat-tire/develop
Fun multi-pack of commits fixes #389
2 parents 2bf138d + a28bd01 commit ed972c1

43 files changed

Lines changed: 920 additions & 575 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cSploit/res/anim/fadein.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:duration="@android:integer/config_shortAnimTime"
4+
android:fromAlpha="1.0"
5+
android:interpolator="@android:anim/accelerate_interpolator"
6+
android:toAlpha="0.0" />

‎cSploit/res/anim/fadeout.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:duration="@android:integer/config_shortAnimTime"
4+
android:fromAlpha="0.0"
5+
android:interpolator="@android:anim/accelerate_interpolator"
6+
android:toAlpha="1.0" />

‎cSploit/res/drawable/rounded_square.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
3+
<solid android:color="@color/gray_text"/>
4+
<corners android:radius="2dp"/>
5+
</shape>

‎cSploit/res/layout/actions_layout.xml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
5+
android:orientation="vertical"
56
android:paddingLeft="8dp"
67
android:paddingRight="8dp"
7-
android:paddingTop="8dp"
8-
android:orientation="vertical">
8+
android:paddingTop="8dp">
99

1010
<TextView
1111
android:id="@+id/textView1"
1212
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
1414
android:layout_gravity="center_horizontal"
15-
android:paddingTop="8dp"
16-
android:paddingBottom="8dp"
1715
android:fontFamily="sans-serif-condensed"
18-
android:textAllCaps="true"
16+
android:paddingBottom="8dp"
17+
android:paddingTop="8dp"
1918
android:text="@string/select_module"
19+
android:textAllCaps="true"
2020
android:textAppearance="?android:attr/textAppearanceSmall"
2121
android:textColor="@color/gray_text" />
2222

@@ -25,8 +25,10 @@
2525
android:id="@+id/android_list"
2626
android:layout_width="match_parent"
2727
android:layout_height="wrap_content"
28-
android:showDividers="none"
28+
android:animateLayoutChanges="true"
29+
android:divider="#00ffffff"
2930
android:dividerHeight="6dp"
30-
android:divider="#00ffffff"/>
31+
android:showDividers="none" />
32+
android:divider="#00ffffff" />
3133

3234
</LinearLayout>

‎cSploit/res/layout/plugin_exploit_finder.xml‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="fill_parent"
4-
android:layout_height="fill_parent"
5-
android:orientation="vertical"
6-
android:padding="10dp">
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:orientation="vertical"
6+
android:padding="10dp">
77

88
<ToggleButton
9-
android:id="@+id/searchToggleButton"
10-
android:layout_width="wrap_content"
11-
android:layout_height="wrap_content"
12-
android:paddingLeft="24dp"
13-
android:paddingRight="24dp"
14-
android:text="@string/toggle_button"
15-
android:textOff="Start"
16-
android:textOn="Stop"
17-
android:textAllCaps="true"
18-
android:fontFamily="sans-serif-condensed"/>
9+
android:id="@+id/searchToggleButton"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:fontFamily="sans-serif-condensed"
13+
android:paddingLeft="24dp"
14+
android:paddingRight="24dp"
15+
android:text="@string/toggle_button"
16+
android:textAllCaps="true"
17+
android:textOff="Start"
18+
android:textOn="Stop" />
1919

2020
<ProgressBar
21-
android:id="@+id/searchActivity"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:layout_alignParentRight="true"
25-
android:layout_alignTop="@+id/searchToggleButton"
26-
android:visibility="invisible"/>
21+
android:id="@+id/searchActivity"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_alignParentRight="true"
25+
android:layout_alignTop="@+id/searchToggleButton"
26+
android:visibility="invisible" />
2727

2828
<View
29-
android:id="@+id/separator"
30-
android:layout_width="fill_parent"
31-
android:layout_height="1dp"
32-
android:layout_marginTop="8dp"
33-
android:layout_marginBottom="8dp"
34-
android:layout_below="@+id/searchToggleButton"
35-
android:background="@android:color/darker_gray"/>
29+
android:id="@+id/separator"
30+
android:layout_width="fill_parent"
31+
android:layout_height="1dp"
32+
android:layout_below="@+id/searchToggleButton"
33+
android:layout_marginBottom="8dp"
34+
android:layout_marginTop="8dp"
35+
android:background="@android:color/darker_gray" />
3636

3737
<ListView
38-
android:id="@id/android:list"
39-
android:layout_width="match_parent"
40-
android:layout_height="wrap_content"
41-
android:layout_alignParentBottom="true"
42-
android:layout_alignRight="@+id/searchActivity"
43-
android:layout_below="@+id/separator"/>
38+
android:id="@id/android:list"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
android:layout_alignParentBottom="true"
42+
android:layout_alignRight="@+id/searchActivity"
43+
android:layout_below="@+id/separator"
44+
android:animateLayoutChanges="true" />
4445

4546
</RelativeLayout>

‎cSploit/res/layout/plugin_mitm.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
android:layout_width="match_parent"
1212
android:layout_height="fill_parent"
1313
android:dividerHeight="6dp"
14-
android:divider="#00ffffff" />
14+
android:divider="#00ffffff"
15+
android:animateLayoutChanges="true" />
1516
</LinearLayout>

‎cSploit/res/layout/plugin_mitm_hijacker.xml‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,62 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="fill_parent"
4-
android:layout_height="fill_parent"
5-
android:orientation="vertical"
6-
android:padding="8dp">
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:orientation="vertical"
6+
android:padding="8dp">
77

88
<ToggleButton
9-
android:id="@+id/hijackToggleButton"
10-
android:layout_width="wrap_content"
11-
android:layout_height="wrap_content"
12-
android:text="@string/toggle_button"
13-
android:textOff="Start"
14-
android:textOn="Stop"
15-
android:paddingLeft="24dp"
16-
android:paddingRight="24dp"
17-
android:textAllCaps="true"
18-
android:fontFamily="sans-serif-condensed"/>
9+
android:id="@+id/hijackToggleButton"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:fontFamily="sans-serif-condensed"
13+
android:paddingLeft="24dp"
14+
android:paddingRight="24dp"
15+
android:text="@string/toggle_button"
16+
android:textAllCaps="true"
17+
android:textOff="Start"
18+
android:textOn="Stop" />
1919

2020
<ProgressBar
21-
android:id="@+id/hijackActivity"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:layout_alignParentRight="true"
25-
android:layout_alignTop="@+id/hijackToggleButton"
26-
android:visibility="invisible"/>
21+
android:id="@+id/hijackActivity"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_alignParentRight="true"
25+
android:layout_alignTop="@+id/hijackToggleButton"
26+
android:visibility="invisible" />
2727

2828
<View
29-
android:id="@+id/separator"
30-
android:layout_width="fill_parent"
31-
android:layout_height="1dp"
32-
android:layout_marginTop="8dp"
33-
android:layout_marginBottom="8dp"
34-
android:layout_below="@+id/hijackToggleButton"
35-
android:background="@android:color/darker_gray"/>
29+
android:id="@+id/separator"
30+
android:layout_width="fill_parent"
31+
android:layout_height="1dp"
32+
android:layout_below="@+id/hijackToggleButton"
33+
android:layout_marginBottom="8dp"
34+
android:layout_marginTop="8dp"
35+
android:background="@android:color/darker_gray" />
3636

3737
<TextView
38-
android:id="@+id/textView"
39-
android:layout_width="wrap_content"
40-
android:layout_height="wrap_content"
41-
android:layout_alignLeft="@+id/separator"
42-
android:layout_alignRight="@+id/separator"
43-
android:layout_below="@+id/separator"
44-
android:padding="8dp"
45-
android:gravity="center_horizontal"
46-
android:text="@string/start_hijack"
47-
android:textAppearance="?android:attr/textAppearanceSmall"
48-
android:textColor="@color/gray_text"/>
38+
android:id="@+id/textView"
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content"
41+
android:layout_alignLeft="@+id/separator"
42+
android:layout_alignRight="@+id/separator"
43+
android:layout_below="@+id/separator"
44+
android:gravity="center_horizontal"
45+
android:padding="8dp"
46+
android:text="@string/start_hijack"
47+
android:textAppearance="?android:attr/textAppearanceSmall"
48+
android:textColor="@color/gray_text" />
4949

5050
<ListView
51-
android:id="@+id/listView"
52-
android:layout_width="match_parent"
53-
android:layout_height="wrap_content"
54-
android:layout_alignParentBottom="true"
55-
android:layout_alignRight="@+id/textView"
56-
android:layout_below="@+id/textView"
57-
android:indicatorLeft="?android:attr/expandableListPreferredItemIndicatorLeft"
58-
android:paddingLeft="8dp"
59-
android:paddingRight="8dp"/>
51+
android:id="@+id/listView"
52+
android:layout_width="match_parent"
53+
android:layout_height="wrap_content"
54+
android:layout_alignParentBottom="true"
55+
android:layout_alignRight="@+id/textView"
56+
android:layout_below="@+id/textView"
57+
android:animateLayoutChanges="true"
58+
android:indicatorLeft="?android:attr/expandableListPreferredItemIndicatorLeft"
59+
android:paddingLeft="8dp"
60+
android:paddingRight="8dp" />
6061

6162
</RelativeLayout>

‎cSploit/res/layout/plugin_mitm_hijacker_webview.xml‎

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="fill_parent"
4-
android:layout_height="fill_parent"
5-
android:orientation="vertical">
3+
android:layout_width="fill_parent"
4+
android:layout_height="fill_parent"
5+
android:orientation="vertical">
6+
7+
<ProgressBar
8+
android:id="@+id/webprogress"
9+
style="?android:attr/progressBarStyleHorizontal"
10+
android:layout_width="match_parent"
11+
android:layout_height="wrap_content"
12+
android:layout_alignParentRight="true"
13+
android:layout_alignParentTop="true"
14+
android:layout_marginTop="-7dp"
15+
android:maxHeight="4dp"
16+
android:visibility="visible" />
17+
18+
<EditText
19+
android:id="@+id/url"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:layout_alignParentLeft="true"
23+
android:layout_alignParentStart="true"
24+
android:layout_alignParentTop="true"
25+
android:background="@android:color/white"
26+
android:inputType="textUri"
27+
android:paddingLeft="16dp"
28+
android:paddingStart="16dp"
29+
android:singleLine="true"
30+
android:translationZ="-6dp" />
631

732
<WebView
8-
android:id="@+id/webView"
9-
android:layout_width="match_parent"
10-
android:layout_height="match_parent"
11-
android:layout_alignParentLeft="true"
12-
android:layout_alignParentTop="true"/>
33+
android:id="@+id/webView"
34+
android:layout_width="match_parent"
35+
android:layout_height="match_parent"
36+
android:layout_alignParentBottom="true"
37+
android:layout_alignParentEnd="true"
38+
android:layout_alignParentRight="true"
39+
android:layout_below="@+id/url" />
1340

1441
</RelativeLayout>

0 commit comments

Comments
 (0)