Dvaraka (#28)

* upgrade gradle from 3.3 to 8.1
* upgrade to lib-aeapps v5 alpha
* upgrade agp
* target android api 33
* update travis config

Author: midhunhk

.travis.yml

@@ -2,21 +2,17 @@ language: android
 dist: precise
 jdk: oraclejdk8
 
-# Install Dependencies
-before_install:
-    - git clone --depth=50 --branch=master https://github.com/midhunhk/ae-apps-library.git ../AeAppsLib
-
 # Android settings
 android:
   components:
     - tools
     # Same version as specified in build.gradle
 
     # Build Tools version
-    - build-tools-25.0.1
+    - build-tools-34.0.0
 
     # SDK version to compile against
-    - android-25
+    - android-33
 
    # Additional components
     - extra-android-m2repository
@@ -27,11 +23,11 @@ android:
   licenses:
     - '.+'
 
-# Run before runnig the build script
+# Run before running the build script
 before_script:
-    - wget http://services.gradle.org/distributions/gradle-3.3-bin.zip
-    - unzip gradle-3.3-bin.zip
-    - export GRADLE_HOME=$PWD/gradle-3.3
+    - wget https://services.gradle.org/distributions/gradle-8.1-bin.zip
+    - unzip gradle-8.1-bin.zip
+    - export GRADLE_HOME=$PWD/gradle-8.1
     - export PATH=$GRADLE_HOME/bin:$PATH
     - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
     - emulator -avd test -no-skin -no-audio -no-window &

README.md

@@ -1,7 +1,7 @@
 _*This project is not in active development or support*_
 
 # Trip-O-Meter
-[![Build Status](https://travis-ci.org/midhunhk/trip-o-meter.svg?branch=camelot)](https://travis-ci.org/midhunhk/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) 
 [![Issues](https://img.shields.io/github/issues/midhunhk/trip-o-meter.svg)](https://github.com/midhunhk/trip-o-meter/issues)  
@@ -27,7 +27,9 @@ The codenames for development branches are names of Lost or Mythical cities from
 
 The current development branch name is :
 
-***Camelot*** is a castle and court associated with the legendary King Arthur.
+***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.
 
 See more - [Codenames](https://github.com/midhunhk/trip-o-meter/wiki/Codenames)
 
@@ -71,7 +73,7 @@ This project is released under MIT license
 
 MIT License
 
-Copyright (c) 2017 Midhun Harikumar
+Copyright (c) 2023 Midhun Harikumar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

VersionHistory.md

@@ -1,14 +1,17 @@
 ## Trip 'O Meter Version History
+## Version 3.0 (Dvaraka)
+**Trip O Meter 3.0.0 [Aug 2023]**
+* [IMPROVED] Hero image
+* [IMPROVED] Target API 33
+* [IMPROVED] Use lib-aeapps v5
 
-Version 2.1 (Camelot)
-----------------------
+## Version 2.1 (Camelot)
 **Trip O Meter 2.1.3 [Jul 2017]**
 * [FIXED] FAB Layout issues
 * [ADDED] Unit Testing
 * [IMPROVED] Layouts and performance
 
-Version 2.0 (Balanjar)
-----------------------
+## Version 2.0 (Balanjar)
 **Trip O Meter 2.0.19 [Apr 2017]**
 * [FIXED] App crash on selecting contacts without phone numbers
 
@@ -42,8 +45,7 @@ Version 2.0 (Balanjar)
 * [ADDED] Remember and restore last used feature
 * [FIXED] NullPointer on orientation changes in trip details
 
-Version 1.0 (Atlantis)
-----------------------
+## Version 1.0 (Atlantis)
 **Trip O Meter 1.0.0 [Jan 2017]**
 * [RELEASE] First Public Release
 

app/build.gradle

@@ -6,15 +6,15 @@ android {
         }
     }
 
-    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
     defaultConfig {
+        namespace "com.ae.apps.tripmeter"
         applicationId "com.ae.apps.tripmeter"
-        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 14
-        versionName "2.1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        minSdkVersion 21
+        targetSdkVersion 33
+        compileSdk 33
+        versionCode 16
+        versionName "3.1.0"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -25,13 +25,13 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     compileOptions {
     }
-
+    lint {
+        abortOnError false
+    }
+/*
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def fileName = android.defaultConfig.applicationId + "-" + variant.buildType.name
@@ -40,30 +40,32 @@ android {
             output.outputFile = new File(output.outputFile.parent, fileName)
         }
     }
+ */
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    // 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'
 
-    // The lib project is defined in settings.gradle
-    compile project(':AeAppsLibrary')
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:support-v4:25.3.1'
-    compile 'com.android.support:support-vector-drawable:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.9.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'
 
     // Unit Tests
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.4.0'
 
     // Instrumented Unit Tests
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    androidTestCompile 'org.hamcrest:hamcrest-core:1.1'
-    androidTestCompile 'org.hamcrest:hamcrest-integration:1.1'
-    androidTestCompile 'org.hamcrest:hamcrest-library:1.1'
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation 'org.hamcrest:hamcrest-core:2.2'
+    androidTestImplementation 'org.hamcrest:hamcrest-integration:1.3'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
 
 }

app/src/androidTest/java/com/ae/apps/tripmeter/ExampleInstrumentedTest.java

@@ -1,34 +1,26 @@
 package com.ae.apps.tripmeter.activities;
 
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.ae.apps.tripmeter.R;
-import com.ae.apps.tripmeter.activities.MainActivity;
 
-import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.typeText;
-import static android.support.test.espresso.action.ViewActions.clearText;
-import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.action.ViewActions.clearText;
+import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
 
 /**
  * Android Unit Test
  */
 @RunWith(AndroidJUnit4.class)
 public class FuelCalcTest {
 
-    @Rule
-    public ActivityTestRule<MainActivity> mActivityTestRule = new ActivityTestRule<>(
-            MainActivity.class);
-
     @Test
     public void testTotalFuelAndPrice() {
         String distance = "100";

app/src/androidTest/java/com/ae/apps/tripmeter/activities/FuelCalcTest.java

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.ae.apps.tripmeter"
-          xmlns:android="http://schemas.android.com/apk/res/android"
-          android:versionCode="8"
-          android:versionName="@string/app_version_name">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="8"
+    android:versionName="@string/app_version_name">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <!--<uses-permission android:name="android.permission.READ_PROFILE" />-->
@@ -16,7 +16,7 @@
 
         <activity
             android:name=".activities.MainActivity"
-            android:label="@string/app_name"
+            android:exported="true"
             android:theme="@style/AppTheme.NoActionBar.SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/AndroidManifest.xml

@@ -23,64 +23,64 @@ of this software and associated documentation files (the "Software"), to deal
  */
 package com.ae.apps.tripmeter.activities;
 
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.widget.Button;
 
-import com.ae.apps.common.activities.ToolBarBaseActivity;
-import com.ae.apps.common.utils.DialogUtils;
+import com.ae.apps.lib.common.utils.DialogUtils;
 import com.ae.apps.tripmeter.R;
 
+import java.util.Objects;
+
 /**
  * The About Activity
  */
-public class AboutActivity extends ToolBarBaseActivity {
+public class AboutActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        displayHomeAsUp();
+        setContentView(R.layout.activity_about);
+
+        setSupportActionBar(findViewById(R.id.toolbar));
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setHomeButtonEnabled(true);
 
         // Navigate to GitHub Page
-        Button viewSourceCodeBtn = (Button) findViewById(R.id.viewSourceCode);
-        viewSourceCodeBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                String url = getString(R.string.github_source_visible_url);
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(url));
-                startActivity(intent);
-            }
+        Button viewSourceCodeBtn = findViewById(R.id.viewSourceCode);
+        viewSourceCodeBtn.setOnClickListener(view -> {
+            String url = getString(R.string.github_source_visible_url);
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse(url));
+            startActivity(intent);
         });
 
         final Context context = this;
 
         // Show the License as a dialog
-        Button viewLicenseBtn = (Button) findViewById(R.id.viewLicense);
-        viewLicenseBtn.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                DialogUtils.showMaterialInfoDialog(context, R.string.menu_license,
-                        R.string.str_license, android.R.string.ok);
-            }
-        });
-    }
+        Button viewLicenseBtn = findViewById(R.id.viewLicense);
+        viewLicenseBtn.setOnClickListener(view -> DialogUtils.showMaterialInfoDialog(context, R.string.menu_license,
+                R.string.str_license, android.R.string.ok));
+
+        // Find the toolbar and set it as action bar
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        if (null != mToolbar) {
+            setSupportActionBar(mToolbar);
+        }
 
-    @Override
-    protected int getToolbarResourceId() {
-        return R.id.toolbar;
     }
 
     @Override
-    protected int getLayoutResourceId() {
-        return R.layout.activity_about;
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
+
 }

app/src/main/java/com/ae/apps/tripmeter/activities/AboutActivity.java

@@ -3,11 +3,11 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;