Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Doggy monitor
Manage
Activity
Members
Labels
Plan
Issues
21
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Zofia Drozdowska
Doggy monitor
Commits
aba57b5f
Commit
aba57b5f
authored
3 months ago
by
Zofia Drozdowska
Browse files
Options
Downloads
Plain Diff
Merge branch 'app_big_text' into 'main'
app_big_text See merge request
!45
parents
b448a502
b8f3b017
Branches
Branches containing commit
1 merge request
!45
app_big_text
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/DogMonitor/app/src/main/res/layout/fragment_monitoring.xml
+17
-8
17 additions, 8 deletions
...ogMonitor/app/src/main/res/layout/fragment_monitoring.xml
with
17 additions
and
8 deletions
app/DogMonitor/app/src/main/res/layout/fragment_monitoring.xml
+
17
−
8
View file @
aba57b5f
...
...
@@ -28,12 +28,6 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<TextView
android:id=
"@+id/DogEmotion"
android:layout_width=
"wrap_content"
android:text=
"Czekam na dane emocji..."
android:layout_height=
"wrap_content"
/>
</androidx.cardview.widget.CardView>
<com.longdo.mjpegviewer.MjpegView
...
...
@@ -42,9 +36,24 @@
android:layout_height=
"wrap_content"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_bias=
"1.0"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"1.0"
/>
<TextView
android:id=
"@+id/DogEmotion"
android:layout_width=
"246dp"
android:layout_height=
"114dp"
android:gravity=
"center"
android:text=
"Czekam na dane emocji..."
android:textSize=
"30sp"
android:textStyle=
"bold"
app:layout_constraintBottom_toBottomOf=
"@+id/mjpegview"
app:layout_constraintEnd_toEndOf=
"@+id/mjpegview"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
"0.068"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment