From 03e0b08f74e9f67c1d697c4537312eed62afb6a8 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Mon, 16 Oct 2017 18:46:46 +0200 Subject: [PATCH] =?UTF-8?q?Umbenannt=20und=20Key-Store=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bewoplaner/ExampleInstrumentedTest.java | 2 +- .../app/src/main/AndroidManifest.xml | 31 +++++----- .../data/events/LogoutDirectlyEvent.java | 4 -- .../p3/bewoplaner/BewoplanerApplication.java | 12 ++-- .../p3/bewoplaner/data/AppPrefsConstants.java | 2 +- .../p3/bewoplaner/data/api/ApiModule.java | 16 ++--- .../ErrorHandlingResponseConverter.java | 6 +- .../data/api/common/ErrorThrowable.java | 4 +- .../bewoplaner/data/api/common/ErrorType.java | 2 +- .../data/api/common/ErrorUtils.java | 2 +- .../data/api/responses/GroupResponse.java | 6 +- .../data/api/responses/MessageResponse.java | 7 ++- .../data/api/responses/MessagesResponse.java | 8 ++- .../data/api/responses/ProfileResponse.java | 6 +- .../data/api/responses/RegisterResponse.java | 4 +- .../api/responses/UploadImageResponse.java | 4 +- .../data/api/services/ChatService.java | 8 +-- .../data/api/services/LoginService.java | 4 +- .../data/api/services/ProfileService.java | 6 +- .../data/api/services/RegisterService.java | 4 +- .../data/events/GroupUpdatedEvent.java | 2 +- .../data/events/InvalidTokenEvent.java | 2 +- .../data/events/LogoutDirectlyEvent.java | 4 ++ .../data/firebase/HandleMessagesService.java | 30 +++++----- .../data/firebase/MessagingComponent.java | 10 ++-- .../firebase/MessagingInstanceIdService.java | 10 ++-- .../firebase/ReplyNotificationReceiver.java | 40 ++++++------- .../p3/bewoplaner/data/prefs/AppPrefs.java | 2 +- .../bewoplaner/data/prefs/AppPrefsModule.java | 10 ++-- .../bewoplaner/data/prefs/BasePreference.java | 2 +- .../data/prefs/BooleanPreference.java | 2 +- .../bewoplaner/data/prefs/LongPreference.java | 2 +- .../data/prefs/StringPreference.java | 2 +- .../data/repository/GroupRealmRepository.java | 20 +++---- .../repository/MessageRealmRepository.java | 14 ++--- .../data/repository/RealmProvider.java | 2 +- .../data/repository/RealmWrapper.java | 2 +- .../data/repository/Repository.java | 4 +- .../data/repository/RepositoryModule.java | 18 +++--- .../data/repository/UserRealmRepository.java | 14 ++--- .../data/repository/mapper/Mapper.java | 2 +- .../data/repository/models/GroupRealm.java | 8 +-- .../data/repository/models/MessageRealm.java | 4 +- .../data/repository/models/UserRealm.java | 4 +- .../GroupByIdSpecification.java | 4 +- .../GroupByNameSpecification.java | 4 +- .../specifications/GroupSpecification.java | 4 +- .../MessageByGroupIdSpecification.java | 4 +- .../MessageByIdSpecification.java | 4 +- .../specifications/RealmSpecification.java | 2 +- .../specifications/Specification.java | 2 +- .../specifications/UserByIdSpecification.java | 4 +- .../bewoplaner/di/ApplicationComponent.java | 32 +++++----- .../p3/bewoplaner/di/ApplicationModule.java | 8 +-- .../p3/bewoplaner/di/InjectionHelper.java | 36 +++++------ .../p3/bewoplaner/di/P3DSEndpoint.java | 2 +- .../bewoplaner/di/scopes/ActivityScope.java | 2 +- .../di/scopes/ApplicationScope.java | 2 +- .../p3/bewoplaner/model/Group.java | 8 +-- .../p3/bewoplaner/model/Message.java | 6 +- .../{com => de}/p3/bewoplaner/model/User.java | 4 +- .../bewoplaner/model/common/BaseResponse.java | 2 +- .../page/chat/BaseChatActivity.java | 40 ++++++------- .../bewoplaner/page/chat/BaseChatAdapter.java | 10 ++-- .../bewoplaner/page/chat/ChatComponent.java | 8 +-- .../p3/bewoplaner/page/chat/ChatModule.java | 8 +-- .../bewoplaner/page/chat/ChatPresenter.java | 56 +++++++++--------- .../p3/bewoplaner/page/chat/ChatView.java | 8 +-- .../page/chat/GroupChatActivity.java | 12 ++-- .../page/chat/GroupChatAdapter.java | 10 ++-- .../page/chat/SingleChatActivity.java | 24 ++++---- .../page/chat/SingleChatAdapter.java | 10 ++-- .../page/chatmembers/ChatMembersActivity.java | 8 +-- .../page/chatmembers/ChatMembersAdapter.java | 6 +- .../bewoplaner/page/common/BaseFragment.java | 2 +- .../common/PermissionGrantedListener.java | 2 +- .../common/RuntimePermissionActivity.java | 6 +- .../page/contacts/ContactsAdapter.java | 10 ++-- .../page/contacts/ContactsComponent.java | 8 +-- .../page/contacts/ContactsFragment.java | 28 ++++----- .../page/contacts/ContactsPresenter.java | 36 +++++------ .../page/contacts/ContactsView.java | 8 +-- .../FileConfirmationActivity.java | 10 ++-- .../FileConfirmationComponent.java | 6 +- .../FileConfirmationModule.java | 8 +-- .../FileConfirmationPresenter.java | 6 +- .../FileConfirmationView.java | 4 +- .../page/impressum/ImpressumActivity.java | 4 +- .../bewoplaner/page/login/LoginActivity.java | 22 +++---- .../bewoplaner/page/login/LoginComponent.java | 6 +- .../p3/bewoplaner/page/login/LoginModule.java | 10 ++-- .../bewoplaner/page/login/LoginPresenter.java | 48 +++++++-------- .../p3/bewoplaner/page/login/LoginView.java | 8 +-- .../page/main/LogoutNavigation.java | 2 +- .../p3/bewoplaner/page/main/MainActivity.java | 38 ++++++------ .../bewoplaner/page/main/MainComponent.java | 12 ++-- .../bewoplaner/page/main/MainNavigation.java | 2 +- .../page/main/NavigationMenuAdapter.java | 4 +- .../page/mvp/MVPAbstractPresenter.java | 20 +++---- .../p3/bewoplaner/page/mvp/MVPLceView.java | 2 +- .../p3/bewoplaner/page/mvp/MVPPresenter.java | 2 +- .../p3/bewoplaner/page/mvp/MVPView.java | 2 +- .../page/profile/ProfileComponent.java | 6 +- .../page/profile/ProfileFragment.java | 18 +++--- .../page/profile/ProfileModule.java | 8 +-- .../page/profile/ProfilePresenter.java | 22 +++---- .../bewoplaner/page/profile/ProfileView.java | 6 +- .../page/splash/SplashActivity.java | 8 +-- .../page/splash/SplashComponent.java | 6 +- .../page/splash/SplashPresenter.java | 14 ++--- .../p3/bewoplaner/page/splash/SplashView.java | 4 +- .../bewoplaner/utils/AppStoppedService.java | 12 ++-- .../p3/bewoplaner/utils/Constants.java | 2 +- .../p3/bewoplaner/utils/DateUtils.java | 2 +- .../p3/bewoplaner/utils/DialogHandler.java | 4 +- .../utils/EndlessScrollListener.java | 2 +- .../p3/bewoplaner/utils/FileUtils.java | 2 +- .../p3/bewoplaner/utils/LoggedOutUtils.java | 10 ++-- .../p3/bewoplaner/utils/Preconditions.java | 2 +- .../utils/RuntimePermissionBaseFragment.java | 2 +- .../p3/bewoplaner/utils/SystemUtils.java | 2 +- .../p3/bewoplaner/utils/Utils.java | 2 +- .../p3/bewoplaner/utils/rx/RxUtils.java | 2 +- .../p3/bewoplaner/utils/ui/EmptyLayout.java | 8 +-- .../utils/ui/FlexibleDividerDecoration.java | 2 +- .../ui/HorizontalDividerItemDecoration.java | 2 +- .../bewoplaner/utils/ui/LayoutBehavior.java | 2 +- .../utils/ui/LinearLayoutBehavior.java | 2 +- .../p3/bewoplaner/utils/ui/ViewUtils.java | 4 +- .../app/src/main/res/layout/activity_chat.xml | 2 +- .../res/layout/activity_file_confirmation.xml | 2 +- .../src/main/res/layout/activity_login.xml | 2 +- .../src/main/res/layout/fragment_contacts.xml | 2 +- .../p3/bewoplaner/ExampleUnitTest.java | 2 +- .../bewoplaner-chat-android/ownChat.jks | Bin 0 -> 2280 bytes 135 files changed, 580 insertions(+), 580 deletions(-) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/{com => de}/p3/bewoplaner/ExampleInstrumentedTest.java (96%) delete mode 100644 BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/BewoplanerApplication.java (80%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/AppPrefsConstants.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/ApiModule.java (91%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java (88%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/common/ErrorThrowable.java (83%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/common/ErrorType.java (91%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/common/ErrorUtils.java (90%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/GroupResponse.java (72%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/MessageResponse.java (64%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/MessagesResponse.java (68%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/ProfileResponse.java (70%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/RegisterResponse.java (69%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/responses/UploadImageResponse.java (76%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/services/ChatService.java (82%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/services/LoginService.java (92%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/services/ProfileService.java (79%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/api/services/RegisterService.java (84%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/events/GroupUpdatedEvent.java (69%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/events/InvalidTokenEvent.java (69%) create mode 100644 BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/firebase/HandleMessagesService.java (93%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/firebase/MessagingComponent.java (64%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java (87%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java (86%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/AppPrefs.java (86%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/AppPrefsModule.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/BasePreference.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/BooleanPreference.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/LongPreference.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/prefs/StringPreference.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/GroupRealmRepository.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/MessageRealmRepository.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/RealmProvider.java (90%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/RealmWrapper.java (78%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/Repository.java (82%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/RepositoryModule.java (85%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/UserRealmRepository.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/mapper/Mapper.java (77%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/models/GroupRealm.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/models/MessageRealm.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/models/UserRealm.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java (84%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java (84%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/GroupSpecification.java (79%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java (84%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java (85%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/RealmSpecification.java (82%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/Specification.java (60%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java (79%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/ApplicationComponent.java (73%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/ApplicationModule.java (88%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/InjectionHelper.java (79%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/P3DSEndpoint.java (89%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/scopes/ActivityScope.java (88%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/di/scopes/ApplicationScope.java (88%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/model/Group.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/model/Message.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/model/User.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/model/common/BaseResponse.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/BaseChatActivity.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/BaseChatAdapter.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/ChatComponent.java (61%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/ChatModule.java (63%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/ChatPresenter.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/ChatView.java (91%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/GroupChatActivity.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/GroupChatAdapter.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/SingleChatActivity.java (87%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chat/SingleChatAdapter.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/common/BaseFragment.java (90%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/common/PermissionGrantedListener.java (88%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/common/RuntimePermissionActivity.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/contacts/ContactsAdapter.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/contacts/ContactsComponent.java (58%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/contacts/ContactsFragment.java (92%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/contacts/ContactsPresenter.java (85%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/contacts/ContactsView.java (77%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java (93%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java (66%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java (62%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java (83%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java (74%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/impressum/ImpressumActivity.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/login/LoginActivity.java (93%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/login/LoginComponent.java (65%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/login/LoginModule.java (66%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/login/LoginPresenter.java (93%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/login/LoginView.java (81%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/main/LogoutNavigation.java (70%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/main/MainActivity.java (90%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/main/MainComponent.java (53%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/main/MainNavigation.java (85%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/main/NavigationMenuAdapter.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java (75%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/mvp/MVPLceView.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/mvp/MVPPresenter.java (92%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/mvp/MVPView.java (66%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/profile/ProfileComponent.java (65%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/profile/ProfileFragment.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/profile/ProfileModule.java (62%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/profile/ProfilePresenter.java (86%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/profile/ProfileView.java (81%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/splash/SplashActivity.java (91%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/splash/SplashComponent.java (61%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/splash/SplashPresenter.java (82%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/page/splash/SplashView.java (74%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/AppStoppedService.java (79%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/Constants.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/DateUtils.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/DialogHandler.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/EndlessScrollListener.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/FileUtils.java (99%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/LoggedOutUtils.java (81%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/Preconditions.java (98%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/SystemUtils.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/Utils.java (97%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/rx/RxUtils.java (94%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/EmptyLayout.java (95%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java (99%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java (99%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/LayoutBehavior.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/{com => de}/p3/bewoplaner/utils/ui/ViewUtils.java (96%) rename BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/{com => de}/p3/bewoplaner/ExampleUnitTest.java (93%) create mode 100644 BeWoPlanerChat/bewoplaner-chat-android/ownChat.jks diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/p3/bewoplaner/ExampleInstrumentedTest.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/p3/bewoplaner/ExampleInstrumentedTest.java index 2dbe9bd..58d0656 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/p3/bewoplaner/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner; +package de.p3.bewoplaner; import android.content.Context; import android.support.test.InstrumentationRegistry; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml index 5e09e17..b02b378 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ - + @@ -9,14 +10,14 @@ @@ -26,32 +27,32 @@ @@ -60,15 +61,15 @@ android:name="io.fabric.ApiKey" android:value="1dcc8d0ead50f1b328778876834fea3392c6fc22" /> - + - + @@ -85,7 +86,7 @@ @@ -96,7 +97,7 @@ android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/colorDefault" /> - + \ No newline at end of file diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java deleted file mode 100644 index f5fe0d2..0000000 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.p3.bewoplaner.data.events; - -public class LogoutDirectlyEvent { -} diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/BewoplanerApplication.java similarity index 80% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/BewoplanerApplication.java index ae9e51b..1bd1fc0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/BewoplanerApplication.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner; +package de.p3.bewoplaner; import com.crashlytics.android.Crashlytics; -import com.p3.bewoplaner.data.firebase.MessagingInstanceIdService; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.ApplicationModule; -import com.p3.bewoplaner.di.DaggerApplicationComponent; -import com.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.data.firebase.MessagingInstanceIdService; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.ApplicationModule; +import de.p3.bewoplaner.di.DaggerApplicationComponent; +import de.p3.bewoplaner.di.InjectionHelper; import android.app.Application; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/AppPrefsConstants.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/AppPrefsConstants.java index 823d800..bef0ae0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/AppPrefsConstants.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data; +package de.p3.bewoplaner.data; /** * Created by imarneanu on 2/10/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java similarity index 91% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java index d964e36..85f08d1 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java @@ -1,15 +1,15 @@ -package com.p3.bewoplaner.data.api; +package de.p3.bewoplaner.data.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.BuildConfig; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.di.P3DSEndpoint; -import com.p3.bewoplaner.di.scopes.ApplicationScope; -import com.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.BuildConfig; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.di.P3DSEndpoint; +import de.p3.bewoplaner.di.scopes.ApplicationScope; +import de.p3.bewoplaner.utils.Constants; import java.io.File; import java.util.concurrent.TimeUnit; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java similarity index 88% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java index d6be53f..ebbb866 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.data.api.common; +package de.p3.bewoplaner.data.api.common; -import com.p3.bewoplaner.data.events.InvalidTokenEvent; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.data.events.InvalidTokenEvent; +import de.p3.bewoplaner.model.common.BaseResponse; import org.greenrobot.eventbus.EventBus; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorThrowable.java similarity index 83% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorThrowable.java index d288283..5faba9b 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorThrowable.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.api.common; +package de.p3.bewoplaner.data.api.common; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.common.BaseResponse; /** * Created by laszloffiferenc on 2/21/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorType.java similarity index 91% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorType.java index 1d567fd..7b8f74d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorType.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.api.common; +package de.p3.bewoplaner.data.api.common; /** * Created by laszloffiferenc on 2/21/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorUtils.java similarity index 90% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorUtils.java index a3e32da..1fc4189 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorUtils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.api.common; +package de.p3.bewoplaner.data.api.common; /** * Created by laszloffiferenc on 2/23/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/GroupResponse.java similarity index 72% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/GroupResponse.java index 003beec..7cb2b83 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/GroupResponse.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.common.BaseResponse; import java.util.ArrayList; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessageResponse.java similarity index 64% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessageResponse.java index 68c17a8..9cc1564 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessageResponse.java @@ -1,8 +1,9 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.model.common.BaseResponse; /** * Created by Rares Teodorescu on 08/03/2017. @@ -15,7 +16,7 @@ public class MessageResponse extends BaseResponse { public static class Response { @SerializedName("message") - public com.p3.bewoplaner.model.Message message; + public Message message; } } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessagesResponse.java similarity index 68% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessagesResponse.java index 02ccdd2..f21194e 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/MessagesResponse.java @@ -1,11 +1,13 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.common.BaseResponse; import java.util.ArrayList; +import de.p3.bewoplaner.model.Message; + /** * Created by imarneanu on 3/1/17. */ @@ -16,7 +18,7 @@ public class MessagesResponse extends BaseResponse { public static class Response { @SerializedName("messages") - public ArrayList messages; + public ArrayList messages; @SerializedName("hasMorePages") public boolean hasMorePages; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/ProfileResponse.java similarity index 70% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/ProfileResponse.java index f56c616..92bc6a8 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/ProfileResponse.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.common.BaseResponse; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.User; /** * Created by imarneanu on 2/23/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/RegisterResponse.java similarity index 69% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/RegisterResponse.java index a1d5d8f..75e5e40 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/RegisterResponse.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.common.BaseResponse; /** * Created by laszloffiferenc on 2/28/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/UploadImageResponse.java similarity index 76% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/UploadImageResponse.java index eb2a513..07ab00d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/responses/UploadImageResponse.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.data.api.responses; +package de.p3.bewoplaner.data.api.responses; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.model.common.BaseResponse; +import de.p3.bewoplaner.model.common.BaseResponse; /** * Created by Vlad on 28/02/2017. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ChatService.java similarity index 82% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ChatService.java index cc15d59..a9e488c 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ChatService.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.data.api.services; +package de.p3.bewoplaner.data.api.services; -import com.p3.bewoplaner.data.api.responses.GroupResponse; -import com.p3.bewoplaner.data.api.responses.MessageResponse; -import com.p3.bewoplaner.data.api.responses.MessagesResponse; +import de.p3.bewoplaner.data.api.responses.GroupResponse; +import de.p3.bewoplaner.data.api.responses.MessageResponse; +import de.p3.bewoplaner.data.api.responses.MessagesResponse; import okhttp3.MultipartBody; import okhttp3.RequestBody; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java similarity index 92% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java index b8996f5..dc457f0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.data.api.services; +package de.p3.bewoplaner.data.api.services; import com.google.gson.JsonObject; -import com.p3.bewoplaner.data.api.responses.ProfileResponse; +import de.p3.bewoplaner.data.api.responses.ProfileResponse; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ProfileService.java similarity index 79% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ProfileService.java index 4b9f379..cd04233 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/ProfileService.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.data.api.services; +package de.p3.bewoplaner.data.api.services; -import com.p3.bewoplaner.data.api.responses.ProfileResponse; -import com.p3.bewoplaner.data.api.responses.UploadImageResponse; +import de.p3.bewoplaner.data.api.responses.ProfileResponse; +import de.p3.bewoplaner.data.api.responses.UploadImageResponse; import okhttp3.MultipartBody; import retrofit2.http.Field; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/RegisterService.java similarity index 84% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/RegisterService.java index 58e845c..94b7c79 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/RegisterService.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.api.services; +package de.p3.bewoplaner.data.api.services; -import com.p3.bewoplaner.data.api.responses.RegisterResponse; +import de.p3.bewoplaner.data.api.responses.RegisterResponse; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/GroupUpdatedEvent.java similarity index 69% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/GroupUpdatedEvent.java index b037468..556b7b7 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/GroupUpdatedEvent.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.events; +package de.p3.bewoplaner.data.events; /** * Created by Rares Teodorescu on 31/03/2017. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/InvalidTokenEvent.java similarity index 69% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/InvalidTokenEvent.java index 9af7ff6..10d1b6d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/InvalidTokenEvent.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.events; +package de.p3.bewoplaner.data.events; /** * Created by Rares Teodorescu on 27/03/2017. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java new file mode 100644 index 0000000..ffb4897 --- /dev/null +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java @@ -0,0 +1,4 @@ +package de.p3.bewoplaner.data.events; + +public class LogoutDirectlyEvent { +} diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/HandleMessagesService.java similarity index 93% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/HandleMessagesService.java index aaed1e7..feef552 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/HandleMessagesService.java @@ -1,21 +1,21 @@ -package com.p3.bewoplaner.data.firebase; +package de.p3.bewoplaner.data.firebase; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.MessageRealmRepository; -import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.main.MainActivity; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.LoggedOutUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.MessageRealmRepository; +import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.main.MainActivity; +import de.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.utils.LoggedOutUtils; import android.app.Activity; import android.app.Notification; @@ -48,7 +48,7 @@ import javax.inject.Inject; import javax.inject.Named; import static android.graphics.BitmapFactory.decodeStream; -import static com.p3.bewoplaner.utils.Constants.CHAT_IS_ALREADY_OPEN; +import static de.p3.bewoplaner.utils.Constants.CHAT_IS_ALREADY_OPEN; /** * Created by laszloffiferenc on 3/1/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingComponent.java similarity index 64% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingComponent.java index 6748f0a..4baa5ce 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingComponent.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.data.firebase; +package de.p3.bewoplaner.data.firebase; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.page.chat.ChatModule; -import com.p3.bewoplaner.page.login.LoginModule; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.page.chat.ChatModule; +import de.p3.bewoplaner.page.login.LoginModule; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java similarity index 87% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java index 94c0b9c..7ffc9ad 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java @@ -1,12 +1,12 @@ -package com.p3.bewoplaner.data.firebase; +package de.p3.bewoplaner.data.firebase; import com.google.firebase.iid.FirebaseInstanceId; import com.google.firebase.iid.FirebaseInstanceIdService; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.data.api.responses.RegisterResponse; -import com.p3.bewoplaner.data.api.services.RegisterService; -import com.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.data.api.responses.RegisterResponse; +import de.p3.bewoplaner.data.api.services.RegisterService; +import de.p3.bewoplaner.di.InjectionHelper; import android.provider.Settings; import android.util.Log; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java similarity index 86% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java index 26a03e2..0e7466b 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java @@ -1,23 +1,23 @@ -package com.p3.bewoplaner.data.firebase; +package de.p3.bewoplaner.data.firebase; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; -import com.p3.bewoplaner.data.api.responses.MessageResponse; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.MessageRealmRepository; -import com.p3.bewoplaner.data.repository.RealmProvider; -import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.chat.ChatPresenter; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; +import de.p3.bewoplaner.data.api.responses.MessageResponse; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.MessageRealmRepository; +import de.p3.bewoplaner.data.repository.RealmProvider; +import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.chat.ChatPresenter; +import de.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.utils.rx.RxUtils; import android.content.BroadcastReceiver; import android.content.Context; @@ -37,7 +37,7 @@ import javax.inject.Named; import rx.Observable; import rx.Subscriber; -import static com.p3.bewoplaner.utils.Constants.GROUP_ID; +import static de.p3.bewoplaner.utils.Constants.GROUP_ID; /** * Created by laszloffiferenc on 3/20/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefs.java similarity index 86% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefs.java index a28eb72..e5f97ae 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefs.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefsModule.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefsModule.java index a1efdc5..0415922 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefsModule.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.di.scopes.ApplicationScope; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.di.scopes.ApplicationScope; import com.securepreferences.SecurePreferences; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BasePreference.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BasePreference.java index e30b1cf..0f25ec9 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BasePreference.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; import com.securepreferences.SecurePreferences; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BooleanPreference.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BooleanPreference.java index 7b10d17..a13011d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/BooleanPreference.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; import com.securepreferences.SecurePreferences; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/LongPreference.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/LongPreference.java index d77b7a3..5f07a7f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/LongPreference.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; import android.content.SharedPreferences; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/StringPreference.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/StringPreference.java index a9f389c..412609a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/StringPreference.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.prefs; +package de.p3.bewoplaner.data.prefs; import android.content.SharedPreferences; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/GroupRealmRepository.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/GroupRealmRepository.java index 160ad8c..a128206 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/GroupRealmRepository.java @@ -1,14 +1,14 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; -import com.p3.bewoplaner.data.repository.mapper.Mapper; -import com.p3.bewoplaner.data.repository.models.GroupRealm; -import com.p3.bewoplaner.data.repository.models.UserRealm; -import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.RealmSpecification; -import com.p3.bewoplaner.data.repository.specifications.Specification; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.data.repository.mapper.Mapper; +import de.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.RealmSpecification; +import de.p3.bewoplaner.data.repository.specifications.Specification; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.model.User; import java.util.ArrayList; import java.util.List; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/MessageRealmRepository.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/MessageRealmRepository.java index 60a66c2..7e031f2 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/MessageRealmRepository.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; -import com.p3.bewoplaner.data.repository.mapper.Mapper; -import com.p3.bewoplaner.data.repository.models.MessageRealm; -import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.RealmSpecification; -import com.p3.bewoplaner.data.repository.specifications.Specification; -import com.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.data.repository.mapper.Mapper; +import de.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.RealmSpecification; +import de.p3.bewoplaner.data.repository.specifications.Specification; +import de.p3.bewoplaner.model.Message; import java.util.List; import java.util.concurrent.Callable; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmProvider.java similarity index 90% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmProvider.java index 2690264..ee85942 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmProvider.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; import io.realm.Realm; import io.realm.RealmConfiguration; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmWrapper.java similarity index 78% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmWrapper.java index e0a221f..be69090 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RealmWrapper.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; import io.realm.Realm; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/Repository.java similarity index 82% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/Repository.java index 1055ebd..5e1a872 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/Repository.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; -import com.p3.bewoplaner.data.repository.specifications.Specification; +import de.p3.bewoplaner.data.repository.specifications.Specification; import java.util.List; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RepositoryModule.java similarity index 85% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RepositoryModule.java index 0f80d72..afc1f91 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/RepositoryModule.java @@ -1,13 +1,13 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; -import com.p3.bewoplaner.data.repository.mapper.Mapper; -import com.p3.bewoplaner.data.repository.models.GroupRealm; -import com.p3.bewoplaner.data.repository.models.MessageRealm; -import com.p3.bewoplaner.data.repository.models.UserRealm; -import com.p3.bewoplaner.di.scopes.ApplicationScope; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.data.repository.mapper.Mapper; +import de.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.di.scopes.ApplicationScope; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.model.User; import dagger.Module; import dagger.Provides; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/UserRealmRepository.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/UserRealmRepository.java index bcf2c05..cfaca55 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/UserRealmRepository.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.data.repository; +package de.p3.bewoplaner.data.repository; -import com.p3.bewoplaner.data.repository.mapper.Mapper; -import com.p3.bewoplaner.data.repository.models.UserRealm; -import com.p3.bewoplaner.data.repository.specifications.RealmSpecification; -import com.p3.bewoplaner.data.repository.specifications.Specification; -import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.data.repository.mapper.Mapper; +import de.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.data.repository.specifications.RealmSpecification; +import de.p3.bewoplaner.data.repository.specifications.Specification; +import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification; +import de.p3.bewoplaner.model.User; import android.util.Log; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/mapper/Mapper.java similarity index 77% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/mapper/Mapper.java index 4f89b49..3519543 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/mapper/Mapper.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.repository.mapper; +package de.p3.bewoplaner.data.repository.mapper; /** * Class responsible for mapping one object to another. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/GroupRealm.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/GroupRealm.java index cd6b878..40c0a5c 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/GroupRealm.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.data.repository.models; +package de.p3.bewoplaner.data.repository.models; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.model.User; import java.util.ArrayList; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/MessageRealm.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/MessageRealm.java index 6474fd6..59942e3 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/MessageRealm.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.models; +package de.p3.bewoplaner.data.repository.models; -import com.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.model.Message; import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/UserRealm.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/UserRealm.java index 86292bb..707b972 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/models/UserRealm.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.models; +package de.p3.bewoplaner.data.repository.models; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.model.User; import io.realm.RealmObject; import io.realm.annotations.PrimaryKey; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java similarity index 84% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java index 678b491..472bde0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.GroupRealm; import io.realm.Realm; import io.realm.RealmQuery; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java similarity index 84% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java index fbcb139..c6f4c8a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.GroupRealm; import io.realm.Case; import io.realm.Realm; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupSpecification.java similarity index 79% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupSpecification.java index 29cd170..799f747 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/GroupSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.GroupRealm; import io.realm.Realm; import io.realm.RealmQuery; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java similarity index 84% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java index 293361b..353c080 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.models.MessageRealm; import io.realm.Realm; import io.realm.RealmQuery; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java similarity index 85% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java index 976963b..f412c12 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.models.MessageRealm; import io.realm.Realm; import io.realm.RealmQuery; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/RealmSpecification.java similarity index 82% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/RealmSpecification.java index d17fbd7..59b6640 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/RealmSpecification.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; import io.realm.Realm; import io.realm.RealmObject; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/Specification.java similarity index 60% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/Specification.java index bce08be..c552fdd 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/Specification.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; /** * Created by Rares Teodorescu on 11/01/2017. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java similarity index 79% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java index cbb4b65..7a7701a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.data.repository.specifications; +package de.p3.bewoplaner.data.repository.specifications; -import com.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.data.repository.models.UserRealm; import io.realm.Realm; import io.realm.RealmQuery; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationComponent.java similarity index 73% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationComponent.java index 4bfd63c..fa512dc 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationComponent.java @@ -1,21 +1,21 @@ -package com.p3.bewoplaner.di; +package de.p3.bewoplaner.di; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.ApiModule; -import com.p3.bewoplaner.data.prefs.AppPrefs; -import com.p3.bewoplaner.data.prefs.AppPrefsModule; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.MessageRealmRepository; -import com.p3.bewoplaner.data.repository.RealmProvider; -import com.p3.bewoplaner.data.repository.RepositoryModule; -import com.p3.bewoplaner.data.repository.UserRealmRepository; -import com.p3.bewoplaner.di.scopes.ApplicationScope; -import com.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.ApiModule; +import de.p3.bewoplaner.data.prefs.AppPrefs; +import de.p3.bewoplaner.data.prefs.AppPrefsModule; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.MessageRealmRepository; +import de.p3.bewoplaner.data.repository.RealmProvider; +import de.p3.bewoplaner.data.repository.RepositoryModule; +import de.p3.bewoplaner.data.repository.UserRealmRepository; +import de.p3.bewoplaner.di.scopes.ApplicationScope; +import de.p3.bewoplaner.utils.SystemUtils; import com.securepreferences.SecurePreferences; import android.app.NotificationManager; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationModule.java similarity index 88% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationModule.java index 80b0839..c6af234 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationModule.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.di; +package de.p3.bewoplaner.di; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.di.scopes.ApplicationScope; -import com.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.di.scopes.ApplicationScope; +import de.p3.bewoplaner.utils.SystemUtils; import android.app.NotificationManager; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/InjectionHelper.java similarity index 79% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/InjectionHelper.java index 7a3bb12..67beabb 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/InjectionHelper.java @@ -1,22 +1,22 @@ -package com.p3.bewoplaner.di; +package de.p3.bewoplaner.di; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.data.firebase.DaggerMessagingComponent; -import com.p3.bewoplaner.data.firebase.MessagingComponent; -import com.p3.bewoplaner.page.chat.ChatComponent; -import com.p3.bewoplaner.page.chat.DaggerChatComponent; -import com.p3.bewoplaner.page.contacts.ContactsComponent; -import com.p3.bewoplaner.page.contacts.DaggerContactsComponent; -import com.p3.bewoplaner.page.fileconfirmation.DaggerFileConfirmationComponent; -import com.p3.bewoplaner.page.fileconfirmation.FileConfirmationComponent; -import com.p3.bewoplaner.page.login.DaggerLoginComponent; -import com.p3.bewoplaner.page.login.LoginComponent; -import com.p3.bewoplaner.page.main.DaggerMainComponent; -import com.p3.bewoplaner.page.main.MainComponent; -import com.p3.bewoplaner.page.profile.DaggerProfileComponent; -import com.p3.bewoplaner.page.profile.ProfileComponent; -import com.p3.bewoplaner.page.splash.DaggerSplashComponent; -import com.p3.bewoplaner.page.splash.SplashComponent; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.data.firebase.DaggerMessagingComponent; +import de.p3.bewoplaner.data.firebase.MessagingComponent; +import de.p3.bewoplaner.page.chat.ChatComponent; +import de.p3.bewoplaner.page.chat.DaggerChatComponent; +import de.p3.bewoplaner.page.contacts.ContactsComponent; +import de.p3.bewoplaner.page.contacts.DaggerContactsComponent; +import de.p3.bewoplaner.page.fileconfirmation.DaggerFileConfirmationComponent; +import de.p3.bewoplaner.page.fileconfirmation.FileConfirmationComponent; +import de.p3.bewoplaner.page.login.DaggerLoginComponent; +import de.p3.bewoplaner.page.login.LoginComponent; +import de.p3.bewoplaner.page.main.DaggerMainComponent; +import de.p3.bewoplaner.page.main.MainComponent; +import de.p3.bewoplaner.page.profile.DaggerProfileComponent; +import de.p3.bewoplaner.page.profile.ProfileComponent; +import de.p3.bewoplaner.page.splash.DaggerSplashComponent; +import de.p3.bewoplaner.page.splash.SplashComponent; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/P3DSEndpoint.java similarity index 89% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/P3DSEndpoint.java index 9b4b3b2..5d5d740 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/P3DSEndpoint.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.di; +package de.p3.bewoplaner.di; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ActivityScope.java similarity index 88% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ActivityScope.java index 3717bdb..8c85aaa 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ActivityScope.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.di.scopes; +package de.p3.bewoplaner.di.scopes; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ApplicationScope.java similarity index 88% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ApplicationScope.java index dd57a56..e02c3bb 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/scopes/ApplicationScope.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.di.scopes; +package de.p3.bewoplaner.di.scopes; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Group.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Group.java index 4c40178..f912cf5 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Group.java @@ -1,10 +1,10 @@ -package com.p3.bewoplaner.model; +package de.p3.bewoplaner.model; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.data.repository.models.GroupRealm; -import com.p3.bewoplaner.data.repository.models.MessageRealm; -import com.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.data.repository.models.GroupRealm; +import de.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.models.UserRealm; import android.os.Parcel; import android.os.Parcelable; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Message.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Message.java index 3ff5e2b..95db5bc 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/Message.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.model; +package de.p3.bewoplaner.model; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.repository.models.MessageRealm; import java.util.ArrayList; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/User.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/User.java index d268729..1d04a68 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/User.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.model; +package de.p3.bewoplaner.model; import com.google.gson.annotations.SerializedName; -import com.p3.bewoplaner.data.repository.models.UserRealm; +import de.p3.bewoplaner.data.repository.models.UserRealm; import android.os.Parcel; import android.os.Parcelable; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/common/BaseResponse.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/common/BaseResponse.java index ee7690d..9b015a7 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/common/BaseResponse.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.model.common; +package de.p3.bewoplaner.model.common; import com.google.gson.annotations.SerializedName; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatActivity.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatActivity.java index cc0a265..a2b5027 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatActivity.java @@ -1,23 +1,21 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.events.InvalidTokenEvent; -import com.p3.bewoplaner.data.events.LogoutDirectlyEvent; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.common.RuntimePermissionActivity; -import com.p3.bewoplaner.page.fileconfirmation.FileConfirmationActivity; -import com.p3.bewoplaner.page.login.LoginPresenter; -import com.p3.bewoplaner.page.main.LogoutNavigation; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.EndlessScrollListener; -import com.p3.bewoplaner.utils.FileUtils; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.ui.EmptyLayout; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.events.InvalidTokenEvent; +import de.p3.bewoplaner.data.events.LogoutDirectlyEvent; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.common.RuntimePermissionActivity; +import de.p3.bewoplaner.page.login.LoginPresenter; +import de.p3.bewoplaner.page.main.LogoutNavigation; +import de.p3.bewoplaner.utils.EndlessScrollListener; +import de.p3.bewoplaner.utils.FileUtils; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.ui.EmptyLayout; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -64,8 +62,6 @@ import hani.momanii.supernova_emoji_library.Actions.EmojIconActions; import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText; import okhttp3.MediaType; -import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID; - /** * Created by Rares Teodorescu on 21/02/2017. */ @@ -111,7 +107,7 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha CoordinatorLayout mCoordinatorLayout; @Inject - @Named(USER_ID) + @Named(AppPrefsConstants.USER_ID) LongPreference mUserIdPreference; @Inject diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatAdapter.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatAdapter.java index 1ca0b55..3affb77 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatAdapter.java @@ -1,12 +1,12 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.github.lzyzsd.circleprogress.DonutProgress; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.utils.DateUtils; -import com.p3.bewoplaner.utils.ui.ViewUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.utils.DateUtils; +import de.p3.bewoplaner.utils.ui.ViewUtils; import android.net.Uri; import android.support.annotation.Nullable; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatComponent.java similarity index 61% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatComponent.java index 732077f..32e5956 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatComponent.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.page.login.LoginModule; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.page.login.LoginModule; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatModule.java similarity index 63% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatModule.java index 4155e08..1087a75 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatModule.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.di.P3DSEndpoint; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.di.P3DSEndpoint; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Module; import dagger.Provides; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatPresenter.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatPresenter.java index 173f5cc..77847e1 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatPresenter.java @@ -1,27 +1,27 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; -import com.p3.bewoplaner.data.api.responses.MessageResponse; -import com.p3.bewoplaner.data.api.responses.MessagesResponse; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.data.events.GroupUpdatedEvent; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.MessageRealmRepository; -import com.p3.bewoplaner.data.repository.RealmProvider; -import com.p3.bewoplaner.data.repository.models.MessageRealm; -import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; +import de.p3.bewoplaner.data.api.responses.MessageResponse; +import de.p3.bewoplaner.data.api.responses.MessagesResponse; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.data.events.GroupUpdatedEvent; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.MessageRealmRepository; +import de.p3.bewoplaner.data.repository.RealmProvider; +import de.p3.bewoplaner.data.repository.models.MessageRealm; +import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.rx.RxUtils; import org.greenrobot.eventbus.EventBus; @@ -45,6 +45,7 @@ import java.util.Random; import javax.inject.Inject; import javax.inject.Named; +import de.p3.bewoplaner.utils.FileUtils; import io.realm.Realm; import okhttp3.MultipartBody; import okhttp3.RequestBody; @@ -56,8 +57,7 @@ import rx.android.schedulers.AndroidSchedulers; import rx.functions.Func1; import rx.schedulers.Schedulers; -import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID; -import static com.p3.bewoplaner.utils.FileUtils.getFileTypeFromFilePath; +import static de.p3.bewoplaner.data.AppPrefsConstants.USER_ID; /** * Created by Rares Teodorescu on 21/02/2017. @@ -493,7 +493,7 @@ public class ChatPresenter extends MVPAbstractPresenter implements Cha public void downloadFile(Message message, String filePath, int itemPosition) { if (message.fileDownloaded) { getView().stopItemProgress(itemPosition); - getView().fileDownloadedSuccessfully(filePath, getFileTypeFromFilePath(filePath)); + getView().fileDownloadedSuccessfully(filePath, FileUtils.getFileTypeFromFilePath(filePath)); return; } downloadFileFromUrl(message.filePath, filePath, itemPosition) @@ -923,7 +923,7 @@ public class ChatPresenter extends MVPAbstractPresenter implements Cha int totalSize = urlConnection.getContentLength(); if (file.length() == totalSize || totalSize == -1) { - subscriber.onNext(getFileTypeFromFilePath(filePath)); + subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath)); subscriber.onCompleted(); return; } @@ -958,7 +958,7 @@ public class ChatPresenter extends MVPAbstractPresenter implements Cha //close the output stream when done fileOutput.close(); - subscriber.onNext(getFileTypeFromFilePath(filePath)); + subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath)); subscriber.onCompleted(); } catch (IOException e) { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatView.java similarity index 91% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatView.java index 3189457..f589159 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatView.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.mvp.MVPView; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.mvp.MVPView; import android.net.Uri; import android.support.annotation.StringRes; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatActivity.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatActivity.java index 129391a..04a259f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatActivity.java @@ -1,10 +1,10 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.chatmembers.ChatMembersActivity; -import com.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.chatmembers.ChatMembersActivity; +import de.p3.bewoplaner.utils.Constants; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatAdapter.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatAdapter.java index 296a42d..7737621 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/GroupChatAdapter.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.utils.DateUtils; -import com.p3.bewoplaner.utils.ui.ViewUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.utils.DateUtils; +import de.p3.bewoplaner.utils.ui.ViewUtils; import android.support.v7.widget.RecyclerView; import android.view.Gravity; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatActivity.java similarity index 87% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatActivity.java index 4d726e4..1a91e2d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatActivity.java @@ -1,10 +1,10 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.utils.Constants; + +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.utils.Constants; import android.content.BroadcastReceiver; import android.content.Context; @@ -48,7 +48,7 @@ public class SingleChatActivity extends BaseChatActivity { if (mSystemUtils.isNetworkUnavailable()) { mCallback.loadMessagesFromDBByGroupId(mGroup.id, true); - showError(R.string.error_no_internet_connection); + showError(de.p3.bewoplaner.R.string.error_no_internet_connection); } else { mCallback.loadMessagesFromServerByGroupId(mGroup.id); } @@ -66,7 +66,7 @@ public class SingleChatActivity extends BaseChatActivity { if (mSystemUtils.isNetworkUnavailable()) { mCallback.loadMessagesFromDBByGroupId(mGroup.id, true); - showError(R.string.error_no_internet_connection); + showError(de.p3.bewoplaner.R.string.error_no_internet_connection); } else { mCallback.fetchNewMessages(mGroup.id); } @@ -89,12 +89,12 @@ public class SingleChatActivity extends BaseChatActivity { protected void loadMessages() { if (!TextUtils.isEmpty(mGroup.mobile)) { mExtraImageView.setVisibility(View.VISIBLE); - mExtraImageView.setImageResource(R.drawable.call); + mExtraImageView.setImageResource(de.p3.bewoplaner.R.drawable.call); } if (mSystemUtils.isNetworkUnavailable()) { mCallback.loadMessagesFromDBByGroupId(mGroup.id, true); - showError(R.string.error_no_internet_connection); + showError(de.p3.bewoplaner.R.string.error_no_internet_connection); } else { mCallback.loadMessagesFromServerByGroupId(mGroup.id); } @@ -104,13 +104,13 @@ public class SingleChatActivity extends BaseChatActivity { protected void setToolbar() { mSingleChatTitleTextView.setVisibility(View.VISIBLE); mSingleChatTitleTextView.setText(mGroup.name); - mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? R.color.colorHelpGroup : R.color.colorBlack)); + mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? de.p3.bewoplaner.R.color.colorHelpGroup : de.p3.bewoplaner.R.color.colorBlack)); if (TextUtils.isEmpty(mGroup.avatar)) { - mChatImageView.setImageResource(R.drawable.avatar); + mChatImageView.setImageResource(de.p3.bewoplaner.R.drawable.avatar); } else { Glide.with(this).load(mGroup.avatar) - .placeholder(R.drawable.avatar) + .placeholder(de.p3.bewoplaner.R.drawable.avatar) .dontAnimate() .into(mChatImageView); } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatAdapter.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatAdapter.java index 5960951..ac7c115 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/SingleChatAdapter.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.page.chat; +package de.p3.bewoplaner.page.chat; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.utils.DateUtils; -import com.p3.bewoplaner.utils.ui.ViewUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.utils.DateUtils; +import de.p3.bewoplaner.utils.ui.ViewUtils; import android.support.v7.widget.RecyclerView; import android.view.Gravity; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java index 40ccc00..cbe9785 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.chatmembers; +package de.p3.bewoplaner.page.chatmembers; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration; import android.content.Context; import android.content.Intent; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java index 0b88c5a..6712e92 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.page.chatmembers; +package de.p3.bewoplaner.page.chatmembers; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.User; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.User; import android.content.Intent; import android.net.Uri; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/BaseFragment.java similarity index 90% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/BaseFragment.java index d873d25..3630825 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/BaseFragment.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.common; +package de.p3.bewoplaner.page.common; import android.support.v4.app.Fragment; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/PermissionGrantedListener.java similarity index 88% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/PermissionGrantedListener.java index 818cb0c..47244e5 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/PermissionGrantedListener.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.common; +package de.p3.bewoplaner.page.common; /** * Callback for requesting permission. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/RuntimePermissionActivity.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/RuntimePermissionActivity.java index b0d731e..ab7e40f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/common/RuntimePermissionActivity.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.page.common; +package de.p3.bewoplaner.page.common; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.utils.DialogHandler; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.utils.DialogHandler; import android.app.Dialog; import android.content.Intent; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsAdapter.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsAdapter.java index b6dfd73..b6d5233 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsAdapter.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.page.contacts; +package de.p3.bewoplaner.page.contacts; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.utils.DateUtils; -import com.p3.bewoplaner.utils.ui.ViewUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.utils.DateUtils; +import de.p3.bewoplaner.utils.ui.ViewUtils; import android.graphics.Typeface; import android.support.v4.content.ContextCompat; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsComponent.java similarity index 58% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsComponent.java index d58cc13..f476118 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsComponent.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.contacts; +package de.p3.bewoplaner.page.contacts; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.page.chat.ChatModule; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.page.chat.ChatModule; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsFragment.java similarity index 92% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsFragment.java index 524b94c..7ac5105 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsFragment.java @@ -1,18 +1,18 @@ -package com.p3.bewoplaner.page.contacts; +package de.p3.bewoplaner.page.contacts; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.events.GroupUpdatedEvent; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.chat.GroupChatActivity; -import com.p3.bewoplaner.page.chat.SingleChatActivity; -import com.p3.bewoplaner.page.common.BaseFragment; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.ui.EmptyLayout; -import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.events.GroupUpdatedEvent; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.chat.GroupChatActivity; +import de.p3.bewoplaner.page.chat.SingleChatActivity; +import de.p3.bewoplaner.page.common.BaseFragment; +import de.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.utils.ui.EmptyLayout; +import de.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsPresenter.java similarity index 85% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsPresenter.java index 81edf6f..9870ae0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsPresenter.java @@ -1,22 +1,22 @@ -package com.p3.bewoplaner.page.contacts; +package de.p3.bewoplaner.page.contacts; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; -import com.p3.bewoplaner.data.api.responses.GroupResponse; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.UserRealmRepository; -import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; -import com.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification; -import com.p3.bewoplaner.data.repository.specifications.GroupSpecification; -import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; +import de.p3.bewoplaner.data.api.responses.GroupResponse; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.UserRealmRepository; +import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification; +import de.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification; +import de.p3.bewoplaner.data.repository.specifications.GroupSpecification; +import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.rx.RxUtils; import android.support.annotation.NonNull; import android.util.Log; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsView.java similarity index 77% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsView.java index f044996..504ff89 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/contacts/ContactsView.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.contacts; +package de.p3.bewoplaner.page.contacts; -import com.p3.bewoplaner.model.Group; -import com.p3.bewoplaner.model.Message; -import com.p3.bewoplaner.page.mvp.MVPView; +import de.p3.bewoplaner.model.Group; +import de.p3.bewoplaner.model.Message; +import de.p3.bewoplaner.page.mvp.MVPView; import android.support.annotation.StringRes; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java similarity index 93% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java index 804356a..a3df528 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.fileconfirmation; +package de.p3.bewoplaner.page.fileconfirmation; import android.database.Cursor; import android.net.Uri; @@ -10,10 +10,10 @@ import android.os.Bundle; import android.webkit.WebView; import android.widget.ImageView; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.FileUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.utils.FileUtils; import java.io.File; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java similarity index 66% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java index 868f377..5966d8a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.page.fileconfirmation; +package de.p3.bewoplaner.page.fileconfirmation; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java similarity index 62% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java index 3d303d2..d4b4b88 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.fileconfirmation; +package de.p3.bewoplaner.page.fileconfirmation; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.di.P3DSEndpoint; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.di.P3DSEndpoint; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Module; import dagger.Provides; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java similarity index 83% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java index f2dee88..ffc83b8 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.page.fileconfirmation; +package de.p3.bewoplaner.page.fileconfirmation; import android.content.Context; import android.net.Uri; import android.support.annotation.NonNull; -import com.p3.bewoplaner.data.api.services.ChatService; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.data.api.services.ChatService; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; import javax.inject.Inject; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java similarity index 74% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java index b41dfcf..cc77dec 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.fileconfirmation; +package de.p3.bewoplaner.page.fileconfirmation; import android.net.Uri; -import com.p3.bewoplaner.page.mvp.MVPLceView; +import de.p3.bewoplaner.page.mvp.MVPLceView; /** * Created by Lyndon on 13-Oct-2017. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/impressum/ImpressumActivity.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/impressum/ImpressumActivity.java index 06fed75..ad1aa5a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/impressum/ImpressumActivity.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.page.impressum; +package de.p3.bewoplaner.page.impressum; -import com.p3.bewoplaner.R; +import de.p3.bewoplaner.R; import android.annotation.TargetApi; import android.content.Intent; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginActivity.java similarity index 93% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginActivity.java index 101ba83..9234ddc 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginActivity.java @@ -1,17 +1,17 @@ -package com.p3.bewoplaner.page.login; +package de.p3.bewoplaner.page.login; import com.google.firebase.iid.FirebaseInstanceId; -import com.p3.bewoplaner.BewoplanerApplication; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.AppPrefs; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.page.main.MainActivity; -import com.p3.bewoplaner.utils.AppStoppedService; -import com.p3.bewoplaner.utils.DialogHandler; -import com.p3.bewoplaner.utils.ui.ViewUtils; +import de.p3.bewoplaner.BewoplanerApplication; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.AppPrefs; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.page.main.MainActivity; +import de.p3.bewoplaner.utils.AppStoppedService; +import de.p3.bewoplaner.utils.DialogHandler; +import de.p3.bewoplaner.utils.ui.ViewUtils; import com.securepreferences.SecurePreferences; import android.content.Intent; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginComponent.java similarity index 65% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginComponent.java index d22652e..c094635 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginComponent.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.page.login; +package de.p3.bewoplaner.page.login; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginModule.java similarity index 66% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginModule.java index d15a457..8c56512 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginModule.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.page.login; +package de.p3.bewoplaner.page.login; -import com.p3.bewoplaner.data.api.services.LoginService; -import com.p3.bewoplaner.data.api.services.RegisterService; -import com.p3.bewoplaner.di.P3DSEndpoint; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.data.api.services.LoginService; +import de.p3.bewoplaner.data.api.services.RegisterService; +import de.p3.bewoplaner.di.P3DSEndpoint; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Module; import dagger.Provides; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java similarity index 93% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java index 4a5fa7e..cbab5f4 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java @@ -1,31 +1,31 @@ -package com.p3.bewoplaner.page.login; +package de.p3.bewoplaner.page.login; import com.google.gson.JsonObject; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; -import com.p3.bewoplaner.data.api.common.ErrorThrowable; -import com.p3.bewoplaner.data.api.common.ErrorType; -import com.p3.bewoplaner.data.api.common.ErrorUtils; -import com.p3.bewoplaner.data.api.responses.RegisterResponse; -import com.p3.bewoplaner.data.api.services.LoginService; -import com.p3.bewoplaner.data.api.services.RegisterService; -import com.p3.bewoplaner.data.prefs.AppPrefs; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.data.prefs.LongPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.data.repository.GroupRealmRepository; -import com.p3.bewoplaner.data.repository.MessageRealmRepository; -import com.p3.bewoplaner.data.repository.RealmProvider; -import com.p3.bewoplaner.data.repository.UserRealmRepository; -import com.p3.bewoplaner.model.User; -import com.p3.bewoplaner.page.main.LogoutNavigation; -import com.p3.bewoplaner.page.main.MainNavigation; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; +import de.p3.bewoplaner.data.api.common.ErrorThrowable; +import de.p3.bewoplaner.data.api.common.ErrorType; +import de.p3.bewoplaner.data.api.common.ErrorUtils; +import de.p3.bewoplaner.data.api.responses.RegisterResponse; +import de.p3.bewoplaner.data.api.services.LoginService; +import de.p3.bewoplaner.data.api.services.RegisterService; +import de.p3.bewoplaner.data.prefs.AppPrefs; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.data.prefs.LongPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.data.repository.GroupRealmRepository; +import de.p3.bewoplaner.data.repository.MessageRealmRepository; +import de.p3.bewoplaner.data.repository.RealmProvider; +import de.p3.bewoplaner.data.repository.UserRealmRepository; +import de.p3.bewoplaner.model.User; +import de.p3.bewoplaner.page.main.LogoutNavigation; +import de.p3.bewoplaner.page.main.MainNavigation; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.rx.RxUtils; import com.securepreferences.SecurePreferences; import android.app.NotificationManager; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java similarity index 81% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java index f0088b1..7d4e8fd 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.login; +package de.p3.bewoplaner.page.login; -import com.p3.bewoplaner.page.main.LogoutNavigation; -import com.p3.bewoplaner.page.main.MainNavigation; -import com.p3.bewoplaner.page.mvp.MVPLceView; +import de.p3.bewoplaner.page.main.LogoutNavigation; +import de.p3.bewoplaner.page.main.MainNavigation; +import de.p3.bewoplaner.page.mvp.MVPLceView; /** * Created by laszloffiferenc on 2/21/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java similarity index 70% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java index fc281c8..a87ff46 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.main; +package de.p3.bewoplaner.page.main; public interface LogoutNavigation { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainActivity.java similarity index 90% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainActivity.java index 76e7197..454ce9e 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainActivity.java @@ -1,24 +1,24 @@ -package com.p3.bewoplaner.page.main; +package de.p3.bewoplaner.page.main; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.events.InvalidTokenEvent; -import com.p3.bewoplaner.data.events.LogoutDirectlyEvent; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.page.chat.GroupChatActivity; -import com.p3.bewoplaner.page.chat.SingleChatActivity; -import com.p3.bewoplaner.page.contacts.ContactsFragment; -import com.p3.bewoplaner.page.impressum.ImpressumActivity; -import com.p3.bewoplaner.page.login.LoginActivity; -import com.p3.bewoplaner.page.login.LoginPresenter; -import com.p3.bewoplaner.page.profile.ProfileFragment; -import com.p3.bewoplaner.utils.Constants; -import com.p3.bewoplaner.utils.DialogHandler; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.Utils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.events.InvalidTokenEvent; +import de.p3.bewoplaner.data.events.LogoutDirectlyEvent; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.page.chat.GroupChatActivity; +import de.p3.bewoplaner.page.chat.SingleChatActivity; +import de.p3.bewoplaner.page.contacts.ContactsFragment; +import de.p3.bewoplaner.page.impressum.ImpressumActivity; +import de.p3.bewoplaner.page.login.LoginActivity; +import de.p3.bewoplaner.page.login.LoginPresenter; +import de.p3.bewoplaner.page.profile.ProfileFragment; +import de.p3.bewoplaner.utils.Constants; +import de.p3.bewoplaner.utils.DialogHandler; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.Utils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainComponent.java similarity index 53% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainComponent.java index ac894c9..0087854 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainComponent.java @@ -1,10 +1,10 @@ -package com.p3.bewoplaner.page.main; +package de.p3.bewoplaner.page.main; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.page.chat.ChatModule; -import com.p3.bewoplaner.page.login.LoginModule; -import com.p3.bewoplaner.utils.AppStoppedService; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.page.chat.ChatModule; +import de.p3.bewoplaner.page.login.LoginModule; +import de.p3.bewoplaner.utils.AppStoppedService; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainNavigation.java similarity index 85% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainNavigation.java index 7562a95..5eb8062 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainNavigation.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.main; +package de.p3.bewoplaner.page.main; /** * Created by imarneanu on 2/10/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/NavigationMenuAdapter.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/NavigationMenuAdapter.java index f83a945..b291036 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/NavigationMenuAdapter.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.page.main; +package de.p3.bewoplaner.page.main; -import com.p3.bewoplaner.R; +import de.p3.bewoplaner.R; import android.app.Activity; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java similarity index 75% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java index c724015..03f3008 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java @@ -1,14 +1,14 @@ -package com.p3.bewoplaner.page.mvp; +package de.p3.bewoplaner.page.mvp; import android.support.annotation.CallSuper; import android.support.annotation.NonNull; +import de.p3.bewoplaner.utils.Preconditions; import rx.Subscription; import rx.subscriptions.CompositeSubscription; -import static com.p3.bewoplaner.utils.Preconditions.checkNotNull; -import static com.p3.bewoplaner.utils.Preconditions.checkNull; -import static com.p3.bewoplaner.utils.Preconditions.checkState; +import static de.p3.bewoplaner.utils.Preconditions.checkNotNull; +import static de.p3.bewoplaner.utils.Preconditions.checkState; /** * Created by imarneanu on 2/9/17. @@ -29,20 +29,20 @@ public abstract class MVPAbstractPresenter @Override public final void attachView(@NonNull V view) { - checkNull(mView, "view is already attached"); + Preconditions.checkNull(mView, "view is already attached"); mView = view; afterAttachView(view); - checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH, + Preconditions.checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH, "super.afterAttachView() not called"); } @Override public final void detachView() { - checkNotNull(mCompositeSubscription, "subscriptionList is NULL"); + Preconditions.checkNotNull(mCompositeSubscription, "subscriptionList is NULL"); mCompositeSubscription.clear(); - checkNotNull(mView, "view is not attached"); + Preconditions.checkNotNull(mView, "view is not attached"); beforeDetachView(mView); - checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH, + Preconditions.checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH, "super.beforeDetachView() not called"); mView = null; mCalledThroughSuper = 0; @@ -60,7 +60,7 @@ public abstract class MVPAbstractPresenter */ @NonNull protected V getView() { - checkNotNull(mView, "view is not attached"); + Preconditions.checkNotNull(mView, "view is not attached"); return mView; } diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPLceView.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPLceView.java index c4fc056..ee9f82b 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPLceView.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.mvp; +package de.p3.bewoplaner.page.mvp; import android.support.annotation.StringRes; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPPresenter.java similarity index 92% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPPresenter.java index 465bd4c..17a136d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPPresenter.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.mvp; +package de.p3.bewoplaner.page.mvp; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPView.java similarity index 66% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPView.java index 503b1f6..547a58d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPView.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.page.mvp; +package de.p3.bewoplaner.page.mvp; /** * Created by imarneanu on 2/9/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileComponent.java similarity index 65% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileComponent.java index 1d69a9a..a3bb7db 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileComponent.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.page.profile; +package de.p3.bewoplaner.page.profile; /** * Created by imarneanu on 2/22/17. */ -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileFragment.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileFragment.java index 3ebf926..13806f1 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileFragment.java @@ -1,14 +1,14 @@ -package com.p3.bewoplaner.page.profile; +package de.p3.bewoplaner.page.profile; import com.bumptech.glide.Glide; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.model.User; -import com.p3.bewoplaner.utils.DialogHandler; -import com.p3.bewoplaner.utils.FileUtils; -import com.p3.bewoplaner.utils.RuntimePermissionBaseFragment; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.model.User; +import de.p3.bewoplaner.utils.DialogHandler; +import de.p3.bewoplaner.utils.FileUtils; +import de.p3.bewoplaner.utils.RuntimePermissionBaseFragment; import android.Manifest; import android.app.Activity; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileModule.java similarity index 62% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileModule.java index 8b77487..43558b5 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileModule.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.profile; +package de.p3.bewoplaner.page.profile; -import com.p3.bewoplaner.data.api.services.ProfileService; -import com.p3.bewoplaner.di.P3DSEndpoint; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.data.api.services.ProfileService; +import de.p3.bewoplaner.di.P3DSEndpoint; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Module; import dagger.Provides; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfilePresenter.java similarity index 86% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfilePresenter.java index 11eb0b0..f12c832 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfilePresenter.java @@ -1,15 +1,15 @@ -package com.p3.bewoplaner.page.profile; +package de.p3.bewoplaner.page.profile; -import com.p3.bewoplaner.R; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; -import com.p3.bewoplaner.data.api.services.ProfileService; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.model.User; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; -import com.p3.bewoplaner.utils.SystemUtils; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.R; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter; +import de.p3.bewoplaner.data.api.services.ProfileService; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.model.User; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.utils.SystemUtils; +import de.p3.bewoplaner.utils.rx.RxUtils; import android.net.Uri; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileView.java similarity index 81% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileView.java index bff011c..9e775dd 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileView.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.page.profile; +package de.p3.bewoplaner.page.profile; -import com.p3.bewoplaner.model.User; -import com.p3.bewoplaner.page.mvp.MVPView; +import de.p3.bewoplaner.model.User; +import de.p3.bewoplaner.page.mvp.MVPView; import android.net.Uri; import android.support.annotation.StringRes; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashActivity.java similarity index 91% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashActivity.java index 58674f8..a6b1e04 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashActivity.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.page.splash; +package de.p3.bewoplaner.page.splash; -import com.p3.bewoplaner.di.InjectionHelper; -import com.p3.bewoplaner.page.login.LoginActivity; -import com.p3.bewoplaner.page.main.MainActivity; +import de.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.page.login.LoginActivity; +import de.p3.bewoplaner.page.main.MainActivity; import android.content.Intent; import android.os.Bundle; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashComponent.java similarity index 61% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashComponent.java index a4b5fa9..6d77ec4 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashComponent.java @@ -1,7 +1,7 @@ -package com.p3.bewoplaner.page.splash; +package de.p3.bewoplaner.page.splash; -import com.p3.bewoplaner.di.ApplicationComponent; -import com.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.di.ApplicationComponent; +import de.p3.bewoplaner.di.scopes.ActivityScope; import dagger.Component; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashPresenter.java similarity index 82% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashPresenter.java index 4b0306f..999d619 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashPresenter.java @@ -1,11 +1,11 @@ -package com.p3.bewoplaner.page.splash; +package de.p3.bewoplaner.page.splash; -import com.p3.bewoplaner.BuildConfig; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.data.prefs.StringPreference; -import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter; -import com.p3.bewoplaner.utils.rx.RxUtils; +import de.p3.bewoplaner.BuildConfig; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.data.prefs.StringPreference; +import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter; +import de.p3.bewoplaner.utils.rx.RxUtils; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashView.java similarity index 74% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashView.java index 7c0e604..e7012c0 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashView.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.page.splash; +package de.p3.bewoplaner.page.splash; -import com.p3.bewoplaner.page.mvp.MVPView; +import de.p3.bewoplaner.page.mvp.MVPView; /** * Created by imarneanu on 2/9/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/AppStoppedService.java similarity index 79% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/AppStoppedService.java index 3eaae86..cb5d94a 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/AppStoppedService.java @@ -1,8 +1,8 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.di.InjectionHelper; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.di.InjectionHelper; import android.app.NotificationManager; import android.app.Service; @@ -13,9 +13,11 @@ import android.support.annotation.Nullable; import javax.inject.Inject; import javax.inject.Named; +import de.p3.bewoplaner.page.login.LoginActivity; + /** * Service should be started only when "Password Save" - * is not checked in {@link com.p3.bewoplaner.page.login.LoginActivity}; + * is not checked in {@link LoginActivity}; */ public class AppStoppedService extends Service { diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java index 6fa0ad5..750c56d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; /** * Created by laszloffiferenc on 2/21/17. diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DateUtils.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DateUtils.java index 69e85a1..9c2f147 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DialogHandler.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DialogHandler.java index 37b2e52..97cd67f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DialogHandler.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; -import com.p3.bewoplaner.R; +import de.p3.bewoplaner.R; import android.app.Dialog; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/EndlessScrollListener.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/EndlessScrollListener.java index 28ba191..42858e4 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/EndlessScrollListener.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/FileUtils.java similarity index 99% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/FileUtils.java index 4638c7a..edcbddf 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/FileUtils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils;/* +package de.p3.bewoplaner.utils;/* * Copyright (C) 2007-2008 OpenIntents.org * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/LoggedOutUtils.java similarity index 81% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/LoggedOutUtils.java index add4a85..381f0b6 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/LoggedOutUtils.java @@ -1,9 +1,9 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; -import com.p3.bewoplaner.data.AppPrefsConstants; -import com.p3.bewoplaner.data.prefs.BooleanPreference; -import com.p3.bewoplaner.di.scopes.ActivityScope; -import com.p3.bewoplaner.page.login.LoginPresenter; +import de.p3.bewoplaner.data.AppPrefsConstants; +import de.p3.bewoplaner.data.prefs.BooleanPreference; +import de.p3.bewoplaner.di.scopes.ActivityScope; +import de.p3.bewoplaner.page.login.LoginPresenter; import android.app.NotificationManager; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Preconditions.java similarity index 98% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Preconditions.java index 1eab346..6eb26d2 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Preconditions.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import android.support.annotation.NonNull; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java index c97e336..dbf00fe 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import android.content.pm.PackageManager; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/SystemUtils.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/SystemUtils.java index f019049..0ae5d2d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import android.net.ConnectivityManager; import android.net.NetworkInfo; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Utils.java similarity index 97% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Utils.java index b73cce1..482f3e6 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Utils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils; +package de.p3.bewoplaner.utils; import android.app.Activity; import android.support.v4.app.FragmentManager; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/rx/RxUtils.java similarity index 94% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/rx/RxUtils.java index 5c063ac..06bba4f 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/rx/RxUtils.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils.rx; +package de.p3.bewoplaner.utils.rx; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/EmptyLayout.java similarity index 95% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/EmptyLayout.java index ef2a2cb..137110d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/EmptyLayout.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; -import com.p3.bewoplaner.R; +import de.p3.bewoplaner.R; import android.content.Context; import android.content.res.TypedArray; @@ -14,8 +14,6 @@ import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import static com.p3.bewoplaner.utils.ui.ViewUtils.*; - /** * Custom layout to show loading, try again and error messages. *

@@ -58,7 +56,7 @@ public class EmptyLayout extends FrameLayout { inflate(getContext(), R.layout.empty_layout, this); ButterKnife.bind(this); - setProgressBarColorToOrange(mProgressBar); + ViewUtils.setProgressBarColorToOrange(mProgressBar); TypedArray a = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.EmptyLayout, 0, 0); diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java similarity index 99% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java index 00def26..7ffd088 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; import android.content.Context; import android.content.res.Resources; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java similarity index 99% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java index b7e28c1..73e019d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; import android.content.Context; import android.graphics.Rect; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LayoutBehavior.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LayoutBehavior.java index 229237a..926981d 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LayoutBehavior.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; import android.content.Context; import android.support.design.widget.CoordinatorLayout; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java index 31ff42b..d93d52b 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java @@ -1,4 +1,4 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; import android.content.Context; import android.support.design.widget.CoordinatorLayout; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/ViewUtils.java similarity index 96% rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/ViewUtils.java index 0b8bc25..e76d0d6 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/ViewUtils.java @@ -1,6 +1,6 @@ -package com.p3.bewoplaner.utils.ui; +package de.p3.bewoplaner.utils.ui; -import com.p3.bewoplaner.R; +import de.p3.bewoplaner.R; import android.app.Activity; import android.content.Context; diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml index e19cd8b..7947992 100644 --- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml +++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml @@ -22,7 +22,7 @@ android:layout_marginTop="?attr/actionBarSize" tools:listitem="@layout/item_single_chat_left" /> - + tools:context="com.p3.bewoplaner.de.p3.bewoplaner.page.fileconfirmation.FileConfirmationActivity"> + tools:context="de.p3.bewoplaner.page.login.LoginActivity"> - sS0$ks3t89rl;Ot*|(;f5Gx3BxF6$k?-u3{h@n%U;=4mTHi= zQYaxrBKuMpJ2z=Ye7Qf}|KR(a=l$V*&oAeB&w1XnyS%#$0)Zg=0RIa4{zm=j7}kmsqy4XOB?@k^M&C-orP1E7I*3`QXl7GD0k;>1_YTeoWk8Qj0KK zy{J3mk;FDpr5*Pvb7}8-0jOpnnb>uGIQ96XH|^#&V>vjQHe`6Bp{L}+luBI5o$BJP z?3`Nyyp@xLD>C>{L;jTrY1Vy_9ouCcw0Ne#qRtZj@;!Vwmc5tDc~3U_DJNVxoGMVX zQ09@M&q!KnjE}1bTz%!L2RyXaFJjMvZLV%Z}2P*udVl(NjKMU$ToS7G<(ds4!d4`wK0)O7!?;w3F~dB%j<7S z90lo`E-QMmFRyc4IPivaH*v(X zi7#t>Hzo$IG`o(yB<}UKr77CaYu&o(rgVHPhlL|Xtzte3u*d6EMTxl>v|_zOMJkPx zrGCCxP4G8`p69bTjD54zzz(0-J5r7q+u^%#qIy|C*Qf1;q(%yItlW96E^yqc8urBJC;@!KFE*`&{ zAYCrHNtuq5V~m2>n>D-8=?i)6Ef)e0{1{p^5uTVW)rZGV@AQ1^RAN>2RQ4JRWtlQR zDqYSi+NGOyM4V@ji~Xg@9Po!$r9Wj@FZ(qPv|2YtrWND+Oh+Zhe<(KwIFL3F%xg21 zjk}5PQDEnwyiEZ*(|a=f;H23b=wHOcJxp=WneLJ`b>DyYga8GL0!s3(^ul# zwO6{$t0Y&t%vhz2AB_bNDmH$*LLh0BNr>@<_PIU*c?X>Eewywx9wZNe>Pz*ekZ=+J>OkQ`3b~WQs1#3Isu%5ush_(UP707b=ymAK+`&S`D%#ei`!am4LpIuG`T#+=rPdu-)L=s+xdUVmcIWn+KQ*MfPjsyvTW zO(VmedWWB@v<&tVd*ZHk1N0O&_O&r4`|#=?WGxQgX_V&eckx2j zsH>xG(3i#KgL}WdgP(9rfzO&jbK?!-;_5jnE$4hqnj!$E>vc7Gt5D)Xel4hzRhu1z rgaj6a?rzEN+1^gYNlN?~GxQk0tB=>1MdV