public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More cleanup in favour of view injection.

Browse source
This commit is contained in:
dosiecki 2015-05-19 15:50:08 -07:00
parent 712f9f1bbf
commit b2c6bb444c
4 changed files with 73 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
clients/android/NewsBlur/src/com/newsblur/fragment/DefaultFeedViewDialogFragment.java
View file

@ -10,6 +10,10 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.RadioButton;
import butterknife.ButterKnife;
import butterknife.FindView;
import butterknife.OnClick;
import com.newsblur.R;
import com.newsblur.util.DefaultFeedView;
import com.newsblur.util.DefaultFeedViewChangedListener;
@ -17,10 +21,12 @@ import com.newsblur.util.DefaultFeedViewChangedListener;
/**
* Created by mark on 09/01/2014.
*/
public class DefaultFeedViewDialogFragment extends DialogFragment implements View.OnClickListener {
public class DefaultFeedViewDialogFragment extends DialogFragment {
private static String CURRENT_VIEW = "currentView";
private DefaultFeedView currentValue;
@FindView(R.id.radio_story) RadioButton storyButton;
@FindView(R.id.radio_text) RadioButton textButton;
public static DefaultFeedViewDialogFragment newInstance(DefaultFeedView currentValue) {
DefaultFeedViewDialogFragment dialog = new DefaultFeedViewDialogFragment();
@ -40,11 +46,9 @@ public class DefaultFeedViewDialogFragment extends DialogFragment implements Vie
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
currentValue = (DefaultFeedView) getArguments().getSerializable(CURRENT_VIEW);
View v = inflater.inflate(R.layout.defaultfeedview_dialog, null);
RadioButton storyButton = (RadioButton) v.findViewById(R.id.radio_story);
storyButton.setOnClickListener(this);
ButterKnife.bind(this, v);
storyButton.setChecked(currentValue == DefaultFeedView.STORY);
RadioButton textButton = (RadioButton) v.findViewById(R.id.radio_text);
textButton.setOnClickListener(this);
textButton.setChecked(currentValue == DefaultFeedView.TEXT);
getDialog().getWindow().setFlags(WindowManager.LayoutParams.FLAG_DITHER, WindowManager.LayoutParams.FLAG_DITHER);
@ -54,19 +58,18 @@ public class DefaultFeedViewDialogFragment extends DialogFragment implements Vie
return v;
}
@Override
public void onClick(View v) {
DefaultFeedViewChangedListener listener = (DefaultFeedViewChangedListener)getActivity();
if (v.getId() == R.id.radio_story) {
if (currentValue == DefaultFeedView.TEXT) {
listener.defaultFeedViewChanged(DefaultFeedView.STORY);
}
} else {
if (currentValue == DefaultFeedView.STORY) {
listener.defaultFeedViewChanged(DefaultFeedView.TEXT);
}
@OnClick(R.id.radio_story) void selectStory() {
if (currentValue != DefaultFeedView.STORY) {
((DefaultFeedViewChangedListener) getActivity()).defaultFeedViewChanged(DefaultFeedView.STORY);
}
dismiss();
}
@OnClick(R.id.radio_text) void selectText() {
if (currentValue != DefaultFeedView.TEXT) {
((DefaultFeedViewChangedListener) getActivity()).defaultFeedViewChanged(DefaultFeedView.TEXT);
}
dismiss();
}
}

39
clients/android/NewsBlur/src/com/newsblur/fragment/ReadFilterDialogFragment.java
View file

@ -1,25 +1,29 @@
package com.newsblur.fragment;
import android.os.Bundle;
import android.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.RadioButton;
import butterknife.ButterKnife;
import butterknife.FindView;
import butterknife.OnClick;
import com.newsblur.R;
import com.newsblur.util.ReadFilter;
import com.newsblur.util.ReadFilterChangedListener;
public class ReadFilterDialogFragment extends DialogFragment implements OnClickListener {
public class ReadFilterDialogFragment extends DialogFragment {
private static String CURRENT_FILTER = "currentFilter";
private ReadFilter currentValue;
@FindView(R.id.radio_all) RadioButton allButton;
@FindView(R.id.radio_unread) RadioButton unreadButton;
public static ReadFilterDialogFragment newInstance(ReadFilter currentValue) {
ReadFilterDialogFragment dialog = new ReadFilterDialogFragment();
@ -39,11 +43,9 @@ public class ReadFilterDialogFragment extends DialogFragment implements OnClickL
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
currentValue = (ReadFilter) getArguments().getSerializable(CURRENT_FILTER);
View v = inflater.inflate(R.layout.readfilter_dialog, null);
RadioButton allButton = (RadioButton) v.findViewById(R.id.radio_all);
allButton.setOnClickListener(this);
ButterKnife.bind(this, v);
allButton.setChecked(currentValue == ReadFilter.ALL);
RadioButton unreadButton = (RadioButton) v.findViewById(R.id.radio_unread);
unreadButton.setOnClickListener(this);
unreadButton.setChecked(currentValue == ReadFilter.UNREAD);
getDialog().getWindow().setFlags(WindowManager.LayoutParams.FLAG_DITHER, WindowManager.LayoutParams.FLAG_DITHER);
@ -53,19 +55,18 @@ public class ReadFilterDialogFragment extends DialogFragment implements OnClickL
return v;
}
@Override
public void onClick(View v) {
ReadFilterChangedListener listener = (ReadFilterChangedListener)getActivity();
if (v.getId() == R.id.radio_all) {
if (currentValue == ReadFilter.UNREAD) {
listener.readFilterChanged(ReadFilter.ALL);
}
} else {
if (currentValue == ReadFilter.ALL) {
listener.readFilterChanged(ReadFilter.UNREAD);
}
@OnClick(R.id.radio_all) void selectAll() {
if (currentValue != ReadFilter.ALL) {
((ReadFilterChangedListener) getActivity()).readFilterChanged(ReadFilter.ALL);
}
dismiss();
}
@OnClick(R.id.radio_unread) void selectUnread() {
if (currentValue != ReadFilter.UNREAD) {
((ReadFilterChangedListener) getActivity()).readFilterChanged(ReadFilter.UNREAD);
}
dismiss();
}
}

29
clients/android/NewsBlur/src/com/newsblur/fragment/RegisterProgressFragment.java
View file

@ -14,6 +14,10 @@ import android.widget.ImageView;
import android.widget.Toast;
import android.widget.ViewSwitcher;
import butterknife.ButterKnife;
import butterknife.FindView;
import butterknife.OnClick;
import com.newsblur.R;
import com.newsblur.activity.AddSocial;
import com.newsblur.activity.Login;
@ -28,9 +32,9 @@ public class RegisterProgressFragment extends Fragment {
private String password;
private String email;
private RegisterTask registerTask;
private ViewSwitcher switcher;
private Button next;
private ImageView registerProgressLogo;
@FindView(R.id.register_viewswitcher) ViewSwitcher switcher;
@FindView(R.id.registering_next_1) Button next;
@FindView(R.id.registerprogress_logo) ImageView registerProgressLogo;
public static RegisterProgressFragment getInstance(String username, String password, String email) {
RegisterProgressFragment fragment = new RegisterProgressFragment();
@ -51,19 +55,15 @@ public class RegisterProgressFragment extends Fragment {
username = getArguments().getString("username");
password = getArguments().getString("password");
email = getArguments().getString("email");
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_registerprogress, null);
switcher = (ViewSwitcher) v.findViewById(R.id.register_viewswitcher);
ButterKnife.bind(this, v);
registerProgressLogo = (ImageView) v.findViewById(R.id.registerprogress_logo);
registerProgressLogo.startAnimation(AnimationUtils.loadAnimation(getActivity(), R.anim.rotate));
next = (Button) v.findViewById(R.id.registering_next_1);
if (registerTask != null) {
switcher.showNext();
} else {
@ -71,17 +71,14 @@ public class RegisterProgressFragment extends Fragment {
registerTask.execute();
}
next.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
Intent i = new Intent(getActivity(), AddSocial.class);
startActivity(i);
}
});
return v;
}
@OnClick(R.id.registering_next_1) void next() {
Intent i = new Intent(getActivity(), AddSocial.class);
startActivity(i);
}
private class RegisterTask extends AsyncTask<Void, Void, RegisterResponse> {
@Override

39
clients/android/NewsBlur/src/com/newsblur/fragment/StoryOrderDialogFragment.java
View file

@ -1,25 +1,29 @@
package com.newsblur.fragment;
import android.os.Bundle;
import android.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.RadioButton;
import butterknife.ButterKnife;
import butterknife.FindView;
import butterknife.OnClick;
import com.newsblur.R;
import com.newsblur.util.StoryOrder;
import com.newsblur.util.StoryOrderChangedListener;
public class StoryOrderDialogFragment extends DialogFragment implements OnClickListener {
public class StoryOrderDialogFragment extends DialogFragment {
private static String CURRENT_ORDER = "currentOrder";
private StoryOrder currentValue;
@FindView(R.id.radio_newest) RadioButton newestButton;
@FindView(R.id.radio_oldest) RadioButton oldestButton;
public static StoryOrderDialogFragment newInstance(StoryOrder currentValue) {
StoryOrderDialogFragment dialog = new StoryOrderDialogFragment();
@ -39,11 +43,9 @@ public class StoryOrderDialogFragment extends DialogFragment implements OnClickL
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
currentValue = (StoryOrder) getArguments().getSerializable(CURRENT_ORDER);
View v = inflater.inflate(R.layout.storyorder_dialog, null);
RadioButton newestButton = (RadioButton) v.findViewById(R.id.radio_newest);
newestButton.setOnClickListener(this);
ButterKnife.bind(this, v);
newestButton.setChecked(currentValue == StoryOrder.NEWEST);
RadioButton oldestButton = (RadioButton) v.findViewById(R.id.radio_oldest);
oldestButton.setOnClickListener(this);
oldestButton.setChecked(currentValue == StoryOrder.OLDEST);
getDialog().getWindow().setFlags(WindowManager.LayoutParams.FLAG_DITHER, WindowManager.LayoutParams.FLAG_DITHER);
@ -53,19 +55,18 @@ public class StoryOrderDialogFragment extends DialogFragment implements OnClickL
return v;
}
@Override
public void onClick(View v) {
StoryOrderChangedListener listener = (StoryOrderChangedListener)getActivity();
if (v.getId() == R.id.radio_oldest) {
if (currentValue == StoryOrder.NEWEST) {
listener.storyOrderChanged(StoryOrder.OLDEST);
}
} else {
if (currentValue == StoryOrder.OLDEST) {
listener.storyOrderChanged(StoryOrder.NEWEST);
}
@OnClick(R.id.radio_newest) void selectNewest() {
if (currentValue != StoryOrder.NEWEST) {
((StoryOrderChangedListener) getActivity()).storyOrderChanged(StoryOrder.NEWEST);
}
dismiss();
}
@OnClick(R.id.radio_oldest) void selectOldest() {
if (currentValue != StoryOrder.OLDEST) {
((StoryOrderChangedListener) getActivity()).storyOrderChanged(StoryOrder.OLDEST);
}
dismiss();
}
}