commit e3953d96abc1ce59381e56cfd5825501479ba33b Author: danamir Date: Sun Aug 11 11:01:06 2019 +0300 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2b75303 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..2996d53 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..37a7509 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..00aac21 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.1" + defaultConfig { + applicationId "com.example.firtscounter" + minSdkVersion 19 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation "com.google.android.material:material:1.1.0-alpha06" +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/example/firtscounter/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/firtscounter/ExampleInstrumentedTest.java new file mode 100644 index 0000000..e51256c --- /dev/null +++ b/app/src/androidTest/java/com/example/firtscounter/ExampleInstrumentedTest.java @@ -0,0 +1,27 @@ +package com.example.firtscounter; + +import android.content.Context; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.example.firtscounter", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c1ac83d --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/firtscounter/CountActivity.java b/app/src/main/java/com/example/firtscounter/CountActivity.java new file mode 100644 index 0000000..e78e075 --- /dev/null +++ b/app/src/main/java/com/example/firtscounter/CountActivity.java @@ -0,0 +1,75 @@ +package com.example.firtscounter; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; + +import com.google.android.material.snackbar.Snackbar; + +public class CountActivity extends AppCompatActivity { + + private int mCounterValue; + private TextView mValueTextView; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.a_counter); + + mValueTextView = findViewById(R.id.counter); + + final TextView valueText = findViewById(R.id.counter); + mCounterValue = 0; + valueText.setText(String.valueOf(mCounterValue)); + + findViewById(R.id.reset).setOnClickListener(new View.OnClickListener(){ + + @Override + public void onClick(View v){ + final int tmpCounterValue = mCounterValue; + mCounterValue = 0; + Snackbar.make(v, "счетчик обнулен",Snackbar.LENGTH_SHORT) + .setAction("Отмена", new View.OnClickListener() { + @Override + public void onClick(View view) { + mCounterValue = tmpCounterValue; + updateValue(); + } + }) + .show(); + mCounterValue=0; + updateValue(); + + } + }); + + findViewById(R.id.plus).setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v){ + mCounterValue++; + updateValue(); + } + }); + + findViewById(R.id.minus).setOnClickListener(new View.OnClickListener(){ + @Override + public void onClick(View v){ + mCounterValue--; + if (mCounterValue <0){ + mCounterValue=0; + } + updateValue(); + + } + }); + + } + + private void updateValue(){ + mValueTextView.setText(String.valueOf(mCounterValue)); + } +} +// TODO: 2019-08-11 Сделать главный экран на котором будут создаанные счетчики +// TODO: 2019-08-11 Прикрутить базу данных +// TODO: 2019-08-11 Залить в гитхаб diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/a_counter.xml b/app/src/main/res/layout/a_counter.xml new file mode 100644 index 0000000..f14577f --- /dev/null +++ b/app/src/main/res/layout/a_counter.xml @@ -0,0 +1,67 @@ + + + + + + + +