Skip to content

Commit 59c8b84

Browse files
tux-mindtux-mind
committed
Merge branch 'release'
2 parents b59f634 + 3309bf1 commit 59c8b84

Some content is hidden

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

53 files changed

+1491
-753
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ proguard/
4747
.loadpath
4848
actionbarsherlock/build/
4949
dSploit/build/
50+
cSploit/build/
5051
# External tool builders
5152
.externalToolBuilders/
5253

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Copyleft Margaritelli of Simone aka evilsocket and then fused with zANTI2 contin
55

66
- <http://www.csploit.org/>
77

8-
[![Click here to lend your support to: cSploit and make a donation at www.paypal.com](https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif?skin_name=chrome)](https://www.paypal.com/uk/cgi-bin/webscr?cmd=_flow&SESSION=BBgUDlBOyEpm2SBPeuhVH1hHoyi9MORuTT2tAq-WBPfZFlhoXxa1AymS0je&dispatch=5885d80a13c0db1f8e263663d3faee8d66f31424b43e9a70645c907a6cbd8fb4)
8+
[![Click here to lend your support to: cSploit and make a donation at www.paypal.com](https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif?skin_name=chrome)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=FTKXDCBEDMW9G&lc=GB&item_name=cSploit&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted)
99

1010
-------------
1111

‎cSploit/build.gradle‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ apply plugin: 'com.android.application'
2323
dependencies {
2424
compile 'com.android.support:support-v4:23.0.1'
2525
compile 'com.android.support:appcompat-v7:23.0.1'
26+
compile 'com.android.support:design:23.0.1'
2627
compile 'org.apache.commons:commons-compress:1.10'
2728
compile 'commons-net:commons-net:3.3'
2829
compile 'com.github.zafarkhaja:java-semver:0.9.0'
@@ -51,7 +52,10 @@ android {
5152
minSdkVersion 9
5253
targetSdkVersion 22
5354
versionCode 1
54-
versionName "1.6.0-rc.1"
55+
versionName "1.6.0-rc.2"
56+
if(System.getenv("NIGHTLY_BUILD")) {
57+
versionName += "+" + System.getenv("NIGHTLY_BUILD_COMMIT").substring(0, 7)
58+
}
5559
}
5660

5761
lintOptions {

‎cSploit/jni‎

‎cSploit/res/drawable-hdpi/ic_done_white_24dp.png‎

188 Bytes
Loading

‎cSploit/res/drawable-mdpi/ic_done_white_24dp.png‎

139 Bytes
Loading

‎cSploit/res/drawable-xhdpi/ic_done_white_24dp.png‎

199 Bytes
Loading

‎cSploit/res/drawable-xxhdpi/ic_done_white_24dp.png‎

255 Bytes
Loading

‎cSploit/res/drawable-xxxhdpi/ic_done_white_24dp.png‎

308 Bytes
Loading

‎cSploit/res/layout/console_layout.xml‎

Lines changed: 62 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:orientation="vertical"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
4+
xmlns:app="http://schemas.android.com/apk/res-auto"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent"
7+
android:orientation="vertical">
8+
9+
<ScrollView
10+
android:id="@+id/outputscroll"
11+
android:layout_width="fill_parent"
12+
android:layout_height="wrap_content"
13+
android:layout_above="@+id/input"
14+
android:layout_alignParentTop="true"
15+
android:background="@color/black"
16+
android:gravity="top"
17+
android:scrollHorizontally="false"
18+
android:scrollbarAlwaysDrawVerticalTrack="true"
19+
android:scrollbarFadeDuration="0">
20+
21+
<TextView
22+
android:id="@+id/output"
23+
android:layout_width="fill_parent"
24+
android:layout_height="wrap_content"
25+
android:padding="4dp"
26+
android:scrollHorizontally="false"
27+
android:scrollbars="vertical"
28+
android:singleLine="false"
29+
android:textAppearance="?android:attr/textAppearanceMedium"
30+
android:textColor="@color/orange"
31+
android:textIsSelectable="true"
32+
android:textSize="14sp"
33+
android:typeface="monospace" />
34+
</ScrollView>
735

836
<EditText
37+
android:id="@+id/input"
938
android:layout_width="wrap_content"
1039
android:layout_height="wrap_content"
11-
android:textAppearance="?android:attr/textAppearanceMedium"
12-
android:id="@+id/input"
40+
android:layout_alignParentBottom="true"
41+
android:layout_alignParentEnd="true"
42+
android:layout_alignParentLeft="true"
43+
android:layout_alignParentRight="true"
44+
android:layout_alignParentStart="true"
45+
android:layout_alignTop="@android:id/button1"
1346
android:layout_gravity="bottom|left"
14-
android:hint="@string/command"
1547
android:capitalize="none"
1648
android:clickable="true"
1749
android:editable="true"
50+
android:elegantTextHeight="true"
1851
android:enabled="true"
52+
android:focusable="true"
53+
android:focusableInTouchMode="true"
54+
android:hint="@string/command"
1955
android:imeActionId="4"
20-
android:longClickable="true"
56+
android:imeOptions="actionDone"
2157
android:imeActionLabel="@string/run"
22-
android:typeface="monospace"
23-
android:inputType="textMultiLine|textNoSuggestions"
24-
android:layout_alignParentTop="true"
25-
android:layout_alignParentLeft="true"
26-
android:layout_alignBottom="@android:id/button1"
27-
android:layout_toLeftOf="@android:id/button1"/>
58+
android:inputType="textNoSuggestions"
59+
android:longClickable="true"
60+
android:textAppearance="?android:attr/textAppearanceMedium"
61+
android:textSize="14sp"
62+
android:typeface="monospace" />
2863

29-
<Button
30-
style="?android:attr/buttonStyleSmall"
64+
<android.support.design.widget.FloatingActionButton
65+
android:id="@+id/myFAB"
3166
android:layout_width="wrap_content"
3267
android:layout_height="wrap_content"
33-
android:text="@string/run"
34-
android:id="@android:id/button1"
35-
android:layout_alignParentTop="true"
68+
android:layout_alignBottom="@+id/outputscroll"
69+
android:layout_alignParentEnd="true"
3670
android:layout_alignParentRight="true"
37-
android:enabled="true"
38-
android:clickable="true"
39-
android:fontFamily="sans-serif-condensed"/>
71+
android:layout_marginBottom="-20dp"
72+
android:layout_marginEnd="16dp"
73+
android:layout_marginRight="16dp"
74+
android:src="@drawable/ic_done_white_24dp"
75+
android:text="@string/run"
76+
app:elevation="4dp"
77+
app:fabSize="mini"
78+
app:layout_anchor="@id/outputscroll"
79+
app:layout_anchorGravity="bottom|right|end"
80+
app:rippleColor="@color/pink" />
4081

4182
<!-- <TextView
4283
android:layout_width="fill_parent"
@@ -48,16 +89,4 @@
4889
android:typeface="monospace"
4990
android:scrollbars="horizontal|vertical"/> -->
5091

51-
<EditText
52-
android:layout_width="fill_parent"
53-
android:layout_height="wrap_content"
54-
android:textAppearance="?android:attr/textAppearanceMedium"
55-
android:id="@+id/output"
56-
android:layout_below="@+id/input"
57-
android:layout_alignParentBottom="true"
58-
android:typeface="monospace"
59-
android:scrollbars="horizontal|vertical"
60-
android:gravity="top|left"
61-
android:scrollHorizontally="true"
62-
android:inputType="textMultiLine|textNoSuggestions"/>
6392
</RelativeLayout>

0 commit comments

Comments
 (0)