diff --git a/.travis.yml b/.travis.yml index 06a427770..eadee5a1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ android: - tools # The BuildTools version used by your project - - build-tools-23.0.0 + - build-tools-23.0.1 # The SDK version used to compile your project - android-23 diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/BasePreferenceActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/BasePreferenceActivity.java index 57f841da1..48aa99453 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/BasePreferenceActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/BasePreferenceActivity.java @@ -48,7 +48,7 @@ import org.mariotaku.twidere.util.StrictModeUtils; import org.mariotaku.twidere.util.ThemeUtils; import org.mariotaku.twidere.util.TwidereColorUtils; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.util.support.ViewSupport; import org.mariotaku.twidere.view.ShapedImageView.ShapeStyle; import org.mariotaku.twidere.view.TintedStatusFrameLayout; diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/BaseThemedActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/BaseThemedActivity.java index 1e794d8fd..c4bae1c6d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/BaseThemedActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/BaseThemedActivity.java @@ -31,7 +31,7 @@ import org.mariotaku.twidere.util.ActivityTracker; import org.mariotaku.twidere.util.StrictModeUtils; import org.mariotaku.twidere.util.ThemeUtils; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.view.ShapedImageView; import javax.inject.Inject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseAppCompatActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseAppCompatActivity.java index 1d30e7e3a..9f44320fe 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseAppCompatActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/BaseAppCompatActivity.java @@ -38,7 +38,7 @@ import org.mariotaku.twidere.util.KeyboardShortcutsHandler; import org.mariotaku.twidere.util.KeyboardShortcutsHandler.KeyboardShortcutCallback; import org.mariotaku.twidere.util.ReadStateManager; import org.mariotaku.twidere.util.ThemeUtils; -import org.mariotaku.twidere.util.dagger.component.DaggerBaseAppCompatActivityComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.view.iface.IExtendedView.OnFitSystemWindowsListener; import java.util.ArrayList; @@ -149,7 +149,7 @@ public class BaseAppCompatActivity extends ThemedAppCompatActivity implements Co @Override protected void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - DaggerBaseAppCompatActivityComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); mKeyboardShortcutsHandler = TwidereApplication.getInstance(this).getKeyboardShortcutsHandler(); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java index b3c17668d..b19cd42d8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ThemedFragmentActivity.java @@ -43,7 +43,7 @@ import org.mariotaku.twidere.util.StrictModeUtils; import org.mariotaku.twidere.util.ThemeUtils; import org.mariotaku.twidere.util.ThemedLayoutInflaterFactory; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerThemedFragmentActivityComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.view.ShapedImageView.ShapeStyle; import javax.inject.Inject; @@ -138,7 +138,7 @@ public abstract class ThemedFragmentActivity extends FragmentActivity implements StrictModeUtils.detectAllThreadPolicy(); } super.onCreate(savedInstanceState); - DaggerThemedFragmentActivityComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); mKeyboardShortcutsHandler = TwidereApplication.getInstance(this).getKeyboardShortcutsHandler(); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseAdapter.java index 810a6466f..308df82f2 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/BaseAdapter.java @@ -25,7 +25,7 @@ import android.support.v7.widget.RecyclerView; import org.mariotaku.twidere.app.TwidereApplication; import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.ReadStateManager; -import org.mariotaku.twidere.util.dagger.component.DaggerBaseAdapterComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; @@ -40,7 +40,7 @@ public abstract class BaseAdapter extends Re public BaseAdapter(Context context) { //noinspection unchecked - DaggerBaseAdapterComponent.builder() + DaggerGeneralComponent.builder() .applicationModule(TwidereApplication.getModule(context)) .build() .inject((BaseAdapter) this); diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFragment.java index 5aee47e97..32da14004 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseFragment.java @@ -32,7 +32,7 @@ import org.mariotaku.twidere.activity.support.BaseAppCompatActivity; import org.mariotaku.twidere.app.TwidereApplication; import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.MultiSelectManager; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseListFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseListFragment.java index 6cd416fa0..b942bbf1f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseListFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/BaseListFragment.java @@ -37,7 +37,7 @@ import org.mariotaku.twidere.fragment.iface.RefreshScrollTopInterface; import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.MultiSelectManager; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerBaseListFragmentComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; @@ -112,7 +112,7 @@ public class BaseListFragment extends ListFragment implements Constants, OnScrol @Override public void onAttach(Context context) { super.onAttach(context); - DaggerBaseListFragmentComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); } @Override diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportDialogFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportDialogFragment.java index 22c48a982..b5cf4374f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportDialogFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportDialogFragment.java @@ -30,7 +30,7 @@ import android.support.v4.app.DialogFragment; import org.mariotaku.twidere.Constants; import org.mariotaku.twidere.app.TwidereApplication; import org.mariotaku.twidere.util.AsyncTwitterWrapper; -import org.mariotaku.twidere.util.dagger.component.DaggerBaseSupportDialogFragmentComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; @@ -70,7 +70,7 @@ public class BaseSupportDialogFragment extends DialogFragment implements Constan @Override public void onAttach(Context context) { super.onAttach(context); - DaggerBaseSupportDialogFragmentComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); } public void registerReceiver(final BroadcastReceiver receiver, final IntentFilter filter) { diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportFragment.java index c764f99af..818fbbfb3 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/BaseSupportFragment.java @@ -45,7 +45,7 @@ import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.MultiSelectManager; import org.mariotaku.twidere.util.ReadStateManager; import org.mariotaku.twidere.util.ThemedLayoutInflaterFactory; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; diff --git a/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereCommandProvider.java b/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereCommandProvider.java index 13e3f6da2..7372220b8 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereCommandProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereCommandProvider.java @@ -33,7 +33,7 @@ import org.mariotaku.twidere.app.TwidereApplication; import org.mariotaku.twidere.provider.TwidereCommands.Refresh; import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.PermissionsManager; -import org.mariotaku.twidere.util.dagger.component.DaggerTwidereCommandProviderComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import javax.inject.Inject; @@ -75,7 +75,7 @@ public class TwidereCommandProvider extends ContentProvider implements Constants @Override public boolean onCreate() { mContext = getContext(); - DaggerTwidereCommandProviderComponent.builder().applicationModule(TwidereApplication.getModule(mContext)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(mContext)).build().inject(this); mPermissionsManager = new PermissionsManager(mContext); return true; } diff --git a/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java b/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java index db7082951..1f2620734 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java +++ b/twidere/src/main/java/org/mariotaku/twidere/provider/TwidereDataProvider.java @@ -109,7 +109,7 @@ import org.mariotaku.twidere.util.TwidereQueryBuilder.ConversationQueryBuilder; import org.mariotaku.twidere.util.UserColorNameManager; import org.mariotaku.twidere.util.Utils; import org.mariotaku.twidere.util.collection.CompactHashSet; -import org.mariotaku.twidere.util.dagger.component.DaggerTwidereDataProviderComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.util.message.UnreadCountUpdatedEvent; import java.io.File; @@ -418,7 +418,7 @@ public final class TwidereDataProvider extends ContentProvider implements Consta @Override public boolean onCreate() { final Context context = getContext(); - DaggerTwidereDataProviderComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(context)).build().inject(this); final TwidereApplication app = TwidereApplication.getInstance(context); mHandler = new Handler(Looper.getMainLooper()); mDatabaseWrapper = new SQLiteDatabaseWrapper(this); diff --git a/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java b/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java index a885f67ac..57d8aec08 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java +++ b/twidere/src/main/java/org/mariotaku/twidere/service/BackgroundOperationService.java @@ -85,7 +85,7 @@ import org.mariotaku.twidere.util.StatusShortenerInterface; import org.mariotaku.twidere.util.TwidereValidator; import org.mariotaku.twidere.util.TwitterAPIFactory; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerBackgroundOperationServiceComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.util.io.ContentLengthInputStream; import org.mariotaku.twidere.util.io.ContentLengthInputStream.ReadListener; @@ -132,7 +132,7 @@ public class BackgroundOperationService extends IntentService implements Constan @Override public void onCreate() { super.onCreate(); - DaggerBackgroundOperationServiceComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); final TwidereApplication app = TwidereApplication.getInstance(this); mHandler = new Handler(); mPreferences = getSharedPreferences(SHARED_PREFERENCES_NAME, MODE_PRIVATE); diff --git a/twidere/src/main/java/org/mariotaku/twidere/service/RefreshService.java b/twidere/src/main/java/org/mariotaku/twidere/service/RefreshService.java index d9aa2cf94..3f9e134dc 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/service/RefreshService.java +++ b/twidere/src/main/java/org/mariotaku/twidere/service/RefreshService.java @@ -39,7 +39,7 @@ import org.mariotaku.twidere.provider.TwidereDataStore.Statuses; import org.mariotaku.twidere.receiver.PowerStateReceiver; import org.mariotaku.twidere.util.AsyncTwitterWrapper; import org.mariotaku.twidere.util.SharedPreferencesWrapper; -import org.mariotaku.twidere.util.dagger.component.DaggerRefreshServiceComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import java.util.Arrays; @@ -152,7 +152,7 @@ public class RefreshService extends Service implements Constants { @Override public void onCreate() { super.onCreate(); - DaggerRefreshServiceComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); + DaggerGeneralComponent.builder().applicationModule(TwidereApplication.getModule(this)).build().inject(this); mAlarmManager = (AlarmManager) getSystemService(ALARM_SERVICE); final TwidereApplication app = TwidereApplication.getInstance(this); mPreferences = SharedPreferencesWrapper.getInstance(app, SHARED_PREFERENCES_NAME, MODE_PRIVATE); diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectEventHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectEventHandler.java index 116a67453..77cb4621d 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectEventHandler.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/MultiSelectEventHandler.java @@ -40,7 +40,7 @@ import org.mariotaku.twidere.model.ParcelableAccount; import org.mariotaku.twidere.model.ParcelableStatus; import org.mariotaku.twidere.model.ParcelableUser; import org.mariotaku.twidere.provider.TwidereDataStore.Filters; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import java.util.ArrayList; import java.util.Arrays; diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/GeneralComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/GeneralComponent.java similarity index 59% rename from twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/GeneralComponent.java rename to twidere/src/main/java/org/mariotaku/twidere/util/dagger/GeneralComponent.java index 47bac92f8..da4b0560f 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/GeneralComponent.java +++ b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/GeneralComponent.java @@ -17,14 +17,24 @@ * along with this program. If not, see . */ -package org.mariotaku.twidere.util.dagger.component; +package org.mariotaku.twidere.util.dagger; + +import android.support.v7.widget.RecyclerView; import org.mariotaku.twidere.activity.BasePreferenceActivity; import org.mariotaku.twidere.activity.BaseThemedActivity; +import org.mariotaku.twidere.activity.support.BaseAppCompatActivity; +import org.mariotaku.twidere.activity.support.ThemedFragmentActivity; +import org.mariotaku.twidere.adapter.BaseAdapter; import org.mariotaku.twidere.fragment.BaseFragment; +import org.mariotaku.twidere.fragment.BaseListFragment; +import org.mariotaku.twidere.fragment.support.BaseSupportDialogFragment; import org.mariotaku.twidere.fragment.support.BaseSupportFragment; +import org.mariotaku.twidere.provider.TwidereCommandProvider; +import org.mariotaku.twidere.provider.TwidereDataProvider; +import org.mariotaku.twidere.service.BackgroundOperationService; +import org.mariotaku.twidere.service.RefreshService; import org.mariotaku.twidere.util.MultiSelectEventHandler; -import org.mariotaku.twidere.util.dagger.ApplicationModule; import org.mariotaku.twidere.view.holder.StatusViewHolder; import dagger.Component; @@ -45,4 +55,22 @@ public interface GeneralComponent { void inject(BasePreferenceActivity object); void inject(BaseThemedActivity object); + + void inject(BaseSupportDialogFragment object); + + void inject(RefreshService object); + + void inject(ThemedFragmentActivity object); + + void inject(TwidereCommandProvider object); + + void inject(TwidereDataProvider object); + + void inject(BaseListFragment object); + + void inject(BaseAppCompatActivity object); + + void inject(BackgroundOperationService object); + + void inject(BaseAdapter object); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BackgroundOperationServiceComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BackgroundOperationServiceComponent.java deleted file mode 100644 index 7ca04d53a..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BackgroundOperationServiceComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.service.BackgroundOperationService; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface BackgroundOperationServiceComponent { - void inject(BackgroundOperationService object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAdapterComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAdapterComponent.java deleted file mode 100644 index cf7bc507f..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAdapterComponent.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import android.support.v7.widget.RecyclerView; - -import org.mariotaku.twidere.adapter.BaseAdapter; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface BaseAdapterComponent { - void inject(BaseAdapter object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAppCompatActivityComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAppCompatActivityComponent.java deleted file mode 100644 index 9e066fb0b..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAppCompatActivityComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.activity.support.BaseAppCompatActivity; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface BaseAppCompatActivityComponent { - void inject(BaseAppCompatActivity object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseListFragmentComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseListFragmentComponent.java deleted file mode 100644 index 4e8873d35..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseListFragmentComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.fragment.BaseListFragment; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface BaseListFragmentComponent { - void inject(BaseListFragment object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseSupportDialogFragmentComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseSupportDialogFragmentComponent.java deleted file mode 100644 index dc6556457..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseSupportDialogFragmentComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.fragment.support.BaseSupportDialogFragment; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface BaseSupportDialogFragmentComponent { - void inject(BaseSupportDialogFragment object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/RefreshServiceComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/RefreshServiceComponent.java deleted file mode 100644 index 234d14a29..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/RefreshServiceComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.service.RefreshService; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface RefreshServiceComponent { - void inject(RefreshService object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/ThemedFragmentActivityComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/ThemedFragmentActivityComponent.java deleted file mode 100644 index 29b1f6b95..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/ThemedFragmentActivityComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.activity.support.ThemedFragmentActivity; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface ThemedFragmentActivityComponent { - void inject(ThemedFragmentActivity object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereCommandProviderComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereCommandProviderComponent.java deleted file mode 100644 index 7e905df81..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereCommandProviderComponent.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.provider.TwidereCommandProvider; -import org.mariotaku.twidere.provider.TwidereDataProvider; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface TwidereCommandProviderComponent { - void inject(TwidereCommandProvider object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereDataProviderComponent.java b/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereDataProviderComponent.java deleted file mode 100644 index fb1c4af13..000000000 --- a/twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereDataProviderComponent.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.util.dagger.component; - -import org.mariotaku.twidere.provider.TwidereDataProvider; -import org.mariotaku.twidere.util.dagger.ApplicationModule; - -import dagger.Component; - -/** - * Created by mariotaku on 15/10/5. - */ -@Component(modules = ApplicationModule.class) -public interface TwidereDataProviderComponent { - void inject(TwidereDataProvider object); -} diff --git a/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java b/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java index dd6aa3e14..c2901d9fa 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java +++ b/twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java @@ -31,7 +31,7 @@ import org.mariotaku.twidere.util.TwidereLinkify; import org.mariotaku.twidere.util.TwitterCardUtils; import org.mariotaku.twidere.util.UserColorNameManager; import org.mariotaku.twidere.util.Utils; -import org.mariotaku.twidere.util.dagger.component.DaggerGeneralComponent; +import org.mariotaku.twidere.util.dagger.DaggerGeneralComponent; import org.mariotaku.twidere.view.CardMediaContainer; import org.mariotaku.twidere.view.CardMediaContainer.OnMediaClickListener; import org.mariotaku.twidere.view.ForegroundColorView;