Get the project syncing and building again.
This commit is contained in:
1 parent
1a95d7ad94
commit
09db2cb6d8
6 files changed
+39
-28
No files matched your search
+7
-7
@@ -5,22 +5,22 @@ android {
|
||||
namespace "com.hyperling.apps.the45minuterule"
|
||||
defaultConfig {
|
||||
applicationId "com.hyperling.apps.the45minuterule"
|
||||
minSdkVersion 14
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 36
|
||||
versionCode 8
|
||||
versionName "1.07"
|
||||
versionCode 9
|
||||
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'])
|
||||
testImplementation 'junit:junit:4.12'
|
||||
implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0'
|
||||
//implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
implementation "androidx.appcompat:appcompat:1.8.0"
|
||||
}
|
||||
@@ -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"
|
||||
package="com.hyperling.apps.the45minuterule">
|
||||
|
||||
<uses-sdk tools:overrideLibrary="com.google.android.gms,com.google.android.gms.ads" />
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!-- 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"
|
||||
|
||||
@@ -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()){
|
||||
case R.id.rb1:
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt1_value));
|
||||
break;
|
||||
case R.id.rb2:
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt2_value));
|
||||
break;
|
||||
case R.id.rb3:
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt3_value));
|
||||
break;
|
||||
default:
|
||||
sleepiness = 0;
|
||||
@SuppressWarnings("ConstantConditions")
|
||||
int checkedRadioButtonId = radioGroup.getCheckedRadioButtonId();
|
||||
if (checkedRadioButtonId == R.id.rb1) {
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt1_value));
|
||||
} else if (checkedRadioButtonId == R.id.rb2) {
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt2_value));
|
||||
} else if (checkedRadioButtonId == R.id.rb3) {
|
||||
sleepiness = Integer.parseInt(recs.getString(R.string.rb_opt3_value));
|
||||
} else {
|
||||
sleepiness = 0;
|
||||
}
|
||||
if (debug) System.out.println("Sleepiness is " + sleepiness);
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
Reference in new issue
Block a user