Skip to content

Added Bracket Button and Up and Down to replay input. !!Don't merge!! #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Added Bracket Button and Up and Down to replay input. !!Don't merge!! #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 38 additions & 1 deletion app/src/main/java/replete/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,13 @@ class MainActivity : AppCompatActivity() {
}

var evalButton: Button? = null
var openBracketButton: Button? = null
var historyUpButton: Button? = null
var historyDownButton: Button? = null

var inputField: EditText? = null


var uiHandler: Handler? = null
var thHandler: Handler? = null
var ht: HandlerThread? = null
Expand Down Expand Up @@ -329,6 +334,9 @@ class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

var historyPosition = 0
var sessionList = ArrayList<String>()

uiHandler = object : Handler(Looper.getMainLooper()) {
override fun handleMessage(msg: Message) {
when (msg.what) {
Expand All @@ -348,16 +356,21 @@ class MainActivity : AppCompatActivity() {
setDeviceType()
setContentView(R.layout.activity_main)

inputField = findViewById(R.id.input)
val replHistory: ListView = findViewById(R.id.repl_history)

inputField = findViewById(R.id.input)
evalButton = findViewById(R.id.eval_button)
historyUpButton = findViewById(R.id.history_up)
historyDownButton = findViewById(R.id.history_down)

inputField!!.hint = "Type in here"
inputField!!.setHintTextColor(Color.GRAY)

evalButton!!.isEnabled = false
evalButton!!.setTextColor(Color.GRAY)

openBracketButton = findViewById(R.id.insert_open_bracket)

adapter = HistoryAdapter(this, R.layout.list_item, replHistory)

replHistory.adapter = adapter
Expand Down Expand Up @@ -460,6 +473,8 @@ class MainActivity : AppCompatActivity() {
val input = inputField!!.text.toString()
inputField!!.text.clear()
sendUIMessage(Messages.ADD_INPUT_ITEM, input)
sessionList.add(input)
historyPosition = sessionList.size

try {
if (isMacro(input)) {
Expand All @@ -472,6 +487,28 @@ class MainActivity : AppCompatActivity() {
}

}
openBracketButton!!.setOnClickListener { v ->
val cursorPos = inputField!!.getSelectionStart()
inputField!!.text.insert(cursorPos ,"(")

}
historyUpButton!!.setOnClickListener { v ->
if (historyPosition > 0) {
historyPosition--
val histItem = sessionList.get(historyPosition)
inputField!!.setText(histItem)
}
}
historyDownButton!!.setOnClickListener { v ->
if (historyPosition < sessionList.size -1) {
historyPosition++
val histItem = sessionList.get(historyPosition)
inputField!!.setText(histItem)
} else {
inputField!!.text.clear()
historyPosition = sessionList.size
}
}

sendUIMessage(
Messages.ADD_INPUT_ITEM, "\nClojureScript ${getClojureScriptVersion()}\n" +
Expand Down
54 changes: 45 additions & 9 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,64 @@
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
app:layout_constraintBottom_toTopOf="@+id/input" android:dividerHeight="0dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp">
android:layout_marginRight="8dp" app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintVertical_bias="1.0">
</ListView>
<Button
android:text="Eval"
android:layout_width="64dp"
android:layout_height="0dp" android:id="@+id/eval_button" android:layout_weight="1"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:textColor="@android:color/holo_blue_dark" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="8dp"
app:layout_constraintTop_toBottomOf="@+id/repl_history"/>
android:textColor="@android:color/holo_blue_dark" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/repl_history"
android:layout_marginTop="2dp" app:layout_constraintBottom_toTopOf="@+id/toolbar"
android:layout_marginBottom="2dp"/>
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:inputType="text|textMultiLine|textNoSuggestions"
android:ems="10"
android:id="@+id/input" android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
android:id="@+id/input"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
app:layout_constraintEnd_toStartOf="@+id/eval_button"
android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:typeface="monospace"
android:textSize="14sp" android:textColor="@android:color/black"/>
android:textSize="14sp" android:textColor="@android:color/black"
app:layout_constraintHorizontal_bias="0.0" android:singleLine="true" android:layout_marginBottom="53dp"
app:layout_constraintBottom_toBottomOf="parent"/>
<android.support.v7.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#ff0099cc"
android:theme="?attr/actionBarTheme"
android:minHeight="52dp" android:id="@+id/toolbar"
app:layout_constraintTop_toBottomOf="@+id/input"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
/>
<Button
android:text="("
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/insert-open-bracket"
app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
android:layout_marginBottom="2dp" app:layout_constraintStart_toStartOf="@+id/toolbar"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp" android:layout_marginTop="2dp"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/history-up"
app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
app:layout_constraintVertical_bias="0.0" app:layout_constraintStart_toEndOf="@+id/insert-open-bracket"
android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:text="▲"/>
<Button
android:text="▼"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/history-down"
app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
android:layout_marginBottom="2dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp" android:layout_marginTop="2dp"
app:layout_constraintVertical_bias="1.0" app:layout_constraintStart_toEndOf="@+id/history-up"/>

</android.support.constraint.ConstraintLayout>