Skip to content

Commit

Permalink
Develop merge (#59)
Browse files Browse the repository at this point in the history
* Prepare code for add alarms to realm from other tabs (#29)

* Add initial EventBus setup

* Refactor Alarm classess, remove add item to alarm option for now

* Add more dependencies to .gitignore

* Resolve 2 issues (#31)

* Add feature: double back press to exit, Issue #17

* Apply style for TimePicker in dark mode, Issue #8

* Change ic_access_alarm foreground color, Issue #2 (#36)

* Fix bug with navigation bar, solve issue #32 (#37)

* Add informative toast, issue #16 (#39)

* Set screen orientation to portrait only in all activities, issue #38 (#40)

* Issue/#42 (#44)

* Change TAGs to match theirs class names

* Refactor ItemBuilder classes to make them consistent and cleaner

* Refactor count down function in MainContract to make it functionality easier to understand

* Change names of items builder classes

* Fix issue #42

*  Refactor ItemBuilders, Add save state of list feature, Fix unit tests, a
dd more unit test

* Clean a code

* Add temporary solution for showTheClosestAlarmToDefinedHour()

* Fix issue #42

* Add Issue #45 feature, make WakeUpAt's layout dynamic (#47)

* Remove redundant layout file

* Add basic animation implementation

* Change list layout from static to dynamic

* Update layout (#49)

* Fix wake up at layout

* Remove image

* Replace constraint layout in cardListView to Linear

* Replace ImageView with FrameLayout

* Add emptyListPlaceholderStyle

* Add empty list image to alarms, make the recyclerView layout dynamic

* Center toolbarTitle textView horizontally to match overflow menu

* Add padding to sleep now list

* WakeUpAt code rearrangement (#51)

* Refactor onActivityCreated function in WakeUpAtPresenter

* Rearange code contract for WakeUpAt view and presenter

* Clean view from business logic and move everything business-like to the presenter

* Remove redundant function

* Items builder improvement (#52)

* Implement strategy pattern for ItemsBuilder, Add tests

* Add more tests that covers all opportunities

* Add info about method of naming convention

* Add more tests in getSummaryTests

* Implement Alarms manager - issue #35 (#56)

* Change code structure of Alarms to dual Contract MVP

* Add AlarmManager, refactor AlarmsPresenter

* Create simple subscriber to set alarm event

* Implement show and hide UI elements system at Alarms tab

* Improve realm connections over app, add onRealmChangeListener to Alarms tab

* Add WakeUpAt subscriber to connect with alarm manager

* Create MyViewManager to avoid repeating myself

* Refactor methods to hide/show at WakeUpAtFragment, move MyViewManager to the utility directory

* Change files structure (#58)

* Reorganize project files, update dependencies, create gradle variable for support dependency

* Add gradlew permissions in travis file

* Add abortOnError lint option and set it to false, change namespace URI in themes.xml

* Fix: Execution failed for task :app:connectedDebugAndroidTest
  • Loading branch information
letelete committed Sep 24, 2018
1 parent c8759e3 commit cf3ded9
Show file tree
Hide file tree
Showing 155 changed files with 2,208 additions and 1,118 deletions.
12 changes: 12 additions & 0 deletions .gitignore
@@ -1,3 +1,14 @@
*.iml
.gradle
/local.properties
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
.DS_Store
/build
/captures
.externalNativeBuild

# Built application files
*.apk
*.ap_
Expand Down Expand Up @@ -63,3 +74,4 @@ fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md

File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 19 additions & 15 deletions .travis.yml
@@ -1,15 +1,19 @@
jdk: oraclejdk8
language: android
android:
components:
- tools
- platform-tools
- build-tools-28.0.2
- android-28
- extra-android-m2repository
- extra-android-support
- sys-img-armeabi-v7a-android-28
- extra-google-google_play_services

before_install:
- "chmod +x ./SleepCycleAlarm/gradlew"
sudo: false
language: android
android:
components:
- tools
- platform-tools
- tools
- build-tools-28.0.3
- android-28
- sys-img-armeabi-v7a-android-26

before_install:
- chmod +x gradlew

before_script:
- echo no | android create avd --force -n test -t android-26 --abi armeabi-v7a
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
10 changes: 0 additions & 10 deletions SleepCycleAlarm/.gitignore

This file was deleted.

105 changes: 0 additions & 105 deletions SleepCycleAlarm/.idea/assetWizardSettings.xml

This file was deleted.

Binary file removed SleepCycleAlarm/.idea/caches/build_file_checksums.ser
Binary file not shown.
18 changes: 0 additions & 18 deletions SleepCycleAlarm/.idea/gradle.xml

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit cf3ded9

Please sign in to comment.