leca
/
barcode_scanner_for_employees
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

cleanup

This commit is contained in:
leca 2024-10-22 04:16:12 +03:00
parent 62cc4db615
commit 6e32545b9d
13 changed files with 20 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/AddAbstractProductActivity.kt
View File

@ -1,8 +1,5 @@
package org.foxarmy.barcodescannerforemployees.activities package org.foxarmy.barcodescannerforemployees.activities
//import com.google.mlkit.vision.codescanner.GmsBarcodeScannerOptions
//import com.google.mlkit.vision.codescanner.GmsBarcodeScanning
import android.content.ContentValues import android.content.ContentValues
import android.content.DialogInterface import android.content.DialogInterface
import android.content.Intent import android.content.Intent

24
app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/ExpiryCalendarActivity.kt
View File

@ -1,10 +1,15 @@
package org.foxarmy.barcodescannerforemployees.activities package org.foxarmy.barcodescannerforemployees.activities
import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.widget.LinearLayout
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import org.foxarmy.barcodescannerforemployees.DBStorageController
import org.foxarmy.barcodescannerforemployees.R
import org.foxarmy.barcodescannerforemployees.databinding.ActivityExpiryCalendarBinding import org.foxarmy.barcodescannerforemployees.databinding.ActivityExpiryCalendarBinding
import org.foxarmy.barcodescannerforemployees.views.ExpiryGroupView
class ExpiryCalendarActivity : AppCompatActivity() { class ExpiryCalendarActivity : AppCompatActivity() {
private lateinit var binding: ActivityExpiryCalendarBinding private lateinit var binding: ActivityExpiryCalendarBinding
@ -12,9 +17,9 @@ class ExpiryCalendarActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityExpiryCalendarBinding.inflate(layoutInflater) setContentView(R.layout.fragment_expiry_dates)
setContentView(binding.root)
fillUp()
} }
fun displayDate(date:Long) { fun displayDate(date:Long) {
@ -23,11 +28,16 @@ class ExpiryCalendarActivity : AppCompatActivity() {
extras.putLong("date", date) extras.putLong("date", date)
expiryCalendarGroupActivityIntent.putExtras(extras) expiryCalendarGroupActivityIntent.putExtras(extras)
ContextCompat.startActivity(this, expiryCalendarGroupActivityIntent, extras) ContextCompat.startActivity(this, expiryCalendarGroupActivityIntent, extras)
}
// val shelfFragment = ShelfFragment.newInstance(date) private fun fillUp() {
// val ft = supportFragmentManager.beginTransaction() val dates = DBStorageController(this).findAllExpiryDates(DBStorageController(this).readableDatabase)
// ft.replace(R.id.include_content, shelfFragment)
// ft.commit() val container = findViewById<LinearLayout>(R.id.datesLinearLayout)
// ft.addToBackStack(null)
dates.forEach { date ->
val newDate = ExpiryGroupView(this, this as Context, date)
container.addView(newDate)
}
} }
} }

1
app/src/main/java/org/foxarmy/barcodescannerforemployees/activities/ExpiryCalendarGroupActivity.kt
View File

