Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
likorn
/
quick_max
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d420f6fb
authored
Sep 24, 2019
by
likorn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed card task not being covered by fragment; updated TimeIsOverFragment
parent
a1562c1a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
app/src/main/java/com/example/quickmax/MainActivity.kt
app/src/main/res/drawable/ic_double_arrow_small.xml
app/src/main/res/layout/fragment_time_is_over.xml
app/src/main/res/values/colors.xml
app/src/main/java/com/example/quickmax/MainActivity.kt
View file @
d420f6fb
...
@@ -80,10 +80,11 @@ class MainActivity : AppCompatActivity() {
...
@@ -80,10 +80,11 @@ class MainActivity : AppCompatActivity() {
}
}
override
fun
onFinish
()
{
override
fun
onFinish
()
{
cv_task
.
elevation
=
0f
makeButtonsUncheckable
()
makeButtonsUncheckable
()
supportFragmentManager
supportFragmentManager
.
beginTransaction
()
.
beginTransaction
()
.
add
(
R
.
id
.
main_layout
,
TimeIsOverFragment
.
newInstance
(),
"time_is_over"
)
.
replace
(
R
.
id
.
main_layout
,
TimeIsOverFragment
.
newInstance
(),
"time_is_over"
)
.
commitAllowingStateLoss
()
.
commitAllowingStateLoss
()
}
}
}
}
...
...
app/src/main/res/drawable/ic_double_arrow_small.xml
0 → 100644
View file @
d420f6fb
<vector
android:height=
"40dp"
android:viewportHeight=
"24"
android:viewportWidth=
"24"
android:width=
"40dp"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M15.5,5l-4.5,0l5,7l-5,7l4.5,0l5,-7z"
/>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M8.5,5l-4.5,0l5,7l-5,7l4.5,0l5,-7z"
/>
</vector>
app/src/main/res/layout/fragment_time_is_over.xml
View file @
d420f6fb
...
@@ -3,14 +3,14 @@
...
@@ -3,14 +3,14 @@
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"
#A80C0000
"
>
android:background=
"
@drawable/gradient
"
>
<ImageView
<ImageView
android:id=
"@+id/img_view_timer"
android:id=
"@+id/img_view_timer"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"8dp"
android:layout_marginBottom=
"8dp"
android:tint=
"
#F44336
"
android:tint=
"
@color/white
"
app:layout_constraintBottom_toTopOf=
"@id/textView"
app:layout_constraintBottom_toTopOf=
"@id/textView"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:text=
"@string/time_is_over"
android:text=
"@string/time_is_over"
android:textAppearance=
"@android:style/TextAppearance.Material.Large"
android:textAppearance=
"@android:style/TextAppearance.Material.Large"
android:textColor=
"
#F44336
"
android:textColor=
"
@color/white
"
app:layout_constraintBottom_toTopOf=
"@+id/response_layout"
app:layout_constraintBottom_toTopOf=
"@+id/response_layout"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
@@ -34,8 +34,8 @@
...
@@ -34,8 +34,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/response_layout"
android:id=
"@+id/response_layout"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"
8
0dp"
android:layout_height=
"
6
0dp"
android:background=
"
#F44336
"
android:background=
"
@color/white
"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
>
app:layout_constraintStart_toStartOf=
"parent"
>
...
@@ -48,11 +48,11 @@
...
@@ -48,11 +48,11 @@
android:layout_marginEnd=
"24dp"
android:layout_marginEnd=
"24dp"
android:layout_marginBottom=
"8dp"
android:layout_marginBottom=
"8dp"
android:background=
"#009C27B0"
android:background=
"#009C27B0"
android:tint=
"
#FFFFFF
"
android:tint=
"
@color/gradient_light
"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_double_arrow"
/>
app:srcCompat=
"@drawable/ic_double_arrow
_small
"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
app/src/main/res/values/colors.xml
View file @
d420f6fb
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
<color
name=
"colorBackground"
>
#C4BFCC
</color>
<color
name=
"colorBackground"
>
#C4BFCC
</color>
<color
name=
"colorCorrect"
>
#81C784
</color>
<color
name=
"colorCorrect"
>
#81C784
</color>
<color
name=
"gradient_dark"
>
#FF4A148C
</color>
<color
name=
"gradient_dark"
>
#FF4A148C
</color>
<color
name=
"gradient_very_dark"
>
#FF320A64
</color>
<color
name=
"gradient_light"
>
#FF00BCD4
</color>
<color
name=
"gradient_light"
>
#FF00BCD4
</color>
<color
name=
"white"
>
#FFF
</color>
<color
name=
"white"
>
#FFF
</color>
<color
name=
"red"
>
#F00
</color>
<color
name=
"red"
>
#F00
</color>
...
...
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