Skip to content

Commit f9ed96d

Browse files
author
Arnav Gupta
committed
optimize imports
1 parent 9fa64ba commit f9ed96d

File tree

7 files changed

+53
-73
lines changed

7 files changed

+53
-73
lines changed

‎App/src/main/java/in/ac/dtu/subtlenews/InstapaperViewer.java‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,25 @@
2020

2121
package in.ac.dtu.subtlenews;
2222

23-
import in.ac.dtu.subtlenews.util.SystemUiHider;
24-
2523
import android.annotation.SuppressLint;
2624
import android.annotation.TargetApi;
2725
import android.app.Activity;
28-
import android.content.DialogInterface;
29-
import android.content.Intent;
3026
import android.os.Build;
3127
import android.os.Bundle;
3228
import android.os.Handler;
29+
import android.support.v4.app.NavUtils;
30+
import android.view.MenuItem;
3331
import android.view.MotionEvent;
3432
import android.view.View;
35-
import android.view.MenuItem;
36-
import android.support.v4.app.NavUtils;
3733
import android.webkit.WebChromeClient;
3834
import android.webkit.WebView;
3935
import android.widget.Button;
40-
import android.widget.FrameLayout;
41-
import android.widget.LinearLayout;
4236
import android.widget.ProgressBar;
4337

44-
import org.json.JSONException;
45-
import org.json.JSONObject;
46-
4738
import java.util.ArrayList;
4839

