Skip to content

Commit

Permalink
Fix warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@mannprerak2
mannprerak2 committed Apr 11, 2021
1 parent e7ddddb commit 5255949
Show file tree
Hide file tree
Showing 35 changed files with 168 additions and 199 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.pkmnapps.activitydo">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/com/pkmnapps/activitydo/ActivityChoser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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.
Expand All @@ -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());
Expand Down
26 changes: 12 additions & 14 deletions app/src/main/java/com/pkmnapps/activitydo/HomeFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.Random;


Expand All @@ -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() {
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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());
Expand Down Expand Up @@ -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) {
Expand All @@ -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());
Expand All @@ -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();
Expand Down Expand Up @@ -270,15 +268,15 @@ 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());
recyclerView.setNestedScrollingEnabled(false);

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());

Expand Down Expand Up @@ -350,6 +348,6 @@ private void changeColorTheme(String colorTheme){
}

public void updatePinnedMenu(){
((MainActivity)getActivity()).menuAddPinned();
((MainActivity) Objects.requireNonNull(getActivity())).menuAddPinned();
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/com/pkmnapps/activitydo/ImageViewFullscreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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);
}


Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/pkmnapps/activitydo/ListActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() {
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/pkmnapps/activitydo/MConstants.java
View file
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
17 changes: 8 additions & 9 deletions app/src/main/java/com/pkmnapps/activitydo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -184,7 +184,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
return super.onOptionsItemSelected(item);
}

@SuppressWarnings("StatementWithEmptyBody")
@Override
public boolean onNavigationItemSelected(MenuItem item) {
FragmentManager fragmentManager = getSupportFragmentManager();
Expand Down Expand Up @@ -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;
}
Expand Down
14 changes: 8 additions & 6 deletions app/src/main/java/com/pkmnapps/activitydo/NoteActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 5255949

Please sign in to comment.