From 52559491bd6b7da0c1a6e84a878d9d25a064b0a0 Mon Sep 17 00:00:00 2001 From: Prerak Mann Date: Sun, 11 Apr 2021 19:34:43 +0530 Subject: [PATCH] Fix warnings --- .idea/caches/build_file_checksums.ser | Bin 540 -> 540 bytes app/src/main/AndroidManifest.xml | 2 + .../pkmnapps/activitydo/ActivityChoser.java | 8 +-- .../com/pkmnapps/activitydo/HomeFragment.java | 26 +++++----- .../activitydo/ImageViewFullscreen.java | 6 +-- .../com/pkmnapps/activitydo/ListActivity.java | 11 ++-- .../com/pkmnapps/activitydo/MConstants.java | 2 +- .../com/pkmnapps/activitydo/MainActivity.java | 17 +++---- .../com/pkmnapps/activitydo/NoteActivity.java | 14 +++--- .../activitydo/QuickNotesFragment.java | 47 ++++++++---------- .../com/pkmnapps/activitydo/TabFragment.java | 13 ++--- .../com/pkmnapps/activitydo/TaskActivity.java | 28 ++++++----- .../activitydo/adapters/ActivityAdapter.java | 22 ++++---- .../adapters/ActivityContentAdapter.java | 46 ++++++++--------- .../adapters/ColorThemeAdapter.java | 4 +- .../adapters/InViewListAdapter.java | 14 +++--- .../activitydo/adapters/ListAdapter.java | 25 ++++------ .../adapters/SimpleActivityAdapter.java | 24 ++++----- .../contentproviders/ImageProvider.java | 1 + .../activitydo/databasehelpers/DBHelper.java | 3 +- .../databasehelpers/DBHelperImage.java | 7 +-- .../databasehelpers/DBHelperList.java | 3 +- .../databasehelpers/DBHelperListItems.java | 1 - .../databasehelpers/DBHelperText.java | 2 +- .../databasehelpers/DBHelperWidgets.java | 3 +- .../activitydo/dataclasses/ActivityData.java | 5 -- .../activitydo/dataclasses/Widget.java | 8 +-- app/src/main/res/layout/content_list.xml | 2 - app/src/main/res/layout/content_note.xml | 4 +- .../res/layout/recycler_list_in_task_view.xml | 4 +- app/src/main/res/layout/simple_note_view.xml | 4 +- app/src/main/res/menu/main.xml | 3 +- app/src/main/res/menu/menu_task_activity.xml | 3 +- app/src/main/res/menu/widget_menu.xml | 3 +- app/src/main/res/xml/file_paths.xml | 2 +- 35 files changed, 168 insertions(+), 199 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index fa3a2f7660a85cf85bec708a64dfa09d38414bd4..cc25d993a4044889654f38130616dfa21b704c80 100644 GIT binary patch delta 16 YcmbQkGKXctbk>T4YCNJF=QJ<^05Qu2y8r+H delta 16 YcmbQkGKXctbk?%Dn>@QW&S_u-05~ZI)Bpeg diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b55b584..038073e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,8 @@ + + diff --git a/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java index 31c00bf..6bcf219 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class ActivityChoser extends AppCompatActivity implements ChangeActivityInterface{ RecyclerView recyclerView; @@ -32,9 +33,9 @@ public class ActivityChoser extends AppCompatActivity implements ChangeActivityI protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_choser); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); int action = getIntent().getIntExtra("action",-1); @@ -57,6 +58,7 @@ protected void onCreate(Bundle savedInstanceState) { } @Override public boolean onOptionsItemSelected(MenuItem item) { + //noinspection SwitchStatementWithTooFewBranches switch (item.getItemId()) { case android.R.id.home: // app icon in action bar clicked; goto parent activity. @@ -67,7 +69,7 @@ public boolean onOptionsItemSelected(MenuItem item) { } } private void initialiseRecyclerview(){ - recyclerView = (RecyclerView)findViewById(R.id.recycler_view); + recyclerView = findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(this,LinearLayoutManager.VERTICAL,false); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); diff --git a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java index d20cb9f..5b0a417 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Random; @@ -55,10 +56,6 @@ public class HomeFragment extends Fragment implements HomeFragInterace{ private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - private OnFragmentInteractionListener mListener; public HomeFragment() { @@ -87,8 +84,9 @@ public static HomeFragment newInstance(String param1, String param2) { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); + // TODO: Rename and change types of parameters + String mParam1 = getArguments().getString(ARG_PARAM1); + String mParam2 = getArguments().getString(ARG_PARAM2); } } @@ -98,12 +96,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, // Inflate the layout for this fragment view = inflater.inflate(R.layout.fragment_home, container, false); - getActivity().setTitle("Home"); + Objects.requireNonNull(getActivity()).setTitle("Home"); activityDataList = new ArrayList<>(); activityAdapter = new ActivityAdapter(activityDataList,HomeFragment.this); - recyclerView = (RecyclerView)view.findViewById(R.id.recycler_view); + recyclerView = view.findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(view.getContext()); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -161,7 +159,7 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { ItemTouchHelper itemTouchHelper = new ItemTouchHelper(itcallback); itemTouchHelper.attachToRecyclerView(recyclerView); itemTouchHelperSwipe.attachToRecyclerView(recyclerView); - Button addNewButton = (Button)view.findViewById(R.id.addNewButton); + Button addNewButton = view.findViewById(R.id.addNewButton); addNewButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(final View v) { @@ -173,7 +171,7 @@ public void onClick(final View v) { changeColorTheme(new Random().nextInt(MConstants.colors.length));//gives random number from 0 to max(excluding) - final RecyclerView recyclerView = (RecyclerView)dialogView.findViewById(R.id.recycler_view); + final RecyclerView recyclerView = dialogView.findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(view.getContext(),LinearLayoutManager.HORIZONTAL,false); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -186,7 +184,7 @@ public void onClick(final View v) { public void onClick(DialogInterface dialog, int which) { String id,name,color; //add to list - EditText nameEdiText = (EditText)dialogView.findViewById(R.id.nameEditText); + EditText nameEdiText = dialogView.findViewById(R.id.nameEditText); id = String.valueOf(System.currentTimeMillis()); name = nameEdiText.getText().toString(); @@ -270,7 +268,7 @@ public void displayEditDialog(final ActivityData activityData) { changeColorTheme(activityData.getColor()); - RecyclerView recyclerView = (RecyclerView)dialogView.findViewById(R.id.recycler_view); + RecyclerView recyclerView = dialogView.findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(view.getContext(),LinearLayoutManager.HORIZONTAL,false); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -278,7 +276,7 @@ public void displayEditDialog(final ActivityData activityData) { recyclerView.setAdapter(new ColorThemeAdapter(HomeFragment.this)); - final EditText nameEdiText = (EditText)dialogView.findViewById(R.id.nameEditText); + final EditText nameEdiText = dialogView.findViewById(R.id.nameEditText); nameEdiText.setText(activityData.getName()); @@ -350,6 +348,6 @@ private void changeColorTheme(String colorTheme){ } public void updatePinnedMenu(){ - ((MainActivity)getActivity()).menuAddPinned(); + ((MainActivity) Objects.requireNonNull(getActivity())).menuAddPinned(); } } diff --git a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java index c459698..8c20a43 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java @@ -118,7 +118,7 @@ protected void onPostCreate(Bundle savedInstanceState) { // created, to briefly hint to the user that UI controls // are available. if(AUTO_HIDE) - delayedHide(100); + delayedHide(); } private void toggle() { @@ -159,9 +159,9 @@ private void show() { * Schedules a call to hide() in delay milliseconds, canceling any * previously scheduled calls. */ - private void delayedHide(int delayMillis) { + private void delayedHide() { mHideHandler.removeCallbacks(mHideRunnable); - mHideHandler.postDelayed(mHideRunnable, delayMillis); + mHideHandler.postDelayed(mHideRunnable, 100); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java index 0c0e3a8..07cdb93 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/ListActivity.java @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class ListActivity extends AppCompatActivity implements ListActivityInterface { String lid,head;//lid is recieved @@ -40,20 +41,20 @@ public class ListActivity extends AppCompatActivity implements ListActivityInter protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_list); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN); - final TextView addItem = (TextView)findViewById(R.id.addItemTextView); + final TextView addItem = findViewById(R.id.addItemTextView); lid = getIntent().getStringExtra("lid"); head = getIntent().getStringExtra("head"); data = getIntent(); - headE = (EditText)findViewById(R.id.head_editText); + headE = findViewById(R.id.head_editText); headE.setText(head); addItem.setOnClickListener(new View.OnClickListener() { @@ -63,7 +64,7 @@ public void onClick(View v) { newListItem(); } }); - recyclerView = (RecyclerView)findViewById(R.id.recycler_view); + recyclerView = findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(ListActivity.this); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); diff --git a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java index 1303d94..3f12e5d 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/MConstants.java +++ b/app/src/main/java/com/pkmnapps/activitydo/MConstants.java @@ -1,7 +1,7 @@ package com.pkmnapps.activitydo; public class MConstants { - public static String[] colors = {"#3f79b4","#50933c","#afaf41","#af4541","#673a9e"}; + public static final String[] colors = {"#3f79b4","#50933c","#afaf41","#af4541","#673a9e"}; public static String selectColor = "#32000000"; diff --git a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java index 0f5a994..c577509 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/MainActivity.java @@ -36,23 +36,23 @@ public class MainActivity extends AppCompatActivity TabFragment.OnFragmentInteractionListener, HomeFragment.OnFragmentInteractionListener, QuickNotesFragment.OnFragmentInteractionListener -{ private FirebaseAnalytics mFirebaseAnalytics; +{ boolean home = true; NavigationView navigationView; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); receiveIntentForAction(); - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + DrawerLayout drawer = findViewById(R.id.drawer_layout); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); drawer.addDrawerListener(toggle); toggle.syncState(); - navigationView = (NavigationView) findViewById(R.id.nav_view); + navigationView = findViewById(R.id.nav_view); navigationView.setNavigationItemSelectedListener(this); menuAddPinned(); @@ -63,7 +63,7 @@ protected void onCreate(Bundle savedInstanceState) { FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); fragmentTransaction.replace(R.id.fragment_parent_main,new TabFragment(),"back").commit(); - mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + FirebaseAnalytics mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); } private void receiveIntentForAction(){ // Get intent, action and MIME type @@ -94,7 +94,7 @@ void handleRecievedText(Intent intent){ } } void handleRecievedImage(Intent intent){ - Uri imageUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM); + Uri imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM); if (imageUri != null) { String uid = String.valueOf(System.currentTimeMillis()); try { @@ -153,7 +153,7 @@ public boolean onMenuItemClick(MenuItem item) { @Override public void onBackPressed() { - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + DrawerLayout drawer = findViewById(R.id.drawer_layout); if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { @@ -184,7 +184,6 @@ public boolean onOptionsItemSelected(MenuItem item) { return super.onOptionsItemSelected(item); } - @SuppressWarnings("StatementWithEmptyBody") @Override public boolean onNavigationItemSelected(MenuItem item) { FragmentManager fragmentManager = getSupportFragmentManager(); @@ -215,7 +214,7 @@ else if(id==R.id.nav_rate){ startActivity(intent); } - DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); + DrawerLayout drawer = findViewById(R.id.drawer_layout); drawer.closeDrawer(GravityCompat.START); return true; } diff --git a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java index d6acace..741fd6d 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java @@ -14,32 +14,34 @@ import com.google.firebase.analytics.FirebaseAnalytics; import com.pkmnapps.activitydo.databasehelpers.DBHelperText; +import java.util.Objects; + public class NoteActivity extends AppCompatActivity { String uid,head,body; EditText headE,bodyE; Intent data; - private FirebaseAnalytics firebaseAnalytics; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_note); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); uid = getIntent().getStringExtra("uid"); head = getIntent().getStringExtra("head"); body = getIntent().getStringExtra("body"); data = getIntent(); - headE = (EditText)findViewById(R.id.note_head_editText); - bodyE = (EditText)findViewById(R.id.note_body_editText); + headE = findViewById(R.id.note_head_editText); + bodyE = findViewById(R.id.note_body_editText); headE.setText(head); bodyE.setText(body); setResult(Activity.RESULT_OK,data); - firebaseAnalytics = FirebaseAnalytics.getInstance(this); + FirebaseAnalytics firebaseAnalytics = FirebaseAnalytics.getInstance(this); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java index 27d6b1e..3fda089 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/QuickNotesFragment.java @@ -18,7 +18,6 @@ import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import androidx.appcompat.widget.Toolbar; import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; @@ -53,6 +52,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import static com.pkmnapps.activitydo.MConstants.REQUEST_LOAD_IMAGE; import static com.pkmnapps.activitydo.MConstants.REQUEST_STORAGE; @@ -85,10 +85,6 @@ public class QuickNotesFragment extends Fragment implements TaskActivityInterfac private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - private OnFragmentInteractionListener mListener; public QuickNotesFragment() { @@ -117,8 +113,9 @@ public static QuickNotesFragment newInstance(String param1, String param2) { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); + // TODO: Rename and change types of parameters + String mParam1 = getArguments().getString(ARG_PARAM1); + String mParam2 = getArguments().getString(ARG_PARAM2); } } @@ -132,7 +129,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, dbHelperWidgets = new DBHelperWidgets(getContext()); - bottomSheetLayout = (BottomSheetLayout)view.findViewById(R.id.bottomsheet); + bottomSheetLayout = view.findViewById(R.id.bottomsheet); setUpJumpControls(); setUpRecyclerView(); initialiseRecyclerViewData(); @@ -196,7 +193,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d Log.w("n",String.valueOf(requestCode)); Log.w("n",String.valueOf(resultCode)); if (resultCode == Activity.RESULT_OK) { - Uri selectedImage = null; + Uri selectedImage; if (requestCode == REQUEST_LOAD_IMAGE && data != null) { //image from gallery selectedImage = data.getData(); if (selectedImage != null) { @@ -271,28 +268,28 @@ else if(requestCode == MConstants.REQUEST_WIDGET_ACTIVITY_CHANGE && data != null private void setUpJumpControls(){ - TextView takeNote = (TextView)view.findViewById(R.id.note_tvbutton); + TextView takeNote = view.findViewById(R.id.note_tvbutton); takeNote.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { createNote(); } }); - ImageButton more = (ImageButton)view.findViewById(R.id.more_button); + ImageButton more = view.findViewById(R.id.more_button); more.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { displayWidgetChoser(); } }); - ImageButton list = (ImageButton)view.findViewById(R.id.list_button); + ImageButton list = view.findViewById(R.id.list_button); list.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { createList(); } }); - ImageButton image = (ImageButton)view.findViewById(R.id.image_button); + ImageButton image = view.findViewById(R.id.image_button); image.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -305,7 +302,7 @@ public void onClick(View v) { }); } public void setUpRecyclerView(){ - recyclerView = (RecyclerView)view.findViewById(R.id.recycler_view); + recyclerView = view.findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getContext(),LinearLayoutManager.VERTICAL,false); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -423,7 +420,7 @@ public void sortWidgetList(){ public void displayWidgetChoser(){ //show bottomsheet MenuSheetView menuSheetView = - new MenuSheetView(getContext(), MenuSheetView.MenuType.LIST, "Chose widget", new MenuSheetView.OnMenuItemClickListener() { + new MenuSheetView(Objects.requireNonNull(getContext()), MenuSheetView.MenuType.LIST, "Chose widget", new MenuSheetView.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) { if (bottomSheetLayout.isSheetShowing()) { @@ -469,14 +466,14 @@ public void createList() { startActivityForResult(intent,MConstants.REQUEST_NEW_LIST); } public void createImageSheet() { - ImagePickerSheetView sheetView = new ImagePickerSheetView.Builder(getContext()) + ImagePickerSheetView sheetView = new ImagePickerSheetView.Builder(Objects.requireNonNull(getContext())) .setMaxItems(30) .setShowCameraOption(createCameraIntent() != null) .setShowPickerOption(createPickIntent() != null) .setImageProvider(new ImagePickerSheetView.ImageProvider() { @Override public void onProvideImage(ImageView imageView, Uri imageUri, int size) {//feeds image to sheet views - Glide.with(getContext()) + Glide.with(Objects.requireNonNull(getContext())) .load(imageUri) .into(imageView); } @@ -505,11 +502,11 @@ public void onTileSelected(ImagePickerSheetView.ImagePickerTile selectedTile) { } private boolean checkNeedsPermission() { - return ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED; + return ActivityCompat.checkSelfPermission(Objects.requireNonNull(getActivity()), Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED; } private void requestStoragePermission() { - if (ActivityCompat.shouldShowRequestPermissionRationale(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE)) { + if (ActivityCompat.shouldShowRequestPermissionRationale(Objects.requireNonNull(getActivity()), Manifest.permission.WRITE_EXTERNAL_STORAGE)) { ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, REQUEST_STORAGE); } else { // Eh, prompt anyway @@ -534,7 +531,7 @@ private void saveImageAddWidget(Uri selectedImageUri){ if (selectedImageUri != null) { try { File file = createImageFile(); - InputStream input = getContext().getContentResolver().openInputStream(selectedImageUri); + InputStream input = Objects.requireNonNull(getContext()).getContentResolver().openInputStream(selectedImageUri); try (OutputStream output = new FileOutputStream(file)) { byte[] buffer = new byte[4 * 1024]; // or other buffer size int read; @@ -562,12 +559,12 @@ private void saveImageAddWidget(Uri selectedImageUri){ private File createImageFile(String tempUid) { // Create an image file name String imageFileName = tempUid + ".jpg"; - return new File(getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES),imageFileName); + return new File(Objects.requireNonNull(getContext()).getExternalFilesDir(Environment.DIRECTORY_PICTURES),imageFileName); } @Nullable private Intent createPickIntent() { Intent picImageIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); - if (picImageIntent.resolveActivity(getActivity().getPackageManager()) != null) { + if (picImageIntent.resolveActivity(Objects.requireNonNull(getActivity()).getPackageManager()) != null) { return picImageIntent; } else { return null; @@ -576,7 +573,7 @@ private Intent createPickIntent() { @Nullable private Intent createCameraIntent() { Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); - if (takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) { + if (takePictureIntent.resolveActivity(Objects.requireNonNull(getActivity()).getPackageManager()) != null) { return takePictureIntent; } else { return null; @@ -590,7 +587,7 @@ private void dispatchTakePictureIntent() { try { File imageFile = createImageFile(); // Save a file: path for use with ACTION_VIEW intents - cameraImageUri = FileProvider.getUriForFile(getContext(),"com.pkmnapps.activitydo.fileprovider",imageFile); + cameraImageUri = FileProvider.getUriForFile(Objects.requireNonNull(getContext()),"com.pkmnapps.activitydo.fileprovider",imageFile); takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, cameraImageUri); startActivityForResult(takePictureIntent, MConstants.REQUEST_IMAGE_CAPTURE); @@ -612,7 +609,7 @@ private void genericError(String message) { private File createImageFile() { // Create an image file name String imageFileName = tempUid + ".jpg"; - return new File(getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES),imageFileName); + return new File(Objects.requireNonNull(getContext()).getExternalFilesDir(Environment.DIRECTORY_PICTURES),imageFileName); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java b/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java index 0ff4bea..893535d 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TabFragment.java @@ -30,10 +30,6 @@ public class TabFragment extends Fragment { private static final String ARG_PARAM1 = "param1"; private static final String ARG_PARAM2 = "param2"; - // TODO: Rename and change types of parameters - private String mParam1; - private String mParam2; - private OnFragmentInteractionListener mListener; public TabFragment() { @@ -62,8 +58,9 @@ public static TabFragment newInstance(String param1, String param2) { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (getArguments() != null) { - mParam1 = getArguments().getString(ARG_PARAM1); - mParam2 = getArguments().getString(ARG_PARAM2); + // TODO: Rename and change types of parameters + String mParam1 = getArguments().getString(ARG_PARAM1); + String mParam2 = getArguments().getString(ARG_PARAM2); } } @@ -71,10 +68,10 @@ public void onCreate(Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_tab, container, false); - ViewPager viewPager = (ViewPager) view.findViewById(R.id.view_pager); + ViewPager viewPager = view.findViewById(R.id.view_pager); setupViewPager(viewPager); // Set Tabs inside Toolbar - TabLayout tabs = (TabLayout) view.findViewById(R.id.tabLayout); + TabLayout tabs = view.findViewById(R.id.tabLayout); tabs.setupWithViewPager(viewPager); // Inflate the layout for this fragment return view; diff --git a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java index 29170f8..209cc76 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java +++ b/app/src/main/java/com/pkmnapps/activitydo/TaskActivity.java @@ -52,6 +52,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Objects; import static com.pkmnapps.activitydo.MConstants.REQUEST_LOAD_IMAGE; import static com.pkmnapps.activitydo.MConstants.REQUEST_STORAGE; @@ -66,7 +67,7 @@ public class TaskActivity extends AppCompatActivity implements TaskActivityInter Uri cameraImageUri = null; String tempUid; DBHelperWidgets dbHelperWidgets; - private FirebaseAnalytics mFirebaseAnalytics; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -77,18 +78,18 @@ protected void onCreate(Bundle savedInstanceState) { setTheme(colorTheme(activityData.getColor())); setContentView(R.layout.activity_task); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setTitle(activityData.getName()); setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true); dbHelperWidgets = new DBHelperWidgets(TaskActivity.this); - bottomSheetLayout = (BottomSheetLayout)findViewById(R.id.bottomsheet); + bottomSheetLayout = findViewById(R.id.bottomsheet); setUpJumpControls(); setUpRecyclerView(); initialiseRecyclerViewData(); - mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); + FirebaseAnalytics mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); } @Override @@ -99,6 +100,7 @@ public boolean onCreateOptionsMenu(Menu menu) { @Override public boolean onOptionsItemSelected(MenuItem item) { + //noinspection SwitchStatementWithTooFewBranches switch (item.getItemId()) { case android.R.id.home: // app icon in action bar clicked; goto parent activity. @@ -124,7 +126,7 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d Log.w("n",String.valueOf(requestCode)); Log.w("n",String.valueOf(resultCode)); if (resultCode == Activity.RESULT_OK) { - Uri selectedImage = null; + Uri selectedImage; if (requestCode == REQUEST_LOAD_IMAGE && data != null) { //image from gallery selectedImage = data.getData(); if (selectedImage != null) { @@ -197,28 +199,28 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d } private void setUpJumpControls(){ - TextView takeNote = (TextView)findViewById(R.id.note_tvbutton); + TextView takeNote = findViewById(R.id.note_tvbutton); takeNote.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { createNote(); } }); - ImageButton more = (ImageButton)findViewById(R.id.more_button); + ImageButton more = findViewById(R.id.more_button); more.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { displayWidgetChoser(); } }); - ImageButton list = (ImageButton)findViewById(R.id.list_button); + ImageButton list = findViewById(R.id.list_button); list.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { createList(); } }); - ImageButton image = (ImageButton)findViewById(R.id.image_button); + ImageButton image = findViewById(R.id.image_button); image.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -313,7 +315,7 @@ public void sortWidgetList(){ } } public void setUpRecyclerView(){ - recyclerView = (RecyclerView)findViewById(R.id.recycler_view); + recyclerView = findViewById(R.id.recycler_view); RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(TaskActivity.this,LinearLayoutManager.VERTICAL,false); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); @@ -543,8 +545,8 @@ private File createImageFile() { public void createAudio() { currentSheetView = LayoutInflater.from(TaskActivity.this).inflate(R.layout.audio_record_view,bottomSheetLayout,false); bottomSheetLayout.showWithSheetView(currentSheetView); - final ImageButton imageButton = (ImageButton)currentSheetView.findViewById(R.id.recButton); - final TextView textView = (TextView)currentSheetView.findViewById(R.id.recText); + final ImageButton imageButton = currentSheetView.findViewById(R.id.recButton); + final TextView textView = currentSheetView.findViewById(R.id.recText); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java index d61b49c..4a4b5a7 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityAdapter.java @@ -27,20 +27,20 @@ public class ActivityAdapter extends RecyclerView.Adapter { - private List activityDataList; - private HomeFragInterace homeFrag; - public class MyViewHolder extends RecyclerView.ViewHolder { - public TextView name; - public CheckBox pinned; - public ImageButton more; - public ImageView label; + private final List activityDataList; + private final HomeFragInterace homeFrag; + public static class MyViewHolder extends RecyclerView.ViewHolder { + public final TextView name; + public final CheckBox pinned; + public final ImageButton more; + public final ImageView label; public MyViewHolder(View view) { super(view); - name = (TextView)view.findViewById(R.id.nameTextView); - pinned = (CheckBox)view.findViewById(R.id.pinCheckBox); - label = (ImageView) view.findViewById(R.id.colorView); - more = (ImageButton)view.findViewById(R.id.more_button); + name = view.findViewById(R.id.nameTextView); + pinned = view.findViewById(R.id.pinCheckBox); + label = view.findViewById(R.id.colorView); + more = view.findViewById(R.id.more_button); } } diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java index d94328a..acee84e 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ActivityContentAdapter.java @@ -30,43 +30,44 @@ public class ActivityContentAdapter extends RecyclerView.Adapter{ - List widgets; - TaskActivityInterface taskActivityInterface; - public class MyTextViewHolder extends RecyclerView.ViewHolder { - public TextView head,body; - public ImageButton more; + final List widgets; + final TaskActivityInterface taskActivityInterface; + public static class MyTextViewHolder extends RecyclerView.ViewHolder { + public final TextView head; + public final TextView body; + public final ImageButton more; public MyTextViewHolder(View view) { super(view); - head = (TextView)view.findViewById(R.id.head_textView); - body = (TextView)view.findViewById(R.id.body_textView); - more = (ImageButton)view.findViewById(R.id.more_button); + head = view.findViewById(R.id.head_textView); + body = view.findViewById(R.id.body_textView); + more = view.findViewById(R.id.more_button); } } - public class MyListViewHolder extends RecyclerView.ViewHolder { - public TextView head; - public RecyclerView recyclerView; - public ImageButton more; + public static class MyListViewHolder extends RecyclerView.ViewHolder { + public final TextView head; + public final RecyclerView recyclerView; + public final ImageButton more; public MyListViewHolder(View view) { super(view); - head = (TextView)view.findViewById(R.id.head_textView); - recyclerView = (RecyclerView)view.findViewById(R.id.recycler_view); - more = (ImageButton)view.findViewById(R.id.more_button); + head = view.findViewById(R.id.head_textView); + recyclerView = view.findViewById(R.id.recycler_view); + more = view.findViewById(R.id.more_button); } } - public class MyImageViewHolder extends RecyclerView.ViewHolder { - public ImageView imageView; - public ImageButton more; + public static class MyImageViewHolder extends RecyclerView.ViewHolder { + public final ImageView imageView; + public final ImageButton more; public MyImageViewHolder(View view) { super(view); - imageView = (ImageView)view.findViewById(R.id.widget_imageView); - more = (ImageButton)view.findViewById(R.id.more_button); + imageView = view.findViewById(R.id.widget_imageView); + more = view.findViewById(R.id.more_button); } } - public class MyAudioViewHolder extends RecyclerView.ViewHolder { + public static class MyAudioViewHolder extends RecyclerView.ViewHolder { public MyAudioViewHolder(View view) { super(view); @@ -94,7 +95,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int v = LayoutInflater.from(parent.getContext()).inflate(R.layout.image_widget_view, parent, false); return new MyImageViewHolder(v); case MConstants.audioW: - return null; default: return null; } @@ -147,7 +147,7 @@ else if(item.getItemId()==R.id.action_change_activity){ ((MyListViewHolder)holder).recyclerView .setAdapter(new InViewListAdapter(new DBHelperListItems(((MyListViewHolder)holder).itemView.getContext()) .get8ListItemsAsList(l.getUid()))); - ((MyListViewHolder)holder).recyclerView.setLayoutFrozen(true); + ((MyListViewHolder)holder).recyclerView.suppressLayout(true); ((MyListViewHolder)holder).itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java index 9b9c493..7e84821 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ColorThemeAdapter.java @@ -14,9 +14,9 @@ public class ColorThemeAdapter extends RecyclerView.Adapter { - HomeFragInterace homeFragInterace; + final HomeFragInterace homeFragInterace; - public class MyViewHolder extends RecyclerView.ViewHolder { + public static class MyViewHolder extends RecyclerView.ViewHolder { public MyViewHolder(View view) { super(view); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java index b2cbff6..7add469 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/InViewListAdapter.java @@ -15,15 +15,15 @@ public class InViewListAdapter extends RecyclerView.Adapter { - private List listItems; + private final List listItems; - public class MyViewHolder extends RecyclerView.ViewHolder { - public CheckBox checkBox; - public TextView textView; + public static class MyViewHolder extends RecyclerView.ViewHolder { + public final CheckBox checkBox; + public final TextView textView; public MyViewHolder(View view) { super(view); - checkBox = (CheckBox)view.findViewById(R.id.checkBox); - textView = (TextView)view.findViewById(R.id.contentTextView); + checkBox = view.findViewById(R.id.checkBox); + textView = view.findViewById(R.id.contentTextView); } } @@ -37,7 +37,7 @@ public InViewListAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup pare View itemView = LayoutInflater.from(parent.getContext()) .inflate(R.layout.recycler_in_view_list_view, parent, false); - return new InViewListAdapter.MyViewHolder(itemView); + return new MyViewHolder(itemView); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java index 619df73..b984b2a 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/ListAdapter.java @@ -20,18 +20,18 @@ public class ListAdapter extends RecyclerView.Adapter { - private List listItems; - ListActivityInterface listActivityInterface; + private final List listItems; + final ListActivityInterface listActivityInterface; - public class MyViewHolder extends RecyclerView.ViewHolder { - public EditText content; - public CheckBox checked; - public ImageButton delete; + public static class MyViewHolder extends RecyclerView.ViewHolder { + public final EditText content; + public final CheckBox checked; + public final ImageButton delete; public MyViewHolder(View view) { super(view); - content = (EditText) view.findViewById(R.id.contentEditText); - checked = (CheckBox)view.findViewById(R.id.checkbox); - delete = (ImageButton)view.findViewById(R.id.deleteButton); + content = view.findViewById(R.id.contentEditText); + checked = view.findViewById(R.id.checkbox); + delete = view.findViewById(R.id.deleteButton); } } @@ -46,7 +46,7 @@ public ListAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, in View itemView = LayoutInflater.from(parent.getContext()) .inflate(R.layout.recycler_listitem_layout, parent, false); - return new ListAdapter.MyViewHolder(itemView); + return new MyViewHolder(itemView); } @Override @@ -58,10 +58,7 @@ public void onBindViewHolder(@NonNull final ListAdapter.MyViewHolder holder, fin holder.checked.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if(holder.checked.isChecked()) - listItem.setChecked(true); - else - listItem.setChecked(false); + listItem.setChecked(holder.checked.isChecked()); } }); holder.delete.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java index c5e81d2..522f693 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java +++ b/app/src/main/java/com/pkmnapps/activitydo/adapters/SimpleActivityAdapter.java @@ -21,20 +21,20 @@ public class SimpleActivityAdapter extends RecyclerView.Adapter { - private List activityDataList; - private ChangeActivityInterface changeActivityInterface; - public class MyViewHolder extends RecyclerView.ViewHolder { - public TextView name; - public CheckBox pinned; - public ImageButton more; - public ImageView label; + private final List activityDataList; + private final ChangeActivityInterface changeActivityInterface; + public static class MyViewHolder extends RecyclerView.ViewHolder { + public final TextView name; + public final CheckBox pinned; + public final ImageButton more; + public final ImageView label; public MyViewHolder(View view) { super(view); - name = (TextView)view.findViewById(R.id.nameTextView); - pinned = (CheckBox)view.findViewById(R.id.pinCheckBox); - label = (ImageView) view.findViewById(R.id.colorView); - more = (ImageButton)view.findViewById(R.id.more_button); + name = view.findViewById(R.id.nameTextView); + pinned = view.findViewById(R.id.pinCheckBox); + label = view.findViewById(R.id.colorView); + more = view.findViewById(R.id.more_button); } } @@ -49,7 +49,7 @@ public SimpleActivityAdapter.MyViewHolder onCreateViewHolder(@NonNull ViewGroup View itemView = LayoutInflater.from(parent.getContext()) .inflate(R.layout.recycler_activity_layout, parent, false); - return new SimpleActivityAdapter.MyViewHolder(itemView); + return new MyViewHolder(itemView); } @Override diff --git a/app/src/main/java/com/pkmnapps/activitydo/contentproviders/ImageProvider.java b/app/src/main/java/com/pkmnapps/activitydo/contentproviders/ImageProvider.java index a7d0745..e6d09be 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/contentproviders/ImageProvider.java +++ b/app/src/main/java/com/pkmnapps/activitydo/contentproviders/ImageProvider.java @@ -34,6 +34,7 @@ public boolean onCreate() { if(!mFile.exists()) { + //noinspection ResultOfMethodCallIgnored mFile.createNewFile(); } diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java index cc5e502..02d343c 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelper.java @@ -7,7 +7,6 @@ import android.database.sqlite.SQLiteOpenHelper; import com.pkmnapps.activitydo.dataclasses.ActivityData; -import com.pkmnapps.activitydo.dataclasses.ListWidget; import java.util.ArrayList; import java.util.List; @@ -23,7 +22,7 @@ public class DBHelper extends SQLiteOpenHelper { public static final String HOME_COLUMN_COLOR = "color"; public static final String HOME_COLUMN_PINNED = "pinned"; public static final String HOME_COLUMN_SORT = "sort"; - Context context; + final Context context; public DBHelper(Context context) { super(context, DATABASE_NAME , null, 1); this.context = context; diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java index 511cb87..9329334 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperImage.java @@ -5,16 +5,11 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.net.Uri; import android.os.Environment; -import com.bumptech.glide.Glide; -import com.pkmnapps.activitydo.TaskActivity; import com.pkmnapps.activitydo.dataclasses.ImageWidget; -import com.pkmnapps.activitydo.dataclasses.SimpleTextWidget; import java.io.File; -import java.io.FileInputStream; import java.util.ArrayList; import java.util.List; @@ -27,7 +22,7 @@ public class DBHelperImage extends SQLiteOpenHelper { public static final String HOME_COLUMN_AID = "aid";//activityid public static final String HOME_COLUMN_UID = "uid";//uniqueid public static final String HOME_COLUMN_URI = "uri"; - Context context; + final Context context; public DBHelperImage(Context context) { super(context, DATABASE_NAME , null, 1); this.context = context; diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java index 17ad899..a8b1365 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperList.java @@ -5,7 +5,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; import com.pkmnapps.activitydo.dataclasses.ListWidget; @@ -22,7 +21,7 @@ public class DBHelperList extends SQLiteOpenHelper { public static final String HOME_COLUMN_UID = "uid";//uniqueid public static final String HOME_COLUMN_HEAD = "head"; - Context context; + final Context context; public DBHelperList(Context context) { super(context, DATABASE_NAME , null, 1); diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperListItems.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperListItems.java index ce5b424..298f502 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperListItems.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperListItems.java @@ -7,7 +7,6 @@ import android.database.sqlite.SQLiteOpenHelper; import com.pkmnapps.activitydo.dataclasses.ListItem; -import com.pkmnapps.activitydo.dataclasses.ListWidget; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java index 2cf8433..c60688d 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperText.java @@ -22,7 +22,7 @@ public class DBHelperText extends SQLiteOpenHelper{ public static final String HOME_COLUMN_HEAD = "head"; public static final String HOME_COLUMN_BODY = "body"; - Context context; + final Context context; public DBHelperText(Context context) { super(context, DATABASE_NAME , null, 1); this.context = context; diff --git a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperWidgets.java b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperWidgets.java index 53c4f05..8bd9373 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperWidgets.java +++ b/app/src/main/java/com/pkmnapps/activitydo/databasehelpers/DBHelperWidgets.java @@ -8,7 +8,6 @@ import com.pkmnapps.activitydo.dataclasses.Widget; -import java.util.ArrayList; import java.util.List; public class DBHelperWidgets extends SQLiteOpenHelper { @@ -19,7 +18,7 @@ public class DBHelperWidgets extends SQLiteOpenHelper { public static final String HOME_COLUMN_ID = "id"; public static final String HOME_COLUMN_UID = "uid";//uniqueid public static final String HOME_COLUMN_SORT = "sort";//order - Context context; + final Context context; public DBHelperWidgets(Context context) { super(context, DATABASE_NAME , null, 1); this.context = context; diff --git a/app/src/main/java/com/pkmnapps/activitydo/dataclasses/ActivityData.java b/app/src/main/java/com/pkmnapps/activitydo/dataclasses/ActivityData.java index 3cbcf53..69899a8 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/dataclasses/ActivityData.java +++ b/app/src/main/java/com/pkmnapps/activitydo/dataclasses/ActivityData.java @@ -1,10 +1,5 @@ package com.pkmnapps.activitydo.dataclasses; -import android.graphics.Bitmap; -import android.graphics.Color; - -import java.util.Date; - public class ActivityData { private String name,id; private String color; diff --git a/app/src/main/java/com/pkmnapps/activitydo/dataclasses/Widget.java b/app/src/main/java/com/pkmnapps/activitydo/dataclasses/Widget.java index e53f98f..f240673 100644 --- a/app/src/main/java/com/pkmnapps/activitydo/dataclasses/Widget.java +++ b/app/src/main/java/com/pkmnapps/activitydo/dataclasses/Widget.java @@ -1,12 +1,8 @@ package com.pkmnapps.activitydo.dataclasses; -import android.content.Context; - -import com.pkmnapps.activitydo.databasehelpers.DBHelperWidgets; - public class Widget { - int type; - Object object; + final int type; + final Object object; int sortOrder; String uid; public Widget(int type, Object object, String uid, int sortOrder) { diff --git a/app/src/main/res/layout/content_list.xml b/app/src/main/res/layout/content_list.xml index 4e71779..9795fe2 100644 --- a/app/src/main/res/layout/content_list.xml +++ b/app/src/main/res/layout/content_list.xml @@ -1,11 +1,9 @@ - - - - + diff --git a/app/src/main/res/menu/menu_task_activity.xml b/app/src/main/res/menu/menu_task_activity.xml index aab207c..99984db 100644 --- a/app/src/main/res/menu/menu_task_activity.xml +++ b/app/src/main/res/menu/menu_task_activity.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/menu/widget_menu.xml b/app/src/main/res/menu/widget_menu.xml index 9135827..c9ccfa9 100644 --- a/app/src/main/res/menu/widget_menu.xml +++ b/app/src/main/res/menu/widget_menu.xml @@ -1,6 +1,5 @@ - + - +