diff --git a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java
index e5318b1f..d26184bd 100755
--- a/app/src/main/java/ohi/andre/consolelauncher/UIManager.java
+++ b/app/src/main/java/ohi/andre/consolelauncher/UIManager.java
@@ -759,6 +759,8 @@ private void updateText(Label l, CharSequence s) {
}
}
+ private boolean is_simons_sexy_view_enabled = true;
+
private SuggestionsManager suggestionsManager;
private TextView terminalView;
@@ -1339,7 +1341,9 @@ public void onGlobalLayout() {
toolbarView = inputOutputView.findViewById(R.id.tools_view);
hideToolbarNoInput = XMLPrefsManager.getBoolean(Toolbar.hide_toolbar_no_input);
- applyBgRect(toolbarView, bgRectColors[TOOLBAR_BGCOLOR_INDEX], bgColors[TOOLBAR_BGCOLOR_INDEX], margins[TOOLBAR_MARGINS_INDEX], strokeWidth, cornerRadius);
+ if( !is_simons_sexy_view_enabled ) {
+ applyBgRect(toolbarView, bgRectColors[TOOLBAR_BGCOLOR_INDEX], bgColors[TOOLBAR_BGCOLOR_INDEX], margins[TOOLBAR_MARGINS_INDEX], strokeWidth, cornerRadius);
+ }
}
mTerminalAdapter = new TerminalManager(terminalView, inputView, prefixView, submitView, backView, nextView, deleteView, pasteView, context, mainPack, executer);
@@ -1352,7 +1356,10 @@ public void onGlobalLayout() {
v.clearFocus();
}
});
- applyBgRect(sv, bgRectColors[SUGGESTIONS_BGCOLOR_INDEX], bgColors[SUGGESTIONS_BGCOLOR_INDEX], margins[SUGGESTIONS_MARGINS_INDEX], strokeWidth, cornerRadius);
+
+ if( !is_simons_sexy_view_enabled ) {
+ applyBgRect(sv, bgRectColors[SUGGESTIONS_BGCOLOR_INDEX], bgColors[SUGGESTIONS_BGCOLOR_INDEX], margins[SUGGESTIONS_MARGINS_INDEX], strokeWidth, cornerRadius);
+ }
LinearLayout suggestionsView = (LinearLayout) rootView.findViewById(R.id.suggestions_group);
@@ -1371,6 +1378,58 @@ public void onGlobalLayout() {
int drawTimes = XMLPrefsManager.getInt(Ui.text_redraw_times);
if(drawTimes <= 0) drawTimes = 1;
OutlineTextView.redrawTimes = drawTimes;
+
+ if( is_simons_sexy_view_enabled ) {
+ int floatingWindowcolor = Color.argb(200, 0, 0, 0 );
+
+ int outsidePadding = 15;
+ int insidePadding = 5;
+
+ // Set our background picture
+ rootView.setBackgroundResource(R.drawable.jellyfish);
+
+ //--------------------------//
+ // Prettier Device section. //
+ //--------------------------//
+
+ // Set the margins for the device info section.
+ LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) lViewsParent.getLayoutParams();
+ params.setMargins( outsidePadding, outsidePadding, outsidePadding, outsidePadding / 2 );
+ lViewsParent.setLayoutParams( params );
+
+ // Set the device info's background colour to make it look like a floating window.
+ //lViewsParent.setBackgroundColor(Color.argb(127, 0, 0, 255));
+ lViewsParent.setBackgroundColor( floatingWindowcolor );
+
+ // Make the text a little further from the border.
+ lViewsParent.setPadding( insidePadding, insidePadding, insidePadding, insidePadding );
+
+ //----------------------------//
+ // Prettier Terminal section. //
+ //----------------------------//
+ View terminalGroupView = inputOutputView.findViewById(R.id.terminal_group);
+
+ // Set the margin
+ params = (LinearLayout.LayoutParams) terminalGroupView.getLayoutParams();
+ params.setMargins( outsidePadding, outsidePadding / 2, outsidePadding, outsidePadding );
+ terminalGroupView.setLayoutParams( params );
+
+ // Set the terminal's background colour to make it look like a floating window.
+ terminalGroupView.setBackgroundColor( floatingWindowcolor );
+
+ // Make the text a little further from the border.
+ terminalGroupView.setPadding(insidePadding,insidePadding, insidePadding, insidePadding);
+
+ //-------------------//
+ // Prettier Buttons. //
+ //-------------------//
+ // Set the background colour for these too.
+ View toolsView = inputOutputView.findViewById(R.id.tools_view);
+ toolsView.setBackgroundColor( floatingWindowcolor );
+
+ View suggestionsContainerView = inputOutputView.findViewById(R.id.suggestions_container);
+ suggestionsContainerView.setBackgroundColor( floatingWindowcolor );
+ }
}
public static int[] getListOfIntValues(String values, int length, int defaultValue) {
diff --git a/app/src/main/res/drawable/jellyfish.jpeg b/app/src/main/res/drawable/jellyfish.jpeg
new file mode 100644
index 00000000..88fe6ade
Binary files /dev/null and b/app/src/main/res/drawable/jellyfish.jpeg differ
diff --git a/app/src/main/res/layout/about_device_view.xml b/app/src/main/res/layout/about_device_view.xml
index bda53e92..8d990467 100755
--- a/app/src/main/res/layout/about_device_view.xml
+++ b/app/src/main/res/layout/about_device_view.xml
@@ -4,94 +4,111 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_down_layout.xml b/app/src/main/res/layout/input_down_layout.xml
index 53b358f9..2fb15f2b 100755
--- a/app/src/main/res/layout/input_down_layout.xml
+++ b/app/src/main/res/layout/input_down_layout.xml
@@ -4,139 +4,162 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+ android:layout_height="match_parent"
+ android:layout_above="@id/tools_view"
+ android:orientation="horizontal">
-
-
+ android:id="@+id/terminal_group"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
-
+
+ android:layout_weight="3"
+ android:fillViewport="true">
-
+
- android:weightSum="@integer/tools_view_weightsum"
+
- android:layout_above="@id/suggestions_container">
+
+ android:gravity="bottom"
+ android:scrollbars="vertical"
+ android:scrollHorizontally="false"
+ android:textIsSelectable="true" />
-
+
-
+
-
+
+ android:weightSum="@integer/input_group_weightsum"
-
- android:weightSum="@integer/input_group_weightsum"
+
- android:layout_above="@id/tools_view">
+
+ android:background="@null"
+ android:imeOptions="actionGo|flagNoFullscreen"
+ android:importantForAutofill="no"
-
- android:importantForAutofill="no"
+
+ android:gravity="center"
+ android:orientation="vertical">
-
+ android:layout_height="wrap_content"
-
- android:id="@+id/submit_tv"
+
- android:background="@null"
- android:src="@drawable/ic_enter"/>
+
-
-
+ android:background="#2196F3"
+ android:focusable="false">
-
-
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
-
- android:scrollHorizontally="false"
- android:scrollbars="vertical"
- android:textIsSelectable="true"
- android:gravity="bottom"/>
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file