Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging #1

Merged
merged 112 commits into from Jun 12, 2019
Merged

Merging #1

merged 112 commits into from Jun 12, 2019

Conversation

jddeep
Copy link
Owner

@jddeep jddeep commented Jun 12, 2019

Fixes #[Add issue number here. Note: This will automatically closes the issue. If you do not solve the issue entirely, please change the message to e.g. "First steps for issues #IssueNumber]

Changes: [Add here what changes were made in this issue and if possible provide links.]

Screenshot/s for the changes: [Add screenshot/s of the layout where you made changes or a *.gif containing a demonstration]

Checklist: [Please tick following check boxes with [x] if the respective task is completed]

  • I have used resources from strings.xml, dimens.xml and colors.xml without hard-coding them
  • No modifications done at the end of resource files strings.xml, dimens.xml or colors.xml
  • I have reformatted code in every file included in this PR [CTRL+ALT+L]
  • My code does not contain any extra lines or extra spaces
  • I have requested reviews from other members

APK for testing: [Compress the app-debug.apk file into a <feature>.rar or <feature>.zip file and upload it here]

CloudyPadmal and others added 30 commits January 19, 2019 09:46
@CloudyPadmal
Merge pull request #1540 from fossasia/development
69f1cc5 
chore: merge dev into master branch
@mariobehling
Update README.md
dcced71
@abhinavraj23 @CloudyPadmal
Added default value in multimeter (#1531)
83cd2dd
@ravi-kishan @CloudyPadmal
Commented hints (#1549)
a036104
@neel1998 @CloudyPadmal
multimeter crash bug fixed (#1551)
267557f
@neel1998 @harsh-2711
Status Bar removed when activity is resumed (#1556)
c5dd459
@Smit2010 @abhinavraj23
feat: recording functionality in compass instrument (#1555)
8daef14
@abhinavraj23
Sensor Bottom Sheet and Hard coded dimens removed (#1573)
16615d8
@neel1998 @CloudyPadmal
Fix #1558 status bar bug fixed, status bar doesnt reappear on opening…
22247db 
… spinners (#1562)

* status bar bug fixed

* empty lines removed
@riyasingh1004
fix:Removing unused fields from MainActivity.java
93e35f9
@neel1998
navbar drawer app logo made perfect
ecdec67
@cweitat
Merge pull request #1613 from neel1998/navbar_app_logo
b0e101b 
Fix #1604 navbar drawer app logo made perfect
@neel1998 @mariobehling
Lux Meter/Barometer configuration titles fixed (#1560)
2e316e4
@buddhdev-harsh @mariobehling
Solved issues in Sensor activity (#1618)
d007e94 
Deleted local file
@chanmol1999 @mariobehling
chore: updated gradle version to 3.3.2 (#1624)
fe1557e 
* updated gradle version

* Update gradle-wrapper.properties
@neel1998 @mariobehling
show logged data option added to multimeter menu (#1611)
bf5c4fa
@neel1998 @mariobehling
button to open guide added to Oscilloscope, logic analyzer and wave g…
5eb9ea7 
…enerator (#1609)
@neel1998 @mariobehling
recording snackbar open button takes to data logger activity (#1590)
1406cab
@neel1998 @mariobehling
Fix #1553 Made wave 1/2 labels clickable in Wave Generator (#1554)
0941eba 
* Made wave 1/2 labels clickable in Wave Generator

* unnecessary lines removed
@neel1998 @mariobehling
no data message visible upon deleting everything from logged data (#1572
e4475bf 
)
@neel1998
shared preference editor.commit replaced with better option editor.apply
e549cd2
@Smit2010 @abhinavraj23
fix: wrong information displayed in Compass instrument (#1658)
3e9a5df
@neel1998 @mariobehling
pins voltage range added to multimeter bottomsheet (#1655)
b58326b
@neel1998 @mariobehling
Option to share app added to side navbar (#1654)
a9dcbf5
@chanmol1999 @mariobehling
Update strings.xml (#1652)
57d56f0
@neel1998 @mariobehling
Show guide option added to Accelerometer (#1648)
37cc7cf
@CloudyPadmal
Added meaningful values to string resource (#1575)
0454ec6
@neel1998
additional gray view removed from the bottom of accelerometer layout
28e0618
Compass slide up guide fixed
9da0906
About Us and FAQ crash fixed
5380e71
neel1998 and others added 29 commits May 27, 2019 11:13
@neel1998
Codacy resolved
8be87b3
@cweitat
Merge pull request #1738 from neel1998/robotic_arm_editable
aac3b5d 
Degree text made editable in Robotic Arm Controller Activity
fix: Accelerometer data log UI
0c61d1e
@CloudyPadmal
chore: upgrade app to v2.0.13 (#1745)
4b15882
@CloudyPadmal
Merge branch 'master' into development
98b8f84
@CloudyPadmal
Merge pull request #1746 from fossasia/development
17e383f 
chore: merge development branch into master
@cweitat
Merge pull request #1744 from ho-dor/development
1fadadf 
fix: Accelerometer data log UI
@mariobehling
UI of thermometer (#1737)
d8ceec8
@neel1998 @mariobehling
indication of time added to time line of robotic arm controller (#1748)
453fd92 
* indication of time added to time line

* codacy resolved
@neel1998 @CloudyPadmal
Readme updated (#1758)
e7834b1
@CloudyPadmal
Thermometer working added and crash fixed (#1754)
a9701ac
@neel1998 @CloudyPadmal
readme updated (#1760)
ba23299
@neel1998 @CloudyPadmal
Fix #1759 multimeter record bug fixed (#1761)
9c2313b 
* multimeter record bug fixed

* stop button icon changed
@CloudyPadmal
Thermometer settings added (#1764)
ed9f70c
@neel1998 @CloudyPadmal
indiactor added to the top of timeline (#1755)
d55e296
@CloudyPadmal
Play,Pause,Stop button working in Robotic arm (#1769)
56a513c
@neel1998 @CloudyPadmal
continuous logging added to multimeter (#1767)
b40c276 
* continuous logging added to multimeter

* hardcoded dimensions removed
@neel1998 @CloudyPadmal
save timeline added to robotic arm controller (#1771)
3e3d364
@neel1998 @CloudyPadmal
Import log working fine for robotic arm controller (#1774)
4b49bdd
No crash on back press
18db805
@CloudyPadmal
chore: upgrade gradle version (#1777)
df3b8c4
@CloudyPadmal
Merge branch 'master' into development
c7cee95
@cweitat
Merge pull request #1776 from ho-dor/finish
1979ac0 
No crash on back press
@neel1998
crash fixed
6f1b5dc
@cweitat
Merge pull request #1780 from neel1998/thermometer_crash
fcc19d3 
Fix #1779 Thermometer crash fixed
@neel1998 @CloudyPadmal
save configs added to wave generator (#1781)
dac34e3
@CloudyPadmal
svg logo added for thermo and gyroscope (#1773)
fd1f315
@CloudyPadmal
Visual message when no data fetched in gyroscope (#1785)
8ec739a
@CloudyPadmal
min sdk version upgraded to 23 (#1788)
a10bfa3
@jddeep jddeep merged commit 7b9a5bd into jddeep:development Jun 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone