Skip to content

Commit dd9e14b

Browse files
MarcoLicciMarcoLicci
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 53fa0a8 + 1132748 commit dd9e14b

File tree

6 files changed

+52
-149
lines changed

6 files changed

+52
-149
lines changed

‎app/src/main/java/it/unimib/pickapp/ui/calendarFragment.java‎

Lines changed: 16 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@
44
import android.os.Bundle;
55
import android.util.Log;
66
import android.view.LayoutInflater;
7-
import android.view.Menu;
8-
import android.view.MenuInflater;
97
import android.view.MenuItem;
108
import android.view.View;
119
import android.view.ViewGroup;
12-
import android.widget.Button;
1310
import android.widget.CalendarView;
11+
import android.widget.ImageButton;
1412
import android.widget.TextView;
1513

1614
import androidx.annotation.NonNull;
1715
import androidx.annotation.Nullable;
18-
import androidx.appcompat.widget.Toolbar;
1916
import androidx.fragment.app.Fragment;
2017
import androidx.lifecycle.ViewModelProvider;
2118
import androidx.navigation.NavController;
@@ -32,7 +29,6 @@
3229
import com.google.firebase.database.Query;
3330

3431
import java.util.Calendar;
35-
import java.util.Objects;
3632
import java.util.TimeZone;
3733

3834
import it.unimib.pickapp.R;
@@ -44,12 +40,12 @@ public class calendarFragment extends Fragment {
4440
private RecyclerView recyclerView;
4541
private View HideShowView;
4642
private FloatingActionButton addButton;
47-
private Button hideShowButton;
43+
private ImageButton hideShowButton;
4844
private DatabaseReference mbase;
4945
private DatabaseReference locationReference;
5046
private String selectedDate;
5147
private Query query;
52-
boolean flag=true;
48+
boolean flag = true;
5349
private static final String TAG = "calendarFragment";
5450
private matchesAdapter adapter; // Create Object of the Adapter class
5551
private matchesAdapter.ItemClickListener itemClickListener;
@@ -61,22 +57,13 @@ public calendarFragment() {
6157
// Required empty public constructor
6258
}
6359

64-
@Override
65-
public void onCreate(@Nullable Bundle savedInstanceState) {
66-
super.onCreate(savedInstanceState);
67-
// It is necessary to specify that the toolbar has a custom menu
68-
setHasOptionsMenu(true);
69-
}
60+
7061
@Override
7162
public View onCreateView(
7263
@NonNull LayoutInflater inflater, ViewGroup container,
7364
Bundle savedInstanceState) {
7465
View rootView = inflater.inflate(R.layout.fragment_calendar, container, false);
75-
7666
setTitle(rootView, getString(R.string.calendar));
77-
Toolbar toolbar = rootView.findViewById(R.id.toolbarCalendar);
78-
Objects.requireNonNull(((pickappActivity) requireActivity()).getSupportActionBar()).hide();
79-
((pickappActivity) getActivity()).setSupportActionBar(toolbar);
8067

8168
calendarView = rootView.findViewById(R.id.calendarView);
8269
HideShowView = rootView.findViewById(R.id.linearLayout2);
@@ -86,18 +73,14 @@ public View onCreateView(
8673
hideShowButton.setOnClickListener(new View.OnClickListener() {
8774
@Override
8875
public void onClick(View v) {
89-
switch (v.getId())
90-
{
91-
case R.id.HideShow:
92-
if(flag)
93-
{
94-
HideShowView.setVisibility(View.GONE);
95-
flag=false;
96-
}
97-
else {
98-
HideShowView.setVisibility(View.VISIBLE);
99-
flag=true;
100-
}
76+
if (v.getId() == R.id.HideShow) {
77+
if (flag) {
78+
HideShowView.setVisibility(View.GONE);
79+
flag = false;
80+
} else {
81+
HideShowView.setVisibility(View.VISIBLE);
82+
flag = true;
83+
}
10184
}
10285
}
10386
});
@@ -158,9 +141,9 @@ public void onClick(View v) {
158141
return rootView;
159142
}
160143

144+
161145
@Override
162146
public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
163-
164147
calendarView.setOnDateChangeListener((view1, year, month, dayOfMonth) -> {
165148
//Toast.makeText(getActivity(), "Date changed to " + dayOfMonth + "/" + month + "/" + year, Toast.LENGTH_SHORT).show();
166149
Log.i(TAG, "Date changed to " + dayOfMonth + "/" + month + "/" + year);
@@ -206,38 +189,23 @@ public void onViewCreated(@NonNull final View view, @Nullable final Bundle saved
206189
});
207190
}
208191

192+
209193
@Override
210194
public void onStart() {
211195
super.onStart();
212196
adapter.startListening();
213197
}
214198

199+
215200
@Override
216201
public void onStop() {
217202
super.onStop();
218203
adapter.stopListening();
219204
}
220205

206+
221207
public void setTitle(View view, String titleCal){
222208
TextView titleToolbar = view.findViewById(R.id.titleCalendar);
223209
titleToolbar.setText(titleCal);
224210
}
225-
226-
@Override
227-
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
228-
// The custom menu that we want to add to the toolbar
229-
inflater.inflate(R.menu.logout_menu, menu);
230-
}
231-
232-
@Override
233-
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
234-
235-
// Listener for the items in the custom menu
236-
if (item.getItemId() == R.id.logout) {
237-
FirebaseAuth.getInstance().signOut();
238-
startActivity(new Intent(requireActivity(), loginActivity.class));
239-
requireActivity().finish();
240-
}
241-
return super.onOptionsItemSelected(item);
242-
}
243211
}

‎app/src/main/java/it/unimib/pickapp/ui/homeFragment.java‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,12 @@ public homeFragment() {
6262
// Required empty public constructor
6363
}
6464

65-
@Override
66-
public void onCreate(@Nullable Bundle savedInstanceState) {
67-
super.onCreate(savedInstanceState);
68-
// It is necessary to specify that the toolbar has a custom menu
69-
setHasOptionsMenu(true);
70-
}
7165

7266
@Override
7367
public View onCreateView(LayoutInflater inflater, ViewGroup container,
7468
Bundle savedInstanceState) {
7569
// Inflate the layout for this fragment
7670
View view = inflater.inflate(R.layout.fragment_home, container, false);
77-
Toolbar toolbar = view.findViewById(R.id.toolbarHome);
78-
Objects.requireNonNull(((pickappActivity) requireActivity()).getSupportActionBar()).hide();
79-
((pickappActivity) getActivity()).setSupportActionBar(toolbar);
8071

8172
setTitle(view, getString(R.string.home));
8273
basket = view.findViewById(R.id.basketFilter);
@@ -91,6 +82,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
9182

9283
return view;
9384
}
85+
86+
9487
@Override
9588
public void onViewCreated(@NonNull final View view, @Nullable final Bundle savedInstanceState) {
9689

@@ -180,37 +173,27 @@ public boolean onTouch(View v, MotionEvent event) {
180173
});
181174
}
182175

