Skip to content

Commit

Permalink
Merge pull request #3 from chaithanyagollapalli/Dheeraj
Browse files Browse the repository at this point in the history
Dheeraj
  • Loading branch information
nero002 authored Mar 9, 2021
2 parents c223bf2 + 2e78489 commit 97acbaf
Show file tree
Hide file tree
Showing 42 changed files with 522 additions and 44 deletions.
9 changes: 8 additions & 1 deletion Vyapar-Clone/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion Vyapar-Clone/app/src/main/java/com/nero/vyapar/HomeActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,21 @@ class HomeActivity : AppCompatActivity() {
// menu should be considered as top level destinations.
appBarConfiguration = AppBarConfiguration(
setOf(
R.id.nav_items, R.id.nav_Business_dasboard, R.id.nav_Reports
R.id.nav_items,
R.id.nav_business_dashboard,
R.id.nav_reports,
R.id.nav_sale,
R.id.nav_purchase,
R.id.nav_expenses,
R.id.nav_cash_banks,
R.id.nav_online_store,
R.id.settings
), drawerLayout
)

//will help to change the icon color
navView.itemIconTintList = null;
navView.itemBackground = null
setupActionBarWithNavController(navController, appBarConfiguration)
navView.setupWithNavController(navController)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.nero.vyapar.home_nav_bar.cashBank

import androidx.lifecycle.ViewModel

class CashBankViewModel : ViewModel() {
// TODO: Implement the ViewModel
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.nero.vyapar.home_nav_bar.cashBank

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.nero.vyapar.R

class cashBankFragment : Fragment() {

companion object {
fun newInstance() = cashBankFragment()
}

private lateinit var viewModel: CashBankViewModel

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.cash_bank_fragment, container, false)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this).get(CashBankViewModel::class.java)
// TODO: Use the ViewModel
}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.nero.vyapar.home_nav_bar.sale
package com.nero.vyapar.home_nav_bar.expense

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
Expand All @@ -8,24 +8,24 @@ import android.view.View
import android.view.ViewGroup
import com.nero.vyapar.R

class sale : Fragment() {
class ExpensesFragment : Fragment() {

companion object {
fun newInstance() = sale()
fun newInstance() = ExpensesFragment()
}

private lateinit var viewModel: SaleViewModel
private lateinit var viewModel: ExpensesViewModel

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.sale_fragment, container, false)
return inflater.inflate(R.layout.expenses_fragment, container, false)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this).get(SaleViewModel::class.java)
viewModel = ViewModelProvider(this).get(ExpensesViewModel::class.java)
// TODO: Use the ViewModel
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.nero.vyapar.home_nav_bar.expense

import androidx.lifecycle.ViewModel

class ExpensesViewModel : ViewModel() {
// TODO: Implement the ViewModel
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.nero.vyapar.home_nav_bar.myOnlineStore

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.nero.vyapar.R

class MyOnlineStoreFragment : Fragment() {

companion object {
fun newInstance() = MyOnlineStoreFragment()
}

private lateinit var viewModel: MyOnlineStoreViewModel

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.my_online_store_fragment, container, false)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this).get(MyOnlineStoreViewModel::class.java)
// TODO: Use the ViewModel
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.nero.vyapar.home_nav_bar.myOnlineStore

import androidx.lifecycle.ViewModel

class MyOnlineStoreViewModel : ViewModel() {
// TODO: Implement the ViewModel
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.nero.vyapar.home_nav_bar.purchase

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.nero.vyapar.R

class PurchaseFragment : Fragment() {

companion object {
fun newInstance() = PurchaseFragment()
}

private lateinit var viewModel: PurchaseViewModel

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.purchase_fragment, container, false)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this).get(PurchaseViewModel::class.java)
// TODO: Use the ViewModel
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.nero.vyapar.home_nav_bar.purchase

import androidx.lifecycle.ViewModel

class PurchaseViewModel : ViewModel() {
// TODO: Implement the ViewModel
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.nero.vyapar.home_nav_bar.sale

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.lifecycle.Observer
import com.nero.vyapar.R
import com.nero.vyapar.databinding.SaleFragmentBinding

class SaleFragment : Fragment() {


private lateinit var saleViewModel: SaleViewModel
private var _binding: SaleFragmentBinding? = null

// This property is only valid between onCreateView and
// onDestroyView.
private val binding get() = _binding!!

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {

saleViewModel = ViewModelProvider(this).get(SaleViewModel::class.java)

_binding = SaleFragmentBinding.inflate(inflater, container, false)
val root: View = binding.root

val textView: TextView = binding.textHome
saleViewModel.text.observe(viewLifecycleOwner, Observer {
textView.text = it
})
return inflater.inflate(R.layout.sale_fragment, container, false)
}

override fun onDestroyView() {
super.onDestroyView()
_binding = null
}

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
package com.nero.vyapar.home_nav_bar.sale

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel

class SaleViewModel : ViewModel() {
// TODO: Implement the ViewModel
class SaleViewModel : ViewModel() {

private val _text = MutableLiveData<String>().apply {
value = "This is Sales Fragment"
}
val text: LiveData<String> = _text
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.nero.vyapar.home_nav_bar.setting

import androidx.lifecycle.ViewModelProvider
import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.nero.vyapar.R

class SettingsFragment : Fragment() {

companion object {
fun newInstance() = SettingsFragment()
}

private lateinit var viewModel: SettingsViewModel

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.settings_fragment, container, false)
}

override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
viewModel = ViewModelProvider(this).get(SettingsViewModel::class.java)
// TODO: Use the ViewModel
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.nero.vyapar.home_nav_bar.setting

import androidx.lifecycle.ViewModel

class SettingsViewModel : ViewModel() {
// TODO: Implement the ViewModel
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M7,18c-1.1,0 -1.99,0.9 -1.99,2S5.9,22 7,22s2,-0.9 2,-2 -0.9,-2 -2,-2zM1,2v2h2l3.6,7.59 -1.35,2.45c-0.16,0.28 -0.25,0.61 -0.25,0.96 0,1.1 0.9,2 2,2h12v-2L7.42,15c-0.14,0 -0.25,-0.11 -0.25,-0.25l0.03,-0.12 0.9,-1.63h7.45c0.75,0 1.41,-0.41 1.75,-1.03l3.58,-6.49c0.08,-0.14 0.12,-0.31 0.12,-0.48 0,-0.55 -0.45,-1 -1,-1L5.21,4l-0.94,-2L1,2zM17,18c-1.1,0 -1.99,0.9 -1.99,2s0.89,2 1.99,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M14.43,10l-2.43,-8l-2.43,8l-7.57,0l6.18,4.41l-2.35,7.59l6.17,-4.69l6.18,4.69l-2.35,-7.59l6.17,-4.41z"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#C1C1C1"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20,4L4,4v2h16L20,4zM21,14v-2l-1,-5L4,7l-1,5v2h1v6h10v-6h4v6h2v-6h1zM12,18L6,18v-4h6v4z"/>
</vector>
Loading

0 comments on commit 97acbaf

Please sign in to comment.