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.

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

Update UI/UX from latest designs #57

Merged
merged 24 commits into from
Jun 20, 2019
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
91b5810
Update authentication screens & transfer progress screens
ekigamba Jun 6, 2019
857ba8a
Fix QR Code scanning & generator screens
ekigamba Jun 7, 2019
6085bec
Fix transfer progress screen text
ekigamba Jun 7, 2019
591d92e
Update transfer summary screen
ekigamba Jun 7, 2019
f9b77da
Enable connection accept after scan on sender
ekigamba Jun 10, 2019
e863e8a
Add error screens from design mockups
ekigamba Jun 10, 2019
c105af3
Add Devices Connected screen to start transfer
ekigamba Jun 10, 2019
c4d619e
Fix share image asset size
ekigamba Jun 10, 2019
efa6062
Fix sync progress on sender
ekigamba Jun 10, 2019
3b061aa
Fix progress update on progress bar
ekigamba Jun 10, 2019
a2e0e5f
Fix last batch not being processed
ekigamba Jun 10, 2019
41ace0a
Fix blank page skip->cancel->cancel cases
ekigamba Jun 10, 2019
4a0003c
Fix codacy issues
ekigamba Jun 11, 2019
e6155d9
Fix tests
ekigamba Jun 11, 2019
dc24396
Remove unused imports & test code
ekigamba Jun 12, 2019
bf63fcd
Fix flaky test due to new Thread()
ekigamba Jun 12, 2019
1619842
Make builds faster by removing AVD
ekigamba Jun 12, 2019
c589393
Add tests
ekigamba Jun 12, 2019
cb72d0e
Fix GenericAsyncTask tests
ekigamba Jun 13, 2019
fcd8aa4
Add tests to increase cov to 59%
ekigamba Jun 13, 2019
ee6c5ce
Fix codacy issues
ekigamba Jun 13, 2019
615dd3e
Disable Travis CI gradle cache
ekigamba Jun 14, 2019
f7c8f85
Fix text size on Devices connected screen
ekigamba Jun 17, 2019
809c6d3
Fix SyncSenderHandlerTest coverage not reflecting
ekigamba Jun 20, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,7 @@ sudo: required
jdk: oraclejdk8
dist: precise

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/

env:
matrix:
- ANDROID_TARGET=android-22 ANDROID_ABI=armeabi-v7a

global:
# wait up to 10 minutes for adb to connect to emulator
- ADB_INSTALL_TIMEOUT=10
Expand All @@ -33,17 +21,6 @@ android:
- android-28
- android-22

# Specify at least one system image,
# if you need to run emulator(s) during your tests
- sys-img-armeabi-v7a-android-22

before_script:
# Emulator Management: Create, Start and Wait
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- adb wait-for-device
- adb shell input keyevent 82 &

script:
- echo "Travis branch is $TRAVIS_BRANCH"
- echo "Travis branch is in pull request $TRAVIS_PULL+REQUEST"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx1536m
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableUnitTestBinaryResources=true
VERSION_NAME=0.2.1-SNAPSHOT
VERSION_NAME=0.3.0-SNAPSHOT
VERSION_CODE=1
GROUP=org.smartregister
POM_SETTING_DESCRIPTION=Android Peer-to-Peer Sync
Expand Down
2 changes: 1 addition & 1 deletion p2p-sync/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'com.github.kt3k.coveralls'


jacoco {
toolVersion = "0.8.0"
toolVersion = "0.8.2"
}

android {
Expand Down

This file was deleted.

9 changes: 9 additions & 0 deletions p2p-sync/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
android:label="@string/peer_to_peer_activity_title"
android:windowSoftInputMode="stateHidden|adjustResize"
android:name=".activity.P2pModeSelectActivity"/>

<meta-data
android:name="com.google.android.gms.vision.Dependencies"
android:value="barcode" />

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

</application>

</manifest>
Loading