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
db58036e
Commit
db58036e
authored
Jan 12, 2022
by
Jan Milosic
Browse files
tipkovnica
parent
1841d5c2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
318 additions
and
37 deletions
+318
-37
.idea/gradle.xml
.idea/gradle.xml
+1
-0
.idea/misc.xml
.idea/misc.xml
+2
-0
app/src/main/res/drawable/circle.xml
app/src/main/res/drawable/circle.xml
+11
-0
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/activity_main.xml
+276
-37
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+28
-0
No files found.
.idea/gradle.xml
View file @
db58036e
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"GradleMigrationSettings"
migrationVersion=
"1"
/>
<component
name=
"GradleSettings"
>
<option
name=
"linkedExternalProjectsSettings"
>
<GradleProjectSettings>
...
...
.idea/misc.xml
View file @
db58036e
...
...
@@ -3,6 +3,8 @@
<component
name=
"DesignSurface"
>
<option
name=
"filePathToZoomLevelMap"
>
<map>
<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=
"app/src/main/res/layout/activity_main.xml"
value=
"0.34427083333333336"
/>
</map>
</option>
...
...
app/src/main/res/drawable/circle.xml
0 → 100644
View file @
db58036e
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<item>
<shape
android:shape=
"rectangle"
>
<corners
android:radius=
"1000dp"
/>
<solid
android:color=
"#123"
/>
</shape>
</item>
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @
db58036e
...
...
@@ -6,52 +6,291 @@
android:layout_height=
"match_parent"
tools:context=
".MainActivity"
>
<TextView
android:id=
"@+id/textView"
android:layout_width=
"wrap_content"
<TableLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:text=
"Vnesite ime:"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.28"
/>
app:layout_constraintTop_toBottomOf=
"@+id/textView"
app:layout_constraintVertical_bias=
"0.95"
tools:layout_editor_absoluteX=
"1dp"
>
<Button
android:id=
"@+id/button"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"Prijava"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.498"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.443"
/>
<TableRow
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<Button
android:id=
"@+id/clearBTN"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_margin=
"5dp"
android:layout_weight=
"1"
android:background=
"@drawable/circle"
android:backgroundTint=
"#DD2C00"
android:text=
"@string/clear"
android:textColor=
"#ffffff"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button24"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/pharentheses"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button23"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/exponent"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button22"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/divide"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
</TableRow>
<TableRow
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<Button
android:id=
"@+id/button29"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/seven"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button28"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/eight"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button27"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/nine"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button26"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/multiply"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
</TableRow>
<TableRow
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<Button
android:id=
"@+id/button33"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/four"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button32"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/five"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button31"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/six"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button30"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/subtract"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
</TableRow>
<TableRow
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<Button
android:id=
"@+id/button37"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/one"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button36"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/two"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button35"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/three"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button34"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/add"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
</TableRow>
<TableRow
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<Button
android:id=
"@+id/button41"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/plusMinus"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button40"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/zero"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button39"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/point"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
<Button
android:id=
"@+id/button38"
style=
"@style/Widget.AppCompat.Button.Borderless"
android:layout_width=
"0dp"
android:layout_height=
"70dp"
android:layout_weight=
"1"
android:text=
"@string/equals"
android:background=
"@drawable/circle"
android:textColor=
"#ffffff"
android:layout_margin=
"5dp"
android:textSize=
"24sp"
/>
</TableRow>
</TableLayout>
<TextView
android:id=
"@+id/textView
2
"
android:id=
"@+id/textView"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"Aplikacija"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.078"
/>
<EditText
android:id=
"@+id/editTextTextPersonName"
android:layout_width=
"152dp"
android:layout_height=
"45dp"
android:ems=
"10"
android:inputType=
"textPersonName"
android:text=
"Ime"
app:layout_constraintBottom_toBottomOf=
"parent"
android:layout_marginTop=
"30dp"
android:text=
"TextView"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"0.498"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
a
pp:layout_constraintVertical_bias=
"0.339"
/>
a
ndroid:backgroundTint=
"#43A047"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
db58036e
<resources>
<string
name=
"app_name"
>
prva4a22
</string>
<string
name=
"zero"
>
0
</string>
<string
name=
"one"
>
1
</string>
<string
name=
"two"
>
2
</string>
<string
name=
"three"
>
3
</string>
<string
name=
"four"
>
4
</string>
<string
name=
"five"
>
5
</string>
<string
name=
"six"
>
6
</string>
<string
name=
"seven"
>
7
</string>
<string
name=
"eight"
>
8
</string>
<string
name=
"nine"
>
9
</string>
<string
name=
"clear"
>
C
</string>
<string
name=
"exponent"
>
^
</string>
<string
name=
"pharentheses"
>
( )
</string>
<string
name=
"divide"
>
÷
</string>
<string
name=
"multiply"
>
×
</string>
<string
name=
"add"
>
+
</string>
<string
name=
"subtract"
>
-
</string>
<string
name=
"plusMinus"
>
+/-
</string>
<string
name=
"point"
>
.
</string>
<string
name=
"equals"
>
=
</string>
<string
name=
"backspace"
>
</string>
</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