From 0e8fcc5bf4aff9c8cc8d027bf98bd548e3adcb4f Mon Sep 17 00:00:00 2001 From: yangfeng Date: Tue, 26 Jul 2016 11:14:12 +0800 Subject: [PATCH 1/6] code refactor with application get. --- app/src/main/java/com/cleaner/CleanCodeApplication.java | 8 ++++++++ app/src/main/java/com/cleaner/main/MainActivity.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/cleaner/CleanCodeApplication.java b/app/src/main/java/com/cleaner/CleanCodeApplication.java index fc410fb..41ec787 100644 --- a/app/src/main/java/com/cleaner/CleanCodeApplication.java +++ b/app/src/main/java/com/cleaner/CleanCodeApplication.java @@ -1,6 +1,8 @@ package com.cleaner; import android.app.Application; +import android.content.Context; +import android.support.annotation.NonNull; import com.cleaner.config.ConfigurationRepositoryComponent; import com.cleaner.config.DaggerConfigurationRepositoryComponent; @@ -10,6 +12,12 @@ public class CleanCodeApplication extends Application { private ConfigurationRepositoryComponent mRepositoryComponent; + // Prevent need in a singleton (global) reference to the application object. + @NonNull + public static CleanCodeApplication get(@NonNull Context context) { + return (CleanCodeApplication) context.getApplicationContext(); + } + @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/java/com/cleaner/main/MainActivity.java b/app/src/main/java/com/cleaner/main/MainActivity.java index c960fba..626b227 100644 --- a/app/src/main/java/com/cleaner/main/MainActivity.java +++ b/app/src/main/java/com/cleaner/main/MainActivity.java @@ -83,7 +83,7 @@ protected void onCreate(Bundle savedInstanceState) { // Create the presenter DaggerMainConfigComponent.builder() - .configurationRepositoryComponent(((CleanCodeApplication) getApplication()).getConfigurationRepositoryComponent()) + .configurationRepositoryComponent(CleanCodeApplication.get(this).getConfigurationRepositoryComponent()) .mainConfigPresenterModule(new MainConfigPresenterModule(this)).build() .inject(this); From a50a70ae70b86474f6bdd7e68995b14f92ea11a0 Mon Sep 17 00:00:00 2001 From: yangfeng Date: Fri, 3 Mar 2017 18:28:11 +0800 Subject: [PATCH 2/6] replace with fragment. --- .../java/com/cleaner/main/MainActivity.java | 250 +++++++----------- .../main/fragments/BaseTabFragment.java | 48 ++++ .../main/fragments/ChatListFragment.java | 27 ++ .../main/fragments/ContactListFragment.java | 27 ++ .../main/fragments/ExploreFragment.java | 27 ++ .../main/fragments/ProfileFragment.java | 27 ++ .../main/fragments/SummaryFragment.java | 27 ++ .../com/cleaner/view/BadgeRadioButton.java | 26 +- app/src/main/res/layout/activity_main.xml | 172 ++++-------- .../main/res/layout/badge_radio_button.xml | 4 +- dependencies.gradle | 10 +- 11 files changed, 344 insertions(+), 301 deletions(-) create mode 100644 app/src/main/java/com/cleaner/main/fragments/BaseTabFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/ChatListFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/ContactListFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/ExploreFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/ProfileFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/SummaryFragment.java diff --git a/app/src/main/java/com/cleaner/main/MainActivity.java b/app/src/main/java/com/cleaner/main/MainActivity.java index 626b227..c5b0398 100644 --- a/app/src/main/java/com/cleaner/main/MainActivity.java +++ b/app/src/main/java/com/cleaner/main/MainActivity.java @@ -1,17 +1,21 @@ package com.cleaner.main; -import android.app.TabActivity; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; +import android.support.v7.app.AppCompatActivity; import android.view.KeyEvent; import android.view.View; -import android.view.View.OnClickListener; -import android.widget.TabHost; -import android.widget.TabHost.TabSpec; +import android.widget.RadioGroup; import android.widget.Toast; import com.cleaner.CleanCodeApplication; +import com.cleaner.main.fragments.ChatListFragment; +import com.cleaner.main.fragments.ContactListFragment; +import com.cleaner.main.fragments.ExploreFragment; +import com.cleaner.main.fragments.ProfileFragment; +import com.cleaner.main.fragments.SummaryFragment; import com.cleaner.view.BadgeRadioButton; import javax.inject.Inject; @@ -20,12 +24,9 @@ import butterknife.ButterKnife; import butterknife.Unbinder; -public class MainActivity extends TabActivity implements MainConfigContracts.ConfigView{ +public class MainActivity extends AppCompatActivity implements MainConfigContracts.ConfigView, RadioGroup.OnCheckedChangeListener{ private static final String TAG = MainActivity.class.getSimpleName(); - @BindView(android.R.id.tabhost) - TabHost tabHost; - @BindView(R.id.summaryBadgeRadio) BadgeRadioButton summaryBadgeRadio; @@ -41,21 +42,24 @@ public class MainActivity extends TabActivity implements MainConfigContracts.Con @BindView(R.id.profileBadgeRadio) BadgeRadioButton profileBadgeRadio; - private static final int INDEX_SUMMARY = 0; - private static final int INDEX_CONVERSATION = 1; - private static final int INDEX_CONTACT = 2; - private static final int INDEX_EXPLORE = 3; - private static final int INDEX_PROFILE = 4; - private static int activeIndex = INDEX_SUMMARY; - - private static final String ACTIVE_INDEX_KEY = "ACTIVE_INDEX_KEY"; + @BindView(R.id.main_radio) + RadioGroup root; - private static final String TAB_SPEC_SUMMARY = "TAB_SPEC_SUMMARY"; - private static final String TAB_SPEC_CONVERSATION = "TAB_SPEC_CONVERSATION"; - private static final String TAB_SPEC_CONTACT = "TAB_SPEC_CONTACT"; - private static final String TAB_SPEC_EXPLORE = "TAB_SPEC_EXPLORE"; - private static final String TAB_SPEC_PROFILE = "TAB_SPEC_PROFILE"; - private TabSpec tabConversation; +// private static final int INDEX_SUMMARY = 0; +// private static final int INDEX_CONVERSATION = 1; +// private static final int INDEX_CONTACT = 2; +// private static final int INDEX_EXPLORE = 3; +// private static final int INDEX_PROFILE = 4; +// private static int activeIndex = INDEX_SUMMARY; +// +// private static final String ACTIVE_INDEX_KEY = "ACTIVE_INDEX_KEY"; +// +// private static final String TAB_SPEC_SUMMARY = "TAB_SPEC_SUMMARY"; +// private static final String TAB_SPEC_CONVERSATION = "TAB_SPEC_CONVERSATION"; +// private static final String TAB_SPEC_CONTACT = "TAB_SPEC_CONTACT"; +// private static final String TAB_SPEC_EXPLORE = "TAB_SPEC_EXPLORE"; +// private static final String TAB_SPEC_PROFILE = "TAB_SPEC_PROFILE"; +// private TabSpec tabConversation; private static final int EVENT_SUMMARY = 0; private static final int EVENT_CONVERSATION = 1; @@ -67,9 +71,6 @@ public class MainActivity extends TabActivity implements MainConfigContracts.Con private final ToastWrapper toastWrapper = new ToastWrapper(R.string.toast_exit, Toast.LENGTH_LONG); private Unbinder unbinder; - private BadgeRadioButton activeBadgeRadio; - - private final RadioClickListener listener = new RadioClickListener(); @Inject MainConfigPresenterImpl configPresenter; @@ -77,9 +78,6 @@ public class MainActivity extends TabActivity implements MainConfigContracts.Con @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (savedInstanceState != null) { - setActiveIndex(savedInstanceState.getInt(ACTIVE_INDEX_KEY, INDEX_SUMMARY)); - } // Create the presenter DaggerMainConfigComponent.builder() @@ -102,8 +100,6 @@ public void onContentChanged() { // MainConfigContracts.ConfigPresenter configPresenter = new MainConfigPresenterImpl(this, pageConfig); - initSelectTab(getIntent()); - initRadioButtons(); configPresenter.initTabs(); //事件的监听 @@ -115,53 +111,22 @@ public void onContentChanged() { // //显示未读消息数 // setRecentChatUnreadNumber(RecentChatManager.getInstance() // .getUnreadMessageTotalCount()); - } - - private static void setActiveIndex(int which) { - activeIndex = which; + initContents(); + initBottomTabs(); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - - outState.putInt(ACTIVE_INDEX_KEY, activeIndex); - } - - private void initRadioButtons() { - switch (activeIndex) { - case INDEX_SUMMARY: - radioClick(summaryBadgeRadio); - break; - case INDEX_CONVERSATION: - radioClick(conversationBadgeRadio); - break; - case INDEX_CONTACT: - radioClick(contactBadgeRadio); - break; - case INDEX_EXPLORE: - radioClick(exploreBadgeRadio); - break; - case INDEX_PROFILE: - radioClick(profileBadgeRadio); - break; - default: - break; - } } @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); parseNewIntent(intent); - initSelectTab(intent); - initRadioButtons(); - } - - private void initSelectTab(Intent intent) { - setActiveIndex(INDEX_SUMMARY); - setActiveIndex(intent.getIntExtra(ACTIVE_INDEX_KEY, INDEX_SUMMARY)); + initContents(); + initBottomTabs(); } @Override @@ -217,33 +182,12 @@ public void addUnknownSummaryTab() { } private void initHomePageTab(@NonNull Class cls) { - TabSpec tabNearby = tabHost.newTabSpec(TAB_SPEC_SUMMARY); - tabNearby.setIndicator(TAB_SPEC_SUMMARY).setContent(new Intent(this, cls)); - initTabPanel(tabNearby, summaryBadgeRadio, R.string.radio_label_summary, R.drawable.radio_bg_summary, listener); - } - -// private boolean initTabPanel(TabSpec tabSpec, View panel, View tabView, RadioClickListener listener) { -// if (null == tabSpec) { -// panel.setVisibility(View.GONE); -// return false; -// } else { -// tabHost.addTab(tabSpec); -// tabView.setOnClickListener(listener); -// panel.setVisibility(View.VISIBLE); -// } -// return true; -// } + initTabPanel(summaryBadgeRadio, R.string.radio_label_summary, R.drawable.radio_bg_summary); + } - private boolean initTabPanel(TabSpec tabSpec, BadgeRadioButton panel, int labelId, int iconId, - RadioClickListener listener) { -// if (null == tabSpec) { -// panel.setVisibility(View.GONE); -// return false; -// } else { - tabHost.addTab(tabSpec); - panel.setOnClickListener(labelId, iconId, listener); - panel.setVisibility(View.VISIBLE); -// } + private boolean initTabPanel(BadgeRadioButton panel, int labelId, int iconId) { + panel.setOnClickListener(labelId, iconId); + panel.setVisibility(View.VISIBLE); return true; } @@ -253,9 +197,7 @@ private void hideTabPanel(@NonNull BadgeRadioButton panel) { @Override public void addMessageTab() { - tabConversation = tabHost.newTabSpec(TAB_SPEC_CONVERSATION); - initOrUpdateConversationTab(); - initTabPanel(tabConversation, conversationBadgeRadio, R.string.radio_label_conversation, R.drawable.radio_bg_conversation, listener); + initTabPanel(conversationBadgeRadio, R.string.radio_label_conversation, R.drawable.radio_bg_conversation); } @Override @@ -266,10 +208,7 @@ public void addUnknownMessageTab() { @Override public void addDoctorTab() { - TabSpec tabDoctor = tabHost.newTabSpec(TAB_SPEC_CONTACT); - tabDoctor.setIndicator(TAB_SPEC_CONTACT).setContent( - new Intent(this, TabSearchDoctorActivity.class)); - initTabPanel(tabDoctor, contactBadgeRadio, R.string.radio_label_contact, R.drawable.radio_bg_explore, listener); + initTabPanel(contactBadgeRadio, R.string.radio_label_contact, R.drawable.radio_bg_explore); } @Override @@ -280,9 +219,7 @@ public void addUnknownDoctorTab() { @Override public void addMineTab() { - TabSpec tabMine = tabHost.newTabSpec(TAB_SPEC_PROFILE); - tabMine.setIndicator(TAB_SPEC_PROFILE).setContent(new Intent(this, MineActivity.class)); - initTabPanel(tabMine, profileBadgeRadio, R.string.radio_label_profile, R.drawable.radio_bg_profile, listener); + initTabPanel(profileBadgeRadio, R.string.radio_label_profile, R.drawable.radio_bg_profile); } @Override @@ -293,10 +230,7 @@ public void addUnknownMineTab() { @Override public void addDiscoveryTab() { - TabSpec tabDiscovery = tabHost.newTabSpec(TAB_SPEC_EXPLORE); - tabDiscovery.setIndicator(TAB_SPEC_EXPLORE).setContent( - new Intent(this, DiscoveryActivity.class)); - initTabPanel(tabDiscovery, exploreBadgeRadio, R.string.radio_label_explore, R.drawable.radio_bg_explore, listener); + initTabPanel(exploreBadgeRadio, R.string.radio_label_explore, R.drawable.radio_bg_explore); } @Override @@ -305,22 +239,9 @@ public void addUnknownDiscoveryTab() { hideTabPanel(exploreBadgeRadio); } - private class RadioClickListener implements OnClickListener { - @Override - public void onClick(View v) { - radioClick(v.getId()); - } - } - @Override protected void onDestroy() { super.onDestroy(); - tabHost = null; - -// AndroidEventManager.getInstance().removeEventListener( -// EventCode.LoginActivityLaunched, this); -// AndroidEventManager.getInstance().removeEventListener( -// EventCode.UnreadMessageCountChanged, this); unbinder.unbind(); toastWrapper.cancel(); } @@ -340,7 +261,7 @@ public boolean dispatchKeyEvent(KeyEvent event) { } public void gotoSearchView() { - radioClick(contactBadgeRadio); + root.check(contactBadgeRadio.getId()); } // @Override @@ -362,13 +283,6 @@ public void gotoSearchView() { /** * 初始化或者更新消息tab页 */ - private void initOrUpdateConversationTab() { - if (tabConversation != null) { - tabConversation.setIndicator(TAB_SPEC_CONVERSATION).setContent( - new Intent(this, Message_TabActivity.class)); - } - } - // @Override // protected void onLoginCompleted(String result) { // super.onLoginCompleted(result); @@ -403,51 +317,85 @@ protected void bindUnreadCountTextView(BadgeRadioButton view) { //bindUnreadCountTextView(view, R.id.badge); } - // refactor tab view item. - private void radioClick(BadgeRadioButton view) { - radioClick(view.getId()); - } - - private void radioClick(int viewId) { - setSelectFlag(false); - - switch (viewId) { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + switch (checkedId) { case R.id.summaryBadgeRadio: - tabHost.setCurrentTabByTag(TAB_SPEC_SUMMARY); - setActiveIndex(INDEX_SUMMARY); + activateSummary(); reportTabClickEvent(EVENT_SUMMARY); break; case R.id.conversationBadgeRadio: - tabHost.setCurrentTabByTag(TAB_SPEC_CONVERSATION); - setActiveIndex(INDEX_CONVERSATION); + activateMessage(); reportTabClickEvent(EVENT_CONVERSATION); break; case R.id.contactBadgeRadio: - tabHost.setCurrentTabByTag(TAB_SPEC_CONTACT); - setActiveIndex(INDEX_CONTACT); + activateContactTab(); reportTabClickEvent(EVENT_CONTACT); break; case R.id.exploreBadgeRadio: - tabHost.setCurrentTabByTag(TAB_SPEC_EXPLORE); - setActiveIndex(INDEX_EXPLORE); + activateExploreTab(); reportTabClickEvent(EVENT_EXPLORE); break; case R.id.profileBadgeRadio: - tabHost.setCurrentTabByTag(TAB_SPEC_PROFILE); - setActiveIndex(INDEX_PROFILE); + activateMineTab(); reportTabClickEvent(EVENT_PROFILE); break; default: + showUnknownTabError(); break; } - - activeBadgeRadio = ButterKnife.findById(tabHost, viewId); - setSelectFlag(true); } - private void setSelectFlag(boolean flag) { - if (null != activeBadgeRadio) { - activeBadgeRadio.setSelectFlag(flag); + private void initContents() { + Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.tabcontent); + if (fragment == null) { + fragment = SummaryFragment.newInstance(getIntent().getExtras()); + replaceContentTab(fragment); + } else { + attachContentTab(fragment); } } + + private void initBottomTabs() { + root = (RadioGroup) findViewById(R.id.main_radio); + root.check(R.id.summaryBadgeRadio); + root.setOnCheckedChangeListener(this); + } + + private void activateSummary() { + replaceContentTab(SummaryFragment.newInstance()); + } + + private void activateMessage() { + replaceContentTab(ChatListFragment.newInstance()); + } + + private void activateContactTab() { + replaceContentTab(ContactListFragment.newInstance()); + } + + private void activateExploreTab() { + replaceContentTab(ExploreFragment.newInstance()); + } + + private void activateMineTab() { + replaceContentTab(ProfileFragment.newInstance()); + } + + private void attachContentTab(Fragment fragment) { + getSupportFragmentManager() + .beginTransaction() + .attach(fragment) + .commit(); + } + private void replaceContentTab(Fragment fragment) { + getSupportFragmentManager() + .beginTransaction() + .setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out) + .replace(android.R.id.tabcontent, fragment, "") + .commit(); + } + + private void showUnknownTabError() { + } } diff --git a/app/src/main/java/com/cleaner/main/fragments/BaseTabFragment.java b/app/src/main/java/com/cleaner/main/fragments/BaseTabFragment.java new file mode 100644 index 0000000..d6f2cc4 --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/BaseTabFragment.java @@ -0,0 +1,48 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.cleaner.main.R; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public abstract class BaseTabFragment extends Fragment { + + // region Constructors + public BaseTabFragment() { + } + // endregion + + // region Lifecycle Methods + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + View rootView = inflater.inflate(R.layout.activity_dummy_tab, container, false); + TextView textView = (TextView)rootView.findViewById(R.id.dummy_textView); + textView.setText(this.getClass().getSimpleName()); + return rootView; + } + + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/ChatListFragment.java b/app/src/main/java/com/cleaner/main/fragments/ChatListFragment.java new file mode 100644 index 0000000..8ab209d --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/ChatListFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class ChatListFragment extends BaseTabFragment { + + // region Constructors + public ChatListFragment() { + } + // endregion + + // region Factory Methods + public static ChatListFragment newInstance() { + return new ChatListFragment(); + } + + public static ChatListFragment newInstance(Bundle extras) { + ChatListFragment fragment = new ChatListFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/ContactListFragment.java b/app/src/main/java/com/cleaner/main/fragments/ContactListFragment.java new file mode 100644 index 0000000..1050969 --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/ContactListFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class ContactListFragment extends BaseTabFragment { + + // region Constructors + public ContactListFragment() { + } + // endregion + + // region Factory Methods + public static ContactListFragment newInstance() { + return new ContactListFragment(); + } + + public static ContactListFragment newInstance(Bundle extras) { + ContactListFragment fragment = new ContactListFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/ExploreFragment.java b/app/src/main/java/com/cleaner/main/fragments/ExploreFragment.java new file mode 100644 index 0000000..7ac7db7 --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/ExploreFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class ExploreFragment extends BaseTabFragment { + + // region Constructors + public ExploreFragment() { + } + // endregion + + // region Factory Methods + public static ExploreFragment newInstance() { + return new ExploreFragment(); + } + + public static ExploreFragment newInstance(Bundle extras) { + ExploreFragment fragment = new ExploreFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/ProfileFragment.java b/app/src/main/java/com/cleaner/main/fragments/ProfileFragment.java new file mode 100644 index 0000000..7f1d14c --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/ProfileFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class ProfileFragment extends BaseTabFragment { + + // region Constructors + public ProfileFragment() { + } + // endregion + + // region Factory Methods + public static ProfileFragment newInstance() { + return new ProfileFragment(); + } + + public static ProfileFragment newInstance(Bundle extras) { + ProfileFragment fragment = new ProfileFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/SummaryFragment.java b/app/src/main/java/com/cleaner/main/fragments/SummaryFragment.java new file mode 100644 index 0000000..31cc8fd --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/SummaryFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class SummaryFragment extends BaseTabFragment { + + // region Constructors + public SummaryFragment() { + } + // endregion + + // region Factory Methods + public static SummaryFragment newInstance() { + return new SummaryFragment(); + } + + public static SummaryFragment newInstance(Bundle extras) { + SummaryFragment fragment = new SummaryFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/view/BadgeRadioButton.java b/app/src/main/java/com/cleaner/view/BadgeRadioButton.java index 1a58560..354a71d 100644 --- a/app/src/main/java/com/cleaner/view/BadgeRadioButton.java +++ b/app/src/main/java/com/cleaner/view/BadgeRadioButton.java @@ -2,9 +2,7 @@ import android.content.Context; import android.util.AttributeSet; -import android.view.View; import android.widget.RadioButton; -import android.widget.RadioGroup; import android.widget.RelativeLayout; import android.widget.TextView; @@ -13,26 +11,17 @@ /** * Created by yangfeng on 16-7-7. */ -public class BadgeRadioButton extends RelativeLayout implements RadioGroup.OnCheckedChangeListener { +public class BadgeRadioButton extends RelativeLayout { private RadioButton radioButton; private TextView badgeView; private int labelId; private int iconId; - private OnClickListener clickListener; - public void setOnClickListener(int labelId, int iconId, OnClickListener l) { - super.setOnClickListener(l); + public void setOnClickListener(int labelId, int iconId) { this.labelId = labelId; this.iconId = iconId; checkAndDisplay(); - this.clickListener = l; - } - - private void onDelegateClick() { - if (null != clickListener) { - clickListener.onClick(this); - } } public BadgeRadioButton(Context context) { @@ -58,12 +47,6 @@ private void init() { if (null == radioButton) { throw new IllegalStateException("RadioButton with id name 'radio' was not found."); } - radioButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - onDelegateClick(); - } - }); badgeView = (TextView) findViewById(R.id.badge); if (null == badgeView) { throw new IllegalStateException("TextView with id name 'badge' was not found."); @@ -87,11 +70,6 @@ public void setSelectFlag(boolean select) { radioButton.setChecked(select); } - @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - onDelegateClick(); - } - @Override public boolean performClick() { super.performClick(); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 470143a..f502c9b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,120 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/badge_radio_button.xml b/app/src/main/res/layout/badge_radio_button.xml index cc9ba77..da993b8 100644 --- a/app/src/main/res/layout/badge_radio_button.xml +++ b/app/src/main/res/layout/badge_radio_button.xml @@ -27,8 +27,8 @@ android:layout_toEndOf="@+id/anchor" android:background="@drawable/badge_bg" android:gravity="center" - android:singleLine="true" android:textColor="@color/white" android:textSize="@dimen/badge_text_size" - android:visibility="gone"/> + android:visibility="gone" + android:maxLines="1" /> diff --git a/dependencies.gradle b/dependencies.gradle index 8c91b8f..764bce5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -3,11 +3,11 @@ ext.versions = [ name : '1.0', minSdk : 11, - targetSdk : 22, - compileSdk : 23, - buildTools : '23.0.3', + targetSdk : 25, + compileSdk : 25, + buildTools : '25.0.2', - androidGradlePlugin : '2.1.2', + androidGradlePlugin : '2.2.3', aptGradlePlugin : '1.8', retrolambdaGradlePlugin : '3.2.5', lombokGradlePlugin : '0.2.3.a2', @@ -24,7 +24,7 @@ ext.versions = [ rxAndroid : '1.2.0', rxJava : '1.1.5', rxLint : '1.0', - supportLibs : '23.1.1', + supportLibs : '25.1.1', okHttp : '3.2.0', retrofit : '2.0.0-beta4', jackson : '2.6.3', From e4cfa3f7356f16e24cd9d1242905c5570fb2e932 Mon Sep 17 00:00:00 2001 From: yangfeng Date: Fri, 3 Mar 2017 18:49:34 +0800 Subject: [PATCH 3/6] modify root view. --- app/src/main/java/com/cleaner/main/MainActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/cleaner/main/MainActivity.java b/app/src/main/java/com/cleaner/main/MainActivity.java index c5b0398..ffc9c7e 100644 --- a/app/src/main/java/com/cleaner/main/MainActivity.java +++ b/app/src/main/java/com/cleaner/main/MainActivity.java @@ -357,7 +357,6 @@ private void initContents() { } private void initBottomTabs() { - root = (RadioGroup) findViewById(R.id.main_radio); root.check(R.id.summaryBadgeRadio); root.setOnCheckedChangeListener(this); } From ef3fc84525f44e3208574c2211f8c060519122e9 Mon Sep 17 00:00:00 2001 From: yangfeng Date: Fri, 3 Mar 2017 19:09:21 +0800 Subject: [PATCH 4/6] toggle navigation item. --- .../java/com/cleaner/main/MainActivity.java | 120 +++--------------- .../com/cleaner/view/BadgeRadioButton.java | 26 +++- 2 files changed, 44 insertions(+), 102 deletions(-) diff --git a/app/src/main/java/com/cleaner/main/MainActivity.java b/app/src/main/java/com/cleaner/main/MainActivity.java index ffc9c7e..a89a67c 100644 --- a/app/src/main/java/com/cleaner/main/MainActivity.java +++ b/app/src/main/java/com/cleaner/main/MainActivity.java @@ -7,7 +7,6 @@ import android.support.v7.app.AppCompatActivity; import android.view.KeyEvent; import android.view.View; -import android.widget.RadioGroup; import android.widget.Toast; import com.cleaner.CleanCodeApplication; @@ -24,7 +23,7 @@ import butterknife.ButterKnife; import butterknife.Unbinder; -public class MainActivity extends AppCompatActivity implements MainConfigContracts.ConfigView, RadioGroup.OnCheckedChangeListener{ +public class MainActivity extends AppCompatActivity implements MainConfigContracts.ConfigView, View.OnClickListener{ private static final String TAG = MainActivity.class.getSimpleName(); @BindView(R.id.summaryBadgeRadio) @@ -42,24 +41,7 @@ public class MainActivity extends AppCompatActivity implements MainConfigContrac @BindView(R.id.profileBadgeRadio) BadgeRadioButton profileBadgeRadio; - @BindView(R.id.main_radio) - RadioGroup root; - -// private static final int INDEX_SUMMARY = 0; -// private static final int INDEX_CONVERSATION = 1; -// private static final int INDEX_CONTACT = 2; -// private static final int INDEX_EXPLORE = 3; -// private static final int INDEX_PROFILE = 4; -// private static int activeIndex = INDEX_SUMMARY; -// -// private static final String ACTIVE_INDEX_KEY = "ACTIVE_INDEX_KEY"; -// -// private static final String TAB_SPEC_SUMMARY = "TAB_SPEC_SUMMARY"; -// private static final String TAB_SPEC_CONVERSATION = "TAB_SPEC_CONVERSATION"; -// private static final String TAB_SPEC_CONTACT = "TAB_SPEC_CONTACT"; -// private static final String TAB_SPEC_EXPLORE = "TAB_SPEC_EXPLORE"; -// private static final String TAB_SPEC_PROFILE = "TAB_SPEC_PROFILE"; -// private TabSpec tabConversation; + private BadgeRadioButton currentButton; private static final int EVENT_SUMMARY = 0; private static final int EVENT_CONVERSATION = 1; @@ -95,22 +77,8 @@ public void onContentChanged() { bindUnreadCountTextView(conversationBadgeRadio); -// checkAndLoginXbkpIM(); -// PatientApplication.getInstance().addActivity(this); - -// MainConfigContracts.ConfigPresenter configPresenter = new MainConfigPresenterImpl(this, pageConfig); - configPresenter.initTabs(); - //事件的监听 -// AndroidEventManager.getInstance().addEventListener( -// EventCode.LoginActivityLaunched, this, false); -// AndroidEventManager.getInstance().addEventListener( -// EventCode.UnreadMessageCountChanged, this, false); -// -// //显示未读消息数 -// setRecentChatUnreadNumber(RecentChatManager.getInstance() -// .getUnreadMessageTotalCount()); initContents(); initBottomTabs(); } @@ -144,22 +112,6 @@ protected void onResume() { } } -// @Override -// public void eventRunEnd(Event arg0) { -// if (arg0.getEventCode() == EventCode.LoginActivityLaunched) { -// finish(); -// } else if (arg0.getEventCode() == EventCode.UnreadMessageCountChanged) { -// setRecentChatUnreadNumber(RecentChatManager.getInstance() -// .getUnreadMessageTotalCount()); -// } -// } - -// private PageConfig parsePageConfig() { -// String pageConfigKey = MainPageConfigImpl.getPageConfigKey(); -// String preferredConfig = PatientUtil.loadConfigItem(this, pageConfigKey); -// return new MainPageConfigImpl(preferredConfig); -// } - @Override public void addSummaryTab() { initHomePageTab(SummaryActivity.class); @@ -186,7 +138,7 @@ private void initHomePageTab(@NonNull Class cls) { } private boolean initTabPanel(BadgeRadioButton panel, int labelId, int iconId) { - panel.setOnClickListener(labelId, iconId); + panel.setOnClickListener(labelId, iconId, this); panel.setVisibility(View.VISIBLE); return true; } @@ -261,50 +213,8 @@ public boolean dispatchKeyEvent(KeyEvent event) { } public void gotoSearchView() { - root.check(contactBadgeRadio.getId()); - } - -// @Override -// protected String getRoleType() { -// return IntentUtils.getRoleType(); -// } -// -// @Override -// protected void gotoLoginActivity() { -// IntentUtils.gotoLoginActivity(this, true); -// } - -// private void checkAndLoginXbkpIM() { -// if (IMApplication.getInstance().isMyServerLogined()) { -// DemoApplication.loginIM(); -// } -// } - - /** - * 初始化或者更新消息tab页 - */ -// @Override -// protected void onLoginCompleted(String result) { -// super.onLoginCompleted(result); -// checkAndLoginXbkpIM(); -// -// //同步设置免打扰的讨论组 -// requestGroupChatSetting(); -// -// } -// -// @Override -// protected void switchConversationTab(int originalvalue) { -// super.switchConversationTab(originalvalue); -// int currentValue = BaseConstantDef.USED_XB_VALUE; -// if (originalvalue != 0) { -// if (originalvalue == currentValue) { -// Logger.i("used same im , no need switch tab"); -// } else { -// initOrUpdateConversationTab(); -// } -// } -// } + contactBadgeRadio.performClick(); + } // dumb override methods protected void parseNewIntent(Intent intent) { @@ -318,8 +228,14 @@ protected void bindUnreadCountTextView(BadgeRadioButton view) { } @Override - public void onCheckedChanged(RadioGroup group, int checkedId) { - switch (checkedId) { + public void onClick(View v) { + if (v.getId() == currentButton.getId()) { + return; + } + + currentButton.setSelectFlag(false); + + switch (v.getId()) { case R.id.summaryBadgeRadio: activateSummary(); reportTabClickEvent(EVENT_SUMMARY); @@ -342,8 +258,10 @@ public void onCheckedChanged(RadioGroup group, int checkedId) { break; default: showUnknownTabError(); - break; + return; } + + currentButton = (BadgeRadioButton) v; } private void initContents() { @@ -357,8 +275,10 @@ private void initContents() { } private void initBottomTabs() { - root.check(R.id.summaryBadgeRadio); - root.setOnCheckedChangeListener(this); +// root.check(R.id.summaryBadgeRadio); +// root.setOnCheckedChangeListener(this); + currentButton = summaryBadgeRadio; + currentButton.performClick(); } private void activateSummary() { diff --git a/app/src/main/java/com/cleaner/view/BadgeRadioButton.java b/app/src/main/java/com/cleaner/view/BadgeRadioButton.java index 354a71d..1a58560 100644 --- a/app/src/main/java/com/cleaner/view/BadgeRadioButton.java +++ b/app/src/main/java/com/cleaner/view/BadgeRadioButton.java @@ -2,7 +2,9 @@ import android.content.Context; import android.util.AttributeSet; +import android.view.View; import android.widget.RadioButton; +import android.widget.RadioGroup; import android.widget.RelativeLayout; import android.widget.TextView; @@ -11,17 +13,26 @@ /** * Created by yangfeng on 16-7-7. */ -public class BadgeRadioButton extends RelativeLayout { +public class BadgeRadioButton extends RelativeLayout implements RadioGroup.OnCheckedChangeListener { private RadioButton radioButton; private TextView badgeView; private int labelId; private int iconId; - public void setOnClickListener(int labelId, int iconId) { + private OnClickListener clickListener; + public void setOnClickListener(int labelId, int iconId, OnClickListener l) { + super.setOnClickListener(l); this.labelId = labelId; this.iconId = iconId; checkAndDisplay(); + this.clickListener = l; + } + + private void onDelegateClick() { + if (null != clickListener) { + clickListener.onClick(this); + } } public BadgeRadioButton(Context context) { @@ -47,6 +58,12 @@ private void init() { if (null == radioButton) { throw new IllegalStateException("RadioButton with id name 'radio' was not found."); } + radioButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + onDelegateClick(); + } + }); badgeView = (TextView) findViewById(R.id.badge); if (null == badgeView) { throw new IllegalStateException("TextView with id name 'badge' was not found."); @@ -70,6 +87,11 @@ public void setSelectFlag(boolean select) { radioButton.setChecked(select); } + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + onDelegateClick(); + } + @Override public boolean performClick() { super.performClick(); From 2544df69fd9dbdbceea4dced047b5c4e5daa163b Mon Sep 17 00:00:00 2001 From: yangfeng Date: Fri, 3 Mar 2017 19:28:43 +0800 Subject: [PATCH 5/6] response summary version with fragments --- .../java/com/cleaner/main/MainActivity.java | 21 ++++++++++----- .../com/cleaner/main/MainConfigContracts.java | 3 +++ .../cleaner/main/MainConfigPresenterImpl.java | 17 ++++++++++-- .../fragments/RecyclerSummaryFragment.java | 27 +++++++++++++++++++ .../fragments/RecyclerSummaryV2Fragment.java | 27 +++++++++++++++++++ 5 files changed, 86 insertions(+), 9 deletions(-) create mode 100644 app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryFragment.java create mode 100644 app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryV2Fragment.java diff --git a/app/src/main/java/com/cleaner/main/MainActivity.java b/app/src/main/java/com/cleaner/main/MainActivity.java index a89a67c..aafc978 100644 --- a/app/src/main/java/com/cleaner/main/MainActivity.java +++ b/app/src/main/java/com/cleaner/main/MainActivity.java @@ -14,6 +14,8 @@ import com.cleaner.main.fragments.ContactListFragment; import com.cleaner.main.fragments.ExploreFragment; import com.cleaner.main.fragments.ProfileFragment; +import com.cleaner.main.fragments.RecyclerSummaryFragment; +import com.cleaner.main.fragments.RecyclerSummaryV2Fragment; import com.cleaner.main.fragments.SummaryFragment; import com.cleaner.view.BadgeRadioButton; @@ -42,6 +44,7 @@ public class MainActivity extends AppCompatActivity implements MainConfigContrac BadgeRadioButton profileBadgeRadio; private BadgeRadioButton currentButton; + private boolean inited = false; private static final int EVENT_SUMMARY = 0; private static final int EVENT_CONVERSATION = 1; @@ -114,17 +117,20 @@ protected void onResume() { @Override public void addSummaryTab() { - initHomePageTab(SummaryActivity.class); + replaceContentTab(inited ? SummaryFragment.newInstance() : SummaryFragment.newInstance(getIntent().getExtras())); +// initHomePageTab(SummaryActivity.class); } @Override public void addRecyclerSummaryTab() { - initHomePageTab(RecyclerSummaryActivity.class); + replaceContentTab(inited ? RecyclerSummaryFragment.newInstance() : RecyclerSummaryFragment.newInstance(getIntent().getExtras())); +// initHomePageTab(RecyclerSummaryActivity.class); } @Override public void addRecyclerSummaryV2Tab() { - initHomePageTab(RecyclerSummaryV2Activity.class); + replaceContentTab(inited ? RecyclerSummaryV2Fragment.newInstance() : RecyclerSummaryV2Fragment.newInstance(getIntent().getExtras())); +// initHomePageTab(RecyclerSummaryV2Activity.class); } @Override @@ -133,7 +139,8 @@ public void addUnknownSummaryTab() { hideTabPanel(summaryBadgeRadio); } - private void initHomePageTab(@NonNull Class cls) { + @Override + public void showSummaryTab() { initTabPanel(summaryBadgeRadio, R.string.radio_label_summary, R.drawable.radio_bg_summary); } @@ -267,8 +274,8 @@ public void onClick(View v) { private void initContents() { Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.tabcontent); if (fragment == null) { - fragment = SummaryFragment.newInstance(getIntent().getExtras()); - replaceContentTab(fragment); + configPresenter.getSummaryFragment(); + inited = true; } else { attachContentTab(fragment); } @@ -282,7 +289,7 @@ private void initBottomTabs() { } private void activateSummary() { - replaceContentTab(SummaryFragment.newInstance()); + configPresenter.getSummaryFragment(); } private void activateMessage() { diff --git a/app/src/main/java/com/cleaner/main/MainConfigContracts.java b/app/src/main/java/com/cleaner/main/MainConfigContracts.java index 1044a7f..6da0067 100644 --- a/app/src/main/java/com/cleaner/main/MainConfigContracts.java +++ b/app/src/main/java/com/cleaner/main/MainConfigContracts.java @@ -9,6 +9,8 @@ public class MainConfigContracts { * Created by yangfeng on 16-6-29. */ public interface ConfigView { + void showSummaryTab(); + void addSummaryTab(); void addRecyclerSummaryTab(); void addRecyclerSummaryV2Tab(); @@ -33,5 +35,6 @@ public interface ConfigView { */ public interface ConfigPresenter { void initTabs(); + void getSummaryFragment(); } } diff --git a/app/src/main/java/com/cleaner/main/MainConfigPresenterImpl.java b/app/src/main/java/com/cleaner/main/MainConfigPresenterImpl.java index 508f659..6c0d641 100644 --- a/app/src/main/java/com/cleaner/main/MainConfigPresenterImpl.java +++ b/app/src/main/java/com/cleaner/main/MainConfigPresenterImpl.java @@ -1,7 +1,7 @@ package com.cleaner.main; -import com.cleaner.config.PageConfig; import com.cleaner.config.ConfigurationRepository; +import com.cleaner.config.PageConfig; import javax.inject.Inject; @@ -28,6 +28,19 @@ public void initTabs() { } private void initHomePageTab() { + if (pageConfig.hasSummary()) { + view.showSummaryTab(); + } else if (pageConfig.hasRecyclerSummary()) { + view.showSummaryTab(); + } else if (pageConfig.hasRecyclerSummaryV2()) { + view.showSummaryTab(); + } else { + view.addUnknownSummaryTab(); + } + } + + @Override + public void getSummaryFragment() { if (pageConfig.hasSummary()) { view.addSummaryTab(); } else if (pageConfig.hasRecyclerSummary()) { @@ -35,7 +48,7 @@ private void initHomePageTab() { } else if (pageConfig.hasRecyclerSummaryV2()) { view.addRecyclerSummaryV2Tab(); } else { - view.addUnknownSummaryTab(); + view.addSummaryTab(); } } diff --git a/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryFragment.java b/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryFragment.java new file mode 100644 index 0000000..00d29ae --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryFragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class RecyclerSummaryFragment extends BaseTabFragment { + + // region Constructors + public RecyclerSummaryFragment() { + } + // endregion + + // region Factory Methods + public static RecyclerSummaryFragment newInstance() { + return new RecyclerSummaryFragment(); + } + + public static RecyclerSummaryFragment newInstance(Bundle extras) { + RecyclerSummaryFragment fragment = new RecyclerSummaryFragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} diff --git a/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryV2Fragment.java b/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryV2Fragment.java new file mode 100644 index 0000000..a5e7e47 --- /dev/null +++ b/app/src/main/java/com/cleaner/main/fragments/RecyclerSummaryV2Fragment.java @@ -0,0 +1,27 @@ +package com.cleaner.main.fragments; + +import android.os.Bundle; + +/** + * Created by etiennelawlor on 12/16/16. + */ + +public class RecyclerSummaryV2Fragment extends BaseTabFragment { + + // region Constructors + public RecyclerSummaryV2Fragment() { + } + // endregion + + // region Factory Methods + public static RecyclerSummaryV2Fragment newInstance() { + return new RecyclerSummaryV2Fragment(); + } + + public static RecyclerSummaryV2Fragment newInstance(Bundle extras) { + RecyclerSummaryV2Fragment fragment = new RecyclerSummaryV2Fragment(); + fragment.setArguments(extras); + return fragment; + } + // endregion +} From 28eb90b8a5d27afaaeb613f6540c14b210c5dc09 Mon Sep 17 00:00:00 2001 From: yangfeng Date: Fri, 3 Mar 2017 19:32:54 +0800 Subject: [PATCH 6/6] remove actvitiy --- app/src/main/AndroidManifest.xml | 7 ------- app/src/main/java/com/cleaner/main/DiscoveryActivity.java | 7 ------- .../main/java/com/cleaner/main/Message_TabActivity.java | 7 ------- app/src/main/java/com/cleaner/main/MineActivity.java | 7 ------- .../java/com/cleaner/main/RecyclerSummaryActivity.java | 7 ------- .../java/com/cleaner/main/RecyclerSummaryV2Activity.java | 7 ------- app/src/main/java/com/cleaner/main/SummaryActivity.java | 7 ------- .../java/com/cleaner/main/TabSearchDoctorActivity.java | 7 ------- 8 files changed, 56 deletions(-) delete mode 100644 app/src/main/java/com/cleaner/main/DiscoveryActivity.java delete mode 100644 app/src/main/java/com/cleaner/main/Message_TabActivity.java delete mode 100644 app/src/main/java/com/cleaner/main/MineActivity.java delete mode 100644 app/src/main/java/com/cleaner/main/RecyclerSummaryActivity.java delete mode 100644 app/src/main/java/com/cleaner/main/RecyclerSummaryV2Activity.java delete mode 100644 app/src/main/java/com/cleaner/main/SummaryActivity.java delete mode 100644 app/src/main/java/com/cleaner/main/TabSearchDoctorActivity.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d232966..94fc7ff 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,13 +20,6 @@ - - - - - - - diff --git a/app/src/main/java/com/cleaner/main/DiscoveryActivity.java b/app/src/main/java/com/cleaner/main/DiscoveryActivity.java deleted file mode 100644 index 433be3a..0000000 --- a/app/src/main/java/com/cleaner/main/DiscoveryActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class DiscoveryActivity extends BaseTabActivity { -} diff --git a/app/src/main/java/com/cleaner/main/Message_TabActivity.java b/app/src/main/java/com/cleaner/main/Message_TabActivity.java deleted file mode 100644 index 3f05e8d..0000000 --- a/app/src/main/java/com/cleaner/main/Message_TabActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class Message_TabActivity extends BaseTabActivity { -} diff --git a/app/src/main/java/com/cleaner/main/MineActivity.java b/app/src/main/java/com/cleaner/main/MineActivity.java deleted file mode 100644 index 8162ee3..0000000 --- a/app/src/main/java/com/cleaner/main/MineActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class MineActivity extends BaseTabActivity { -} diff --git a/app/src/main/java/com/cleaner/main/RecyclerSummaryActivity.java b/app/src/main/java/com/cleaner/main/RecyclerSummaryActivity.java deleted file mode 100644 index dba2ca9..0000000 --- a/app/src/main/java/com/cleaner/main/RecyclerSummaryActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class RecyclerSummaryActivity extends BaseTabActivity{ -} diff --git a/app/src/main/java/com/cleaner/main/RecyclerSummaryV2Activity.java b/app/src/main/java/com/cleaner/main/RecyclerSummaryV2Activity.java deleted file mode 100644 index f9bf81f..0000000 --- a/app/src/main/java/com/cleaner/main/RecyclerSummaryV2Activity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class RecyclerSummaryV2Activity extends BaseTabActivity { -} diff --git a/app/src/main/java/com/cleaner/main/SummaryActivity.java b/app/src/main/java/com/cleaner/main/SummaryActivity.java deleted file mode 100644 index 4d387df..0000000 --- a/app/src/main/java/com/cleaner/main/SummaryActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class SummaryActivity extends BaseTabActivity { -} diff --git a/app/src/main/java/com/cleaner/main/TabSearchDoctorActivity.java b/app/src/main/java/com/cleaner/main/TabSearchDoctorActivity.java deleted file mode 100644 index 5ae6d8c..0000000 --- a/app/src/main/java/com/cleaner/main/TabSearchDoctorActivity.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.cleaner.main; - -/** - * Created by yangfeng on 16-7-5. - */ -public class TabSearchDoctorActivity extends BaseTabActivity { -}