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
291fd28e
authored
Sep 27, 2019
by
likorn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Layout refactoring
parent
6d2307f6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
25 deletions
app/src/main/res/layout-land/activity_task.xml
app/src/main/res/layout/activity_task.xml
app/src/main/res/layout-land/activity_task.xml
View file @
291fd28e
...
@@ -16,8 +16,7 @@
...
@@ -16,8 +16,7 @@
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"
app:layout_constraintTop_toTopOf=
"parent"
>
app:layout_constraintTop_toTopOf=
"parent"
/>
</View>
<ImageButton
<ImageButton
android:id=
"@+id/btn_back"
android:id=
"@+id/btn_back"
...
...
app/src/main/res/layout/activity_task.xml
View file @
291fd28e
...
@@ -8,29 +8,28 @@
...
@@ -8,29 +8,28 @@
android:background=
"#DADADA"
android:background=
"#DADADA"
tools:context=
"com.paktalin.quickmax.TaskActivity"
>
tools:context=
"com.paktalin.quickmax.TaskActivity"
>
<
FrameLayout
<
View
android:id=
"@+id/layout_gradient"
android:id=
"@+id/layout_gradient"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"0dp"
android:layout_height=
"0dp"
android:layout_marginBottom=
"32dp"
android:layout_marginBottom=
"32dp"
android:background=
"@drawable/gradient"
android:background=
"@drawable/gradient"
android:elevation=
"2dp"
app:layout_constraintBottom_toBottomOf=
"@+id/cv_task"
app:layout_constraintBottom_toBottomOf=
"@+id/cv_task"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
app:layout_constraintTop_toTopOf=
"parent"
/>
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:layout_marginTop=
"8dp"
android:background=
"@android:color/transparent"
android:tint=
"@android:color/white"
app:srcCompat=
"@drawable/ic_back"
/>
</FrameLayout>
<ImageButton
android:id=
"@+id/btn_back"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:layout_marginTop=
"8dp"
android:background=
"@android:color/transparent"
android:tint=
"@android:color/white"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:srcCompat=
"@drawable/ic_back"
/>
<TextView
<TextView
android:id=
"@+id/tv_response"
android:id=
"@+id/tv_response"
...
@@ -48,12 +47,16 @@
...
@@ -48,12 +47,16 @@
<com.google.android.material.card.MaterialCardView
<com.google.android.material.card.MaterialCardView
android:id=
"@+id/cv_task"
android:id=
"@+id/cv_task"
style=
"@style/MyCard"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"
150dp
"
android:layout_height=
"
wrap_content
"
android:layout_margin=
"16dp"
android:layout_margin=
"16dp"
app:cardElevation=
"4dp"
app:cardCornerRadius=
"6dp"
app:cardMaxElevation=
"4dp"
app:cardElevation=
"1dp"
app:cardMaxElevation=
"2dp"
app:contentPaddingBottom=
"40dp"
app:contentPaddingLeft=
"16dp"
app:contentPaddingRight=
"16dp"
app:contentPaddingTop=
"40dp"
app:layout_constraintBottom_toTopOf=
"@+id/layout_answers"
app:layout_constraintBottom_toTopOf=
"@+id/layout_answers"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
@@ -62,7 +65,7 @@
...
@@ -62,7 +65,7 @@
<TextView
<TextView
android:id=
"@+id/tv_task"
android:id=
"@+id/tv_task"
android:layout_width=
"
match_par
ent"
android:layout_width=
"
wrap_cont
ent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_gravity=
"center"
android:layout_marginStart=
"16dp"
android:layout_marginStart=
"16dp"
...
@@ -152,11 +155,11 @@
...
@@ -152,11 +155,11 @@
android:id=
"@+id/btn_next"
android:id=
"@+id/btn_next"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"
8
dp"
android:layout_marginEnd=
"
16
dp"
android:layout_marginBottom=
"
8
dp"
android:layout_marginBottom=
"
16
dp"
android:text=
"@string/btn_next"
android:text=
"@string/btn_next"
android:visibility=
"invisible"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
/>
android:visibility=
"invisible"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ 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