Skip to content

Commit dcbebc3

Browse files
committed
fix format
1 parent 43957e6 commit dcbebc3

13 files changed

+72
-14
lines changed

.gitignore

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
4+
/.idea
65
.DS_Store
76
/build
87
/captures

.idea/gradle.xml

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/codeest/geeknews/ui/main/MainPresenter.java renamed to app/src/main/java/com/codeest/geeknews/presenter/MainPresenter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package com.codeest.geeknews.ui.main;
1+
package com.codeest.geeknews.presenter;
22

33
import com.codeest.geeknews.base.RxPresenter;
44
import com.codeest.geeknews.model.http.RetrofitHelper;
5+
import com.codeest.geeknews.presenter.contract.MainContract;
56

67
import javax.inject.Inject;
78

app/src/main/java/com/codeest/geeknews/ui/main/MainContract.java renamed to app/src/main/java/com/codeest/geeknews/presenter/contract/MainContract.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.codeest.geeknews.ui.main;
1+
package com.codeest.geeknews.presenter.contract;
22

33
import com.codeest.geeknews.base.BasePresenter;
44
import com.codeest.geeknews.base.BaseView;

app/src/main/java/com/codeest/geeknews/ui/main/MainActivity.java

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import com.codeest.geeknews.R;
1010
import com.codeest.geeknews.base.BaseActivity;
11+
import com.codeest.geeknews.presenter.MainPresenter;
12+
import com.codeest.geeknews.presenter.contract.MainContract;
1113
import com.codeest.geeknews.util.LogUtil;
1214

1315
import butterknife.BindView;

app/src/main/java/com/codeest/geeknews/ui/zhihu/adapter/ZhihuMainAdapter.java

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.support.v4.app.Fragment;
44
import android.support.v4.app.FragmentManager;
55
import android.support.v4.app.FragmentPagerAdapter;
6+
import android.support.v4.view.PagerAdapter;
67

78
/**
89
* Created by codeest on 16/8/11.
@@ -15,11 +16,19 @@ public ZhihuMainAdapter(FragmentManager fm) {
1516

1617
@Override
1718
public Fragment getItem(int position) {
19+
switch (position) {
20+
case 0:
21+
break;
22+
}
1823
return null;
1924
}
2025

2126
@Override
2227
public int getCount() {
2328
return 0;
2429
}
30+
31+
public int getItemPosition(Object object) {
32+
return PagerAdapter.POSITION_NONE;
33+
}
2534
}

app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ZhihuChildFragment.java

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.codeest.geeknews.ui.zhihu.fragment;
2+
3+
/**
4+
* Created by codeest on 2016/8/11.
5+
*/
6+
public class ZhihuDaliyFragment{
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.codeest.geeknews.ui.zhihu.fragment;
2+
3+
/**
4+
* Created by codeest on 2016/8/11.
5+
*/
6+
public class ZhihuHotFragment {
7+
}

app/src/main/java/com/codeest/geeknews/ui/zhihu/fragment/ZhihuMainFragment.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public class ZhihuMainFragment extends SimpleFragment{
1919
@BindView(R.id.vp_zhihu_main)
2020
ViewPager mViewPager;
2121

22+
String[] tabTitle = new String[]{"日报","主题","专栏","热门"};
23+
2224
@Override
2325
protected void initInject() {
2426
getFragmentComponent().inject(this);
@@ -31,6 +33,10 @@ protected int getLayoutId() {
3133

3234
@Override
3335
protected void initEventAndData() {
34-
36+
mTabLayout.addTab(mTabLayout.newTab().setText(tabTitle[0]));
37+
mTabLayout.addTab(mTabLayout.newTab().setText(tabTitle[1]));
38+
mTabLayout.addTab(mTabLayout.newTab().setText(tabTitle[2]));
39+
mTabLayout.addTab(mTabLayout.newTab().setText(tabTitle[3]));
40+
mTabLayout.setupWithViewPager(mViewPager);
3541
}
3642
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.codeest.geeknews.ui.zhihu.fragment;
2+
3+
/**
4+
* Created by codeest on 2016/8/11.
5+
*/
6+
public class ZhihuSectionFragment {
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.codeest.geeknews.ui.zhihu.fragment;
2+
3+
/**
4+
* Created by codeest on 2016/8/11.
5+
*/
6+
public class ZhihuThemeFragment {
7+
}

0 commit comments

Comments
 (0)