Merge pull request '1.0.8' (#3) from dev into main

Reviewed-on: #3

app/build.gradle

@@ -5,22 +5,22 @@ android {
     namespace "com.hyperling.apps.the45minuterule"
     defaultConfig {
         applicationId "com.hyperling.apps.the45minuterule"
-        minSdkVersion 14
+        minSdkVersion 23
         targetSdkVersion 36
-        versionCode 8
+        versionCode 9
-        versionName "1.07"
+        versionName "1.0.8"
     }
     buildTypes {
         release {
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
     //compile fileTree(dir: 'libs', include: ['*.jar'])
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    //implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
-    implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0'
+    implementation "androidx.appcompat:appcompat:1.8.0"
 }

app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="com.hyperling.apps.the45minuterule">
-
-    <uses-sdk tools:overrideLibrary="com.google.android.gms,com.google.android.gms.ads" />
 
     <!-- Include required permissions for Google Mobile Ads to run. -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +8,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/t45mr_icon_003"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"

app/src/main/java/com/hyperling/apps/the45minuterule/MainActivity.java

@@ -7,7 +7,7 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v7.app.AppCompatActivity;
 import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.Gravity;
@@ -24,6 +24,8 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Timer;
@@ -254,18 +256,16 @@ public class MainActivity extends AppCompatActivity {
 
             ////////////////////////////////////////////////////////////////////////////////////////
             // Get sleepiness of the user
-            switch(radioGroup.getCheckedRadioButtonId()){
+            @SuppressWarnings("ConstantConditions")
-                case R.id.rb1:
+            int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
-                    sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt1_value));
+            if (checkedRadioButtonId == R.id.rb1) {
-                    break;
+                sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt1_value));
-                case R.id.rb2:
+            } else if (checkedRadioButtonId == R.id.rb2) {
-                    sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt2_value));
+                sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt2_value));
-                    break;
+            } else if (checkedRadioButtonId == R.id.rb3) {
-                case R.id.rb3:
+                sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt3_value));
-                    sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt3_value));
+            } else {
-                    break;
+                sleepiness = 0;
-                default:
-                    sleepiness = 0;
             }
             if (debug) System.out.println("Sleepiness is " + sleepiness);
             ////////////////////////////////////////////////////////////////////////////////////////

app/src/main/java/com/hyperling/apps/the45minuterule/Tips.java

@@ -2,12 +2,14 @@ package com.hyperling.apps.the45minuterule;
 
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
+//import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class Tips extends AppCompatActivity {
 
     @Override

app/src/main/res/layout/activity_main.xml

@@ -7,8 +7,8 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:layout_marginTop="?android:actionBarSize"
+    tools:context="com.hyperling.apps.the45minuterule.MainActivity"
-    tools:context="com.hyperling.apps.the45minuterule.MainActivity">
+    android:fitsSystemWindows="true">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -104,4 +104,4 @@
 
     </ScrollView>
 
-</RelativeLayout>
+</RelativeLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.1'
+        classpath 'com.android.tools.build:gradle:9.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -27,6 +27,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

com.hyperling.apps.the45minuterule.yml

@@ -0,0 +1,16 @@
+AuthorName: 'Chad Michael "Hyperling" Greenwood'
+AuthorWebSite: 'https://hyperling.com/about/'
+Donate: 'https://hyperling.com/donate/'
+Liberapay: 'HyperVegan'
+Bitcoin: 'bc1qsfe8dkvry3d34kztz449gkq67wq8fu2nkgfkh0'
+Litecoin: 'ltc1qavmpu5d6ljntxsd6jj548m4yys83zwscl0dzkx'
+IssueTracker: 'https://hyperling.com/contact/'
+Categories:
+- fdroid
+- hyperling
+- utilities
+Name: The 45 Minute Rule
+AuthorEmail: 'me+t45mr@hyperling.com'
+Summary: 'Determine a good bedtime for waking during light sleep.'
+SourceCode: 'https://git.hyperling.com/me/android-45-minute-rule/'
+WebSite: 'https://hyperling.com/apps/#sleep'

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Jan 12 07:07:15 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists