diff --git a/Android-1/Lesson-6/CityHeraldry/app/src/main/java/ru/geekbrains/cityheraldry/fragments/CitiesFragment.java b/Android-1/Lesson-6/CityHeraldry/app/src/main/java/ru/geekbrains/cityheraldry/fragments/CitiesFragment.java index b4955bc..b796b85 100644 --- a/Android-1/Lesson-6/CityHeraldry/app/src/main/java/ru/geekbrains/cityheraldry/fragments/CitiesFragment.java +++ b/Android-1/Lesson-6/CityHeraldry/app/src/main/java/ru/geekbrains/cityheraldry/fragments/CitiesFragment.java @@ -78,21 +78,26 @@ private void initList(View view) { LinearLayout layoutView = (LinearLayout)view; String[] cities = getResources().getStringArray(R.array.cities); + // При помощи этого объекта будем доставать элементы, спрятанные в item.xml + LayoutInflater ltInflater = getLayoutInflater(); + // В этом цикле создаем элемент TextView, // заполняем его значениями, // и добавляем на экран. // Кроме того, создаем обработку касания на элемент for(int i=0; i < cities.length; i++){ String city = cities[i]; - TextView tv = new TextView(getContext()); + // Достаем элемент из item.xml + View item = ltInflater.inflate(R.layout.item, layoutView, false); + // Находим в этом элементе TextView + TextView tv = item.findViewById(R.id.textView); tv.setText(city); - tv.setTextSize(30); - layoutView.addView(tv); + layoutView.addView(item); final int fi = i; tv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //+ Теперь опираемся на Parcel, а не на текущую позицию + // опираемся на Parcel, а не на текущую позицию currentParcel = new Parcel(fi, getResources().getStringArray(R.array.cities)[fi]); showCoatOfArms(currentParcel); } diff --git a/Android-1/Lesson-6/CityHeraldry/app/src/main/res/layout/item.xml b/Android-1/Lesson-6/CityHeraldry/app/src/main/res/layout/item.xml new file mode 100644 index 0000000..1eaa43e --- /dev/null +++ b/Android-1/Lesson-6/CityHeraldry/app/src/main/res/layout/item.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/Android-1/Lesson-6/CityHeraldry/app/src/main/res/values/dimens.xml b/Android-1/Lesson-6/CityHeraldry/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..05c957c --- /dev/null +++ b/Android-1/Lesson-6/CityHeraldry/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 30sp + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/.gitignore b/Android-1/Lesson-7/SocNet/.gitignore new file mode 100644 index 0000000..2b75303 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.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/Android-1/Lesson-7/SocNet/.idea/encodings.xml b/Android-1/Lesson-7/SocNet/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/.idea/gradle.xml b/Android-1/Lesson-7/SocNet/.idea/gradle.xml new file mode 100644 index 0000000..2996d53 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/.idea/misc.xml b/Android-1/Lesson-7/SocNet/.idea/misc.xml new file mode 100644 index 0000000..a6a242a --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.idea/misc.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + Android + + + CorrectnessLintAndroid + + + LintAndroid + + + + + + + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/.idea/runConfigurations.xml b/Android-1/Lesson-7/SocNet/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/.idea/vcs.xml b/Android-1/Lesson-7/SocNet/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/Android-1/Lesson-7/SocNet/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/.gitignore b/Android-1/Lesson-7/SocNet/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Android-1/Lesson-7/SocNet/app/build.gradle b/Android-1/Lesson-7/SocNet/app/build.gradle new file mode 100644 index 0000000..a6c868e --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/build.gradle @@ -0,0 +1,29 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "ru.geekbrains.socialnetwork" + minSdkVersion 24 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.android.support:recyclerview-v7:28.0.0' +} diff --git a/Android-1/Lesson-7/SocNet/app/proguard-rules.pro b/Android-1/Lesson-7/SocNet/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/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/Android-1/Lesson-7/SocNet/app/src/androidTest/java/ru/geekbrains/socialnetwork/ExampleInstrumentedTest.java b/Android-1/Lesson-7/SocNet/app/src/androidTest/java/ru/geekbrains/socialnetwork/ExampleInstrumentedTest.java new file mode 100644 index 0000000..7765b8e --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/androidTest/java/ru/geekbrains/socialnetwork/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package ru.geekbrains.socialnetwork; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.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("ru.geekbrains.socialnetwork", appContext.getPackageName()); + } +} diff --git a/Android-1/Lesson-7/SocNet/app/src/main/AndroidManifest.xml b/Android-1/Lesson-7/SocNet/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..87ae625 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/MainActivity.java b/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/MainActivity.java new file mode 100644 index 0000000..7ec97be --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/MainActivity.java @@ -0,0 +1,24 @@ +package ru.geekbrains.socialnetwork; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + String[] data = getResources().getStringArray(R.array.items); + + RecyclerView recyclerView = findViewById(R.id.recycler_view); + recyclerView.setHasFixedSize(true); + LinearLayoutManager layoutManager = new LinearLayoutManager(this); + recyclerView.setLayoutManager(layoutManager); + SocnetAdapter adapter = new SocnetAdapter(data); + recyclerView.setAdapter(adapter); + } +} diff --git a/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/SocnetAdapter.java b/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/SocnetAdapter.java new file mode 100644 index 0000000..c88ab35 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/java/ru/geekbrains/socialnetwork/SocnetAdapter.java @@ -0,0 +1,48 @@ +package ru.geekbrains.socialnetwork; + +import android.support.annotation.NonNull; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +public class SocnetAdapter extends RecyclerView.Adapter { + + private String[] dataSource; + + public SocnetAdapter(String[] dataSource){ + this.dataSource = dataSource; + } + + @NonNull + @Override + public SocnetAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { + View v = LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item, viewGroup, false); + return new ViewHolder(v); + } + + @Override + public void onBindViewHolder(@NonNull SocnetAdapter.ViewHolder viewHolder, int i) { + viewHolder.getTextView().setText(dataSource[i]); + } + + @Override + public int getItemCount() { + return dataSource.length; + } + + public class ViewHolder extends RecyclerView.ViewHolder { + private TextView textView; + + public ViewHolder(@NonNull View itemView) { + super(itemView); + textView = (TextView) itemView; + } + + public TextView getTextView() { + return textView; + } + } +} diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/drawable/ic_launcher_background.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/layout/activity_main.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..34207e5 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/layout/item.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/layout/item.xml new file mode 100644 index 0000000..9816629 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/layout/item.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/Android-1/Lesson-7/SocNet/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/values/arrays.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/values/arrays.xml new file mode 100644 index 0000000..7c22f42 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/values/arrays.xml @@ -0,0 +1,8 @@ + + + + One + Two + Three + + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/values/colors.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/values/dimens.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..79ca55c --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/values/dimens.xml @@ -0,0 +1,4 @@ + + + 42sp + \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/values/strings.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..226e2e7 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Social Network + diff --git a/Android-1/Lesson-7/SocNet/app/src/main/res/values/styles.xml b/Android-1/Lesson-7/SocNet/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/Android-1/Lesson-7/SocNet/app/src/test/java/ru/geekbrains/socialnetwork/ExampleUnitTest.java b/Android-1/Lesson-7/SocNet/app/src/test/java/ru/geekbrains/socialnetwork/ExampleUnitTest.java new file mode 100644 index 0000000..604c329 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/app/src/test/java/ru/geekbrains/socialnetwork/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package ru.geekbrains.socialnetwork; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/Android-1/Lesson-7/SocNet/build.gradle b/Android-1/Lesson-7/SocNet/build.gradle new file mode 100644 index 0000000..fafc1b9 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.4.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/Android-1/Lesson-7/SocNet/gradle.properties b/Android-1/Lesson-7/SocNet/gradle.properties new file mode 100644 index 0000000..82618ce --- /dev/null +++ b/Android-1/Lesson-7/SocNet/gradle.properties @@ -0,0 +1,15 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + + diff --git a/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.jar b/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.properties b/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..90db63f --- /dev/null +++ b/Android-1/Lesson-7/SocNet/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 06 22:38:13 MSK 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/Android-1/Lesson-7/SocNet/gradlew b/Android-1/Lesson-7/SocNet/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/Android-1/Lesson-7/SocNet/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/Android-1/Lesson-7/SocNet/gradlew.bat b/Android-1/Lesson-7/SocNet/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/Android-1/Lesson-7/SocNet/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Android-1/Lesson-7/SocNet/settings.gradle b/Android-1/Lesson-7/SocNet/settings.gradle new file mode 100644 index 0000000..e7b4def --- /dev/null +++ b/Android-1/Lesson-7/SocNet/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/Android-2/Lesson-8/GeoFences/app/build.gradle b/Android-2/Lesson-8/GeoFences/app/build.gradle index 77a23e6..20df9fb 100644 --- a/Android-2/Lesson-8/GeoFences/app/build.gradle +++ b/Android-2/Lesson-8/GeoFences/app/build.gradle @@ -26,7 +26,7 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - compile 'com.google.android.gms:play-services:11.8.0' + implementation 'com.google.android.gms:play-services:11.8.0' implementation 'com.android.support:design:26.1.0' } \ No newline at end of file diff --git a/Android-2/Lesson-8/GeoFences/build.gradle b/Android-2/Lesson-8/GeoFences/build.gradle index 4ee40ed..51ec063 100644 --- a/Android-2/Lesson-8/GeoFences/build.gradle +++ b/Android-2/Lesson-8/GeoFences/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/Android-2/Lesson-8/GeoFences/gradle/wrapper/gradle-wrapper.properties b/Android-2/Lesson-8/GeoFences/gradle/wrapper/gradle-wrapper.properties index 2ac4235..4eebd52 100644 --- a/Android-2/Lesson-8/GeoFences/gradle/wrapper/gradle-wrapper.properties +++ b/Android-2/Lesson-8/GeoFences/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 25 06:14:23 MSK 2017 +#Sat Jul 13 14:42:19 MSK 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip