migrating to dagger

updated CI build version

.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

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;

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;

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();
     }
 

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();
     }
 

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<VH extends RecyclerView.ViewHolder> extends Re
 
     public BaseAdapter(Context context) {
         //noinspection unchecked
-        DaggerBaseAdapterComponent.builder()
+        DaggerGeneralComponent.builder()
                 .applicationModule(TwidereApplication.getModule(context))
                 .build()
                 .inject((BaseAdapter<RecyclerView.ViewHolder>) this);

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;
 

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

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) {

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;
 

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;
     }

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);

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);

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);

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;

twidere/src/main/java/org/mariotaku/twidere/util/dagger/GeneralComponent.java

@@ -17,14 +17,24 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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<RecyclerView.ViewHolder> object);
 }

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BackgroundOperationServiceComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAdapterComponent.java

@@ -1,35 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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<RecyclerView.ViewHolder> object);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseAppCompatActivityComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseListFragmentComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/BaseSupportDialogFragmentComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/RefreshServiceComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/ThemedFragmentActivityComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereCommandProviderComponent.java

@@ -1,34 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

twidere/src/main/java/org/mariotaku/twidere/util/dagger/component/TwidereDataProviderComponent.java

@@ -1,33 +0,0 @@
-/*
- *                 Twidere - Twitter client for Android
- *
- *  Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-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);
-}

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;