Skip to content

Commit e2b61b9

Browse files
lenabeliaevalenabeliaeva
committed
I hope it will work
1 parent 44b37b9 commit e2b61b9

38 files changed

+413
-111
lines changed

‎.gitignore

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*.iml
2+
.gradle
3+
/local.properties
4+
/.idea/caches
5+
/.idea/libraries
6+
/.idea/modules.xml
7+
/.idea/workspace.xml
8+
/.idea/navEditor.xml
9+
/.idea/assetWizardSettings.xml
10+
.DS_Store
11+
/build
12+
/captures
13+
.externalNativeBuild
14+
.cxx
15+
local.properties

‎.idea/.gitignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/compiler.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/jarRepositories.xml

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/build
1+
/build

‎app/build.gradle

+20-14
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
1-
apply plugin: 'com.android.application'
1+
plugins {
2+
id 'com.android.application'
3+
}
24

35
android {
4-
compileSdkVersion 29
5-
buildToolsVersion "29.0.3"
6+
compileSdkVersion 30
7+
buildToolsVersion "30.0.3"
8+
69
defaultConfig {
710
applicationId "com.example.antidepression"
8-
minSdkVersion 15
9-
targetSdkVersion 29
11+
minSdkVersion 16
12+
targetSdkVersion 30
1013
versionCode 1
1114
versionName "1.0"
15+
1216
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1317
}
18+
1419
buildTypes {
1520
release {
1621
minifyEnabled false
1722
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1823
}
1924
}
2025
compileOptions {
21-
sourceCompatibility = 1.8
22-
targetCompatibility = 1.8
26+
sourceCompatibility JavaVersion.VERSION_1_8
27+
targetCompatibility JavaVersion.VERSION_1_8
2328
}
2429
}
2530

2631
dependencies {
27-
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation 'androidx.appcompat:appcompat:1.1.0'
29-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
30-
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
32-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
33-
}
32+
33+
implementation 'androidx.appcompat:appcompat:1.3.0'
34+
implementation 'com.google.android.material:material:1.3.0'
35+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
36+
testImplementation 'junit:junit:4.+'
37+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
38+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
39+
}

‎app/proguard-rules.pro

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile

‎app/src/androidTest/java/com/example/antidepression/ExampleInstrumentedTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public class ExampleInstrumentedTest {
2121
public void useAppContext() {
2222
// Context of the app under test.
2323
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
24-
2524
assertEquals("com.example.antidepression", appContext.getPackageName());
2625
}
27-
}
26+
}

‎app/src/main/AndroidManifest.xml

+2-17
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,11 @@
44

55
<application
66
android:allowBackup="true"
7-
android:icon="@drawable/icon"
7+
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/LightTheme">
12-
<activity android:name=".PleasureActivity"
13-
android:parentActivityName=".MainActivity"></activity>
14-
<activity android:name=".AudioActivity"
15-
android:parentActivityName=".MainActivity"/>
16-
<activity android:name=".NotesActivity"
17-
android:parentActivityName=".MainActivity"/>
18-
<activity android:name=".NoteActivity"
19-
android:parentActivityName=".MainActivity"/>
20-
<activity android:name=".AdviceScreenSlidePagerActivity"
21-
android:parentActivityName=".MainActivity"/>
22-
<activity android:name=".TestActivity"
23-
android:parentActivityName=".MainActivity"/>
24-
<activity android:name=".AboutDepressionActivity"
25-
android:parentActivityName=".MainActivity"/>
11+
android:theme="@style/Theme.Antidepression">
2612
<activity android:name=".MainActivity">
2713
<intent-filter>
2814
<action android:name="android.intent.action.MAIN" />
@@ -32,5 +18,4 @@
3218
</activity>
3319
</application>
3420

35-
3621
</manifest>

‎app/src/main/java/com/example/antidepression/MainActivity.java

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.example.antidepression;
2+
3+
import androidx.appcompat.app.AppCompatActivity;
4+
5+
import android.os.Bundle;
6+
7+
public class MainActivity extends AppCompatActivity {
8+
9+
@Override
10+
protected void onCreate(Bundle savedInstanceState) {
11+
super.onCreate(savedInstanceState);
12+
setContentView(R.layout.activity_main);
13+
}
14+
}

‎app/src/main/java/com/example/antidepression/helpers/InputFilterMinMax.java

-33
This file was deleted.

‎app/src/main/res/drawable-v24/ic_launcher_foreground.xml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="108dp"
4+
android:height="108dp"
5+
android:viewportWidth="108"
6+
android:viewportHeight="108">
7+
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
8+
<aapt:attr name="android:fillColor">
9+
<gradient
10+
android:endX="85.84757"
11+
android:endY="92.4963"
12+
android:startX="42.9492"
13+
android:startY="49.59793"
14+
android:type="linear">
15+
<item
16+
android:color="#44000000"
17+
android:offset="0.0" />
18+
<item
19+
android:color="#00000000"
20+
android:offset="1.0" />
21+
</gradient>
22+
</aapt:attr>
23+
</path>
24+
<path
25+
android:fillColor="#FFFFFF"
26+
android:fillType="nonZero"
27+
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
28+
android:strokeWidth="1"
29+
android:strokeColor="#00000000" />
30+
</vector>

0 commit comments

Comments
 (0)