diff --git a/app/build.gradle b/app/build.gradle
index e97410d..8011b02 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
+ compileSdkVersion 28
defaultConfig {
applicationId "com.ulan.timetable"
minSdkVersion 21
- targetSdkVersion 27
+ targetSdkVersion 28
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -16,20 +16,32 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ compileOptions {
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+ }
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:27.1.1'
- implementation 'com.android.support:support-v4:27.1.1'
- implementation 'com.android.support:design:27.1.1'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'com.android.support:customtabs:27.1.1'
- implementation 'com.android.support:preference-v7:27.1.1'
- implementation 'com.android.support:cardview-v7:27.1.1'
- implementation 'petrov.kristiyan:colorpicker-library:1.1.8'
- implementation 'org.xdty.preference:color-picker:0.0.5'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.browser:browser:1.2.0'
+ implementation 'androidx.preference:preference:1.1.0'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'petrov.kristiyan:colorpicker-library:1.1.10'
+ implementation 'com.firebaseui:firebase-ui-auth:4.3.1'
+ implementation 'com.google.firebase:firebase-analytics:17.2.1'
+ implementation 'com.google.firebase:firebase-core:17.2.1'
+ // Required only if Facebook login support is required
+ // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
+ implementation 'com.facebook.android:facebook-android-sdk:4.29.0'
+ implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
+ implementation "com.google.firebase:firebase-auth:19.2.0"
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'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 0000000..493aad2
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,40 @@
+{
+ "project_info": {
+ "project_number": "436077303281",
+ "firebase_url": "https://timetable-e6129.firebaseio.com",
+ "project_id": "timetable-e6129",
+ "storage_bucket": "timetable-e6129.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:436077303281:android:844b815f9a9784aa586050",
+ "android_client_info": {
+ "package_name": "com.ulan.timetable"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "436077303281-eomhiu4gr9oi0iqtgcf7ft8eus6lqgsf.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyChbM3TDXNtRL5YaoRtgzd5Ps1PFnh24zw"
+ }
+ ],
+ "services": {
+ "appinvite_service": {
+ "other_platform_oauth_client": [
+ {
+ "client_id": "436077303281-eomhiu4gr9oi0iqtgcf7ft8eus6lqgsf.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ]
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java b/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
index c3af4be..4b549e9 100644
--- a/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/ExamsActivity.java
@@ -1,7 +1,6 @@
package com.ulan.timetable.activities;
import android.content.Context;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
@@ -12,6 +11,8 @@
import android.widget.AbsListView;
import android.widget.ListView;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.ulan.timetable.adapters.ExamsAdapter;
import com.ulan.timetable.model.Exam;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java b/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
index 10f607e..fbf8e5a 100644
--- a/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/HomeworksActivity.java
@@ -2,7 +2,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
import android.view.Menu;
@@ -12,6 +11,8 @@
import android.widget.AbsListView;
import android.widget.ListView;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.ulan.timetable.adapters.HomeworksAdapter;
import com.ulan.timetable.model.Homework;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/activities/MainActivity.java b/app/src/main/java/com/ulan/timetable/activities/MainActivity.java
index 20882ad..728723a 100644
--- a/app/src/main/java/com/ulan/timetable/activities/MainActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/MainActivity.java
@@ -5,23 +5,24 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
-import android.support.v7.preference.PreferenceManager;
import android.text.TextUtils;
-import android.view.View;
-import android.support.design.widget.NavigationView;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
-
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.preference.PreferenceManager;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.tabs.TabLayout;
+import com.ulan.timetable.R;
import com.ulan.timetable.adapters.FragmentsTabAdapter;
import com.ulan.timetable.fragments.FridayFragment;
import com.ulan.timetable.fragments.MondayFragment;
@@ -30,7 +31,6 @@
import com.ulan.timetable.fragments.ThursdayFragment;
import com.ulan.timetable.fragments.TuesdayFragment;
import com.ulan.timetable.fragments.WednesdayFragment;
-import com.ulan.timetable.R;
import com.ulan.timetable.utils.AlertDialogsHelper;
import com.ulan.timetable.utils.DailyReceiver;
@@ -69,7 +69,7 @@ private void initAll() {
setupCustomDialog();
setupSevenDaysPref();
- if(switchSevenDays) changeFragments(true);
+ if (switchSevenDays) changeFragments(true);
setDailyAlarm();
}
@@ -86,29 +86,29 @@ private void setupFragments() {
adapter.addFragment(new ThursdayFragment(), getResources().getString(R.string.thursday));
adapter.addFragment(new FridayFragment(), getResources().getString(R.string.friday));
viewPager.setAdapter(adapter);
- viewPager.setCurrentItem(day == 1 ? 6 : day-2, true);
+ viewPager.setCurrentItem(day == 1 ? 6 : day - 2, true);
tabLayout.setupWithViewPager(viewPager);
}
private void changeFragments(boolean isChecked) {
- if(isChecked) {
+ if (isChecked) {
TabLayout tabLayout = findViewById(R.id.tabLayout);
Calendar calendar = Calendar.getInstance();
int day = calendar.get(Calendar.DAY_OF_WEEK);
adapter.addFragment(new SaturdayFragment(), getResources().getString(R.string.saturday));
adapter.addFragment(new SundayFragment(), getResources().getString(R.string.sunday));
viewPager.setAdapter(adapter);
- viewPager.setCurrentItem(day == 1 ? 6 : day-2, true);
+ viewPager.setCurrentItem(day == 1 ? 6 : day - 2, true);
tabLayout.setupWithViewPager(viewPager);
} else {
- if(adapter.getFragmentList().size() > 5) {
+ if (adapter.getFragmentList().size() > 5) {
adapter.removeFragment(new SaturdayFragment(), 5);
adapter.removeFragment(new SundayFragment(), 5);
}
}
adapter.notifyDataSetChanged();
}
-
+
private void setupCustomDialog() {
final View alertLayout = getLayoutInflater().inflate(R.layout.dialog_add_subject, null);
AlertDialogsHelper.getAddSubjectDialog(MainActivity.this, alertLayout, adapter, viewPager);
@@ -143,6 +143,7 @@ private void setDailyAlarm() {
}
}
+
@Override
public void onBackPressed() {
DrawerLayout drawer = findViewById(R.id.drawer_layout);
@@ -177,7 +178,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.schoolwebsitemenu:
String schoolWebsite = PreferenceManager.getDefaultSharedPreferences(this).getString(SettingsActivity.KEY_SCHOOL_WEBSITE_SETTING, null);
- if(!TextUtils.isEmpty(schoolWebsite)) {
+ if (!TextUtils.isEmpty(schoolWebsite)) {
openUrlInChromeCustomTab(getApplicationContext(), schoolWebsite);
} else {
Snackbar.make(navigationView, R.string.school_website_snackbar, Snackbar.LENGTH_SHORT).show();
diff --git a/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java b/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
index cc2091c..94a70f9 100644
--- a/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/NoteInfoActivity.java
@@ -1,11 +1,12 @@
package com.ulan.timetable.activities;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.ulan.timetable.model.Note;
import com.ulan.timetable.R;
import com.ulan.timetable.utils.DbHelper;
diff --git a/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java b/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
index 2f015a1..83eeaf1 100644
--- a/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/NotesActivity.java
@@ -2,7 +2,6 @@
import android.content.Context;
import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
@@ -14,6 +13,8 @@
import android.widget.AdapterView;
import android.widget.ListView;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.ulan.timetable.adapters.NotesAdapter;
import com.ulan.timetable.model.Note;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java b/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
index 4311a65..6650ba6 100644
--- a/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/SettingsActivity.java
@@ -1,8 +1,6 @@
package com.ulan.timetable.activities;
-
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
-
+import androidx.appcompat.app.AppCompatActivity;
import com.ulan.timetable.fragments.SettingsFragment;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java b/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
index 00fe339..142d79a 100644
--- a/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
+++ b/app/src/main/java/com/ulan/timetable/activities/TeachersActivity.java
@@ -1,8 +1,6 @@
package com.ulan.timetable.activities;
import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.SparseBooleanArray;
import android.view.ActionMode;
@@ -13,6 +11,9 @@
import android.widget.AbsListView;
import android.widget.ListView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+
import com.ulan.timetable.adapters.TeachersAdapter;
import com.ulan.timetable.model.Teacher;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
index 5377fe8..2fe999e 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/ExamsAdapter.java
@@ -1,9 +1,8 @@
package com.ulan.timetable.adapters;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.PopupMenu;
+
+
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -14,6 +13,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
+
import com.ulan.timetable.model.Exam;
import com.ulan.timetable.R;
import com.ulan.timetable.utils.AlertDialogsHelper;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
index b6c9cb1..a2c592e 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/FragmentsTabAdapter.java
@@ -1,10 +1,9 @@
package com.ulan.timetable.adapters;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
index ed87530..47c6090 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/HomeworksAdapter.java
@@ -1,9 +1,8 @@
package com.ulan.timetable.adapters;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.PopupMenu;
+
+
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -14,6 +13,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
+
import com.ulan.timetable.model.Homework;
import com.ulan.timetable.R;
import com.ulan.timetable.utils.AlertDialogsHelper;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
index b773b59..c147ff2 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/NotesAdapter.java
@@ -1,10 +1,6 @@
package com.ulan.timetable.adapters;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.PopupMenu;
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -15,6 +11,11 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
+
import com.ulan.timetable.model.Note;
import com.ulan.timetable.R;
import com.ulan.timetable.utils.AlertDialogsHelper;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
index d2df716..7910ad7 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/TeachersAdapter.java
@@ -1,9 +1,8 @@
package com.ulan.timetable.adapters;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.PopupMenu;
+
+
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -14,6 +13,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
+
import com.ulan.timetable.model.Teacher;
import com.ulan.timetable.R;
import com.ulan.timetable.utils.AlertDialogsHelper;
diff --git a/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java b/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
index 172d99b..59be4e7 100644
--- a/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
+++ b/app/src/main/java/com/ulan/timetable/adapters/WeekAdapter.java
@@ -2,9 +2,8 @@
import android.annotation.SuppressLint;
import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.PopupMenu;
+
+
import android.util.SparseBooleanArray;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -15,6 +14,10 @@
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.cardview.widget.CardView;
+
import com.ulan.timetable.R;
import com.ulan.timetable.model.Week;
import com.ulan.timetable.utils.AlertDialogsHelper;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
index 2b83982..e05ca13 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/FridayFragment.java
@@ -1,7 +1,8 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
index 904cabc..ddf03d9 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/MondayFragment.java
@@ -1,16 +1,17 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.ListView;
+import androidx.fragment.app.Fragment;
+
+import com.ulan.timetable.R;
import com.ulan.timetable.adapters.WeekAdapter;
import com.ulan.timetable.utils.DbHelper;
-import com.ulan.timetable.R;
import com.ulan.timetable.utils.FragmentHelper;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
index cea5705..e88e73b 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SaturdayFragment.java
@@ -1,7 +1,8 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
index c832a58..295079f 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SettingsFragment.java
@@ -1,7 +1,7 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceFragmentCompat;
import com.ulan.timetable.R;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
index ea81373..1d5b216 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/SundayFragment.java
@@ -1,6 +1,7 @@
package com.ulan.timetable.fragments;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
import android.os.Bundle;;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
index eac9f0f..52271cc 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/ThursdayFragment.java
@@ -1,7 +1,8 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
+
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
index a2aa9a0..dfee8d7 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/TuesdayFragment.java
@@ -1,15 +1,16 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ListView;
+import androidx.fragment.app.Fragment;
+
+import com.ulan.timetable.R;
import com.ulan.timetable.adapters.WeekAdapter;
import com.ulan.timetable.utils.DbHelper;
-import com.ulan.timetable.R;
import com.ulan.timetable.utils.FragmentHelper;
public class TuesdayFragment extends Fragment {
diff --git a/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java b/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
index ea084d4..8ea9fd7 100644
--- a/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
+++ b/app/src/main/java/com/ulan/timetable/fragments/WednesdayFragment.java
@@ -1,15 +1,14 @@
package com.ulan.timetable.fragments;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ListView;
-
+import androidx.fragment.app.Fragment;
+import com.ulan.timetable.R;
import com.ulan.timetable.adapters.WeekAdapter;
import com.ulan.timetable.utils.DbHelper;
-import com.ulan.timetable.R;
import com.ulan.timetable.utils.FragmentHelper;
diff --git a/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java b/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
index 240caf4..9c279b2 100644
--- a/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
+++ b/app/src/main/java/com/ulan/timetable/utils/AlertDialogsHelper.java
@@ -5,11 +5,11 @@
import android.app.TimePickerDialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
@@ -19,6 +19,8 @@
import android.widget.TextView;
import android.widget.TimePicker;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
import com.ulan.timetable.adapters.ExamsAdapter;
import com.ulan.timetable.adapters.FragmentsTabAdapter;
import com.ulan.timetable.adapters.HomeworksAdapter;
@@ -31,10 +33,6 @@
import com.ulan.timetable.model.Teacher;
import com.ulan.timetable.model.Week;
import com.ulan.timetable.R;
-
-import org.xdty.preference.colorpicker.ColorPickerDialog;
-import org.xdty.preference.colorpicker.ColorPickerSwatch;
-
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
@@ -42,6 +40,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import petrov.kristiyan.colorpicker.ColorPicker;
+
/**
* Created by Ulan on 22.10.2018.
@@ -118,21 +118,19 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -239,21 +237,20 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
+
}
});
@@ -355,21 +352,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
+ @Override
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -451,21 +445,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -551,21 +542,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -631,21 +619,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -720,21 +705,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -786,21 +768,18 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
+ @Override
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -918,21 +897,19 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
@@ -1045,21 +1022,19 @@ public void onClick(View v) {
int mSelectedColor = ContextCompat.getColor(activity, R.color.white);
select_color.setBackgroundColor(mSelectedColor);
int[] mColors = activity.getResources().getIntArray(R.array.default_colors);
- ColorPickerDialog dialog = ColorPickerDialog.newInstance(R.string.color_picker_default_title,
- mColors,
- mSelectedColor,
- 5,
- ColorPickerDialog.SIZE_SMALL,
- true
- );
-
- dialog.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() {
+
+ ColorPicker colorPicker = new ColorPicker(activity);
+ colorPicker.show();
+ colorPicker.setOnChooseColorListener(new ColorPicker.OnChooseColorListener() {
+ @Override
+ public void onChooseColor(int position,int color) {
+ select_color.setBackgroundColor(color); }
+
@Override
- public void onColorSelected(int color) {
- select_color.setBackgroundColor(color);
+ public void onCancel(){
+ // put code
}
});
- dialog.show(activity.getFragmentManager(), "color_dialog");
}
});
diff --git a/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java b/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
index 75cb8f3..b24904b 100644
--- a/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
+++ b/app/src/main/java/com/ulan/timetable/utils/BrowserUtil.java
@@ -4,7 +4,7 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.support.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsIntent;
/**
* Created by Ulan on 19.10.2018.
diff --git a/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java b/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
index 8fda250..84fac1e 100644
--- a/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
+++ b/app/src/main/java/com/ulan/timetable/utils/DailyReceiver.java
@@ -9,8 +9,10 @@
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
+
+
+import androidx.annotation.RequiresApi;
+import androidx.core.app.NotificationCompat;
import com.ulan.timetable.activities.MainActivity;
import com.ulan.timetable.R;
@@ -70,10 +72,12 @@ private String getLessons(int day) {
db.getWeek(currentDay).forEach(week -> {
if(week != null) {
- lessons.append(week.getSubject()).append(" ")
+ lessons.append(week.getSubject())
+ .append(" ")
.append(week.getFromTime())
.append(" - ")
- .append(week.getToTime()).append(" ")
+ .append(week.getToTime())
+ .append(" ")
.append(week.getRoom())
.append("\n");
}
diff --git a/app/src/main/res/layout/activity_exams.xml b/app/src/main/res/layout/activity_exams.xml
index cf1a6e6..d0a57ef 100644
--- a/app/src/main/res/layout/activity_exams.xml
+++ b/app/src/main/res/layout/activity_exams.xml
@@ -1,12 +1,12 @@
-
-
@@ -18,9 +18,9 @@
android:cacheColorHint="@android:color/transparent"
android:divider="@null"
/>
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_homeworks.xml b/app/src/main/res/layout/activity_homeworks.xml
index c0e54a9..d06aa6c 100644
--- a/app/src/main/res/layout/activity_homeworks.xml
+++ b/app/src/main/res/layout/activity_homeworks.xml
@@ -1,5 +1,5 @@
-
-
@@ -21,9 +21,9 @@
android:cacheColorHint="@android:color/transparent"
android:divider="@null"
/>
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d38e97d..204e5fb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
-
+
diff --git a/app/src/main/res/layout/activity_note_info.xml b/app/src/main/res/layout/activity_note_info.xml
index 854a054..2a16849 100644
--- a/app/src/main/res/layout/activity_note_info.xml
+++ b/app/src/main/res/layout/activity_note_info.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_notes.xml b/app/src/main/res/layout/activity_notes.xml
index 79f4613..3c64d49 100644
--- a/app/src/main/res/layout/activity_notes.xml
+++ b/app/src/main/res/layout/activity_notes.xml
@@ -1,5 +1,5 @@
-
-
@@ -20,9 +20,9 @@
android:cacheColorHint="@android:color/transparent"
android:divider="@null"
/>
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 4a4970a..adbc1aa 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,9 +1,9 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_teachers.xml b/app/src/main/res/layout/activity_teachers.xml
index 81624f4..9aed8ca 100644
--- a/app/src/main/res/layout/activity_teachers.xml
+++ b/app/src/main/res/layout/activity_teachers.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 64963df..8214c06 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -7,13 +7,13 @@
tools:context=".activities.MainActivity"
android:orientation="vertical">
-
-
-
+
-
-
+
-
-
+
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/listview_homeworks_adapter.xml b/app/src/main/res/layout/listview_homeworks_adapter.xml
index 451b761..9cb4e8c 100644
--- a/app/src/main/res/layout/listview_homeworks_adapter.xml
+++ b/app/src/main/res/layout/listview_homeworks_adapter.xml
@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" >
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/listview_notes_adapter.xml b/app/src/main/res/layout/listview_notes_adapter.xml
index 1e0d220..f390454 100644
--- a/app/src/main/res/layout/listview_notes_adapter.xml
+++ b/app/src/main/res/layout/listview_notes_adapter.xml
@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:descendantFocusability="beforeDescendants">
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/listview_teachers_adapter.xml b/app/src/main/res/layout/listview_teachers_adapter.xml
index 1e39905..7391f2a 100644
--- a/app/src/main/res/layout/listview_teachers_adapter.xml
+++ b/app/src/main/res/layout/listview_teachers_adapter.xml
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/listview_week_adapter.xml b/app/src/main/res/layout/listview_week_adapter.xml
index 5b3e33a..1dce4f0 100644
--- a/app/src/main/res/layout/listview_week_adapter.xml
+++ b/app/src/main/res/layout/listview_week_adapter.xml
@@ -7,7 +7,7 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto">
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/switch_layout.xml b/app/src/main/res/layout/switch_layout.xml
index fc705f9..b43b722 100644
--- a/app/src/main/res/layout/switch_layout.xml
+++ b/app/src/main/res/layout/switch_layout.xml
@@ -3,7 +3,7 @@
android:orientation="horizontal" android:layout_width="match_parent"
android:layout_height="match_parent">
-
-