feat: Added option for Custom Pooja and Amount paid #65

gopikaharikumar · 2019-07-01T12:27:57Z

Fixes issue #11

Added an option for Custom Pooja in the App

Added an option to enter the Amount paid for a Pooja

ajay-prabhakar · 2019-07-01T14:41:08Z

@gopikaharikumar your build is failing because of spotless Just run ./gradlew spotlessApply it will automatically detects your errors and it will change them

ajay-prabhakar · 2019-07-01T14:42:50Z

app/src/main/java/org/amfoss/templeapp/adapter/MyArrayAdapter.java

@@ -44,6 +44,9 @@ public View getView(int position, View convertView, ViewGroup parent) {

        String[] str = item.getName().split("     ");
        String lastWord = str[0].substring(str[0].lastIndexOf(" ") + 1);
+        if(lastWord.length()>1){
+            lastWord="C";
+        }

        vh.textViewName.setText(str[1] + "     " + str[2]);


Currently, it will show only 2 values add the Pojja Name also in readAll

Add the input type is numbers only in amount edit text

yashk2000 · 2019-07-01T15:36:00Z

app/src/main/java/org/amfoss/templeapp/activities/InsertData.java

@@ -37,11 +40,15 @@ protected void onCreate(Bundle savedInstanceState) {
        insert = findViewById(R.id.insert_btn);
        uid1ET = findViewById(R.id.uid);
        nameET = findViewById(R.id.name);
+        custompooja=(EditText)findViewById(R.id.custompooja);


Redundant type casts. Please remove.

yashk2000 · 2019-07-01T15:36:14Z

app/src/main/java/org/amfoss/templeapp/activities/InsertData.java

@@ -37,11 +40,15 @@ protected void onCreate(Bundle savedInstanceState) {
        insert = findViewById(R.id.insert_btn);
        uid1ET = findViewById(R.id.uid);
        nameET = findViewById(R.id.name);
+        custompooja=(EditText)findViewById(R.id.custompooja);
+        amount=(EditText)findViewById(R.id.amount);


Redundant type casts.

yashk2000 · 2019-07-01T15:38:35Z

@gopikaharikumar always follow Semantic Pull Request format while sending a pr, please.
Also before sending a pr, do run ./gradlew spotlessApply to detect any code formatting errors and fix them.

immadisairaj · 2019-07-02T06:03:24Z

app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java

@@ -115,7 +116,7 @@ protected Void doInBackground(Void... params) {
                */
                if (jsonObject != null) {
                    JSONObject user = jsonObject.getJSONObject(getString(R.string.user));
-                    name = user.getString(getString(R.string.name_));
+                    name = user.getString("name");


don't use hardcoded strings. Revert

app/src/main/java/org/amfoss/templeapp/activities/InsertData.java

immadisairaj · 2019-07-02T06:06:42Z

app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java

@@ -43,6 +46,8 @@ protected void onCreate(Bundle savedInstanceState) {
        poojaType = findViewById(R.id.spinner1);
        totalLayout = findViewById(R.id.total_View);
        moneyDonated = findViewById(R.id.money_donated);
+        custompooja = (EditText) findViewById(R.id.custompooja);
+        amount= (EditText) findViewById(R.id.amount);


same as above from @yashk2000

app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java

yashk2000 · 2019-07-02T06:51:28Z

app/src/main/java/org/amfoss/templeapp/activities/ReadSingleData.java

@@ -115,7 +116,7 @@ protected Void doInBackground(Void... params) {
                */
                if (jsonObject != null) {
                    JSONObject user = jsonObject.getJSONObject(getString(R.string.user));
-                    name = user.getString(getString(R.string.name_));
+                    name = user.getString(getResources().getString(R.string.fetch_name));


@gopikaharikumar is there any need to use getResources(). Can't you directly call getString() ?

immadisairaj · 2019-07-02T06:52:12Z

app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java

@@ -43,6 +46,8 @@ protected void onCreate(Bundle savedInstanceState) {
        poojaType = findViewById(R.id.spinner1);
        totalLayout = findViewById(R.id.total_View);
        moneyDonated = findViewById(R.id.money_donated);
+        custompooja = (EditText) findViewById(R.id.custompooja);
+        amount = (EditText) findViewById(R.id.amount);


remove typecasting

immadisairaj · 2019-07-02T06:53:12Z

app/src/main/java/org/amfoss/templeapp/activities/UpdateData.java

+                    }
+
+                    @Override
+                    public void onNothingSelected(AdapterView<?> adapterView) {}


add a comment or a log statement

immadisairaj · 2019-07-02T06:55:13Z

app/src/main/res/values/strings.xml

@@ -57,12 +57,16 @@
    <string name="update_the_details_of_donated_money">Update The Details Of Donated Money</string>
    <string name="update">Update</string>
    <string name="error_notSelected">Please select any option</string>
+    <string name="fetch_name">name</string>
+    <string name="insert_data">InsertData</string>


"Insert Data" or "InsertData"

immadisairaj · 2019-07-02T07:50:14Z

app/src/main/java/org/amfoss/templeapp/activities/InsertData.java

                        name = nameET.getText().toString();
                        if (id.length() == 3) {
                            uid1ET.setError(getString(R.string.valid_ID));
                        } else {
                            if (flag == 1) {
-                                poojaTyp = String.valueOf(poojaType.getSelectedItem());
+                                if (sp.contentEquals("Custom Pooja")) {


can you check by using string array instead of "Custom Pooja" because it is hardcoded.

yashk2000

@gopikaharikumar good job. Thanks 😄

ajay-prabhakar suggested changes Jul 1, 2019

View reviewed changes

yashk2000 changed the title ~~Added option for Custom Pooja and Amount paid~~ feat: Added option for Custom Pooja and Amount paid Jul 1, 2019

yashk2000 reviewed Jul 1, 2019

View reviewed changes

immadisairaj suggested changes Jul 2, 2019

View reviewed changes

gopikaharikumar force-pushed the temp1 branch from 8b8b963 to 97c7897 Compare July 2, 2019 06:44

yashk2000 reviewed Jul 2, 2019

View reviewed changes

immadisairaj suggested changes Jul 2, 2019

View reviewed changes

gopikaharikumar force-pushed the temp1 branch 2 times, most recently from 4fd2c54 to 23ea34b Compare July 2, 2019 07:16

immadisairaj self-requested a review July 2, 2019 07:47

immadisairaj reviewed Jul 2, 2019

View reviewed changes

gopikaharikumar force-pushed the temp1 branch from b4d14cf to 7e40cc9 Compare July 2, 2019 09:19

Added option for Custom Pooja and Amount paid

aa73cea

gopikaharikumar force-pushed the temp1 branch from 5b4a55c to aa73cea Compare July 2, 2019 09:35

immadisairaj approved these changes Jul 2, 2019

View reviewed changes

Merge branch 'development' into temp1

5d407f5

immadisairaj requested review from yashk2000 and ajay-prabhakar July 2, 2019 09:52

ajay-prabhakar approved these changes Jul 2, 2019

View reviewed changes

yashk2000 approved these changes Jul 2, 2019

View reviewed changes

immadisairaj merged commit 9975ddf into amfoss:development Jul 2, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Added option for Custom Pooja and Amount paid #65

feat: Added option for Custom Pooja and Amount paid #65

gopikaharikumar commented Jul 1, 2019

ajay-prabhakar commented Jul 1, 2019 •

edited

Loading

ajay-prabhakar Jul 1, 2019

ajay-prabhakar Jul 1, 2019

yashk2000 Jul 1, 2019

yashk2000 Jul 1, 2019

yashk2000 commented Jul 1, 2019

immadisairaj Jul 2, 2019

immadisairaj Jul 2, 2019

yashk2000 Jul 2, 2019 •

edited

Loading

immadisairaj Jul 2, 2019

immadisairaj Jul 2, 2019

immadisairaj Jul 2, 2019

immadisairaj Jul 2, 2019

yashk2000 left a comment

feat: Added option for Custom Pooja and Amount paid #65

feat: Added option for Custom Pooja and Amount paid #65

Conversation

gopikaharikumar commented Jul 1, 2019

ajay-prabhakar commented Jul 1, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yashk2000 commented Jul 1, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yashk2000 Jul 2, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yashk2000 left a comment

Choose a reason for hiding this comment

ajay-prabhakar commented Jul 1, 2019 •

edited

Loading

yashk2000 Jul 2, 2019 •

edited

Loading