El dorado (#29)

* verion changes

* update

Author: midhunhk

.gitignore

@@ -12,6 +12,7 @@
 bin/
 gen/
 out/
+app/release
 
 # Gradle files
 .gradle/

README.md

@@ -1,9 +1,8 @@
 _*This project is not in active development or support*_
 
 # Trip-O-Meter
-[![Build Status](https://travis-ci.org/midhunhk/trip-o-meter.svg?branch=main)](https://travis-ci.org/midhunhk/trip-o-meter) 
 [![Release](https://img.shields.io/github/release/midhunhk/trip-o-meter.svg)](https://github.com/midhunhk/trip-o-meter/releases) 
-[![GitHub commits](https://img.shields.io/github/commits-since/midhunhk/trip-o-meter/v2.0.18.svg)](https://github.com/midhunhk/trip-o-meter) 
+[![GitHub commits](https://img.shields.io/github/commits-since/midhunhk/trip-o-meter/v3.0.0.svg)](https://github.com/midhunhk/trip-o-meter) 
 [![Issues](https://img.shields.io/github/issues/midhunhk/trip-o-meter.svg)](https://github.com/midhunhk/trip-o-meter/issues)  
 
 <img alt="Trip O Meter" src="/resources/promotional/feature_graphic_v2.png" width="820"/>
@@ -27,9 +26,9 @@ The codenames for development branches are names of Lost or Mythical cities from
 
 The current development branch name is :
 
-***Dvaraka*** was a prosperous and advanced city located along the western coast of present-day Gujarat, India. 
-It was known for its grandeur, opulence, and divine association with Lord Krishna. 
-The city is often described as having majestic palaces, gardens, temples, and well-planned streets.
+***El Dorado*** is a legendary city or place believed to be overflowing with gold and riches. According to these stories, 
+El Dorado was a city or kingdom located somewhere in the unexplored regions of South America, often associated with 
+present-day Colombia or Venezuela.
 
 See more - [Codenames](https://github.com/midhunhk/trip-o-meter/wiki/Codenames)
 

app/build.gradle

@@ -10,9 +10,9 @@ android {
         namespace "com.ae.apps.tripmeter"
         applicationId "com.ae.apps.tripmeter"
         minSdkVersion 21
-        targetSdkVersion 33
-        compileSdk 33
-        versionCode 16
+        targetSdkVersion 34
+        compileSdk 34
+        versionCode 17
         versionName "3.1.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
@@ -46,14 +46,14 @@ android {
 dependencies {
     // implementation fileTree(include: ['*.jar'], dir: 'libs')
     // implementation 'com.github.midhunhk.lib-aeapps::4.1.0'
-    implementation 'com.github.midhunhk.lib-aeapps:aeapps:v5.0.0-alpha.12'
+    implementation 'com.github.midhunhk.lib-aeapps:aeapps:v5.0.0-alpha.20'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
     // Unit Tests
     testImplementation 'junit:junit:4.13.2'

app/src/main/java/com/ae/apps/tripmeter/database/TripExpensesDatabase.java

@@ -194,17 +194,14 @@ public List<TripExpense> getExpensesForTrip(String tripId) {
     public List<TripMemberShare> getExpenseShareForTrip(String tripId) {
         List<TripMemberShare> memberShares = new ArrayList<>();
         String[] selectionArgs = {tripId};
-        Cursor cursor = rawQuery("SELECT SUM (" + DatabaseConstants.EXPENSE_SHARE_MEMBER_SHARE + ")," +
+        try (Cursor cursor = rawQuery("SELECT SUM (" + DatabaseConstants.EXPENSE_SHARE_MEMBER_SHARE + ")," +
                 " " + DatabaseConstants.EXPENSE_SHARE_MEMBER_ID +
                 " FROM " + DatabaseConstants.EXPENSE_SHARE_TABLE +
                 " WHERE " + DatabaseConstants.EXPENSE_SHARE_TRIP_ID + " = ? " +
-                " GROUP BY " + DatabaseConstants.EXPENSE_SHARE_MEMBER_ID, selectionArgs);
-        try {
+                " GROUP BY " + DatabaseConstants.EXPENSE_SHARE_MEMBER_ID, selectionArgs)) {
             while (cursor.moveToNext()) {
                 memberShares.add(mapExpenseShareModel(cursor));
             }
-        } finally {
-            cursor.close();
         }
         return memberShares;
     }

app/src/main/java/com/ae/apps/tripmeter/fragments/PickProfileDialogFragment.java

@@ -38,6 +38,8 @@
 import com.ae.apps.tripmeter.R;
 import com.ae.apps.tripmeter.managers.ExpenseManager;
 
+import java.util.Objects;
+
 /**
  * A DialogFragment that is used to select a profile from contacts list
  */
@@ -62,8 +64,9 @@ public PickProfileDialogFragment() {
     public void onStart() {
         super.onStart();
 
-        getDialog().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
+        Objects.requireNonNull(Objects.requireNonNull(getDialog()).getWindow())
+                .setLayout(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     @Override
@@ -111,6 +114,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == Activity.RESULT_OK && requestCode == CONTACT_PICKER_RESULT) {
 
             Uri result = data.getData();
+            assert result != null;
             contactId = result.getLastPathSegment();
 
             ContactInfo profile = mExpenseManager.getContactFromContactId(contactId);

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

@@ -1,8 +1,8 @@
 <resources>
     <string name="app_name">Trip O Meter</string>
-    <string name="app_version_name">3.0.0 (Dvaraka)</string>
-    <string name="app_version_code">Dwarka is an ancient city in the northwestern Indian state of Gujarat.</string>
-    <string name="app_release_date">Aug 2023</string>
+    <string name="app_version_name">3.1.0 (El Dorado)</string>
+    <string name="app_version_code">El Dorado is a legendary city or place believed to be overflowing with gold and riches. According to these stories, El Dorado was a city or kingdom located somewhere in the unexplored regions of South America, often associated with present-day Colombia or Venezuela.</string>
+    <string name="app_release_date">Jun 2024</string>
     <string name="app_disclaim">The data shown in this app is approximate and should be used for a rough estimate only and may vary with actually observed values.</string>
     <string name="app_desc">This app calculates an estimate of fuel and cost needed for a trip</string>
     <string name="app_developer_info">Designed &amp; Developed at ae labs</string>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.5.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip