update to sdk33 and android 8.8.1

.gitignore

@@ -1,65 +1,15 @@
-# Built application files
-*.apk
-*.ap_
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-
-# Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
 .externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# fastlane
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots
-fastlane/test_output
-fastlane/readme.md
+.cxx
+local.properties

app/build.gradle

@@ -1,33 +1,53 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    namespace = "com.example.can301.things"
+    compileSdk 33
+
     defaultConfig {
-        applicationId "com.example.yzbkaka.things"
-        minSdkVersion 15
-        targetSdkVersion 26
+        applicationId "com.example.can301.things"
+        minSdk 26
+//        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    dependenciesInfo {
+        includeInApk false
+        includeInBundle false
+    }
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.0.0-beta1'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:0.5'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
-    compile 'com.android.support:design:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.android.support:cardview-v7:26.1.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
+    implementation 'androidx.navigation:navigation-fragment:2.0.0-rc02'
+    implementation 'androidx.navigation:navigation-ui:2.0.0-rc02'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'org.litepal.android:java:3.0.0'
-    compile 'com.prolificinteractive:material-calendarview:1.4.3'
+//    implementation 'com.pr7olificinteractive:material-calendarview:1.4.3'
+    implementation 'com.prolificinteractive:material-calendarview:1.4.3'
+    //MPAndroidChart
+    implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
 }

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.example.yzbkaka.things","split":"","minSdkVersion":"15"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.example.can301.things","split":"","minSdkVersion":"15"}}]

app/src/androidTest/java/com/example/yzbkaka/things/ExampleInstrumentedTest.java → app/src/androidTest/java/com/example/can301/things/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
-package com.example.yzbkaka.things;
+package com.example.can301.things;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,8 +19,9 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() throws Exception {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+//        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.example.yzbkaka.things", appContext.getPackageName());
+        assertEquals("com.example.can301.things", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.yzbkaka.things">
+    package="com.example.can301.things">
 
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
 
     <application
@@ -13,48 +15,61 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity" />
-        <activity android:name=".Today.NoteActivity" />
+        <activity android:name="com.example.can301.things.MainActivity" />
+        <activity android:name="com.example.can301.things.Today.NoteActivity" />
         <activity
-            android:name=".Today.TodayCreateActivitty"
+            android:name="com.example.can301.things.Today.TodayCreateActivitty"
             android:theme="@style/MyTheme1"
             android:windowSoftInputMode="stateVisible|adjustPan" />
         <activity
-            android:name=".Today.AlterTodayActivity"
+            android:name="com.example.can301.things.Today.AlterTodayActivity"
             android:theme="@style/MyTheme1"
             android:windowSoftInputMode="stateVisible|adjustPan" />
-        <activity android:name=".Log.LogActivity" />
+        <activity android:name="com.example.can301.things.Log.LogActivity" />
         <activity
-            android:name=".Log.LogCreateActivity"
+            android:name="com.example.can301.things.Log.LogCreateActivity"
             android:windowSoftInputMode="stateVisible|adjustPan" />
-        <activity android:name=".Log.AlterLogActivity" />
-        <activity android:name=".History.HistoryActivity" />
-        <activity android:name=".Schedule.ScheduleActivity" />
-        <activity android:name=".Schedule.ScheduleViewActivity" />
+        <activity android:name="com.example.can301.things.Log.AlterLogActivity" />
+        <activity android:name="com.example.can301.things.History.HistoryActivity" />
+        <activity android:name="com.example.can301.things.Schedule.ScheduleActivity" />
+        <activity android:name="com.example.can301.things.Schedule.ScheduleViewActivity" />
         <activity
-            android:name=".Schedule.ScheduleCreateActivity"
+            android:name="com.example.can301.things.Schedule.ScheduleCreateActivity"
             android:theme="@style/MyTheme1"
             android:windowSoftInputMode="stateVisible|adjustPan" />
-        <activity android:name=".StartActivity">
+        <activity
+            android:name="com.example.can301.things.Record.AnalyzeActivity"
+            android:exported="false" />
+        <activity
+            android:name="com.example.can301.things.Record.RecordListActivity"
+            android:exported="false" />
+        <activity
+            android:name="com.example.can301.things.Record.RecordActivity"
+            android:exported="true"
+            android:windowSoftInputMode="stateVisible|adjustPan">
+        </activity>
+        <activity android:name="com.example.can301.things.Tomato.TomatoActivity" />
+        <activity android:name="com.example.can301.things.StartActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".Setting.SettingActivity" />
+        <activity android:name="com.example.can301.things.Setting.SettingActivity" />
 
         <service
-            android:name=".Service.SendMessage"
+            android:name="com.example.can301.things.Service.SendMessage"
             android:enabled="true"
             android:exported="true" />
 
-        <activity android:name=".Setting.ExplainActivity" />
+        <activity android:name="com.example.can301.things.Setting.ExplainActivity_Today" />
+        <activity android:name="com.example.can301.things.Setting.ExplainActivity_Tomato" />
+        <activity android:name="com.example.can301.things.Setting.ExplainActivity_Log" />
         <activity
-            android:name=".Schedule.AlterScheduleActivity"
+            android:name="com.example.can301.things.Schedule.AlterScheduleActivity"
             android:theme="@style/MyTheme1"
             android:windowSoftInputMode="stateVisible|adjustPan" />
-        <activity android:name=".Setting.AboutActivity"></activity>
     </application>
 
 </manifest>