176+
183177
public void setTitle(View view, String title){
184178
TextView titleToolbar = view.findViewById(R.id.titleHome);
185179
titleToolbar.setText(title);
186180
}
187-
@Override
188-
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
189-
// The custom menu that we want to add to the toolbar
190-
inflater.inflate(R.menu.logout_menu, menu);
191-
}
192-
@Override
193-
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
194181

195-
// Listener for the items in the custom menu
196-
if (item.getItemId() == R.id.logout) {
197-
FirebaseAuth.getInstance().signOut();
198-
startActivity(new Intent(requireActivity(), loginActivity.class));
199-
requireActivity().finish();
200-
}
201-
return super.onOptionsItemSelected(item);
202-
}
182+
203183
public void activateImgBttn(ImageButton bttn) {
204184
bttn.setScaleX(1.2F);
205185
bttn.setScaleY(1.2F);
206186
bttn.setColorFilter(ContextCompat.getColor(getContext(), R.color.mainGreen));
207187
}
188+
189+
208190
public void inactivateImgBttn(ImageButton bttn) {
209191
bttn.setScaleY(1);
210192
bttn.setScaleX(1);
211193
bttn.setColorFilter(ContextCompat.getColor(getContext(), R.color.item_color_inactive));
212194
}
213195

196+
214197
@Override
215198
public void onStart() {
216199
super.onStart();
@@ -225,6 +208,7 @@ public void onStop() {
225208
}
226209
}
227210

