From 3bed2f6f04afcc85663eeaf83c22947aa4deb131 Mon Sep 17 00:00:00 2001 From: myitschool Date: Tue, 18 Oct 2022 17:29:59 +0300 Subject: [PATCH] Initial commit --- .gitignore | 15 ++ .idea/.gitignore | 3 + .idea/.name | 1 + .idea/androidTestResultsUserPreferences.xml | 40 ++++ .idea/compiler.xml | 6 + .idea/gradle.xml | 21 ++ .idea/misc.xml | 15 ++ .idea/vcs.xml | 6 + app/.gitignore | 1 + app/build.gradle | 78 ++++++++ app/proguard-rules.pro | 21 ++ .../ru/myitschool/mte/InstrumentedTestMTE.kt | 14 ++ app/src/main/AndroidManifest.xml | 29 +++ .../java/ru/myitschool/mte/MainActivity.java | 93 +++++++++ .../main/java/ru/myitschool/mte/Utils.java | 8 + .../ru/myitschool/mte/data/CameraData.java | 13 ++ .../java/ru/myitschool/mte/data/Photo.java | 13 ++ .../java/ru/myitschool/mte/data/Report.java | 6 + .../drawable-v24/ic_launcher_foreground.xml | 30 +++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ app/src/main/res/layout/activity_main.xml | 14 ++ app/src/main/res/layout/content_main.xml | 61 ++++++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values-night/themes.xml | 16 ++ app/src/main/res/values/colors.xml | 10 + app/src/main/res/values/dimens.xml | 4 + app/src/main/res/values/strings.xml | 9 + app/src/main/res/values/themes.xml | 16 ++ app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../java/ru/myitschool/mte/ExampleUnitTest.kt | 17 ++ build.gradle | 23 +++ gradle.properties | 23 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 ++++++++++++++++++ gradlew.bat | 89 +++++++++ settings.gradle | 16 ++ 49 files changed, 1114 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/androidTestResultsUserPreferences.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 app/.gitignore create mode 100644 app/build.gradle create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/ru/myitschool/mte/InstrumentedTestMTE.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/ru/myitschool/mte/MainActivity.java create mode 100644 app/src/main/java/ru/myitschool/mte/Utils.java create mode 100644 app/src/main/java/ru/myitschool/mte/data/CameraData.java create mode 100644 app/src/main/java/ru/myitschool/mte/data/Photo.java create mode 100644 app/src/main/java/ru/myitschool/mte/data/Report.java create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/layout/activity_main.xml create mode 100644 app/src/main/res/layout/content_main.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values-night/themes.xml create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/dimens.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/test/java/ru/myitschool/mte/ExampleUnitTest.kt create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.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 +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3114b16 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Simultaneous Series \ No newline at end of file diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..0c8e851 --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,40 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..e3b9331 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..15677d6 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..dc642b7 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,78 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} + +android { + namespace "ru.myitschool.mte" + compileSdk 32 + + defaultConfig { + applicationId "ru.myitschool.mte" + minSdk 26 + targetSdk 32 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + testOptions { + animationsDisabled true + } + buildFeatures { + viewBinding true + } + kotlinOptions { + jvmTarget = '11' + } +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.8.0' + + implementation "androidx.appcompat:appcompat:1.4.2" + implementation "com.google.android.material:material:1.6.1" + implementation "androidx.constraintlayout:constraintlayout:2.1.4" + + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0' + + implementation "androidx.lifecycle:lifecycle-livedata-ktx:$jetpack_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$jetpack_version" + implementation "androidx.navigation:navigation-fragment-ktx:$jetpack_version" + + implementation "androidx.navigation:navigation-fragment:$jetpack_version" + implementation "androidx.navigation:navigation-ui:$jetpack_version" + + // Network + implementation "com.squareup.retrofit2:retrofit:$retrofit_version" + implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" + implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation "com.android.volley:volley:$volley_version" + + implementation 'androidx.test.uiautomator:uiautomator:2.2.0' + testImplementation 'junit:junit:4.13.2' + + androidTestImplementation "io.github.kakaocup:kakao:$kakao_version" + androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0' + + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /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 \ No newline at end of file diff --git a/app/src/androidTest/java/ru/myitschool/mte/InstrumentedTestMTE.kt b/app/src/androidTest/java/ru/myitschool/mte/InstrumentedTestMTE.kt new file mode 100644 index 0000000..69b8030 --- /dev/null +++ b/app/src/androidTest/java/ru/myitschool/mte/InstrumentedTestMTE.kt @@ -0,0 +1,14 @@ +package ru.myitschool.mte + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.MediumTest +import org.junit.FixMethodOrder +import org.junit.runner.RunWith +import org.junit.runners.MethodSorters + + +@RunWith(AndroidJUnit4::class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@MediumTest +class InstrumentedTestMTE { +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..472c000 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ru/myitschool/mte/MainActivity.java b/app/src/main/java/ru/myitschool/mte/MainActivity.java new file mode 100644 index 0000000..ff08517 --- /dev/null +++ b/app/src/main/java/ru/myitschool/mte/MainActivity.java @@ -0,0 +1,93 @@ +package ru.myitschool.mte; + +import static ru.myitschool.mte.Utils.API_KEY; +import static ru.myitschool.mte.Utils.BASE_URL; +import static ru.myitschool.mte.Utils.BLANK_URL; + +import android.os.Bundle; +import android.webkit.WebView; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + +import com.google.android.material.switchmaterial.SwitchMaterial; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; +import ru.myitschool.mte.data.Report; +import ru.myitschool.mte.databinding.ActivityMainBinding; + +public class MainActivity extends AppCompatActivity { + + private ActivityMainBinding binding; + + EditText etDate; + Button btSearch; + SwitchMaterial btSwitch; + WebView wvResult; + Retrofit retrofit; + + /** + * Uses API + * https://api.nasa.gov/mars-photos/api/v1/rovers/curiosity/photos?earth_date=2022-07-01&camera=navcam&api_key=DEMO_KEY + * https://api.nasa.gov/mars-photos/api/v1/rovers/curiosity/photos?earth_date=2022-02-01&camera=fhaz&api_key=DEMO_KEY + */ + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = ActivityMainBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + + etDate = binding.content.etDate; + btSearch = binding.content.btFind; + btSwitch = binding.content.switchCamera; + wvResult = binding.content.wvResult; + + wvResult.getSettings().setJavaScriptEnabled(true); + wvResult.getSettings().setBuiltInZoomControls(true); + retrofit = new Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + retrofit = new Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + MarsService service = retrofit.create(MarsService.class); + btSearch.setOnClickListener(view -> { + wvResult.loadUrl(BLANK_URL); + Call call = service.getPhotos(etDate.getText().toString(), + btSwitch.isChecked() ? btSwitch.getTextOn().toString() : btSwitch.getTextOff().toString(), API_KEY); + call.enqueue(new Callback<>() { + + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + if (response.isSuccessful()) { + Report report = response.body(); + if (report.photos != null) { + wvResult.loadUrl(report.photos[0].img); + } else { + Toast.makeText(MainActivity.this, getResources().getString(R.string.nothing), Toast.LENGTH_SHORT).show(); + } + } + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { + Toast.makeText(MainActivity.this, getResources().getString(R.string.connection_problems), Toast.LENGTH_SHORT).show(); + } + }); + }); + } +} + + + diff --git a/app/src/main/java/ru/myitschool/mte/Utils.java b/app/src/main/java/ru/myitschool/mte/Utils.java new file mode 100644 index 0000000..17708a6 --- /dev/null +++ b/app/src/main/java/ru/myitschool/mte/Utils.java @@ -0,0 +1,8 @@ +package ru.myitschool.mte; + +public class Utils { + static final String BASE_URL = "https://api.nasa.gov/"; + static final String API_KEY = "DEMO_KEY"; + static final String BLANK_URL = "about:blank"; + +} diff --git a/app/src/main/java/ru/myitschool/mte/data/CameraData.java b/app/src/main/java/ru/myitschool/mte/data/CameraData.java new file mode 100644 index 0000000..113f348 --- /dev/null +++ b/app/src/main/java/ru/myitschool/mte/data/CameraData.java @@ -0,0 +1,13 @@ +package ru.myitschool.mte.data; + + +import com.google.gson.annotations.SerializedName; + +public class CameraData { + public int id; + public String name; + @SerializedName("rover_id") + public int rover; + @SerializedName("full_name") + public String fullName; +} diff --git a/app/src/main/java/ru/myitschool/mte/data/Photo.java b/app/src/main/java/ru/myitschool/mte/data/Photo.java new file mode 100644 index 0000000..3a36f92 --- /dev/null +++ b/app/src/main/java/ru/myitschool/mte/data/Photo.java @@ -0,0 +1,13 @@ +package ru.myitschool.mte.data; + +import com.google.gson.annotations.SerializedName; + +public class Photo { + public int id; + public int sol; + public CameraData camera; + @SerializedName("img_src") + public String img; + @SerializedName("earth_date") + public String date; +} diff --git a/app/src/main/java/ru/myitschool/mte/data/Report.java b/app/src/main/java/ru/myitschool/mte/data/Report.java new file mode 100644 index 0000000..b0d8b3d --- /dev/null +++ b/app/src/main/java/ru/myitschool/mte/data/Report.java @@ -0,0 +1,6 @@ +package ru.myitschool.mte.data; + + +public class Report { + public Photo[] photos; +} 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..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..9bf505e --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml new file mode 100644 index 0000000..c4b3d59 --- /dev/null +++ b/app/src/main/res/layout/content_main.xml @@ -0,0 +1,61 @@ + + + + + + + + +