forked from bttv-android/bttv
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
68 changed files
with
381 additions
and
461 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| # Changelog | ||
|
|
||
| # master | ||
| - rebase to v17.0.0 | ||
| - rebase to v18.9.0 | ||
|
|
||
| # 0.41.0-beta | ||
| - rebase to v16.9.1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 23 additions & 54 deletions
77
mod/app/src/main/java/bttv/settings/SettingsFragmentBindingFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,46 @@ | ||
| package bttv.settings; | ||
|
|
||
| import javax.inject.Provider; | ||
|
|
||
| import android.util.Log; | ||
| import androidx.fragment.app.FragmentActivity; | ||
| import tv.twitch.android.app.core.dagger.modules.ActivityModule; | ||
| import tv.twitch.android.app.core.dagger.modules.ActivityModule_ProvideMenuAdapterBinderFactory; | ||
| import tv.twitch.android.settings.base.SettingsTracker; | ||
| import tv.twitch.android.settings.dagger.SettingsActivityModule; | ||
| import tv.twitch.android.settings.dagger.SettingsActivityModule_ProvideSettingsTrackerFactory; | ||
| import tv.twitch.android.shared.analytics.PageViewTracker; | ||
| import tv.twitch.android.shared.settings.SettingsTracker; | ||
| import tv.twitch.android.shared.ui.menus.core.MenuAdapterBinder; | ||
|
|
||
| public class SettingsFragmentBindingFactory implements SettingsFragmentBinding.Factory { | ||
|
|
||
| private static Provider<FragmentActivity> fragmentActivityProvider; | ||
| private static Provider<PageViewTracker> pageViewTrackerProvider; | ||
| private static ActivityModule activityModule; | ||
| private static SettingsActivityModule settingsActivityModule; | ||
|
|
||
| public static void setFragmentActivityProvider(Provider<FragmentActivity> fragmentActivityProvider) { | ||
| SettingsFragmentBindingFactory.fragmentActivityProvider = fragmentActivityProvider; | ||
| Log.d("LBTTVDI", "got fragmentActivityProvider"); | ||
| } | ||
|
|
||
| public static void setActivityModule(ActivityModule activityModule) { | ||
| SettingsFragmentBindingFactory.activityModule = activityModule; | ||
| Log.d("LBTTVDI", "got activityModule"); | ||
| } | ||
|
|
||
| public static void setSettingsActivityModule(SettingsActivityModule activityModule) { | ||
| SettingsFragmentBindingFactory.settingsActivityModule = activityModule; | ||
| Log.d("LBTTVDI", "got settingsActivityModule"); | ||
| } | ||
| private static FragmentActivity fragmentActivity; // TODO ;fragmentActivityProvider.get(); | ||
| private static MenuAdapterBinder menuAdapterBinder; // TODO; | ||
| private static SettingsTracker settingsTracker; // TODO; | ||
|
|
||
| public static void setPageViewTrackerProvider(Provider<PageViewTracker> pageViewTrackerProvider) { | ||
| SettingsFragmentBindingFactory.pageViewTrackerProvider = pageViewTrackerProvider; | ||
| Log.d("LBTTVDI", "got pageViewTrackerProvider"); | ||
| /** @noinspection unused */ | ||
| public static void setFragmentActivity(Object fragmentActivity) { | ||
| Log.d("LBTTVDI", "got fragmentActivity: " + fragmentActivity.getClass().getName()); | ||
| SettingsFragmentBindingFactory.fragmentActivity = (FragmentActivity) fragmentActivity; | ||
| } | ||
|
|
||
| private static MenuAdapterBinder getMenuAdapterBinder() { | ||
| return ActivityModule_ProvideMenuAdapterBinderFactory.provideMenuAdapterBinder( | ||
| SettingsFragmentBindingFactory.activityModule, | ||
| SettingsFragmentBindingFactory.fragmentActivityProvider.get()); | ||
| /** @noinspection unused */ | ||
| public static void setMenuAdapterBinder(MenuAdapterBinder menuAdapterBinder) { | ||
| SettingsFragmentBindingFactory.menuAdapterBinder = menuAdapterBinder; | ||
| Log.d("LBTTVDI", "got menuAdapterBinder"); | ||
| } | ||
|
|
||
| private static SettingsTracker getTracker() { | ||
| return SettingsActivityModule_ProvideSettingsTrackerFactory.provideSettingsTracker( | ||
| SettingsFragmentBindingFactory.settingsActivityModule, pageViewTrackerProvider.get()); | ||
| /** @noinspection unused */ | ||
| public static void setSettingsTracker(SettingsTracker settingsTracker) { | ||
| SettingsFragmentBindingFactory.settingsTracker = settingsTracker; | ||
| Log.d("LBTTVDI", "got settingsTracker"); | ||
| } | ||
|
|
||
| @Override | ||
| public SettingsFragmentBinding create(SettingsFragment fragment) { | ||
| if (fragmentActivityProvider == null) { | ||
| Log.e("LBTTVDI", "fragmentActivityProvider null"); | ||
| return null; | ||
| } | ||
| if (activityModule == null) { | ||
| Log.e("LBTTVDI", "activityModule null"); | ||
| return null; | ||
| if (fragmentActivity == null) { | ||
| Log.e("LBTTV", "SettingsFragmentBinding.create will fail: fragmentActivity == null"); | ||
| } | ||
| if (settingsActivityModule == null) { | ||
| Log.e("LBTTVDI", "settingsActivityModule null"); | ||
| return null; | ||
| if (menuAdapterBinder == null) { | ||
| Log.e("LBTTV", "SettingsFragmentBinding.create will fail: menuAdapterBinder == null"); | ||
| } | ||
| if (pageViewTrackerProvider == null) { | ||
| Log.e("LBTTVDI", "pageViewTrackerProvider null"); | ||
| return null; | ||
| if (settingsTracker == null) { | ||
| Log.e("LBTTV", "SettingsFragmentBinding.create will fail: settingsTracker == null"); | ||
| } | ||
|
|
||
| FragmentActivity activity = fragmentActivityProvider.get(); | ||
|
|
||
| return new SettingsFragmentBindingImpl(fragment, activity, getMenuAdapterBinder(), getTracker()); | ||
| return new SettingsFragmentBindingImpl(fragment, fragmentActivity, menuAdapterBinder, settingsTracker); | ||
| } | ||
|
|
||
| } |
2 changes: 1 addition & 1 deletion
2
mod/app/src/main/java/bttv/settings/SettingsFragmentBindingImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
mod/twitch/src/main/java/tv/twitch/android/app/consumer/dagger/ActivityModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package tv.twitch.android.app.consumer.dagger; | ||
|
|
||
| public class ActivityModule { | ||
|
|
||
| } |
3 changes: 2 additions & 1 deletion
3
...dule_ProvideMenuAdapterBinderFactory.java → ...dule_ProvideMenuAdapterBinderFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
mod/twitch/src/main/java/tv/twitch/android/app/core/dagger/modules/ActivityModule.java
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
mod/twitch/src/main/java/tv/twitch/android/settings/base/SettingsTracker.java
This file was deleted.
Oops, something went wrong.
4 changes: 2 additions & 2 deletions
4
.../twitch/android/settings/dagger/SettingsActivityModule_ProvideSettingsTrackerFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 0 additions & 4 deletions
4
mod/twitch/src/main/java/tv/twitch/android/shared/chat/ChatMessageParserSdk.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...d/settings/base/BaseSettingsFragment.java → ...shared/settings/BaseSettingsFragment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
.../settings/base/BaseSettingsPresenter.java → ...hared/settings/BaseSettingsPresenter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...gs/base/SettingsNavigationController.java → ...ettings/SettingsNavigationController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package tv.twitch.android.settings.base; | ||
| package tv.twitch.android.shared.settings; | ||
|
|
||
| import android.os.Bundle; | ||
|
|
||
|
|
||
5 changes: 5 additions & 0 deletions
5
mod/twitch/src/main/java/tv/twitch/android/shared/settings/SettingsTracker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package tv.twitch.android.shared.settings; | ||
|
|
||
| public class SettingsTracker { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.