1.12.34-YK2018.14.02V-22.32-beta

Добавление новых пунктов.
Новое расписание для заочников

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Feb 06 10:06:57 EET 2018
-gradle.version=4.4
+#Mon Feb 12 22:06:56 EET 2018
+gradle.version=4.5

app/app.iml

@@ -84,6 +84,7 @@
  <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
  <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
  <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/artifact_transform" />
  <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
  <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
  <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />

app/build.gradle

@@ -8,8 +8,8 @@ android {
  applicationId "com.yarashevich.kiryl.ipd"
  minSdkVersion 14
  targetSdkVersion 26
- versionCode 33
- versionName "1.11.33-YK2018.07.02V-20.32-beta"
+ versionCode 34
+ versionName "1.12.34-YK2018.14.02V-22.32-beta"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
  }
  buildTypes {

app/src/main/AndroidManifest.xml

@@ -133,6 +133,21 @@
  android:value="com.yarashevich.kiryl.ipd.MainActivity" />
  </activity>
 
+ <activity
+ android:name=".SrokOplata"
+ android:label="@string/timing">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="com.yarashevich.kiryl.ipd.MainActivity" />
+ </activity>
+ <activity
+ android:name=".PhoneBookIpd"
+ android:label="@string/phonebookipd">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="com.yarashevich.kiryl.ipd.MainActivity" />
+ </activity>
+
  </application>
 
 </manifest>

app/src/main/java/com/yarashevich/kiryl/ipd/MainActivity.java

@@ -103,12 +103,12 @@ public boolean onNavigationItemSelected(MenuItem item) {
  } else if (id == R.id.nav_4) {
  startActivity(new Intent(this, Nav_D.class));
 
- } else if (id == R.id.zaochnoe_b) {
- startActivity(new Intent(this, Zaochnoe_B.class));
-
  } else if (id == R.id.zaochnoe_a) {
  startActivity(new Intent(this, Zaochnoe_A.class));
 
+ } else if (id == R.id.zaochnoe_b) {
+ startActivity(new Intent(this, Zaochnoe_B.class));
+
  } else if (id == R.id.zaochnoe_c) {
  startActivity(new Intent(this, Zaochnoe_C.class));
 
@@ -126,9 +126,10 @@ public boolean onNavigationItemSelected(MenuItem item) {
  startActivity(new Intent(this, ScrollingActivity2.class));
 
  } else if (id == R.id.timing) {
- Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.uoipd.by/ru/students/oplata/" +
- ""));
- startActivity(browserIntent);
+ startActivity(new Intent(this, SrokOplata.class));
+
+ } else if (id == R.id.phonebookipd1) {
+ startActivity(new Intent(this, PhoneBookIpd.class));
 
  } else if (id == R.id.activiti_scrol) {
  startActivity(new Intent(this, ExampleMaterialAboutFragmentActivity.class));

app/src/main/java/com/yarashevich/kiryl/ipd/ParseNewContent.java

@@ -98,6 +98,7 @@ protected String doInBackground(String... params) {
  return str;
  }
  }
+
  class ParseTitle extends AsyncTask<Void,Void,HashMap<String,String>> {
 
  @Override

app/src/main/java/com/yarashevich/kiryl/ipd/PhoneBookIpd.java

@@ -0,0 +1,43 @@
+package com.yarashevich.kiryl.ipd;
+
+ import android.os.Bundle;
+ import android.support.v7.app.AppCompatActivity;
+ import android.webkit.WebSettings;
+ import android.webkit.WebViewClient;
+
+/**
+ * Created by kiril on 15.02.2018.
+ */
+
+public class PhoneBookIpd extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ android.webkit.WebView webView = new android.webkit.WebView(PhoneBookIpd.this);
+ webView.getSettings().setJavaScriptEnabled(true);
+ webView.getSettings().setBuiltInZoomControls(true);
+ webView.getSettings().setDisplayZoomControls(false);
+ webView.getSettings().setPluginState(WebSettings.PluginState.ON);
+
+//---you need this to prevent the webview from
+// launching another browser when a url
+// redirection occurs-—
+ webView.setWebViewClient(new Callback());
+
+ String pdfURL = "http://www.uoipd.by/files/files/tes-spravka1.pdf";
+ webView.loadUrl(
+ "http://docs.google.com/gview?embedded=true&url=" + pdfURL);
+
+ setContentView(webView);
+ }
+
+ private class Callback extends WebViewClient {
+ @Override
+ public boolean shouldOverrideUrlLoading(
+ android.webkit.WebView view, String url) {
+ return (false);
+ }
+ }
+
+
+}

app/src/main/java/com/yarashevich/kiryl/ipd/SrokOplata.java