40+
import in.ac.dtu.subtlenews.util.SystemUiHider;
41+
4942
/**
5043
* An example full-screen activity that shows and hides the system UI (i.e.
5144
* status bar and navigation/system bar) with user interaction.
@@ -110,14 +103,13 @@ protected void onCreate(Bundle savedInstanceState) {
110103
progressBar = (ProgressBar) findViewById(R.id.progressBar);
111104

112105
instapaperView.setWebChromeClient(new WebChromeClient() {
113-
public void onProgressChanged(WebView view, int progress)
114-
{
115-
if(progress < 100 && progressBar.getVisibility() == ProgressBar.GONE){
106+
public void onProgressChanged(WebView view, int progress) {
107+
if (progress < 100 && progressBar.getVisibility() == ProgressBar.GONE) {
116108
progressBar.setVisibility(ProgressBar.VISIBLE);
117109
//txtview.setVisibility(View.VISIBLE);
118110
}
119111
progressBar.setProgress(progress);
120-
if(progress == 100) {
112+
if (progress == 100) {
121113
progressBar.setVisibility(ProgressBar.GONE);
122114
//txtview.setVisibility(View.GONE);
123115
}
@@ -172,7 +164,6 @@ public void onVisibilityChange(boolean visible) {
172164
}
173165

174166

175-
176167
}
177168
});
178169

@@ -246,7 +237,6 @@ private void setupActionBar() {
246237
getActionBar().setDisplayHomeAsUpEnabled(true);
247238
}
248239
}*/
249-
250240
@Override
251241
public boolean onOptionsItemSelected(MenuItem item) {
252242
int id = item.getItemId();

‎App/src/main/java/in/ac/dtu/subtlenews/MainActivity.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
package in.ac.dtu.subtlenews;
2222

23-
import android.app.Activity;
2423
import android.content.Intent;
2524
import android.content.SharedPreferences;
2625
import android.os.Bundle;
@@ -30,13 +29,11 @@
3029
import android.support.v4.widget.DrawerLayout;
3130
import android.support.v7.app.ActionBar;
3231
import android.support.v7.app.ActionBarActivity;
33-
import android.text.Layout;
3432
import android.view.Menu;
3533
import android.view.MenuItem;
3634
import android.view.View;
3735
import android.view.Window;
3836
import android.widget.ImageView;
39-
import android.widget.RelativeLayout;
4037
import android.widget.Toast;
4138

4239
public class MainActivity extends ActionBarActivity
@@ -62,13 +59,13 @@ protected void onCreate(Bundle savedInstanceState) {
6259
final ImageView splashScreen = (ImageView) findViewById(R.id.splashScreen);
6360

6461

65-
new CountDownTimer(3000, 1000)
66-
{
62+
new CountDownTimer(3000, 1000) {
6763
@Override
6864
public void onTick(long millisUntilFinished) {
6965
splashScreen.bringToFront();
7066

7167
}
68+
7269
@Override
7370
public void onFinish() {
7471
splashScreen.setVisibility(View.INVISIBLE);
@@ -92,7 +89,7 @@ public void onFinish() {
9289
SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0);
9390
boolean mainRun = settings.getBoolean("MainRun", false);
9491

95-
if(!mainRun){
92+
if (!mainRun) {
9693

9794
//Try to read shared prefs if they exist (most possibly they won't) else 3 hours is default
9895
SharedPreferences defaultPrefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -170,9 +167,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
170167
// automatically handle clicks on the Home/Up button, so long
171168
// as you specify a parent activity in AndroidManifest.xml.
172169
int id = item.getItemId();
173-
switch (id){
170+
switch (id) {
174171
case R.id.action_refresh:
175-
if(Utils.isNetworkConnected(MainActivity.this)){
172+
if (Utils.isNetworkConnected(MainActivity.this)) {
176173
new UpdateNews(MainActivity.this, false).execute();
177174
MainFragment mainFragment = (MainFragment) getSupportFragmentManager().findFragmentById(R.id.container);
178175
mainFragment.updateView();

‎App/src/main/java/in/ac/dtu/subtlenews/MainFragment.java‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import android.net.Uri;
3131
import android.os.AsyncTask;
3232
import android.os.Bundle;
33-
import android.speech.tts.TextToSpeech;
3433
import android.support.v4.app.Fragment;
3534
import android.util.Log;
3635
import android.view.Gravity;
@@ -66,7 +65,7 @@ public class MainFragment extends Fragment {
6665
private static final String ARG_SECTION_NUMBER = "section_number";
6766
private static final String TAG = "MAIN_FRAGMENT";
6867

69-
private int sNumber ;
68+
private int sNumber;
7069
public ArrayList<String> urlArray = new ArrayList<String>();
7170

7271
View rootView;
@@ -114,12 +113,11 @@ public void onAttach(Activity activity) {
114113
private static final String TAG_LINK = "link";
115114
private static final String TAG_DATE = "date";
116115

117-
public void updateView(){
116+
public void updateView() {
118117
new ReadFromJSON().execute();
119118
}
120119

121120

122-
123121
private class ReadFromJSON extends AsyncTask<Void, Void, ArrayList<JSONObject>> {
124122

125123
@Override
@@ -129,12 +127,12 @@ protected ArrayList<JSONObject> doInBackground(Void... v) {
129127

130128
try {
131129
//Log.d(TAG, getActivity().getFilesDir() + "data.json");
132-
File cacheFile = new File(getActivity().getFilesDir() , "data.json");
130+
File cacheFile = new File(getActivity().getFilesDir(), "data.json");
133131

134132
BufferedReader br = new BufferedReader(new FileReader(cacheFile));
135133
jsonString = br.readLine();
136134

137-
} catch (Exception e){
135+
} catch (Exception e) {
138136
e.printStackTrace();
139137
if (Utils.isNetworkConnected(getActivity())) {
140138
new UpdateNews(getActivity(), true).execute();
@@ -151,17 +149,17 @@ protected ArrayList<JSONObject> doInBackground(Void... v) {
151149
JSONObject mJSONObject = new JSONObject(jsonString);
152150
JSONArray jsonArray = mJSONObject.getJSONArray(NEWSFEED_NAME);
153151

154-
for(int i = 1; i < jsonArray.length(); ++i){
152+
for (int i = 1; i < jsonArray.length(); ++i) {
155153
JSONObject obj = jsonArray.getJSONObject(i);
156154

157-
if(obj.getString(TAG_CATEGORY).equals(Utils.categoryMap[sNumber - 1])){
155+
if (obj.getString(TAG_CATEGORY).equals(Utils.categoryMap[sNumber - 1])) {
158156
selectedCategoryList.add(obj);
159157
urlArray.add(obj.getString(TAG_LINK));
160158
}
161159

162160
}
163161

164-
} catch (Exception e){
162+
} catch (Exception e) {
165163
e.printStackTrace();
166164
}
167165

@@ -174,7 +172,7 @@ protected ArrayList<JSONObject> doInBackground(Void... v) {
174172
Set onItemClickListener on the listview which will display the summary of the news.
175173
*/
176174

177-
protected void onPostExecute(ArrayList<JSONObject> mArrayList){
175+
protected void onPostExecute(ArrayList<JSONObject> mArrayList) {
178176

179177
final ArrayList<JSONObject> fArrayList = mArrayList;
180178

@@ -239,8 +237,8 @@ public void onClick(DialogInterface dialog, int id) {
239237
summaryText.setTextSize(12);
240238
try {
241239
summaryText.setTextIsSelectable(true);
242-
} catch ( Exception e ) {
243-
Log.d (TAG, "text could not be set selectable. possible below android v3.0");
240+
} catch (Exception e) {
241+
Log.d(TAG, "text could not be set selectable. possible below android v3.0");
244242
}
245243

246244
} catch (JSONException e) {
@@ -256,7 +254,7 @@ private class ListViewLoader extends BaseAdapter {
256254

257255
private ArrayList<JSONObject> selectedCategoryList;
258256

259-
public ListViewLoader( ArrayList<JSONObject> selectedCategoryList ){
257+
public ListViewLoader(ArrayList<JSONObject> selectedCategoryList) {
260258

261259
this.selectedCategoryList = selectedCategoryList;
262260
}
@@ -285,7 +283,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
285283

286284
View rowView;
287285

288-
if(convertView == null){
286+
if (convertView == null) {
289287
LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
290288
rowView = inflater.inflate(R.layout.row_list, null);
291289
} else {
@@ -297,7 +295,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
297295
TextView sourceName = (TextView) rowView.findViewById(R.id.source_news);
298296
TextView newsDate = (TextView) rowView.findViewById(R.id.date_news);
299297
newsItem.setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
300-
newsItem.setPadding(5,10,5,10);
298+
newsItem.setPadding(5, 10, 5, 10);
301299
sourceName.setTextColor(Color.GRAY);
302300
sourceName.setTextSize(10);
303301
newsDate.setTextColor(Color.GRAY);
@@ -306,7 +304,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
306304
newsTitle.setText(selectedCategoryList.get(position).getString(TAG_TITLE));
307305
sourceName.setText(selectedCategoryList.get(position).getString(TAG_SOURCE));
308306
newsDate.setText(selectedCategoryList.get(position).getString(TAG_DATE));
309-
} catch (Exception e){
307+
} catch (Exception e) {
310308
e.printStackTrace();
311309
}
312310

‎App/src/main/java/in/ac/dtu/subtlenews/NavigationDrawerFragment.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@
2020

2121
package in.ac.dtu.subtlenews;
2222

23-
import android.content.Context;
24-
import android.graphics.Color;
25-
import android.support.v7.app.ActionBarActivity;
2623
import android.app.Activity;
27-
import android.support.v7.app.ActionBar;
28-
import android.support.v4.app.Fragment;
29-
import android.support.v4.app.ActionBarDrawerToggle;
30-
import android.support.v4.view.GravityCompat;
31-
import android.support.v4.widget.DrawerLayout;
24+
import android.content.Context;
3225
import android.content.SharedPreferences;
3326
import android.content.res.Configuration;
3427
import android.os.Bundle;
3528
import android.preference.PreferenceManager;
29+
import android.support.v4.app.ActionBarDrawerToggle;
30+
import android.support.v4.app.Fragment;
31+
import android.support.v4.view.GravityCompat;
32+
import android.support.v4.widget.DrawerLayout;
33+
import android.support.v7.app.ActionBar;
34+
import android.support.v7.app.ActionBarActivity;
3635
import android.view.LayoutInflater;
3736
import android.view.Menu;
3837
import android.view.MenuInflater;
@@ -105,15 +104,15 @@ public void onCreate(Bundle savedInstanceState) {
105104
}
106105

107106
@Override
108-
public void onActivityCreated (Bundle savedInstanceState) {
107+
public void onActivityCreated(Bundle savedInstanceState) {
109108
super.onActivityCreated(savedInstanceState);
110109
// Indicate that this fragment would like to influence the set of actions in the action bar.
111110
setHasOptionsMenu(true);
112111
}
113112

114113
@Override
115114
public View onCreateView(LayoutInflater inflater, ViewGroup container,
116-
Bundle savedInstanceState) {
115+
Bundle savedInstanceState) {
117116
mDrawerListView = (ListView) inflater.inflate(
118117
R.layout.fragment_navigation_drawer, container, false);
119118
mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -296,7 +295,7 @@ private class NavigationDrawerAdapter extends BaseAdapter {
296295

297296
String[] mCategoryMap;
298297

299-
public NavigationDrawerAdapter( String[] mCategoryMap ){
298+
public NavigationDrawerAdapter(String[] mCategoryMap) {
300299

301300
this.mCategoryMap = mCategoryMap;
302301
}
@@ -324,7 +323,7 @@ public View getView(int pos, View convertView, ViewGroup parent) {
324323

325324
View rowView;
326325

327-
if(convertView == null){
326+
if (convertView == null) {
328327
LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
329328
rowView = inflater.inflate(R.layout.row_navigation_drawer, null);
330329
} else {
@@ -345,8 +344,7 @@ public View getView(int pos, View convertView, ViewGroup parent) {
345344
} else if (s.equals("India")) {
346345
navigationIcon.setBackgroundResource(R.drawable.india_b);
347346

348-
}
349-
else if (s.equals("Entertainment")) {
347+
} else if (s.equals("Entertainment")) {
350348
navigationIcon.setBackgroundResource(R.drawable.entertainment_b);
351349

352350
} else if (s.equals("Technology")) {

‎App/src/main/java/in/ac/dtu/subtlenews/NewsAutoRefresh.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import android.content.BroadcastReceiver;
2626
import android.content.Context;
2727
import android.content.Intent;
28-
import android.os.Bundle;
29-
import android.util.Log;
3028

3129
import java.util.Calendar;
3230

@@ -36,12 +34,13 @@
3634
public class NewsAutoRefresh extends BroadcastReceiver {
3735

3836
//The default constructor
39-
public NewsAutoRefresh() {}
37+
public NewsAutoRefresh() {
38+
}
4039

4140
//This constructor is called by the MainActivity
42-
public NewsAutoRefresh(Context context, int timeoutInSeconds, int interval){
41+
public NewsAutoRefresh(Context context, int timeoutInSeconds, int interval) {
4342
AlarmManager alarmMgr =
44-
(AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
43+
(AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
4544
Intent intent = new Intent(context, NewsAutoRefresh.class);
4645
PendingIntent pendingIntent =
4746
PendingIntent.getBroadcast(context, 0, intent,
@@ -58,7 +57,7 @@ public NewsAutoRefresh(Context context, int timeoutInSeconds, int interval){
5857
@Override
5958
public void onReceive(Context context, Intent intent) {
6059

61-
if(Utils.isNetworkConnected(context)){
60+
if (Utils.isNetworkConnected(context)) {
6261
new UpdateNews(context, true).execute();
6362
}
6463
}

0 commit comments

Comments
 (0)