From 12b27fc3325f5d564594cc99c46fd804255d3f2a Mon Sep 17 00:00:00 2001 From: Rishav Chnada Date: Mon, 10 Jan 2022 12:20:15 +0530 Subject: [PATCH 1/4] removed the onboarding --- .idea/deploymentTargetDropDown.xml | 28 ++++++++++ app/build.gradle | 5 +- app/src/main/AndroidManifest.xml | 4 ++ .../buckoid/Adapter/TransactionAdapter.kt | 28 ---------- .../buckoid/fragments/AddTransaction.kt | 24 --------- .../buckoid/fragments/AllTransactions.kt | 54 ------------------- .../com/rishav/buckoid/fragments/Dashboard.kt | 46 ---------------- app/src/main/res/layout/activity_main.xml | 1 - 8 files changed, 35 insertions(+), 155 deletions(-) create mode 100644 .idea/deploymentTargetDropDown.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..9641bfd --- /dev/null +++ b/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 996d03f..14d8bf3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,9 @@ android { buildFeatures { viewBinding = true } + lintOptions { + checkReleaseBuilds false + } } dependencies { @@ -75,6 +78,4 @@ dependencies { //play implementation("com.google.android.play:core-ktx:1.8.1") - implementation 'uk.co.samuelwall:material-tap-target-prompt:3.3.2' - } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a60cdd4..3c62e4c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,12 @@ + + ) : RecyclerView.Adapter(){ @@ -92,35 +89,10 @@ class TransactionAdapter(val context: Context, val activity:Activity,val fragmen } userDetails = context.getSharedPreferences("UserDetails", AppCompatActivity.MODE_PRIVATE) - if(transList.size == 1 && !userDetails.getBoolean("ShowedOnboardingTransactionCard",false)){ - showOnBoardingTransactionCard(holder) - } - } override fun getItemCount() = transList.size - fun showOnBoardingTransactionCard(holder: transactionViewHolder){ - MaterialTapTargetPrompt.Builder(activity) - .setTarget(holder.binding.root) - .setPrimaryText("Hey Click Me!!") - .setPromptFocal(RectanglePromptFocal()) - .setPromptBackground(RectanglePromptBackground()) - .setBackgroundColour(ContextCompat.getColor(context, R.color.button)) - .setPrimaryTextColour(ContextCompat.getColor(context, R.color.textPrimary)) - .setSecondaryTextColour(ContextCompat.getColor(context, R.color.textSecondary)) - .setSecondaryText("Good Job !! Click to see details of your transaction..") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED){ - val editor: SharedPreferences.Editor = userDetails.edit() - editor.putBoolean("ShowedOnboardingTransactionCard", true) - editor.apply() - } - } - .show() - } - } diff --git a/app/src/main/java/com/rishav/buckoid/fragments/AddTransaction.kt b/app/src/main/java/com/rishav/buckoid/fragments/AddTransaction.kt index 6e4cd50..b538234 100644 --- a/app/src/main/java/com/rishav/buckoid/fragments/AddTransaction.kt +++ b/app/src/main/java/com/rishav/buckoid/fragments/AddTransaction.kt @@ -20,9 +20,6 @@ import androidx.core.content.ContextCompat import androidx.navigation.fragment.navArgs import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.button.MaterialButton -import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt -import uk.co.samuelwall.materialtaptargetprompt.extras.backgrounds.RectanglePromptBackground -import uk.co.samuelwall.materialtaptargetprompt.extras.focals.RectanglePromptFocal import java.text.SimpleDateFormat import java.util.* @@ -48,9 +45,6 @@ class AddTransaction : Fragment(), View.OnClickListener { setListner(binding) datePicker(binding) userDetails = requireActivity().getSharedPreferences("UserDetails", AppCompatActivity.MODE_PRIVATE) - if(!userDetails.getBoolean("ShowedOnboardingAddTransaction",false)){ - showOnBoarding() - } if(data.from){ setDatas() binding.addTransaction.setText("Save Transaction") @@ -277,24 +271,6 @@ class AddTransaction : Fragment(), View.OnClickListener { button.setTextColor(ContextCompat.getColor(requireContext(), R.color.textSecondary)) } - fun showOnBoarding(){ - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.selector1) - .setPromptFocal(RectanglePromptFocal()) - .setPromptBackground(RectanglePromptBackground()) - .setPrimaryText("Select Any Category of Transaction") - .setSecondaryText("Nice Select the category you spend on...") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED){ - val editor: SharedPreferences.Editor = userDetails.edit() - editor.putBoolean("ShowedOnboardingAddTransaction", true) - editor.apply() - } - } - .show() - } - } diff --git a/app/src/main/java/com/rishav/buckoid/fragments/AllTransactions.kt b/app/src/main/java/com/rishav/buckoid/fragments/AllTransactions.kt index cae89d2..a67bb87 100644 --- a/app/src/main/java/com/rishav/buckoid/fragments/AllTransactions.kt +++ b/app/src/main/java/com/rishav/buckoid/fragments/AllTransactions.kt @@ -22,8 +22,6 @@ import android.widget.ArrayAdapter import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import com.google.android.material.bottomnavigation.BottomNavigationView -import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt -import uk.co.samuelwall.materialtaptargetprompt.extras.focals.RectanglePromptFocal import java.text.SimpleDateFormat import java.util.* @@ -57,9 +55,6 @@ class AllTransactions : Fragment() ,View.OnClickListener { bottomNav.visibility = View.VISIBLE userDetails = requireActivity().getSharedPreferences("UserDetails", AppCompatActivity.MODE_PRIVATE) setListener() - if(!userDetails.getBoolean("ShowedOnboardingAllTransactions",false)){ - showOnBoarding() - } when(binding.toggleSelector.checkedButtonId) { R.id.all -> showAllTransactions() R.id.monthly -> showMonthlyTransactions() @@ -599,53 +594,4 @@ class AllTransactions : Fragment() ,View.OnClickListener { } - fun showOnBoarding(){ - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.monthly) - .setPromptFocal(RectanglePromptFocal()) - .setPrimaryText("Monthly Transactions") - .setSecondaryText("Tap to see Monthly Transaction records...") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED){ - showOnBoarding() - }else if(state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED){ - showYearsOnBoarding() - } - } - .show() - } - - fun showYearsOnBoarding(){ - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.yearSpinner) - .setPromptFocal(RectanglePromptFocal()) - .setPrimaryText("Choose Year") - .setSecondaryText("Choose any year to see the transactions..") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED){ - showMonthsOnBoarding() - } - } - .show() - } - fun showMonthsOnBoarding(){ - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.January) - .setPromptFocal(RectanglePromptFocal()) - .setPrimaryText("Select Month") - .setSecondaryText("Choose any month to see the transactions...") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED){ - val editor: SharedPreferences.Editor = userDetails.edit() - editor.putBoolean("ShowedOnboardingAllTransactions", true) - editor.apply() - } - } - .show() - } - - } \ No newline at end of file diff --git a/app/src/main/java/com/rishav/buckoid/fragments/Dashboard.kt b/app/src/main/java/com/rishav/buckoid/fragments/Dashboard.kt index bbf345a..745e338 100644 --- a/app/src/main/java/com/rishav/buckoid/fragments/Dashboard.kt +++ b/app/src/main/java/com/rishav/buckoid/fragments/Dashboard.kt @@ -25,11 +25,6 @@ import java.util.* import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import com.google.android.material.navigation.NavigationView -import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt -import uk.co.samuelwall.materialtaptargetprompt.extras.backgrounds.RectanglePromptBackground -import uk.co.samuelwall.materialtaptargetprompt.extras.focals.RectanglePromptFocal - - class Dashboard : Fragment() { lateinit var binding:FragmentDashboardBinding @@ -78,10 +73,6 @@ class Dashboard : Fragment() { val name = userDetails.getString("Name", "")?.split(" ") binding.name.text = "Hi ${name?.get(0)} !!" - if(!userDetails.getBoolean("ShowedOnboardingDashboard",false)){ - showOnBoarding() - } - totalExpense = 0.0 totalGoal = userDetails.getString("MonthlyBudget","0")?.toFloat()!! totalFood = 0.0f @@ -196,43 +187,6 @@ class Dashboard : Fragment() { } - fun showOnBoarding(){ - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.mainCard) - .setPromptFocal(RectanglePromptFocal()) - .setPromptBackground(RectanglePromptBackground()) - .setPrimaryText("Your Monthly Details") - .setSecondaryText("Your Transactions visual representation and data on Monthly Basis will be shown here!!") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED){ - showButtonPrompt() - } - } - .show() - - } - - private fun showButtonPrompt() { - MaterialTapTargetPrompt.Builder(requireActivity()) - .setTarget(binding.addNew) - .setPrimaryText("Hey Click Me!!") - .setFocalRadius(100.0f) - .setSecondaryText("Good to go... Add your first Transaction by Clicking on this Add Button") - .setBackButtonDismissEnabled(true) - .setPromptStateChangeListener{prompt, state -> - if(state == MaterialTapTargetPrompt.STATE_FOCAL_PRESSED || state == MaterialTapTargetPrompt.STATE_NON_FOCAL_PRESSED){ - val editor: SharedPreferences.Editor = userDetails.edit() - editor.putBoolean("ShowedOnboardingDashboard", true) - editor.apply() - } - } - .show() - } - - - - } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4122762..ddf6ad2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -25,7 +25,6 @@ Date: Mon, 10 Jan 2022 12:22:38 +0530 Subject: [PATCH 2/4] error fixed --- app/src/main/res/layout/activity_main.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ddf6ad2..4122762 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -25,6 +25,7 @@ Date: Mon, 10 Jan 2022 15:14:17 +0530 Subject: [PATCH 3/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 490fd0a..dcbe741 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# Buckoid-Android-App +# Android-Study-Jams +Buckoid-Android-App Problem Statement: From 53526298998affa2bfc81ec520a0885221a96dd0 Mon Sep 17 00:00:00 2001 From: Rishav Chnada Date: Tue, 11 Jan 2022 10:50:09 +0530 Subject: [PATCH 4/4] merged dev branch to master --- .idea/deploymentTargetDropDown.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 9641bfd..73a9ab2 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,17 +1,6 @@ - - - - - - - - - - -