Merge pull request #91 from Crazy-Marvin/development

To Don't 1.3
Crazy-Marvin · Sep 2, 2021 · b9fa328 · b9fa328
2 parents 414c3f1 + c0b012a
commit b9fa328
Show file tree

Hide file tree

Showing 84 changed files with 598 additions and 101 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-
+/app/ @arafaatqureshi
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -1 +1 @@
-
+Please report (suspected) security vulnerabilities to marvin@poopjournal.rocks. It would be great if you could prepare a patch too. Thanks!
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
@@ -1 +1,33 @@
+Hi!  👋
 
+We’re excited that you’re using **To Dont't** and we’d love to help.
+To help us help you, please read through the following guidelines.
+
+Please understand that people involved with this project often do so for fun,
+next to their day job; you are not entitled to free customer service.
+
+## Help us help you!
+
+Spending time framing a question and adding support links or resources makes it
+much easier for us to help.
+It’s easy to fall into the trap of asking something too specific when you’re
+close to a problem.
+Then, those trying to help you out have to spend a lot of time asking additional
+questions to understand what you are hoping to achieve.
+
+Spending the extra time up front can help save everyone time in the long run.
+
+*   Try to define what you need help with:
+    *   Is there something in particular you want to do?
+    *   What problem are you encountering and what steps have you taken to try
+        and fix it?
+    *   Is there a concept you’re not understanding?
+*   Learn about the [rubber duck debugging method](https://rubberduckdebugging.com/)
+*   Avoid falling for the [XY problem](https://meta.stackexchange.com/questions/66377/what-is-the-xy-problem/66378#66378)
+*   Search on GitHub to see if a similar question has been asked
+*   If possible, provide sample code, a [CodeSandbox](https://codesandbox.io/), or a video/GIF
+*   The more time you put into asking your question, the better we can help you
+
+## Contributions
+
+See [`contributing.md`](https://github.com/Crazy-Marvin/ToDont/blob/trunk/.github/CONTRIBUTING.md) on how to contribute. Quality PRs are really appreaciated!
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,12 +21,11 @@ jobs:
       - name: "🏗 Build"
         run: ./gradlew assembleDebug
       - name: "🧪 Code coverage"
-        run: ./gradlew jacocoTestReport
+        run: ./gradlew test
       - name: "📤 Upload code coverage"
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          yml: .codecov.yml
       - name: "🧪 Android LINT"
         run: ./gradlew lint
       - name: "🧪 Unit test"

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Issues](https://img.shields.io/github/issues/Crazy-Marvin/ToDont.svg?style=flat)](https://github.com/Crazy-Marvin/ToDont/issues)
 [![Pull requests](https://img.shields.io/github/issues-pr/Crazy-Marvin/ToDont.svg?style=flat)](https://github.com/Crazy-Marvin/ToDont/pulls)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/7dadc506c2df42a38c2ef733948f9492)](https://www.codacy.com/gh/Crazy-Marvin/ToDont/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Crazy-Marvin/ToDont&amp;utm_campaign=Badge_Grade)
-[![codecov](https://codecov.io/gh/Crazy-Marvin/ToDont/branch/master/graph/badge.svg)](https://codecov.io/gh/Crazy-Marvin/ToDont)
+[![codecov](https://codecov.io/gh/Crazy-Marvin/ToDont/branch/development/graph/badge.svg?token=ECQID61KGH)](https://codecov.io/gh/Crazy-Marvin/ToDont)
 [![Hosted Weblate](https://hosted.weblate.org/widgets/todont/-/svg-badge.svg)](https://hosted.weblate.org/engage/todont/)
 [![Known Vulnerabilities](https://snyk.io/test/github/Crazy-Marvin/ToDont/badge.svg?targetFile=app%2Fbuild.gradle)](https://snyk.io/test/github/Crazy-Marvin/ToDont?targetFile=app%2Fbuild.gradle)
 [![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19)

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "rocks.poopjournal.todont"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.2"
+        versionCode 4
+        versionName "1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,7 +40,7 @@ dependencies {
     implementation 'com.android.support:design:27.0.2'
     implementation 'com.jaredrummler:material-spinner:1.3.1'
     implementation 'com.google.android.material:material:1.0.0-rc01'
-    implementation 'com.ornach.nobobutton:nobobutton:1.6'
+    compile 'com.ornach.nobobutton:nobobutton:1.6'
     implementation 'de.hdodenhof:circleimageview:2.2.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'de.hdodenhof:circleimageview:3.1.0'

diff --git a/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java b/app/src/main/java/rocks/poopjournal/todont/Adapters/HabitsAdapter.java
@@ -132,7 +132,12 @@ public void onClick(View view) {
 
                         } catch (SQLiteException e) {
                         }
-                        db.update_habitsdata(position, formattedDate, habit.getText().toString()
+                        String str=habit.getText().toString();
+                        if(str.contains("'")){
+                            str=str.replace("'","geodhola");
+                            Log.d("kuttistring",""+str);
+                        }
+                        db.update_habitsdata(position, formattedDate,str
                                 , detail.getText().toString(), catagoryselected);
                         db.show_habits_data();
                         Intent intent = new Intent(con, MainActivity.class);

diff --git a/app/src/main/res/drawable/codeaquaria.png b/app/src/main/res/drawable/codeaquaria.png
diff --git a/app/src/main/res/drawable/crazymarvin.png b/app/src/main/res/drawable/crazymarvin.png
diff --git a/app/src/main/res/drawable/designerlogo.png b/app/src/main/res/drawable/designerlogo.png
diff --git a/app/src/main/res/drawable/drop.jpeg b/app/src/main/res/drawable/drop.jpeg
diff --git a/app/src/main/res/drawable/drop.png b/app/src/main/res/drawable/drop.png
diff --git a/app/src/main/res/drawable/git.png b/app/src/main/res/drawable/git.png
diff --git a/app/src/main/res/drawable/i.jpg b/app/src/main/res/drawable/i.jpg
diff --git a/app/src/main/res/drawable/onbording.png b/app/src/main/res/drawable/onbording.png
diff --git a/app/src/main/res/drawable/reportproblem.png b/app/src/main/res/drawable/reportproblem.png
diff --git a/app/src/main/res/drawable/translate.png b/app/src/main/res/drawable/translate.png
diff --git a/app/src/main/res/drawable/twitter.png b/app/src/main/res/drawable/twitter.png
diff --git a/app/src/main/res/drawable/web.png b/app/src/main/res/drawable/web.png
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -108,7 +108,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text=" Apache License 2.0"
+                android:text="@string/apachelicense"
                 android:textColor="@color/colorPrimary"
                 android:onClick="apacheee"/>
         </LinearLayout>
@@ -190,7 +190,7 @@
                             <TextView
                                 android:layout_width="230dp"
                                 android:layout_height="wrap_content"
-                                android:text="Developer"
+                                android:text="@string/developer"
                                 android:textColor="@color/spinr" />
                         </LinearLayout>
                     </LinearLayout>
@@ -294,7 +294,7 @@
                             <TextView
                                 android:layout_width="230dp"
                                 android:layout_height="wrap_content"
-                                android:text="Developer"
+                                android:text="@string/developer"
                                 android:textColor="@color/spinr" />
                         </LinearLayout>
                     </LinearLayout>
@@ -444,7 +444,7 @@
                 android:layout_height="30dp"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="25dp"
-                android:text="Contribute"
+                android:text="@string/contribute"
                 android:textColor="@color/colorPrimary"
                 android:textSize="18sp" />
 
@@ -475,7 +475,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_marginLeft="10dp"
-                    android:text="Translate"
+                    android:text="@string/translate"
                     android:onClick="translate"
                     android:gravity = "center_vertical"
                     android:textColor="@color/textcolor" />
@@ -509,7 +509,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_marginLeft="10dp"
-                    android:text="Report a problem"
+                    android:text="@string/report"
                     android:gravity = "center_vertical"
                     android:textColor="@color/textcolor"
                     android:onClick="report"
@@ -544,7 +544,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="30dp"
                     android:layout_marginLeft="10dp"
-                    android:text="View source"
+                    android:text="@string/source"
                     android:gravity = "center_vertical"
                     android:onClick="viewsource"
                     android:textColor="@color/textcolor"/>
@@ -555,7 +555,7 @@
                 android:layout_height="30dp"
                 android:layout_marginLeft="25dp"
                 android:layout_marginTop="25dp"
-                android:text="Open-source licences"
+                android:text="@string/opensourcelicense"
                 android:textColor="@color/colorPrimary"
                 android:textSize="18sp" />
 
@@ -578,14 +578,14 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:text="Feather Icons"
+                        android:text="@string/feather"
                         android:onClick="feather"
                         android:textColor="@color/textcolor"/>
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:text="MIT License"
+                        android:text="@string/mitlicence"
                         android:onClick="feather"
                         android:textColor="@color/spinr" />
                 </LinearLayout>
@@ -609,15 +609,15 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:text="Android Jetpack"
+                        android:text="@string/jetpack"
                         android:onClick="jetpack"
                         android:textColor="@color/textcolor"/>
                     <TextView
                         android:id="@+id/textjetpack1"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:text="Apache License 2.0"
+                        android:text="@string/apachelicense"
                         android:onClick="jetpack"
                         android:textColor="@color/spinr" />
                 </LinearLayout>
@@ -640,15 +640,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="MaterialSpinner"
+                    android:text="@string/materialspinner"
                     android:onClick="spinner"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/spinner1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Apache License 2.0"
+                    android:text="@string/apachelicense"
                     android:onClick="spinner"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -672,15 +672,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="NoboButton"
+                    android:text="@string/nobobutton"
                     android:onClick="nobobutton"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/nobobutton1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Apache License 2.0"
+                    android:text="@string/apachelicense"
                     android:onClick="nobobutton"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -705,15 +705,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="CircleImageView"
+                    android:text="@string/circleimg"
                     android:onClick="cImgButton"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/CircleImageView1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Apache License 2.0"
+                    android:text="@string/apachelicense"
                     android:onClick="cImgButton"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -736,15 +736,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="MPAndroidChart"
+                    android:text="@string/mpandroidchart"
                     android:onClick="MPAndroidChart"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/MPAndroidChart1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Apache License 2.0"
+                    android:text="@string/apachelicense"
                     android:onClick="MPAndroidChart"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -770,15 +770,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="JUnit"
+                    android:text="@string/junit"
                     android:onClick="JUnit"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/JUnit1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Eclipse Public License 1.0"
+                    android:text="@string/eclipse"
                     android:onClick="JUnit"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -804,15 +804,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Kotlin"
+                    android:text="@string/kotlin"
                     android:onClick="Kotlin"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/Kotlin1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Apache License 2.0"
+                    android:text="@string/apachelicense"
                     android:onClick="Kotlin"
                     android:textColor="@color/spinr" />
             </LinearLayout>
@@ -838,15 +838,15 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="Java"
+                    android:text="@string/java"
                     android:onClick="Java"
                     android:textColor="@color/textcolor"/>
                 <TextView
                     android:id="@+id/Java1"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="10dp"
-                    android:text="GNU General Public License CE"
+                    android:text="@string/gnu"
                     android:onClick="Java"
                     android:textColor="@color/spinr" />
             </LinearLayout>

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -31,7 +31,7 @@
             android:layout_height="20dp"
             android:textSize="18sp"
             android:layout_marginLeft="20dp"
-            android:text="Settings"
+            android:text="@string/settings"
             android:textColor="@color/textcolor"
             android:layout_gravity="center"
             android:gravity="bottom"
@@ -67,15 +67,15 @@
                 android:gravity="bottom"
                 android:textSize="16sp"
                 android:textColor="@color/textcolor"
-                android:text="Appearance"
+                android:text="@string/appearance"
                 android:onClick="changeMode"
 
                 />
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textSize="14sp"
-                android:text="Follow System"
+                android:text="@string/followsys"
                 android:textColor="@color/textcolor"
                 android:layout_marginLeft="20dp"
                 android:onClick="changeMode"
@@ -113,7 +113,7 @@
                 android:gravity="bottom"
                 android:textSize="16sp"
                 android:textColor="@color/textcolor"
-                android:text="About"
+                android:text="@string/about"
                 android:onClick="aboutus"
 
                 />

diff --git a/app/src/main/res/layout/recyclerview_layout.xml b/app/src/main/res/layout/recyclerview_layout.xml
@@ -14,8 +14,8 @@
         >
 
         <Button
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
             android:layout_weight="0"
             android:layout_gravity="top"
             android:layout_marginTop="5dp"

diff --git a/app/src/main/res/layout/recyclerview_layout_log_habits.xml b/app/src/main/res/layout/recyclerview_layout_log_habits.xml
@@ -13,8 +13,8 @@
         android:layout_marginLeft="15dp"
         >
         <Button
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
             android:layout_weight="0"
             android:layout_gravity="top"
             android:layout_marginTop="5dp"

diff --git a/app/src/main/res/mipmap-mdpi/ic_roundstore.png b/app/src/main/res/mipmap-mdpi/ic_roundstore.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_store.png b/app/src/main/res/mipmap-mdpi/ic_store.png