Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Salamander - APP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eirik Martin Danielsen
Salamander - APP
Commits
62b01cb6
Commit
62b01cb6
authored
Apr 22, 2021
by
Andrea Magnussen
Browse files
Options
Downloads
Patches
Plain Diff
Added message to process image activity indicator
parent
7b743117
No related branches found
No related tags found
1 merge request
!57
Resolve "Add message option on the activity indicatior"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
components/CustomActivityIndicator.js
+9
-1
9 additions, 1 deletion
components/CustomActivityIndicator.js
screens/camera/CameraScreen.js
+3
-8
3 additions, 8 deletions
screens/camera/CameraScreen.js
with
12 additions
and
9 deletions
components/CustomActivityIndicator.js
+
9
−
1
View file @
62b01cb6
import
React
from
'
react
'
import
React
from
'
react
'
import
{
StyleSheet
,
View
,
Modal
}
from
'
react-native
'
import
{
StyleSheet
,
View
,
Modal
,
Text
}
from
'
react-native
'
import
{
Colors
,
ActivityIndicator
}
from
"
react-native-paper
"
;
import
{
Colors
,
ActivityIndicator
}
from
"
react-native-paper
"
;
const
CustomActivityIndicator
=
(
props
)
=>
{
const
CustomActivityIndicator
=
(
props
)
=>
{
...
@@ -13,6 +13,9 @@ const CustomActivityIndicator = (props) => {
...
@@ -13,6 +13,9 @@ const CustomActivityIndicator = (props) => {
color
=
{
Colors
.
white
}
color
=
{
Colors
.
white
}
size
=
'
large
'
size
=
'
large
'
/>
/>
<
Text
style
=
{
styles
.
text
}
>
{
props
.
text
}
<
/Text
>
<
/View
>
<
/View
>
<
/Modal
>
<
/Modal
>
)
)
...
@@ -35,5 +38,10 @@ const styles = StyleSheet.create({
...
@@ -35,5 +38,10 @@ const styles = StyleSheet.create({
alignItems
:
"
center
"
,
alignItems
:
"
center
"
,
justifyContent
:
"
center
"
,
justifyContent
:
"
center
"
,
backgroundColor
:
`rgba(0,0,0,
${
0.1
}
)`
backgroundColor
:
`rgba(0,0,0,
${
0.1
}
)`
},
text
:
{
alignContent
:
"
center
"
,
marginTop
:
100
,
color
:
'
white
'
}
}
})
})
This diff is collapsed.
Click to expand it.
screens/camera/CameraScreen.js
+
3
−
8
View file @
62b01cb6
...
@@ -101,6 +101,7 @@ const _CameraScreen = (props) => {
...
@@ -101,6 +101,7 @@ const _CameraScreen = (props) => {
<
View
style
=
{
styles
.
takeImage
}
>
<
View
style
=
{
styles
.
takeImage
}
>
<
CustomActivityIndicator
<
CustomActivityIndicator
style
=
{
styles
.
activityIndicator
}
style
=
{
styles
.
activityIndicator
}
text
=
"
Processing image. Please wait.
"
visible
=
{
showIndicator
}
visible
=
{
showIndicator
}
/
>
/
>
<
CustomImagePicker
setImageUri
=
{(
uri
)
=>
setImage
(
uri
)}
/
>
<
CustomImagePicker
setImageUri
=
{(
uri
)
=>
setImage
(
uri
)}
/
>
...
@@ -154,7 +155,7 @@ const _CameraScreen = (props) => {
...
@@ -154,7 +155,7 @@ const _CameraScreen = (props) => {
)}
)}
{
image
&&
(
{
image
&&
(
<
CustomButton
<
CustomButton
title
=
"
Start
Image
Processing
"
title
=
"
Start Processing
"
mode
=
"
contained
"
mode
=
"
contained
"
style
=
{
styles
.
button
}
style
=
{
styles
.
button
}
onPress
=
{()
=>
{
onPress
=
{()
=>
{
...
@@ -184,13 +185,7 @@ const styles = StyleSheet.create({
...
@@ -184,13 +185,7 @@ const styles = StyleSheet.create({
paddingTop
:
25
,
paddingTop
:
25
,
},
},
button
:
{
button
:
{
width
:
150
,
width
:
200
,
marginTop
:
50
,
marginBottom
:
20
,
alignSelf
:
"
center
"
,
},
button
:
{
width
:
250
,
marginTop
:
50
,
marginTop
:
50
,
marginBottom
:
20
,
marginBottom
:
20
,
alignSelf
:
"
center
"
,
alignSelf
:
"
center
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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