Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Andy B-S
Companion App Android
Commits
f1c913ff
Commit
f1c913ff
authored
Aug 23, 2019
by
Anon
Browse files
Merge branch 'scroll-fix' into 'master'
Make main menu scrollable See merge request
card10/companion-app-android!24
parents
1f2eca7e
6099a1e7
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/res/layout/main_fragment.xml
View file @
f1c913ff
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"@dimen/activity_padding"
>
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/image_logo"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:src=
"@drawable/card10_logo_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/label_status"
android:layout_marginTop=
"@dimen/logo_margin_bottom"
android:gravity=
"center"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/image_logo"
/>
<Button
android:id=
"@+id/button_pair"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/main_button_pair"
android:layout_marginTop=
"@dimen/main_label_margin"
style=
"@style/MainButton"
app:layout_constraintTop_toBottomOf=
"@id/label_status"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<ScrollView
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
app:layout_constraintTop_toBottomOf=
"@id/button_pair"
app:layout_constraintBottom_toBottomOf=
"parent"
android:id=
"@+id/container_disconnected"
>
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height=
"wrap_content"
android:padding=
"@dimen/activity_padding"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
app:layout_constraintTop_toBottomOf=
"@id/button_pair"
android:id=
"@+id/container_connected"
>
<Button
android:layout_width=
"wrap_content"
<androidx.appcompat.widget.AppCompatImageView
android:id=
"@+id/image_logo"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_label_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_hatchery"
android:text=
"@string/main_button_browse_apps"
android:src=
"@drawable/card10_logo_text"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
android:enabled=
"false"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_send"
android:text=
"@string/main_button_send_file"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/button_hatchery"
android:enabled=
"false"
/>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/label_status"
android:layout_marginTop=
"@dimen/logo_margin_bottom"
android:gravity=
"center"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/image_logo"
/>
<Button
android:layout_width=
"wrap_content"
<Button
android:id=
"@+id/button_pair"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
android:text=
"@string/main_button_pair"
android:layout_marginTop=
"@dimen/main_label_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_mood"
android:text=
"@string/main_button_mood"
app:layout_constraintTop_toBottomOf=
"@+id/button_send"
app:layout_constraintTop_toBottomOf=
"@id/label_status"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
app:layout_constraintRight_toRightOf=
"parent"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_beautiful"
android:text=
"@string/main_button_beautiful"
app:layout_constraintTop_toBottomOf=
"@+id/button_mood"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
app:layout_constraintTop_toBottomOf=
"@id/button_pair"
app:layout_constraintBottom_toBottomOf=
"parent"
android:id=
"@+id/container_disconnected"
>
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_set_time"
android:text=
"@string/main_button_set_time"
app:layout_constraintTop_toBottomOf=
"@+id/button_beautiful"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
app:layout_constraintTop_toBottomOf=
"@id/button_pair"
android:id=
"@+id/container_connected"
>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_label_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_hatchery"
android:text=
"@string/main_button_browse_apps"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
android:enabled=
"false"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_send"
android:text=
"@string/main_button_send_file"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/button_hatchery"
android:enabled=
"false"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_mood"
android:text=
"@string/main_button_mood"
app:layout_constraintTop_toBottomOf=
"@+id/button_send"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_beautiful"
android:text=
"@string/main_button_beautiful"
app:layout_constraintTop_toBottomOf=
"@+id/button_mood"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
<Button
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/main_button_margin"
style=
"@style/MainButton"
android:id=
"@+id/button_set_time"
android:text=
"@string/main_button_set_time"
app:layout_constraintTop_toBottomOf=
"@+id/button_beautiful"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
android:enabled=
"false"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
Write
Preview
Supports
Markdown
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