mirror of
https://github.com/wismna/DoNext.git
synced 2025-10-03 15:40:14 -04:00
SonarQube code smells corrections
This commit is contained in:
@@ -23,6 +23,8 @@ import com.wismna.geoffroy.donext.fragments.TaskFormDialogFragment;
|
|||||||
import com.wismna.geoffroy.donext.fragments.TaskListsDialogFragment;
|
import com.wismna.geoffroy.donext.fragments.TaskListsDialogFragment;
|
||||||
import com.wismna.geoffroy.donext.fragments.TasksFragment;
|
import com.wismna.geoffroy.donext.fragments.TasksFragment;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Main Activity class
|
* Main Activity class
|
||||||
*/
|
*/
|
||||||
@@ -80,13 +82,13 @@ public class MainActivity extends AppCompatActivity {
|
|||||||
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
SharedPreferences.Editor editor = sharedPref.edit();
|
SharedPreferences.Editor editor = sharedPref.edit();
|
||||||
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
|
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
|
||||||
int layoutType = Integer.valueOf(layoutTypeString);
|
int layoutType = Integer.parseInt(layoutTypeString);
|
||||||
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
|
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
// Update the ViewPagerAdapter to refresh all tabs
|
// Update the ViewPagerAdapter to refresh all tabs
|
||||||
ViewPager viewPager = getMainFragmentViewPager();
|
ViewPager viewPager = getMainFragmentViewPager();
|
||||||
viewPager.getAdapter().notifyDataSetChanged();
|
Objects.requireNonNull(viewPager.getAdapter()).notifyDataSetChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Called when the user clicks the Edit Lists button */
|
/** Called when the user clicks the Edit Lists button */
|
||||||
|
@@ -75,7 +75,7 @@ public class TodayActivity extends ToolBarActivityBase
|
|||||||
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
|
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
|
||||||
SharedPreferences.Editor editor = sharedPref.edit();
|
SharedPreferences.Editor editor = sharedPref.edit();
|
||||||
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
|
String layoutTypeString = sharedPref.getString("pref_conf_task_layout", "1");
|
||||||
int layoutType = Integer.valueOf(layoutTypeString);
|
int layoutType = Integer.parseInt(layoutTypeString);
|
||||||
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
|
editor.putString("pref_conf_task_layout", String.valueOf(layoutType % 2 + 1));
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
|
@@ -21,7 +21,7 @@ import java.util.List;
|
|||||||
* {@link RecyclerView.Adapter} that can display a {@link TaskList}.
|
* {@link RecyclerView.Adapter} that can display a {@link TaskList}.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRecyclerViewAdapter.ViewHolder>
|
public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRecyclerViewAdapter.TaskViewHolder>
|
||||||
implements TaskListTouchHelper.TaskListTouchHelperAdapter {
|
implements TaskListTouchHelper.TaskListTouchHelperAdapter {
|
||||||
|
|
||||||
public interface TaskListRecyclerViewAdapterListener {
|
public interface TaskListRecyclerViewAdapterListener {
|
||||||
@@ -41,14 +41,14 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
public TaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||||
View view = LayoutInflater.from(parent.getContext())
|
View view = LayoutInflater.from(parent.getContext())
|
||||||
.inflate(R.layout.fragment_tasklist, parent, false);
|
.inflate(R.layout.fragment_tasklist, parent, false);
|
||||||
return new ViewHolder(view);
|
return new TaskViewHolder(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBindViewHolder(final ViewHolder holder, int position) {
|
public void onBindViewHolder(final TaskViewHolder holder, int position) {
|
||||||
holder.mItem = mValues.get(position);
|
holder.mItem = mValues.get(position);
|
||||||
holder.mTaskCountView.setText(String.valueOf(mValues.get(position).getTaskCount()));
|
holder.mTaskCountView.setText(String.valueOf(mValues.get(position).getTaskCount()));
|
||||||
holder.mTaskNameView.setText(mValues.get(position).getName());
|
holder.mTaskNameView.setText(mValues.get(position).getName());
|
||||||
@@ -134,7 +134,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
class ViewHolder extends RecyclerView.ViewHolder {
|
class TaskViewHolder extends RecyclerView.ViewHolder {
|
||||||
final View mView;
|
final View mView;
|
||||||
final ImageView handleView;
|
final ImageView handleView;
|
||||||
final TextView mTaskCountView;
|
final TextView mTaskCountView;
|
||||||
@@ -142,7 +142,7 @@ public class TaskListRecyclerViewAdapter extends RecyclerView.Adapter<TaskListRe
|
|||||||
final Button mTaskDeleteButton;
|
final Button mTaskDeleteButton;
|
||||||
TaskList mItem;
|
TaskList mItem;
|
||||||
|
|
||||||
ViewHolder(View view) {
|
TaskViewHolder(View view) {
|
||||||
super(view);
|
super(view);
|
||||||
mView = view;
|
mView = view;
|
||||||
handleView = itemView.findViewById(R.id.handle);
|
handleView = itemView.findViewById(R.id.handle);
|
||||||
|
@@ -2,6 +2,7 @@ package com.wismna.geoffroy.donext.adapters;
|
|||||||
|
|
||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.graphics.Typeface;
|
import android.graphics.Typeface;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v7.widget.RecyclerView;
|
import android.support.v7.widget.RecyclerView;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
@@ -32,25 +33,25 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
|
|||||||
this.viewType = viewType;
|
this.viewType = viewType;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
@Override
|
@Override
|
||||||
public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
|
||||||
View view;
|
View view;
|
||||||
switch (viewType)
|
switch (viewType)
|
||||||
{
|
{
|
||||||
case 1:
|
|
||||||
view = LayoutInflater.from(parent.getContext())
|
|
||||||
.inflate(R.layout.fragment_task_simple, parent, false);
|
|
||||||
return new SimpleViewHolder(view);
|
|
||||||
case 2:
|
case 2:
|
||||||
view = LayoutInflater.from(parent.getContext())
|
view = LayoutInflater.from(parent.getContext())
|
||||||
.inflate(R.layout.fragment_task_detailed, parent, false);
|
.inflate(R.layout.fragment_task_detailed, parent, false);
|
||||||
return new DetailedViewHolder(view);
|
return new DetailedViewHolder(view);
|
||||||
|
default:
|
||||||
|
view = LayoutInflater.from(parent.getContext())
|
||||||
|
.inflate(R.layout.fragment_task_simple, parent, false);
|
||||||
|
return new SimpleViewHolder(view);
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onBindViewHolder(final SimpleViewHolder holder, int position) {
|
public void onBindViewHolder(@NonNull final SimpleViewHolder holder, int position) {
|
||||||
// Set basic information
|
// Set basic information
|
||||||
holder.mItem = mValues.get(position);
|
holder.mItem = mValues.get(position);
|
||||||
holder.mIdView.setText(String.valueOf(holder.mItem.getId()));
|
holder.mIdView.setText(String.valueOf(holder.mItem.getId()));
|
||||||
@@ -84,6 +85,9 @@ public class TaskRecyclerViewAdapter extends RecyclerView.Adapter<TaskRecyclerVi
|
|||||||
case 2:
|
case 2:
|
||||||
holder.mTitleView.setTypeface(holder.mTitleView.getTypeface(), Typeface.BOLD);
|
holder.mTitleView.setTypeface(holder.mTitleView.getTypeface(), Typeface.BOLD);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
// No special styles to apply
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -25,7 +25,7 @@ public class TaskDataAccess implements AutoCloseable {
|
|||||||
|
|
||||||
private SQLiteDatabase database;
|
private SQLiteDatabase database;
|
||||||
private final DatabaseHelper dbHelper;
|
private final DatabaseHelper dbHelper;
|
||||||
private final String[] taskColumns = {
|
private final static String[] taskColumns = {
|
||||||
DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKS_COLUMN_NAME,
|
DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKS_COLUMN_NAME,
|
||||||
DatabaseHelper.TASKS_COLUMN_DESC, DatabaseHelper.TASKS_COLUMN_PRIORITY,
|
DatabaseHelper.TASKS_COLUMN_DESC, DatabaseHelper.TASKS_COLUMN_PRIORITY,
|
||||||
DatabaseHelper.TASKS_COLUMN_CYCLE, DatabaseHelper.TASKS_COLUMN_DONE,
|
DatabaseHelper.TASKS_COLUMN_CYCLE, DatabaseHelper.TASKS_COLUMN_DONE,
|
||||||
@@ -40,7 +40,7 @@ public class TaskDataAccess implements AutoCloseable {
|
|||||||
open(writeMode);
|
open(writeMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void open(MODE writeMode) throws SQLException {
|
private void open(MODE writeMode) {
|
||||||
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
|
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
|
||||||
else database = dbHelper.getReadableDatabase();
|
else database = dbHelper.getReadableDatabase();
|
||||||
}
|
}
|
||||||
|
@@ -23,7 +23,7 @@ public class TaskListDataAccess implements AutoCloseable {
|
|||||||
// Database fields
|
// Database fields
|
||||||
private SQLiteDatabase database;
|
private SQLiteDatabase database;
|
||||||
private final DatabaseHelper dbHelper;
|
private final DatabaseHelper dbHelper;
|
||||||
private final String[] taskListColumns =
|
private final static String[] taskListColumns =
|
||||||
{DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKLIST_COLUMN_NAME,
|
{DatabaseHelper.COLUMN_ID, DatabaseHelper.TASKLIST_COLUMN_NAME,
|
||||||
DatabaseHelper.COLUMN_ORDER, DatabaseHelper.TASKLIST_COLUMN_VISIBLE};
|
DatabaseHelper.COLUMN_ORDER, DatabaseHelper.TASKLIST_COLUMN_VISIBLE};
|
||||||
|
|
||||||
@@ -35,7 +35,7 @@ public class TaskListDataAccess implements AutoCloseable {
|
|||||||
open(writeMode);
|
open(writeMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void open(MODE writeMode) throws SQLException {
|
public void open(MODE writeMode) {
|
||||||
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
|
if (writeMode == MODE.WRITE) database = dbHelper.getWritableDatabase();
|
||||||
else database = dbHelper.getReadableDatabase();
|
else database = dbHelper.getReadableDatabase();
|
||||||
}
|
}
|
||||||
|
@@ -22,11 +22,9 @@ public class ConfirmDialogFragment extends DialogFragment {
|
|||||||
NO
|
NO
|
||||||
}
|
}
|
||||||
private ConfirmDialogListener confirmDialogListener;
|
private ConfirmDialogListener confirmDialogListener;
|
||||||
//private String message;
|
|
||||||
|
|
||||||
public static ConfirmDialogFragment newInstance(/*String message, */ConfirmDialogListener confirmDialogListener) {
|
public static ConfirmDialogFragment newInstance(ConfirmDialogListener confirmDialogListener) {
|
||||||
ConfirmDialogFragment fragment = new ConfirmDialogFragment();
|
ConfirmDialogFragment fragment = new ConfirmDialogFragment();
|
||||||
//fragment.message = message;
|
|
||||||
fragment.confirmDialogListener = confirmDialogListener;
|
fragment.confirmDialogListener = confirmDialogListener;
|
||||||
fragment.setRetainInstance(true);
|
fragment.setRetainInstance(true);
|
||||||
return fragment;
|
return fragment;
|
||||||
|
Reference in New Issue
Block a user