Aditya.Gaikwad/SimpliTend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

home pc

Browse Source
This commit is contained in:
ADITYA
2024-02-22 01:25:07 +05:30
parent 1a5f70c2e0
commit 29b84d1041
8 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,28 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_33.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-01-29T07:18:34.414268Z" />
<targetsSelectedWithDialog>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\adity\.android\avd\Samsung_Z3_flip_API_34.avd" />
</Key>
</deviceKey>
</Target>
</targetsSelectedWithDialog>
<value>
<entry key="app">
<State />
</entry>
</value>
</component>
</project>

5
.idea/gradle.xml generated
View File

@@ -4,16 +4,15 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

4
app/src/main/AndroidManifest.xml
View File

@@ -16,11 +16,11 @@
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission
android:name="android.permission.WRITE_SECURE_SETTINGS"
tools:ignore="ProtectedPermissions" /> <!-- for retrieving all the apps having launcher screen -->
tools:ignore="ProtectedPermissions" />
<queries>
<intent>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent>
</queries>

8
app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java
View File

@@ -87,7 +87,7 @@ public class CgSubscriptionActivity extends AppCompatActivity
paymentSheet = new PaymentSheet(this, this::onPaymentSheetResult);
} else {
// Already subscribed thus, loading current plans
loadCurrentPlans();
// loadCurrentPlans();
}
} else {
binding.plansView.setVisibility(View.GONE);
@@ -293,7 +293,9 @@ public class CgSubscriptionActivity extends AppCompatActivity
// loading subscription plans
progressDialog = new ProgressDialog(this);
binding.description.setText(getString(R.string.subscribe_description));
binding.description.setText(getString(R.string.proceed_to_the_payment_website_to_select_a_subscription_option_and_pay));
// binding.makePayment.setVisibility(View.VISIBLE);
binding.makePayment.setText(getString(R.string.proceed_to_website));
// try {
// String description = getString(R.string.subscribe_description);
@@ -505,7 +507,7 @@ public class CgSubscriptionActivity extends AppCompatActivity
private void inflatePlans() {
binding.makePayment.setVisibility(View.VISIBLE);
binding.makePayment.setText(getString(R.string.subscribe_plus_tax));
binding.makePayment.setText(getString(R.string.proceed_to_website));
binding.yourPlan.setVisibility(View.GONE);

11
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/CreateContactFragment.java
View File

@@ -26,6 +26,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavBackStackEntry;
import androidx.navigation.Navigation;
import com.app.simplitend.R;
@@ -440,13 +441,17 @@ public class CreateContactFragment extends Fragment implements WelcomeContracts.
// create contact callback
@Override
public void onContactCreated(Contact contact) {
Log.d(TAG, "onContactCreated: " + contact);
public void onContactCreated(Contact con) {
progressDialog.dismiss();
try {
NavBackStackEntry entry = Navigation.findNavController(binding.getRoot()).getBackStackEntry(R.id.addContactFragment);
Navigation.findNavController(binding.getRoot()).popBackStack(R.id.addContactFragment, false);
}catch (IllegalArgumentException e){
// addcontactFragment is not available in backstack
Navigation.findNavController(binding.getRoot()).navigate(R.id.action_createContactFragment_to_addContactFragment);
} catch (Exception e) {
}
catch (Exception e) {
// this fragment is opened from outside of welcome_nav_graph
try {
getParentFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);

6
app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/mvvm/UserContactRepository.java
View File

@@ -119,7 +119,11 @@ public class UserContactRepository {
Log.e(TAG, "onResponse: no success response and also response body is null");
if (createContactInterface != null) {
createContactInterface.onContactCreateFailed(new Exception("no success response and also response body is null"), "It's not you, it's us.\nPlease try again later", 1);
// createContactInterface.onContactCreateFailed(new Exception("no success response and also response body is null"), "It's not you, it's us.\nPlease try again later", 1);
// There's a chance that the contact was created but, with an server error
// thus, mimicking the contact was created
createContactInterface.onContactCreated(null);
}
if (updateContactContracts != null) {

4
app/src/main/res/layout/cg_subscription_layout.xml
View File

@@ -288,7 +288,7 @@
android:id="@+id/ll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_centerVertical="true"
android:orientation="horizontal">
<ImageView
@@ -442,7 +442,7 @@
android:textColor="@color/black"
android:textSize="@dimen/_14ssp"
tools:text="@string/subscribe_description"
tools:text="@string/proceed_to_the_payment_website_to_select_a_subscription_option_and_pay"
/>

2
app/src/main/res/values/strings.xml
View File

@@ -493,5 +493,7 @@
<string name="update_app">Update app</string>
<string name="skip_underline"><u>skip</u></string>
<string name="update_to_50_contacts">Update to 50 contacts</string>
<string name="proceed_to_the_payment_website_to_select_a_subscription_option_and_pay">Proceed to the payment website to select a subscription option and pay</string>
<string name="proceed_to_website">Proceed to website</string>
</resources>