211+
228212
public void creaRecyclerView() {
229213
mbase = FirebaseDatabase.getInstance().getReference("Matches");
230214
locationReference = FirebaseDatabase.getInstance().getReference("Places");

‎app/src/main/java/it/unimib/pickapp/ui/locationFragment.java‎

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,11 @@ public locationFragment() {
7474
// Required empty public constructor
7575
}
7676

77-
@Override
78-
public void onCreate(@Nullable Bundle savedInstanceState) {
79-
super.onCreate(savedInstanceState);
80-
// It is necessary to specify that the toolbar has a custom menu
81-
setHasOptionsMenu(true);
82-
}
77+
8378
@Override
8479
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
8580
View view = inflater.inflate(R.layout.fragment_location, container, false);
8681
setTitle(view, getString(R.string.location));
87-
Toolbar toolbar = view.findViewById(R.id.toolbarLocation);
88-
Objects.requireNonNull(((pickappActivity) requireActivity()).getSupportActionBar()).hide();
89-
((pickappActivity) getActivity()).setSupportActionBar(toolbar);
9082

9183
if(!markersDrawn) {
9284
mbase = FirebaseDatabase.getInstance().getReference("Matches");
@@ -122,6 +114,7 @@ public void onCancelled(@NonNull DatabaseError error) {
122114
return view;
123115
}
124116

117+
125118
private void initGoogleMap(Bundle savedInstanceState){
126119
Bundle mapViewBundle = null;
127120
if (savedInstanceState != null) {
@@ -131,6 +124,7 @@ private void initGoogleMap(Bundle savedInstanceState){
131124
mMapView.getMapAsync(this);
132125
}
133126

127+
134128
@Override
135129
public void onSaveInstanceState(@NonNull Bundle outState) {
136130
super.onSaveInstanceState(outState);
@@ -143,6 +137,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
143137
mMapView.onSaveInstanceState(mapViewBundle);
144138
}
145139

140+
146141
private final ActivityResultLauncher<String> requestPermissionLauncher =
147142
registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {
148143
if (isGranted) {
@@ -160,11 +155,11 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
160155
}
161156
});
162157

158+
163159
@SuppressLint("MissingPermission")
164160
@RequiresApi(api = Build.VERSION_CODES.N)
165161
@Override
166162
public void onMapReady(@NonNull GoogleMap map) {
167-
168163
FusedLocationProviderClient client = LocationServices.getFusedLocationProviderClient(requireContext());
169164

170165
// Controllo se l'utente ha già accettato i permessi
@@ -184,6 +179,7 @@ public void onMapReady(@NonNull GoogleMap map) {
184179

185180
}
186181

182+
187183
@SuppressLint("MissingPermission")
188184
public void setupMap(GoogleMap map, FusedLocationProviderClient client) {
189185
map.setMyLocationEnabled(true);
@@ -203,6 +199,7 @@ public void setupMap(GoogleMap map, FusedLocationProviderClient client) {
203199
map.setOnInfoWindowClickListener(this);
204200
}
205201

202+
206203
public void createRandomMarkers(int markersQuantity, GoogleMap map, double latitude, double longitude) {
207204
Random rand = new Random();
208205

@@ -245,27 +242,13 @@ public void createRandomMarkers(int markersQuantity, GoogleMap map, double latit
245242
markersDrawn = true;
246243
}
247244

245+
248246
// Toolbar
249247
public void setTitle(View view, String title){
250248
TextView titleToolbar = view.findViewById(R.id.titleLocation);
251249
titleToolbar.setText(title);
252250
}
253-
@Override
254-
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
255-
// The custom menu that we want to add to the toolbar
256-
inflater.inflate(R.menu.logout_menu, menu);
257-
}
258-
@Override
259-
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
260251

261-
// Listener for the items in the custom menu
262-
if (item.getItemId() == R.id.logout) {
263-
FirebaseAuth.getInstance().signOut();
264-
startActivity(new Intent(requireActivity(), loginActivity.class));
265-
requireActivity().finish();
266-
}
267-
return super.onOptionsItemSelected(item);
268-
}
269252

270253
// This converts a Vector image to bitmapDescriptor (so it can be used as an icon for the markers on the map)
271254
private BitmapDescriptor bitmapDescriptorFromVector(Context context, int vectorResId) {
@@ -293,36 +276,42 @@ public void onInfoWindowClick(@NonNull Marker marker) {
293276
navController.navigate(R.id.action_location_to_matchFragment);
294277
}
295278

279+
296280
@Override
297281
public void onResume() {
298282
super.onResume();
299283
mMapView.onResume();
300284
}
301285

286+
302287
@Override
303288
public void onStart() {
304289
super.onStart();
305290
mMapView.onStart();
306291
}
307292

293+
308294
@Override
309295
public void onStop() {
310296
super.onStop();
311297
mMapView.onStop();
312298
}
313299

300+
314301
@Override
315302
public void onPause() {
316303
mMapView.onPause();
317304
super.onPause();
318305
}
319306

307+
320308
@Override
321309
public void onDestroy() {
322310
mMapView.onDestroy();
323311
super.onDestroy();
324312
}
325313

314+
326315
@Override
327316
public void onLowMemory() {
328317
super.onLowMemory();

0 commit comments

Comments
 (0)