@ -16,7 +16,6 @@ class ExpiryCalendarGroupActivity : AppCompatActivity() {
val date = intent.extras!!.getLong("date") val date = intent.extras!!.getLong("date")
// binding.root.addView(ShelfFragment.newInstance(date).view!!.rootView)
val ft = supportFragmentManager.beginTransaction() val ft = supportFragmentManager.beginTransaction()
ft.replace(R.id.content, ShelfFragment.newInstance(date)) ft.replace(R.id.content, ShelfFragment.newInstance(date))
ft.commit() ft.commit()

16
app/src/main/java/org/foxarmy/barcodescannerforemployees/fragments/ExpiryDatesFragment.kt
View File

@ -5,9 +5,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import org.foxarmy.barcodescannerforemployees.DBStorageController
import org.foxarmy.barcodescannerforemployees.databinding.FragmentExpiryDatesBinding import org.foxarmy.barcodescannerforemployees.databinding.FragmentExpiryDatesBinding
import org.foxarmy.barcodescannerforemployees.views.ExpiryGroupView
class ExpiryDatesFragment : Fragment() { class ExpiryDatesFragment : Fragment() {
private lateinit var binding: FragmentExpiryDatesBinding private lateinit var binding: FragmentExpiryDatesBinding
@ -18,20 +16,6 @@ class ExpiryDatesFragment : Fragment() {
): View { ): View {
binding = FragmentExpiryDatesBinding.inflate(layoutInflater) binding = FragmentExpiryDatesBinding.inflate(layoutInflater)
fillUp()
return binding.root return binding.root
} }
private fun fillUp() {
val dates = DBStorageController(requireContext()).findAllExpiryDates(DBStorageController(requireContext()).readableDatabase)
val container = binding.datesLinearLayout
dates.forEach { date ->
val newDate = ExpiryGroupView(requireActivity(), requireContext(), date)
container.addView(newDate)
}
}
} }

2
app/src/main/res/layout/activity_add_abstract_product.xml
View File

@ -6,5 +6,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.AddAbstractProductFragment"> tools:context=".fragments.AddAbstractProductFragment">
<include layout="@layout/content_add_abstract_product" android:id="@+id/include_content"/> <include layout="@layout/fragment_add_abstract_product" android:id="@+id/include_content"/>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

3
app/src/main/res/layout/activity_add_product.xml
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.AddProductFragment"> tools:context=".fragments.AddProductFragment">
<include layout="@layout/content_add_product" android:id="@+id/include_content"/> <include layout="@layout/fragment_add_product" android:id="@+id/include_content"/>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

2
app/src/main/res/layout/activity_expiry_calendar.xml
View File

@ -5,5 +5,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragments.ExpiryDatesFragment"> tools:context=".fragments.ExpiryDatesFragment">
<include layout="@layout/content_expiry_calendar" android:id="@+id/include_content"/> <include layout="@layout/fragment_expiry_dates" android:id="@+id/include_content"/>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>

14
app/src/main/res/layout/content_add_abstract_product.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/addAbstractProductLayout">
<androidx.fragment.app.FragmentContainerView
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" app:navGraph="@navigation/nav_graph_add_abstract_product"
app:defaultNavHost="true" android:id="@+id/fragmentContainerView"/>
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/content_add_product.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/addProductLayout">
<androidx.fragment.app.FragmentContainerView
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" app:navGraph="@navigation/nav_graph_add_product"
app:defaultNavHost="true" android:id="@+id/fragmentContainerView"/>
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/content_expiry_calendar.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" android:id="@+id/expiryCalendarContent">
<androidx.fragment.app.FragmentContainerView
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" app:navGraph="@navigation/nav_graph_expiry_calendar"
app:defaultNavHost="true" android:id="@+id/fragmentContainerView"/>
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/navigation/nav_graph_add_abstract_product.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph_add_abstract_product"
app:startDestination="@id/addAbstractProductFragment">
<fragment android:id="@+id/addAbstractProductFragment"
android:name="org.foxarmy.barcodescannerforemployees.fragments.AddAbstractProductFragment"
android:label="activity_add_abstract_product" tools:layout="@layout/fragment_add_abstract_product"/>
</navigation>

11
app/src/main/res/navigation/nav_graph_add_product.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/nav_graph_add_product"
app:startDestination="@id/addProductFragment">
<fragment android:id="@+id/addProductFragment"
android:name="org.foxarmy.barcodescannerforemployees.fragments.AddProductFragment"
android:label="activity_add_product" tools:layout="@layout/fragment_add_product"/>
</navigation>

11
app/src/main/res/navigation/nav_graph_expiry_calendar.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/navigation_graph_expiry_calendar"
app:startDestination="@id/expiryDatesFragment">
<fragment android:id="@+id/expiryDatesFragment"
android:name="org.foxarmy.barcodescannerforemployees.fragments.ExpiryDatesFragment"
android:label="expiry dates" tools:layout="@layout/fragment_expiry_dates"/>
</navigation>