Skip to content

Cleaning-up / deprecating unused activities and their related files;

Tyler Sizse requested to merge issue_189_clean_up_unused_activities into master

[If this MR is accepted !174 (closed) should be closed]

Closes #189 (closed); Cleaning-up / deprecating unused activities and their related files.

NOTE: Also renamed files, created directories/sub-directories, and cleaned up nav_graphs for each feature from last semester for easier readability and organization. Doing this helped me to more easily understand what each class is being used for.

NOTE: For the nav_graphs, I chose to add an abbreviation of the related feature before each of the ids. For example, in the nav_graph related to checking the expiration date, instead of android:id="@+id/StartFragment", I added CED_ to the beginning: android:id="@+id/CED_StartFragment". CED stands for the "CheckExpirationDate" feature, I left a comment in each nav_graph explaining what the abbreviation stands for. I chose to add these abbreviations because some features are using similar names for fragments and this abbreviation helps determine which id is used for which feature/nav_graph and prevents duplicate resource ids.

NOTE: Cleaned up .idea/navEditor.xml for the changes related to nav_graphs

Example of the new feature directories:

  • FeatureName
    • Activities
      • (Contains the underlying activities for this feature)
    • DatabaseClasses
      • (Contains classes for a database related to this feature)
    • Fragments
      • (Contains any fragments related to this feature)

Deprecated/Unused Activities:

  • EnterUPC.java
    • Replaced by EnterUpcFragment.java
    • 1 usage in GetUPC.java (Deprecated)
  • FinalDate.java
    • Replaced by DisplayTrueExpirationFragment.java
    • 1 usage in FoodItem.java (Deprecated)
  • FoodItem.java
    • Replaced by SelectItemFragment.java
    • 1 usage in EnterUPC.java (Deprecated)
    • 1 usage in Scanner.java (Deprecated)
  • GetUPC.java
    • Replaced by CheckExpirationDate/Fragments/StartFragment.java
  • GuestForm.java
    • Replaced by GuestDatabaseRegistrationActivity.java && GuestGoogleSheetRegistrationActivity.java
  • ItemInformation.java
    • Replaced by fragments related to Check Expiration Date feature
    • Replaced usages with a Toast/comment saying this class has been deprecated
  • Scanner.java
    • Replaced by AbstractScannerFragment.java
    • 1 Usage in ItemInformation.java (Deprecated)

Deprecated/Unused Layouts (Related to the deprecated Activities):

  • activity_get_upc.xml
  • activity_enter_upc.xml
  • activity_scanner.xml
  • activity_final_date.xml
  • activity_food_item.xml
  • activity_guest_form.xml
  • activity_item_info.xml

Additional Deprecated/Unused Layouts (DELETED):

  • fragment_scan.xml
    • AbstractScannerFragment.java uses a new layout fragment_abstract_scanner.xml, so this layout is no longer needed
  • fragment_guest_database_registration_scanner.xml
    • Not needed because AbstractScannerFragment.java already uses the fragment_abstract_scanner.xml layout
Edited by Tyler Sizse

Merge request reports