diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ViewModelProviderFactory.java b/app/src/main/java/com/mindorks/framework/mvvm/ViewModelProviderFactory.java index 530d571a093e36eae072be090912fc3c16ef5865..81c9b6d8533b5f3eca3f4e325e7c4135721ef9b4 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ViewModelProviderFactory.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ViewModelProviderFactory.java @@ -12,6 +12,7 @@ import com.mindorks.framework.mvvm.ui.main.MainViewModel; import com.mindorks.framework.mvvm.ui.main.rating.RateUsViewModel; import com.mindorks.framework.mvvm.ui.splash.SplashViewModel; import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; +import javax.inject.Inject; /** * Created by jyotidubey on 22/02/19. @@ -22,6 +23,7 @@ public class ViewModelProviderFactory extends ViewModelProvider.NewInstanceFacto private final DataManager dataManager; private final SchedulerProvider schedulerProvider; + @Inject public ViewModelProviderFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { this.dataManager = dataManager; diff --git a/app/src/main/java/com/mindorks/framework/mvvm/di/builder/ActivityBuilder.java b/app/src/main/java/com/mindorks/framework/mvvm/di/builder/ActivityBuilder.java index 7a63bd59c060a309a9e486c6163b3bae9d4a0168..d42bb36ce776e6d555f552f0cb75267f167bd92d 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/di/builder/ActivityBuilder.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/di/builder/ActivityBuilder.java @@ -22,12 +22,9 @@ import com.mindorks.framework.mvvm.ui.feed.FeedActivityModule; import com.mindorks.framework.mvvm.ui.feed.blogs.BlogFragmentProvider; import com.mindorks.framework.mvvm.ui.feed.opensource.OpenSourceFragmentProvider; import com.mindorks.framework.mvvm.ui.login.LoginActivity; -import com.mindorks.framework.mvvm.ui.login.LoginActivityModule; import com.mindorks.framework.mvvm.ui.main.MainActivity; -import com.mindorks.framework.mvvm.ui.main.MainActivityModule; import com.mindorks.framework.mvvm.ui.main.rating.RateUsDialogProvider; import com.mindorks.framework.mvvm.ui.splash.SplashActivity; -import com.mindorks.framework.mvvm.ui.splash.SplashActivityModule; import dagger.Module; import dagger.android.ContributesAndroidInjector; @@ -43,15 +40,14 @@ public abstract class ActivityBuilder { OpenSourceFragmentProvider.class}) abstract FeedActivity bindFeedActivity(); - @ContributesAndroidInjector(modules = LoginActivityModule.class) + @ContributesAndroidInjector abstract LoginActivity bindLoginActivity(); @ContributesAndroidInjector(modules = { - MainActivityModule.class, AboutFragmentProvider.class, RateUsDialogProvider.class}) abstract MainActivity bindMainActivity(); - @ContributesAndroidInjector(modules = SplashActivityModule.class) + @ContributesAndroidInjector abstract SplashActivity bindSplashActivity(); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentModule.java deleted file mode 100644 index e4f3d536cc801034280e684b97144eca9da0213a..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentModule.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://mindorks.com/license/apache-v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.mindorks.framework.mvvm.ui.about; - -import com.mindorks.framework.mvvm.ViewModelProviderFactory; -import com.mindorks.framework.mvvm.data.DataManager; -import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; -import dagger.Module; -import dagger.Provides; - -/** - * Created by amitshekhar on 14/09/17. - */ -@Module -public class AboutFragmentModule { - @Provides - ViewModelProviderFactory provideSplashViewModel(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } -} diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentProvider.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentProvider.java index 4318abd1b18167ffba00cc607f4561fbce26b046..c0e1c232ab8a87f276e9a1fbf87979a0458c541c 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentProvider.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragmentProvider.java @@ -25,6 +25,6 @@ import dagger.android.ContributesAndroidInjector; @Module public abstract class AboutFragmentProvider { - @ContributesAndroidInjector(modules = AboutFragmentModule.class) + @ContributesAndroidInjector abstract AboutFragment provideAboutFragmentFactory(); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedActivity.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedActivity.java index f3ed18a8c9a747f842459b031e3eafaf06522de0..326db9a23fe3ea667a6779cac232d6a208b64d6c 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedActivity.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedActivity.java @@ -34,7 +34,6 @@ import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.support.HasSupportFragmentInjector; import javax.inject.Inject; -import javax.inject.Named; /** * Created by amitshekhar on 10/07/17. @@ -47,7 +46,6 @@ public class FeedActivity extends BaseActivity()); } - @Provides - ViewModelProviderFactory provideBlogViewModelFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } - @Provides LinearLayoutManager provideLinearLayoutManager(BlogFragment fragment) { return new LinearLayoutManager(fragment.getActivity()); diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/opensource/OpenSourceFragmentModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/opensource/OpenSourceFragmentModule.java index eedc90ff31fdf6e4359207942b9ab5b613996dc6..baddc81cbabde8f0741bcd6a492276c2a022ccb0 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/opensource/OpenSourceFragmentModule.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/feed/opensource/OpenSourceFragmentModule.java @@ -17,7 +17,6 @@ package com.mindorks.framework.mvvm.ui.feed.opensource; import android.support.v7.widget.LinearLayoutManager; -import com.mindorks.framework.mvvm.ViewModelProviderFactory; import com.mindorks.framework.mvvm.data.DataManager; import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; import dagger.Module; @@ -44,8 +43,4 @@ public class OpenSourceFragmentModule { return new OpenSourceAdapter(); } - @Provides - ViewModelProviderFactory provideOpenSourceFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginActivityModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginActivityModule.java deleted file mode 100644 index d36734c8ded79f419fd2380fb4bd560570827861..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/login/LoginActivityModule.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://mindorks.com/license/apache-v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.mindorks.framework.mvvm.ui.login; - -import com.mindorks.framework.mvvm.ViewModelProviderFactory; -import com.mindorks.framework.mvvm.data.DataManager; -import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; -import dagger.Module; -import dagger.Provides; - -/** - * Created by amitshekhar on 14/09/17. - */ -@Module -public class LoginActivityModule { - - @Provides - ViewModelProviderFactory provideLoginViewModelFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } -} diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java index d913cb3ea3bb1714538ba438192c768a2b099974..854dd83a71795a6552eafada67576a4ef265702e 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivity.java @@ -52,14 +52,12 @@ import dagger.android.AndroidInjector; import dagger.android.DispatchingAndroidInjector; import dagger.android.support.HasSupportFragmentInjector; import javax.inject.Inject; -import javax.inject.Named; public class MainActivity extends BaseActivity implements MainNavigator, HasSupportFragmentInjector { @Inject DispatchingAndroidInjector fragmentDispatchingAndroidInjector; @Inject - @Named("MainActivity") ViewModelProviderFactory factory; private ActivityMainBinding mActivityMainBinding; private SwipePlaceHolderView mCardsContainerView; diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivityModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivityModule.java deleted file mode 100644 index d99f9a0845e1c8fd1356d506a496a6b18beb8ad3..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainActivityModule.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://mindorks.com/license/apache-v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.mindorks.framework.mvvm.ui.main; - -import com.mindorks.framework.mvvm.ViewModelProviderFactory; -import com.mindorks.framework.mvvm.data.DataManager; -import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; -import dagger.Module; -import dagger.Provides; -import javax.inject.Named; - -/** - * Created by amitshekhar on 14/09/17. - */ -@Module -public class MainActivityModule { - - @Provides - @Named("MainActivity") - ViewModelProviderFactory provideMainSourceFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } - -} diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainViewModel.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainViewModel.java index d90646129664871b8aca3cdfd8a31d4d422e0c9b..f3874db62e4ddcc8037eb3063c53a51e812f7c8a 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainViewModel.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/MainViewModel.java @@ -138,7 +138,6 @@ public class MainViewModel extends BaseViewModel { public void removeQuestionCard() { action = ACTION_DELETE_SINGLE; - questionDataList.remove(0); questionCardData.getValue().remove(0); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogModule.java deleted file mode 100644 index f50c0394beae670249f9db0f0ad0c39767f110ca..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogModule.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://mindorks.com/license/apache-v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.mindorks.framework.mvvm.ui.main.rating; - -import com.mindorks.framework.mvvm.ViewModelProviderFactory; -import com.mindorks.framework.mvvm.data.DataManager; -import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; -import dagger.Module; -import dagger.Provides; - -/** - * Created by amitshekhar on 14/09/17. - */ -@Module -public class RateUsDialogModule { - - @Provides - ViewModelProviderFactory provideRateUsViewModelFactory(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } -} diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogProvider.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogProvider.java index 32229484f88a35d5941b46da93badf1c594f559e..f02d72480634c90e6b58d3a2d07a203b968a1c0c 100644 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogProvider.java +++ b/app/src/main/java/com/mindorks/framework/mvvm/ui/main/rating/RateUsDialogProvider.java @@ -25,6 +25,6 @@ import dagger.android.ContributesAndroidInjector; @Module public abstract class RateUsDialogProvider { - @ContributesAndroidInjector(modules = RateUsDialogModule.class) + @ContributesAndroidInjector abstract RateUsDialog provideRateUsDialogFactory(); } diff --git a/app/src/main/java/com/mindorks/framework/mvvm/ui/splash/SplashActivityModule.java b/app/src/main/java/com/mindorks/framework/mvvm/ui/splash/SplashActivityModule.java deleted file mode 100644 index 0d6f86f29c4e6a2bfd0bf7c86a465a0daeda4c4d..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/mindorks/framework/mvvm/ui/splash/SplashActivityModule.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://mindorks.com/license/apache-v2 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.mindorks.framework.mvvm.ui.splash; - -import com.mindorks.framework.mvvm.ViewModelProviderFactory; -import com.mindorks.framework.mvvm.data.DataManager; -import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider; -import dagger.Module; -import dagger.Provides; - -/** - * Created by amitshekhar on 14/09/17. - */ -@Module -public class SplashActivityModule { - - @Provides - ViewModelProviderFactory provideSplashViewModel(DataManager dataManager, SchedulerProvider schedulerProvider) { - return new ViewModelProviderFactory(dataManager, schedulerProvider); - } -}