Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
milosic.jan1@scptuj.si
KALKULATOR-EVAL-FUNKCIJA
Commits
78bcc302
Commit
78bcc302
authored
Jan 26, 2022
by
Jan Milosic
Browse files
popravki
parent
ef5d6315
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
4 deletions
+11
-4
.idea/misc.xml
.idea/misc.xml
+1
-0
app/src/main/res/drawable/border.xml
app/src/main/res/drawable/border.xml
+6
-0
app/src/main/res/drawable/circle.xml
app/src/main/res/drawable/circle.xml
+1
-1
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_main.xml
+2
-2
app/src/main/res/values/colors.xml
app/src/main/res/values/colors.xml
+1
-1
No files found.
.idea/misc.xml
View file @
78bcc302
...
...
@@ -3,6 +3,7 @@
<component
name=
"DesignSurface"
>
<option
name=
"filePathToZoomLevelMap"
>
<map>
<entry
key=
"..\:/AndroidStudioProjects/app/src/main/res/drawable/border.xml"
value=
"0.75"
/>
<entry
key=
"..\:/AndroidStudioProjects/app/src/main/res/drawable/circle.xml"
value=
"0.590625"
/>
<entry
key=
"..\:/AndroidStudioProjects/app/src/main/res/layout/activity_main.xml"
value=
"0.5"
/>
<entry
key=
"..\:/Users/Anej/Desktop/Random Stuff/Mili/AndroidStudioProjects/app/src/main/res/layout/activity_main.xml"
value=
"0.19635416666666666"
/>
...
...
app/src/main/res/drawable/border.xml
0 → 100644
View file @
78bcc302
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:shape=
"rectangle"
>
<solid
android:color=
"#191919"
/>
<stroke
android:width=
"1dp"
android:color=
"#2196F3"
/>
<corners
android:radius=
"10dp"
/>
</shape>
app/src/main/res/drawable/circle.xml
View file @
78bcc302
...
...
@@ -4,7 +4,7 @@
<item>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"1000dp"
/>
<solid
android:color=
"#
123
"
/>
<solid
android:color=
"#
21364A
"
/>
</shape>
</item>
...
...
app/src/main/res/layout/activity_main.xml
View file @
78bcc302
...
...
@@ -331,7 +331,7 @@
android:layout_marginTop=
"24dp"
android:fontFamily=
"sans-serif-condensed-medium"
android:text=
"KALKULATOR"
android:textColor=
"#
dd2c00
"
android:textColor=
"#
2196F3
"
android:textSize=
"34sp"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.497"
...
...
@@ -343,7 +343,7 @@
android:layout_width=
"355dp"
android:layout_height=
"46dp"
android:layout_marginTop=
"144dp"
android:backgroundTint=
"#
00BCD4
"
android:backgroundTint=
"#
2196F3
"
android:ems=
"10"
android:inputType=
"textPersonName"
android:textColor=
"@color/white"
...
...
app/src/main/res/values/colors.xml
View file @
78bcc302
...
...
@@ -7,5 +7,5 @@
<color
name=
"teal_700"
>
#FF018786
</color>
<color
name=
"black"
>
#FF000000
</color>
<color
name=
"white"
>
#FFFFFFFF
</color>
<color
name=
"malomajncrna"
>
#
070707
</color>
<color
name=
"malomajncrna"
>
#
191919
</color>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment