From ce3b10ad4457f7d7a9c204e0fbebbcd6d28d36fd Mon Sep 17 00:00:00 2001
From: mesinger <matthias.kreidl@squer.io>
Date: Sat, 1 Jun 2024 16:23:50 +0200
Subject: [PATCH] Migrate additional fragments and activities to jetpack
 bindings

---
 .../grobox/transportr/about/AboutFragment.kt  | 16 +++++++---
 .../transportr/about/ContributorFragment.kt   | 26 +++++++++++++----
 .../departures/DeparturesActivity.java        | 15 ++++++----
 .../locations/SpecialLocationFragment.kt      | 13 +++++++--
 .../trips/FavoriteTripsFragment.java          | 16 +++++++---
 .../locations/LocationFragment.java           | 29 ++++++++++++-------
 .../trips/search/DirectionsActivity.kt        |  1 +
 7 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/de/grobox/transportr/about/AboutFragment.kt b/app/src/main/java/de/grobox/transportr/about/AboutFragment.kt
index d81ba64b1..3e867fa23 100644
--- a/app/src/main/java/de/grobox/transportr/about/AboutFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/about/AboutFragment.kt
@@ -30,12 +30,16 @@ import android.widget.Button
 import android.widget.TextView
 import de.grobox.transportr.R
 import de.grobox.transportr.TransportrFragment
+import de.grobox.transportr.databinding.FragmentAboutBinding
 
 
 class AboutFragment : TransportrFragment() {
 
+    private var _binding: FragmentAboutBinding? = null
+    private val binding get() = _binding!!
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val v = inflater.inflate(R.layout.fragment_about, container, false)
+        _binding = FragmentAboutBinding.inflate(inflater, container, false)
 
         // add app name and version
         val versionName = try {
@@ -44,17 +48,21 @@ class AboutFragment : TransportrFragment() {
         } catch (e: NameNotFoundException) {
             "?.?"
         }
-        val appNameVersion = v.findViewById<TextView>(R.id.appNameVersion)
+        val appNameVersion = binding.appNameVersion
         appNameVersion.text = "${getString(R.string.app_name)} $versionName"
 
         // website button
-        val websiteButton = v.findViewById<Button>(R.id.websiteButton)
+        val websiteButton = binding.websiteButton
         websiteButton.setOnClickListener {
             val launchBrowser = Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.website) + getString(R.string.website_source_app)))
             startActivity(launchBrowser)
         }
 
-        return v
+        return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
diff --git a/app/src/main/java/de/grobox/transportr/about/ContributorFragment.kt b/app/src/main/java/de/grobox/transportr/about/ContributorFragment.kt
index 3dfaa9cfa..4e8dd79ba 100644
--- a/app/src/main/java/de/grobox/transportr/about/ContributorFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/about/ContributorFragment.kt
@@ -30,33 +30,47 @@ import de.grobox.transportr.R
 import de.grobox.transportr.TransportrFragment
 import de.grobox.transportr.about.ContributorAdapter.ContributorViewHolder
 import de.grobox.transportr.about.ContributorGroupAdapter.ContributorGroupViewHolder
+import de.grobox.transportr.databinding.FragmentContributorsBinding
+import de.grobox.transportr.databinding.FragmentTranslatorsBinding
 
 class ContributorFragment : TransportrFragment() {
+    private var _binding: FragmentContributorsBinding? = null
+    private val binding get() = _binding!!
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val v = inflater.inflate(R.layout.fragment_contributors, container, false)
+        _binding = FragmentContributorsBinding.inflate(inflater, container, false)
 
-        val list = v.findViewById<RecyclerView>(R.id.list)
+        val list = binding.list
         list.layoutManager = LinearLayoutManager(context)
         list.adapter = ContributorGroupAdapter(CONTRIBUTORS)
 
-        return v
+        return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
 
 class TranslatorsFragment : TransportrFragment() {
+    private var _binding: FragmentTranslatorsBinding? = null
+    private val binding get() = _binding!!
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val v = inflater.inflate(R.layout.fragment_translators, container, false)
+        _binding = FragmentTranslatorsBinding.inflate(inflater, container, false)
 
-        val list = v.findViewById<RecyclerView>(R.id.list)
+        val list = binding.list
         list.layoutManager = LinearLayoutManager(context)
         list.adapter = ContributorGroupAdapter(LANGUAGES)
 
-        return v
+        return binding.root
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
 
 
diff --git a/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java b/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
index 37ce0465f..00aee7041 100644
--- a/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
+++ b/app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
@@ -51,6 +51,7 @@
 
 import de.grobox.transportr.R;
 import de.grobox.transportr.TransportrActivity;
+import de.grobox.transportr.databinding.ActivityDeparturesBinding;
 import de.grobox.transportr.locations.WrapLocation;
 import de.grobox.transportr.ui.LceAnimator;
 import de.grobox.transportr.ui.TimeDateFragment;
@@ -77,6 +78,7 @@ public class DeparturesActivity extends TransportrActivity
 
 	private enum SearchState {INITIAL, TOP, BOTTOM}
 
+	private ActivityDeparturesBinding binding;
 	private ProgressBar progressBar;
 	private View errorLayout;
 	private TextView errorText;
@@ -101,16 +103,17 @@ public void onFinish() {
 	@Override
 	public void onCreate(@Nullable Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		binding = ActivityDeparturesBinding.inflate(getLayoutInflater());
 
 		Intent intent = getIntent();
 		location = (WrapLocation) intent.getSerializableExtra(WRAP_LOCATION);
 		if (location == null || location.getLocation() == null)
 			throw new IllegalArgumentException("No Location");
 
-		setContentView(R.layout.activity_departures);
+		setContentView(binding.getRoot());
 
 		// Toolbar
-		Toolbar toolbar = findViewById(R.id.toolbar);
+		Toolbar toolbar = binding.toolbar;
 		setSupportActionBar(toolbar);
 		toolbar.setSubtitle(location.getName());
 		ActionBar actionBar = getSupportActionBar();
@@ -120,7 +123,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		}
 
 		// Swipe to Refresh
-		swipe = findViewById(R.id.swipe);
+		swipe = binding.swipe;
 		swipe.setColorSchemeResources(R.color.accent);
 		swipe.setDirection(SwipyRefreshLayoutDirection.BOTH);
 		swipe.setDistanceToTriggerSync(getDragDistance(this));
@@ -129,7 +132,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
 		// Departures List
 		adapter = new DepartureAdapter();
-		list = findViewById(R.id.list);
+		list = binding.list;
 		list.setVisibility(INVISIBLE);
 		list.setAdapter(adapter);
 		list.setLayoutManager(new LinearLayoutManager(this));
@@ -139,8 +142,8 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 		Loader<QueryDeparturesResult> loader = getSupportLoaderManager().initLoader(LOADER_DEPARTURES, args, this);
 
 		// Progress Bar and Error View
-		progressBar = findViewById(R.id.progressBar);
-		errorLayout = findViewById(R.id.errorLayout);
+		progressBar = binding.progressBar;
+		errorLayout = binding.errorLayout;
 		errorText = errorLayout.findViewById(R.id.errorText);
 		errorLayout.findViewById(R.id.errorButton).setOnClickListener(view -> {
 			LceAnimator.showLoading(progressBar, list, errorLayout);
diff --git a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
index c32d4e169..c9b720891 100644
--- a/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
+++ b/app/src/main/java/de/grobox/transportr/favorites/locations/SpecialLocationFragment.kt
@@ -35,6 +35,7 @@ import de.grobox.transportr.AppComponent
 import de.grobox.transportr.R
 import de.grobox.transportr.TransportrApplication
 import de.grobox.transportr.data.locations.FavoriteLocation.FavLocationType
+import de.grobox.transportr.databinding.FragmentSpecialLocationBinding
 import de.grobox.transportr.favorites.trips.FavoriteTripListener
 import de.grobox.transportr.locations.LocationView
 import de.grobox.transportr.locations.LocationsViewModel
@@ -54,6 +55,9 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
     protected lateinit var viewModel: LocationsViewModel
     var listener: FavoriteTripListener? = null
 
+    private var _binding: FragmentSpecialLocationBinding? = null;
+    private val binding get() = _binding!!
+
     private lateinit var loc: LocationView
 
     @get:StringRes
@@ -72,10 +76,11 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
     protected abstract fun viewModel(): LocationsViewModel  // a method to init when activity has been created
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val v = inflater.inflate(R.layout.fragment_special_location, container)
+        _binding = FragmentSpecialLocationBinding.inflate(inflater, container, false)
+        val v = binding.root
 
         // Initialize LocationView
-        loc = v.findViewById(R.id.location_input)
+        loc = binding.locationInput
         loc.setHint(hint)
         loc.setLocationViewListener(this)
 
@@ -121,4 +126,8 @@ abstract class SpecialLocationFragment : DialogFragment(), LocationView.Location
 
     override fun onLocationCleared(type: FavLocationType) {}
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
diff --git a/app/src/main/java/de/grobox/transportr/favorites/trips/FavoriteTripsFragment.java b/app/src/main/java/de/grobox/transportr/favorites/trips/FavoriteTripsFragment.java
index bb53a931b..fb88b6aa8 100644
--- a/app/src/main/java/de/grobox/transportr/favorites/trips/FavoriteTripsFragment.java
+++ b/app/src/main/java/de/grobox/transportr/favorites/trips/FavoriteTripsFragment.java
@@ -40,6 +40,7 @@
 import de.grobox.transportr.TransportrFragment;
 import de.grobox.transportr.data.locations.HomeLocation;
 import de.grobox.transportr.data.locations.WorkLocation;
+import de.grobox.transportr.databinding.FragmentFavoritesBinding;
 import de.grobox.transportr.favorites.locations.HomePickerDialogFragment;
 import de.grobox.transportr.favorites.locations.WorkPickerDialogFragment;
 import de.grobox.transportr.locations.WrapLocation;
@@ -57,6 +58,7 @@ public abstract class FavoriteTripsFragment<VM extends SavedSearchesViewModel> e
 	@Inject protected ViewModelProvider.Factory viewModelFactory;
 	protected VM viewModel;
 
+	private FragmentFavoritesBinding binding;
 	private ProgressBar progressBar;
 	private RecyclerView list;
 	private FavoriteTripAdapter adapter;
@@ -64,11 +66,11 @@ public abstract class FavoriteTripsFragment<VM extends SavedSearchesViewModel> e
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.fragment_favorites, container, false);
+		binding = FragmentFavoritesBinding.inflate(inflater, container, false);
 
-		progressBar = v.findViewById(R.id.progressBar);
+		progressBar = binding.progressBar;
 
-		list = v.findViewById(R.id.favorites);
+		list = binding.favorites;
 		adapter = new FavoriteTripAdapter(this);
 		list.setHasFixedSize(false);
 		list.setAdapter(adapter);
@@ -79,7 +81,13 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		viewModel.getWork().observe(getViewLifecycleOwner(), this::onWorkLocationChanged);
 		viewModel.getFavoriteTrips().observe(getViewLifecycleOwner(), this::onFavoriteTripsChanged);
 
-		return v;
+		return binding.getRoot();
+	}
+
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		binding = null;
 	}
 
 	abstract protected VM getViewModel();
diff --git a/app/src/main/java/de/grobox/transportr/locations/LocationFragment.java b/app/src/main/java/de/grobox/transportr/locations/LocationFragment.java
index 511577790..bbbdafe8b 100644
--- a/app/src/main/java/de/grobox/transportr/locations/LocationFragment.java
+++ b/app/src/main/java/de/grobox/transportr/locations/LocationFragment.java
@@ -50,6 +50,7 @@
 
 import de.grobox.transportr.R;
 import de.grobox.transportr.TransportrFragment;
+import de.grobox.transportr.databinding.FragmentLocationBinding;
 import de.grobox.transportr.departures.DeparturesActivity;
 import de.grobox.transportr.departures.DeparturesLoader;
 import de.grobox.transportr.locations.ReverseGeocoder.ReverseGeocoderCallback;
@@ -87,6 +88,7 @@ public class LocationFragment extends TransportrFragment
 	private WrapLocation location;
 	private final LineAdapter adapter = new LineAdapter();
 
+	private FragmentLocationBinding binding;
 	private ImageView locationIcon;
 	private TextView locationName;
 	private TextView locationInfo;
@@ -113,7 +115,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		location = (WrapLocation) args.getSerializable(WRAP_LOCATION);
 		if (location == null) throw new IllegalArgumentException("No location");
 
-		View v = inflater.inflate(R.layout.fragment_location, container, false);
+		binding = FragmentLocationBinding.inflate(inflater, container, false);
 		getComponent().inject(this);
 
 		if (getActivity() == null) throw new IllegalStateException();
@@ -121,20 +123,20 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		viewModel.nearbyStationsFound().observe(getViewLifecycleOwner(), found -> onNearbyStationsLoaded());
 
 		// Location
-		locationIcon = v.findViewById(R.id.locationIcon);
-		locationName = v.findViewById(R.id.locationName);
+		locationIcon = binding.locationIcon;
+		locationName = binding.locationName;
 		locationIcon.setOnClickListener(view -> onLocationClicked());
 		locationName.setOnClickListener(view -> onLocationClicked());
 
 		// Lines
-		linesLayout = v.findViewById(R.id.linesLayout);
+		linesLayout = binding.linesLayout;
 		linesLayout.setVisibility(GONE);
 		linesLayout.setAdapter(adapter);
 		linesLayout.setLayoutManager(new LinearLayoutManager(getContext(), HORIZONTAL, false));
 		linesLayout.setOnClickListener(view -> onLocationClicked());
 
 		// Location Info
-		locationInfo = v.findViewById(R.id.locationInfo);
+		locationInfo = binding.locationInfo;
 		showLocation();
 
 		if (location.getLocation().type == COORD) {
@@ -143,7 +145,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		}
 
 		// Departures
-		Button departuresButton = v.findViewById(R.id.departuresButton);
+		Button departuresButton = binding.departuresButton;
 		if (location.hasId()) {
 			departuresButton.setOnClickListener(view -> {
 				Intent intent = new Intent(getContext(), DeparturesActivity.class);
@@ -155,8 +157,8 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		}
 
 		// Nearby Stations
-		nearbyStationsButton = v.findViewById(R.id.nearbyStationsButton);
-		nearbyStationsProgress = v.findViewById(R.id.nearbyStationsProgress);
+		nearbyStationsButton = binding.nearbyStationsButton;
+		nearbyStationsProgress = binding.nearbyStationsProgress;
 		nearbyStationsButton.setOnClickListener(view -> {
 			nearbyStationsButton.setVisibility(INVISIBLE);
 			nearbyStationsProgress.setVisibility(VISIBLE);
@@ -164,18 +166,25 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 		});
 
 		// Share Location
-		Button shareButton = v.findViewById(R.id.shareButton);
+		Button shareButton = binding.shareButton;
 		shareButton.setOnClickListener(view -> startGeoIntent(getActivity(), location));
 
 		// Overflow Button
-		ImageButton overflowButton = v.findViewById(R.id.overflowButton);
+		ImageButton overflowButton = binding.overflowButton;
 		overflowButton.setOnClickListener(view -> new LocationPopupMenu(getContext(), view, location).show());
 
+		View v = binding.getRoot();
 		v.getViewTreeObserver().addOnGlobalLayoutListener(this);
 
 		return v;
 	}
 
+	@Override
+	public void onDestroyView() {
+		super.onDestroyView();
+		binding = null;
+	}
+
 	@Override
 	public void onGlobalLayout() {
 		// set peek distance to show view header
diff --git a/app/src/main/java/de/grobox/transportr/trips/search/DirectionsActivity.kt b/app/src/main/java/de/grobox/transportr/trips/search/DirectionsActivity.kt
index aed53de4d..78dbb9a06 100644
--- a/app/src/main/java/de/grobox/transportr/trips/search/DirectionsActivity.kt
+++ b/app/src/main/java/de/grobox/transportr/trips/search/DirectionsActivity.kt
@@ -130,6 +130,7 @@ class DirectionsActivity : TransportrActivity(), OnOffsetChangedListener {
         supportFragmentManager.beginTransaction()
             .replace(R.id.fragmentContainer, TripsFragment(), TripsFragment.TAG)
             .commit()
+        binding.fragmentContainer.requestFocus()
     }
 
     private fun processIntent(intent: Intent?) {