@@ -0,0 +1,43 @@
+package com.yarashevich.kiryl.ipd;
+
+ import android.os.Bundle;
+ import android.support.v7.app.AppCompatActivity;
+ import android.webkit.WebSettings;
+ import android.webkit.WebViewClient;
+
+/**
+ * Created by kiril on 15.02.2018.
+ */
+
+public class SrokOplata extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ android.webkit.WebView webView = new android.webkit.WebView(SrokOplata.this);
+ webView.getSettings().setJavaScriptEnabled(true);
+ webView.getSettings().setBuiltInZoomControls(true);
+ webView.getSettings().setDisplayZoomControls(false);
+ webView.getSettings().setPluginState(WebSettings.PluginState.ON);
+
+//---you need this to prevent the webview from
+// launching another browser when a url
+// redirection occurs-—
+ webView.setWebViewClient(new Callback());
+
+ String pdfURL = "http://personalcode.at.ua/ipd_files/oplata.pdf";
+ webView.loadUrl(
+ "http://docs.google.com/gview?embedded=true&url=" + pdfURL);
+
+ setContentView(webView);
+ }
+
+ private class Callback extends WebViewClient {
+ @Override
+ public boolean shouldOverrideUrlLoading(
+ android.webkit.WebView view, String url) {
+ return (false);
+ }
+ }
+
+
+}

app/src/main/java/com/yarashevich/kiryl/ipd/Zaochnoe_B.java

@@ -24,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) {
 // redirection occurs-—
  webView.setWebViewClient(new Callback());
 
- String pdfURL = "http://www.uoipd.by/files/files/studentu/raspisanie/zaochnoe/Raspisanie_4_kursa_s_30.10_po_18.11.2017.pdf";
+ String pdfURL = "http://www.uoipd.by/files/files/studentu/raspisanie/zaochnoe/3_sokr_kurs_6_sessija_19.02-10.03.2018.pdf";
  webView.loadUrl(
  "http://docs.google.com/gview?embedded=true&url=" + pdfURL);
 

app/src/main/res/drawable/contacts.xml

@@ -0,0 +1,8 @@
+<!-- drawable/contacts.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path android:fillColor="#000" android:pathData="M20,0H4V2H20V0M4,24H20V22H4V24M20,4H4A2,2 0 0,0 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6A2,2 0 0,0 20,4M12,6.75A2.25,2.25 0 0,1 14.25,9A2.25,2.25 0 0,1 12,11.25A2.25,2.25 0 0,1 9.75,9A2.25,2.25 0 0,1 12,6.75M17,17H7V15.5C7,13.83 10.33,13 12,13C13.67,13 17,13.83 17,15.5V17Z" />
+</vector>

app/src/main/res/layout/phonebookipd.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/phonebookipd1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context="com.yarashevich.kiryl.ipd.SrokOplata">
+
+
+</RelativeLayout>

app/src/main/res/layout/srok_oplata.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/srokoplata1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ tools:context="com.yarashevich.kiryl.ipd.SrokOplata">
+
+
+</RelativeLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -37,6 +37,10 @@
  android:id="@+id/zaochnoe_a"
  android:icon="@drawable/ic_picture_as_pdf_black_24dp"
  android:title="@string/zaochnoe_a" />
+ <item
+ android:id="@+id/zaochnoe_b"
+ android:icon="@drawable/ic_picture_as_pdf_black_24dp"
+ android:title="@string/zaochnoe_b" />
  </menu>
  </item>
 
@@ -54,6 +58,10 @@
  android:id="@+id/timing"
  android:icon="@drawable/ic_timetable_grey600_24dp"
  android:title="@string/timing" />
+ <item
+ android:id="@+id/phonebookipd1"
+ android:icon="@drawable/ic_contacts_grey600_24dp"
+ android:title="@string/phonebookipd" />
  <item
  android:id="@+id/activiti_scrol"
  android:icon="@drawable/ic_info_black_24dp"

app/src/main/res/values/strings.xml

@@ -60,8 +60,9 @@
 "Адрес банка: г.Минск, пр-т Независимости,95а"\n</string>
 
  <string name="timing">Сроки оплаты этапов</string>
+ <string name="phonebookipd">Телефонный справочник</string>
  <string name="zaochnoe_a">2 курс полн.ср 05.02-24.02.18</string>
- <string name="zaochnoe_b">4 курс 30.10-18.11.2017</string>
+ <string name="zaochnoe_b">3 курс сокр.с 19.02-10.03.18</string>
  <string name="zaochnoe_c">3 курс 5 сессия 23.10-11.11.2017</string>
  <string name="zaochnoe_d">2 курс 09.10-28.10.2017</string>
 

build.gradle

@@ -6,7 +6,7 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.0-alpha01'
+ classpath 'com.android.tools.build:gradle:3.2.0-alpha02'
  classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line
 
  // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Feb 06 10:01:22 EET 2018
+#Mon Feb 12 21:55:11 EET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip