Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,35 +1,47 @@
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 {
minifyEnabled false
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'
40 changes: 40 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -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"
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
43 changes: 22 additions & 21 deletions app/src/main/java/com/ulan/timetable/activities/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -69,7 +69,7 @@ private void initAll() {
setupCustomDialog();
setupSevenDaysPref();

if(switchSevenDays) changeFragments(true);
if (switchSevenDays) changeFragments(true);

setDailyAlarm();
}
Expand All @@ -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);
Expand Down Expand Up @@ -143,6 +143,7 @@ private void setDailyAlarm() {
}

}

@Override
public void onBackPressed() {
DrawerLayout drawer = findViewById(R.id.drawer_layout);
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Loading