Skip to content

Commit 2183a21

Browse files
PodsolnyXPodsolnyX
committed
Немного красоты
1 parent 4258f10 commit 2183a21

File tree

9 files changed

+47
-33
lines changed

9 files changed

+47
-33
lines changed

‎.idea/misc.xml‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/apochromat/codeblockmobile/ProjectActivity.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,23 @@ class ProjectActivity : AppCompatActivity() {
9999
}
100100
}
101101

102-
fun createConsoleInput() {
102+
private fun createConsoleInput() {
103103
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
104104
blocksAdapter.saveAllData()
105105
blocksAdapter.addBlock(ConsoleInput())
106106
listBlocks[listBlocks.size - 1].adapterConsole = consoleAdapter
107107
listBlocks[listBlocks.size - 1].adapterBlocks = blocksAdapter
108108
}
109109

110-
fun createConsoleOutput() {
110+
private fun createConsoleOutput() {
111111
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
112112
blocksAdapter.saveAllData()
113113
blocksAdapter.addBlock(ConsoleOutput())
114114
listBlocks[listBlocks.size - 1].adapterConsole = consoleAdapter
115115
listBlocks[listBlocks.size - 1].adapterBlocks = blocksAdapter
116116
}
117117

118-
fun createCycleWhile() {
118+
private fun createCycleWhile() {
119119
bindingClass.blocksRV.scrollToPosition(listBlocks.size + 2)
120120
blocksAdapter.saveAllData()
121121
blocksAdapter.addBlock(CycleWhile())
@@ -152,7 +152,7 @@ class ProjectActivity : AppCompatActivity() {
152152
}
153153
}
154154

155-
fun createConditionIf() {
155+
private fun createConditionIf() {
156156
bindingClass.blocksRV.scrollToPosition(listBlocks.size + 2)
157157
blocksAdapter.saveAllData()
158158
blocksAdapter.addBlock(ConditionIf())
@@ -169,39 +169,39 @@ class ProjectActivity : AppCompatActivity() {
169169
listBlocks[listBlocks.size - 1].adapterConsole = consoleAdapter
170170
}
171171

172-
fun createDefinedArray() {
172+
private fun createDefinedArray() {
173173
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
174174
blocksAdapter.saveAllData()
175175
blocksAdapter.addBlock(DefinedArray())
176176
listBlocks[listBlocks.size-1].adapterConsole = consoleAdapter
177177
listBlocks[listBlocks.size-1].adapterBlocks = blocksAdapter
178178
}
179179

180-
fun createUndefinedArray() {
180+
private fun createUndefinedArray() {
181181
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
182182
blocksAdapter.saveAllData()
183183
blocksAdapter.addBlock(UndefinedArray())
184184
listBlocks[listBlocks.size-1].adapterConsole = consoleAdapter
185185
listBlocks[listBlocks.size-1].adapterBlocks = blocksAdapter
186186
}
187187

188-
fun createDefinedVar() {
188+
private fun createDefinedVar() {
189189
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
190190
blocksAdapter.saveAllData()
191191
blocksAdapter.addBlock(DefinedVariable())
192192
listBlocks[listBlocks.size-1].adapterConsole = consoleAdapter
193193
listBlocks[listBlocks.size-1].adapterBlocks = blocksAdapter
194194
}
195195

196-
fun createUndefinedVar() {
196+
private fun createUndefinedVar() {
197197
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
198198
blocksAdapter.saveAllData()
199199
blocksAdapter.addBlock(UndefinedVariable())
200200
listBlocks[listBlocks.size - 1].adapterConsole = consoleAdapter
201201
listBlocks[listBlocks.size - 1].adapterBlocks = blocksAdapter
202202
}
203203

204-
fun createAssignment() {
204+
private fun createAssignment() {
205205
bindingClass.blocksRV.scrollToPosition(listBlocks.size)
206206
blocksAdapter.saveAllData()
207207
blocksAdapter.addBlock(Assignment())
@@ -525,6 +525,7 @@ class ProjectActivity : AppCompatActivity() {
525525
}
526526
Block.isProgramRunning = true
527527
listBlocks[0].run()
528+
bindingClass.drawer.openDrawer(GravityCompat.START)
528529
}
529530

530531
private fun printAllConnections(){

‎app/src/main/res/drawable/shape_variable_array.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:ignore="ExtraText">
3+
xmlns:android="http://schemas.android.com/apk/res/android">
4+
<item>
5+
<shape>
6+
<gradient android:type="linear" android:endColor="@color/color_var_arr" android:startColor="#089776" android:angle="45.0" />
7+
<corners android:bottomRightRadius="15dp"
8+
android:bottomLeftRadius="15dp"
9+
android:topLeftRadius="15dp"
10+
android:topRightRadius="15dp"/>
11+
</shape>
12+
</item>
13+
</selector>

‎app/src/main/res/layout/activity_project.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
android:layout_width="wrap_content"
8585
android:layout_height="wrap_content"
8686
android:layout_weight="1"
87-
android:backgroundTint="@color/color_var"
87+
android:backgroundTint="@color/color_var_arr"
8888
android:insetLeft="5dp"
8989
android:insetRight="2.5dp"
9090
android:insetBottom="8dp"
@@ -97,7 +97,7 @@
9797
android:layout_width="wrap_content"
9898
android:layout_height="wrap_content"
9999
android:layout_weight="1"
100-
android:backgroundTint="@color/color_var"
100+
android:backgroundTint="@color/color_var_arr"
101101
android:insetLeft="5dp"
102102
android:insetRight="2.5dp"
103103
android:insetBottom="8dp"

‎app/src/main/res/layout/item_console_bar.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:layout_margin="18dp">
7+
android:layout_margin="10dp">
88

99
<RelativeLayout
1010
android:id="@+id/content"
@@ -19,7 +19,7 @@
1919
android:layout_width="match_parent"
2020
android:layout_height="wrap_content"
2121
android:paddingLeft="15dp"
22-
android:text="TextView"
22+
android:text=""
2323
android:textAlignment="textStart"
2424
android:textColor="@color/white" />
2525
</RelativeLayout>

‎app/src/main/res/layout/item_defined_array.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_width="match_parent"
77
android:layout_height="110dp"
88
android:layout_margin="5dp"
9-
android:background="@drawable/shape_variable">
9+
android:background="@drawable/shape_variable_array">
1010
<TextView
1111
android:id="@+id/textType"
1212
android:layout_width="177dp"
@@ -37,18 +37,18 @@
3737

3838
<EditText
3939
android:id="@+id/editLeft"
40-
android:layout_width="204dp"
41-
android:layout_height="49dp"
40+
android:layout_width="187dp"
41+
android:layout_height="50dp"
4242
android:ems="10"
4343
android:hint="@string/name"
4444
android:inputType="textPersonName"
4545
android:textColor="@color/dark_grey"
4646
app:layout_constraintBottom_toBottomOf="parent"
47-
app:layout_constraintEnd_toEndOf="parent"
48-
app:layout_constraintHorizontal_bias="0.092"
47+
app:layout_constraintEnd_toStartOf="@+id/editMedium"
48+
app:layout_constraintHorizontal_bias="0.327"
4949
app:layout_constraintStart_toStartOf="parent"
5050
app:layout_constraintTop_toTopOf="parent"
51-
app:layout_constraintVertical_bias="0.262" />
51+
app:layout_constraintVertical_bias="0.316" />
5252

5353
<Spinner
5454
android:id="@+id/spinnerComparator"
@@ -66,7 +66,7 @@
6666

6767
<EditText
6868
android:id="@+id/editRight"
69-
android:layout_width="356dp"
69+
android:layout_width="352dp"
7070
android:layout_height="49dp"
7171
android:ems="10"
7272
android:hint="@string/value"
@@ -81,18 +81,18 @@
8181

8282
<EditText
8383
android:id="@+id/editMedium"
84-
android:layout_width="137dp"
84+
android:layout_width="128dp"
8585
android:layout_height="48dp"
8686
android:ems="10"
8787
android:hint="@string/sizeArray"
8888
android:inputType="textPersonName"
8989
android:textColor="@color/dark_grey"
9090
app:layout_constraintBottom_toBottomOf="parent"
9191
app:layout_constraintEnd_toEndOf="parent"
92-
app:layout_constraintHorizontal_bias="0.931"
92+
app:layout_constraintHorizontal_bias="0.905"
9393
app:layout_constraintStart_toStartOf="parent"
9494
app:layout_constraintTop_toTopOf="parent"
95-
app:layout_constraintVertical_bias="0.274" />
95+
app:layout_constraintVertical_bias="0.338" />
9696

9797

9898
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/item_undefined_array.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/VarBlock"
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent"
13-
android:background="@drawable/shape_variable"
13+
android:background="@drawable/shape_variable_array"
1414
tools:layout_editor_absoluteX="0dp"
1515
tools:layout_editor_absoluteY="34dp">
1616

@@ -54,12 +54,12 @@
5454
android:layout_height="48dp"
5555
android:layout_alignParentStart="true"
5656
android:layout_alignParentTop="true"
57-
android:layout_alignParentEnd="true"
5857
android:layout_alignParentBottom="true"
5958
android:layout_marginStart="8dp"
6059
android:layout_marginTop="26dp"
61-
android:layout_marginEnd="152dp"
60+
android:layout_marginEnd="27dp"
6261
android:layout_marginBottom="6dp"
62+
android:layout_toStartOf="@+id/editRight"
6363
android:ems="10"
6464
android:hint="@string/name"
6565
android:imeOptions="actionNext"
@@ -76,11 +76,9 @@
7676
android:id="@+id/editRight"
7777
android:layout_width="144dp"
7878
android:layout_height="48dp"
79-
android:layout_alignParentStart="true"
8079
android:layout_alignParentTop="true"
8180
android:layout_alignParentEnd="true"
8281
android:layout_alignParentBottom="true"
83-
android:layout_marginStart="246dp"
8482
android:layout_marginTop="26dp"
8583
android:layout_marginEnd="12dp"
8684
android:layout_marginBottom="6dp"

‎app/src/main/res/values/colors.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<color name="dark_grey">#222222</color>
1212
<color name="cian">#276474</color>
1313
<color name="color_var">#5fb6a2</color>
14+
<color name="color_var_arr">#0BAC87</color>
1415
<color name="color_assignment">#db8483</color>
1516
<color name="color_condition">#e29956</color>
1617
<color name="color_cycle">#00bbde</color>
17-
<color name="color_console">#0F59DF</color>
18+
<color name="color_console">#1261F0</color>
1819
</resources>

‎app/src/main/res/values/themes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</style>
1818
<style name="Theme.CodeblockMobile.NoActionBar">
1919
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
20-
<item name="windowActionBar">false</item>
20+
<item name="windowActionBar">true</item>
2121
<item name="windowNoTitle">true</item>
22-
<item name="android:windowFullscreen">true</item>
22+
<item name="android:windowFullscreen">false</item>
2323
</style>
2424
</resources>

0 commit comments

Comments
 (0)