From bd075124dbc7806fec4686d0c206a3fc6a73f5af Mon Sep 17 00:00:00 2001 From: Shreyansh Lodha Date: Wed, 3 Oct 2018 04:02:51 +0530 Subject: [PATCH] Update all dependencies and convert entire app to kotlin Signed-off-by: Shreyansh Lodha --- app/build.gradle | 20 +- .../nealgosalia/timetable/MainActivity.java | 102 ------- .../com/nealgosalia/timetable/MainActivity.kt | 95 ++++++ .../activities/PreferencesActivity.java | 109 ------- .../activities/PreferencesActivity.kt | 114 +++++++ .../timetable/activities/SplashActivity.java | 53 ---- .../timetable/activities/SplashActivity.kt | 51 ++++ .../timetable/adapters/AttendanceAdapter.java | 55 ---- .../timetable/adapters/AttendanceAdapter.kt | 43 +++ .../timetable/adapters/LecturesAdapter.java | 56 ---- .../timetable/adapters/LecturesAdapter.kt | 46 +++ .../adapters/SimpleFragmentPagerAdapter.java | 73 ----- .../adapters/SimpleFragmentPagerAdapter.kt | 65 ++++ .../timetable/adapters/SubjectsAdapter.java | 49 ---- .../timetable/adapters/SubjectsAdapter.kt | 39 +++ .../timetable/database/FragmentDatabase.java | 115 -------- .../timetable/database/FragmentDatabase.kt | 114 +++++++ .../timetable/database/FragmentDetails.java | 53 ---- .../timetable/database/FragmentDetails.kt | 7 + .../timetable/database/SubjectDatabase.java | 91 ------ .../timetable/database/SubjectDatabase.kt | 91 ++++++ .../timetable/database/SubjectDetails.java | 45 --- .../timetable/database/SubjectDetails.kt | 20 ++ .../fragments/AttendanceFragment.java | 192 ------------ .../timetable/fragments/AttendanceFragment.kt | 191 ++++++++++++ .../timetable/fragments/FridayFragment.java | 85 ------ .../timetable/fragments/FridayFragment.kt | 85 ++++++ .../timetable/fragments/MondayFragment.java | 85 ------ .../timetable/fragments/MondayFragment.kt | 85 ++++++ .../fragments/MyPreferenceFragment.java | 209 ------------- .../fragments/MyPreferenceFragment.kt | 211 +++++++++++++ .../timetable/fragments/SaturdayFragment.java | 85 ------ .../timetable/fragments/SaturdayFragment.kt | 85 ++++++ .../timetable/fragments/SubjectsFragment.java | 277 ------------------ .../timetable/fragments/SubjectsFragment.kt | 277 ++++++++++++++++++ .../timetable/fragments/SundayFragment.java | 87 ------ .../timetable/fragments/SundayFragment.kt | 87 ++++++ .../timetable/fragments/ThursdayFragment.java | 87 ------ .../timetable/fragments/ThursdayFragment.kt | 87 ++++++ .../fragments/TimetableFragment.java | 253 ---------------- .../timetable/fragments/TimetableFragment.kt | 256 ++++++++++++++++ .../timetable/fragments/TuesdayFragment.java | 87 ------ .../timetable/fragments/TuesdayFragment.kt | 87 ++++++ .../fragments/WednesdayFragment.java | 87 ------ .../timetable/fragments/WednesdayFragment.kt | 87 ++++++ .../timetable/receivers/MyReceiver.java | 43 --- .../timetable/receivers/MyReceiver.kt | 43 +++ .../timetable/receivers/OnBootReceiver.java | 67 ----- .../timetable/receivers/OnBootReceiver.kt | 69 +++++ .../nealgosalia/timetable/utils/Alarms.java | 29 -- .../com/nealgosalia/timetable/utils/Alarms.kt | 13 + .../utils/DividerItemDecoration.java | 89 ------ .../timetable/utils/DividerItemDecoration.kt | 90 ++++++ .../nealgosalia/timetable/utils/Lecture.java | 66 ----- .../nealgosalia/timetable/utils/Lecture.kt | 28 ++ .../utils/RecyclerItemClickListener.java | 48 --- .../utils/RecyclerItemClickListener.kt | 46 +++ .../nealgosalia/timetable/utils/Subject.java | 53 ---- .../nealgosalia/timetable/utils/Subject.kt | 26 ++ build.gradle | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 72 +++-- gradlew.bat | 14 +- 64 files changed, 2602 insertions(+), 2781 deletions(-) delete mode 100644 app/src/main/java/com/nealgosalia/timetable/MainActivity.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/MainActivity.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Alarms.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Alarms.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Lecture.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Lecture.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.kt delete mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Subject.java create mode 100644 app/src/main/java/com/nealgosalia/timetable/utils/Subject.kt create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/app/build.gradle b/app/build.gradle index 28d75c8..f2133c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 - buildToolsVersion "26.0.1" + buildToolsVersion "26.0.3" defaultConfig { applicationId "com.nealgosalia.timetable" minSdkVersion 15 @@ -19,15 +19,15 @@ android { } dependencies { - compile 'com.roughike:bottom-bar:2.0.2' - compile 'com.ncapdevi:frag-nav:1.2.5' - compile 'com.shawnlin:number-picker:2.4.4' - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.daimajia.numberprogressbar:library:1.2@aar' + implementation 'com.roughike:bottom-bar:2.0.2' + implementation 'com.ncapdevi:frag-nav:1.2.5' + implementation 'com.shawnlin:number-picker:2.4.4' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.daimajia.numberprogressbar:library:1.4@aar' //noinspection GradleCompatible - compile 'com.android.support:appcompat-v7:26.0.+' - compile 'com.android.support:design:26.0.+' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:design:26.1.0' testCompile 'junit:junit:4.12' - compile 'com.android.support:support-v4:26.0.+' - compile 'com.android.support:recyclerview-v7:26.0.+' + implementation 'com.android.support:support-v4:26.1.0' + implementation 'com.android.support:recyclerview-v7:26.1.0' } diff --git a/app/src/main/java/com/nealgosalia/timetable/MainActivity.java b/app/src/main/java/com/nealgosalia/timetable/MainActivity.java deleted file mode 100644 index 10c824f..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/MainActivity.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.nealgosalia.timetable; - -import android.support.v7.app.AppCompatActivity; -import android.support.v4.app.Fragment; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.support.annotation.IdRes; -import android.view.Menu; -import android.view.MenuItem; -import android.widget.Toast; - -import com.ncapdevi.fragnav.FragNavController; -import com.nealgosalia.timetable.activities.PreferencesActivity; -import com.nealgosalia.timetable.fragments.AttendanceFragment; -import com.nealgosalia.timetable.fragments.SubjectsFragment; -import com.nealgosalia.timetable.fragments.TimetableFragment; -import com.roughike.bottombar.BottomBar; -import com.roughike.bottombar.OnTabReselectListener; -import com.roughike.bottombar.OnTabSelectListener; - -import java.util.ArrayList; -import java.util.List; - -public class MainActivity extends AppCompatActivity { - - private final int TAB_FIRST = FragNavController.TAB1; - private final int TAB_SECOND = FragNavController.TAB2; - private final int TAB_THIRD = FragNavController.TAB3; - boolean doubleBackToExitPressedOnce = false; - private FragNavController fragNavController; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - List fragments = new ArrayList<>(3); - fragments.add(new TimetableFragment()); - fragments.add(new AttendanceFragment()); - fragments.add(new SubjectsFragment()); - fragNavController = new FragNavController(savedInstanceState, getSupportFragmentManager(), R.id.contentContainer, fragments, TAB_FIRST); - BottomBar bottomBar = (BottomBar) findViewById(R.id.bottomBar); - bottomBar.setDefaultTabPosition(1); - bottomBar.setOnTabSelectListener(new OnTabSelectListener() { - @Override - public void onTabSelected(@IdRes int tabId) { - switch (tabId) { - case R.id.tab_timetable: - fragNavController.switchTab(TAB_FIRST); - break; - case R.id.tab_attendance: - fragNavController.switchTab(TAB_SECOND); - break; - case R.id.tab_subjects: - fragNavController.switchTab(TAB_THIRD); - break; - } - } - }); - - bottomBar.setOnTabReselectListener(new OnTabReselectListener() { - @Override - public void onTabReSelected(@IdRes int tabId) { - fragNavController.clearStack(); - } - }); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.menu, menu); - return super.onCreateOptionsMenu(menu); - } - - @Override - public void onBackPressed() { - if (doubleBackToExitPressedOnce) { - super.onBackPressed(); - return; - } - this.doubleBackToExitPressedOnce = true; - Toast.makeText(this, getResources().getString(R.string.press_back), Toast.LENGTH_SHORT).show(); - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - doubleBackToExitPressedOnce = false; - } - }, 2000); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.settings: - Intent intent = new Intent(MainActivity.this, PreferencesActivity.class); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/MainActivity.kt b/app/src/main/java/com/nealgosalia/timetable/MainActivity.kt new file mode 100644 index 0000000..e709580 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/MainActivity.kt @@ -0,0 +1,95 @@ +package com.nealgosalia.timetable + +import android.support.v7.app.AppCompatActivity +import android.support.v4.app.Fragment +import android.content.Intent +import android.os.Bundle +import android.os.Handler +import android.support.annotation.IdRes +import android.view.Menu +import android.view.MenuItem +import android.widget.Toast + +import com.ncapdevi.fragnav.FragNavController +import com.nealgosalia.timetable.activities.PreferencesActivity +import com.nealgosalia.timetable.fragments.AttendanceFragment +import com.nealgosalia.timetable.fragments.SubjectsFragment +import com.nealgosalia.timetable.fragments.TimetableFragment +import com.roughike.bottombar.BottomBar +import com.roughike.bottombar.OnTabReselectListener +import com.roughike.bottombar.OnTabSelectListener + +import java.util.ArrayList + +class MainActivity : AppCompatActivity() { + + private val TAB_FIRST = FragNavController.TAB1 + private val TAB_SECOND = FragNavController.TAB2 + private val TAB_THIRD = FragNavController.TAB3 + internal var doubleBackToExitPressedOnce = false + private var fragNavController: FragNavController? = null + + @Override + protected fun onCreate(savedInstanceState: Bundle) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + val fragments = ArrayList(3) + fragments.add(TimetableFragment()) + fragments.add(AttendanceFragment()) + fragments.add(SubjectsFragment()) + fragNavController = FragNavController(savedInstanceState, getSupportFragmentManager(), R.id.contentContainer, fragments, TAB_FIRST) + val bottomBar = findViewById(R.id.bottomBar) as BottomBar + bottomBar.setDefaultTabPosition(1) + bottomBar.setOnTabSelectListener(object : OnTabSelectListener() { + @Override + fun onTabSelected(@IdRes tabId: Int) { + when (tabId) { + R.id.tab_timetable -> fragNavController!!.switchTab(TAB_FIRST) + R.id.tab_attendance -> fragNavController!!.switchTab(TAB_SECOND) + R.id.tab_subjects -> fragNavController!!.switchTab(TAB_THIRD) + } + } + }) + + bottomBar.setOnTabReselectListener(object : OnTabReselectListener() { + @Override + fun onTabReSelected(@IdRes tabId: Int) { + fragNavController!!.clearStack() + } + }) + } + + @Override + fun onCreateOptionsMenu(menu: Menu): Boolean { + getMenuInflater().inflate(R.menu.menu, menu) + return super.onCreateOptionsMenu(menu) + } + + @Override + fun onBackPressed() { + if (doubleBackToExitPressedOnce) { + super.onBackPressed() + return + } + this.doubleBackToExitPressedOnce = true + Toast.makeText(this, getResources().getString(R.string.press_back), Toast.LENGTH_SHORT).show() + Handler().postDelayed(object : Runnable() { + @Override + fun run() { + doubleBackToExitPressedOnce = false + } + }, 2000) + } + + @Override + fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.getItemId()) { + R.id.settings -> { + val intent = Intent(this@MainActivity, PreferencesActivity::class.java) + startActivity(intent) + return true + } + else -> return super.onOptionsItemSelected(item) + } + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.java b/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.java deleted file mode 100644 index 628e534..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.nealgosalia.timetable.activities; - -import android.Manifest; -import android.app.Activity; -import android.content.pm.PackageManager; -import android.os.Build; -import android.os.Bundle; -import android.os.Environment; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AppCompatActivity; -import android.util.Log; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.fragments.MyPreferenceFragment; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.nio.channels.FileChannel; - -public class PreferencesActivity extends AppCompatActivity { - - private static final String TAG = "PreferencesActivity"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_preferences); - getFragmentManager().beginTransaction().replace(android.R.id.content, new MyPreferenceFragment()).commit(); - } - - @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { - Log.v(TAG, "Permission: " + permissions[0] + "was " + grantResults[0]); - } - } - - public boolean importDatabase(String ePath) { - try { - File sd = Environment.getExternalStorageDirectory(); - if (sd.canWrite()) { - String currentDBPath = sd + "/Timetable/" + ePath; - String internalDBPath = "data/data/com.nealgosalia.timetable/databases/"; - String backupDBPath = internalDBPath + ePath; - File internalDB = new File(internalDBPath); - internalDB.mkdirs(); - File currentDB = new File(currentDBPath); - File backupDB = new File(backupDBPath); - if (currentDB.exists()) { - FileChannel src = new FileInputStream(currentDB).getChannel(); - FileChannel dst = new FileOutputStream(backupDB).getChannel(); - dst.transferFrom(src, 0, src.size()); - src.close(); - dst.close(); - return true; - } - } - } catch (Exception e) { - e.printStackTrace(); - } - return false; - } - - public boolean exportDatabase(String mPath) { - try { - File outDir = new File(Environment.getExternalStorageDirectory() + File.separator + "Timetable"); - if (!outDir.exists()) { - Log.d(TAG, "Creating directory"); - outDir.mkdir(); - } else { - Log.d(TAG, "Directory present"); - } - String currentDBPath = Environment.getDataDirectory() + "/data/com.nealgosalia.timetable/databases/" + mPath; - String backupDBPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Timetable/" + mPath; - File currentDB = new File(currentDBPath); - File backupDB = new File(backupDBPath); - if (currentDB.exists()) { - FileChannel src = new FileInputStream(currentDB).getChannel(); - FileChannel dst = new FileOutputStream(backupDB).getChannel(); - dst.transferFrom(src, 0, src.size()); - src.close(); - dst.close(); - return true; - } - } catch (Exception e) { - e.printStackTrace(); - } - return false; - } - - public boolean isStoragePermissionGranted(Activity activity) { - if (Build.VERSION.SDK_INT >= 23) { - if (ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) { - Log.v(TAG, "Permission granted"); - return true; - } else { - Log.v(TAG, "Permission denied"); - ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1); - return false; - } - } else { //permission is automatically granted on sdk<23 upon installation - Log.v(TAG, "Permission granted"); - return true; - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.kt b/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.kt new file mode 100644 index 0000000..10c56e2 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/activities/PreferencesActivity.kt @@ -0,0 +1,114 @@ +package com.nealgosalia.timetable.activities + +import android.Manifest +import android.app.Activity +import android.content.pm.PackageManager +import android.os.Build +import android.os.Bundle +import android.os.Environment +import android.support.v4.app.ActivityCompat +import android.support.v4.content.ContextCompat +import android.support.v7.app.AppCompatActivity +import android.util.Log + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.fragments.MyPreferenceFragment + +import java.io.File +import java.io.FileInputStream +import java.io.FileOutputStream +import java.nio.channels.FileChannel + +class PreferencesActivity : AppCompatActivity() { + + @Override + protected fun onCreate(savedInstanceState: Bundle) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_preferences) + getFragmentManager().beginTransaction().replace(android.R.id.content, MyPreferenceFragment()).commit() + } + + @Override + fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { + Log.v(TAG, "Permission: " + permissions[0] + "was " + grantResults[0]) + } + } + + fun importDatabase(ePath: String): Boolean { + try { + val sd = Environment.getExternalStorageDirectory() + if (sd.canWrite()) { + val currentDBPath = sd + "/Timetable/" + ePath + val internalDBPath = "data/data/com.nealgosalia.timetable/databases/" + val backupDBPath = internalDBPath + ePath + val internalDB = File(internalDBPath) + internalDB.mkdirs() + val currentDB = File(currentDBPath) + val backupDB = File(backupDBPath) + if (currentDB.exists()) { + val src = FileInputStream(currentDB).getChannel() + val dst = FileOutputStream(backupDB).getChannel() + dst.transferFrom(src, 0, src.size()) + src.close() + dst.close() + return true + } + } + } catch (e: Exception) { + e.printStackTrace() + } + + return false + } + + fun exportDatabase(mPath: String): Boolean { + try { + val outDir = File(Environment.getExternalStorageDirectory() + File.separator + "Timetable") + if (!outDir.exists()) { + Log.d(TAG, "Creating directory") + outDir.mkdir() + } else { + Log.d(TAG, "Directory present") + } + val currentDBPath = Environment.getDataDirectory() + "/data/com.nealgosalia.timetable/databases/" + mPath + val backupDBPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Timetable/" + mPath + val currentDB = File(currentDBPath) + val backupDB = File(backupDBPath) + if (currentDB.exists()) { + val src = FileInputStream(currentDB).getChannel() + val dst = FileOutputStream(backupDB).getChannel() + dst.transferFrom(src, 0, src.size()) + src.close() + dst.close() + return true + } + } catch (e: Exception) { + e.printStackTrace() + } + + return false + } + + fun isStoragePermissionGranted(activity: Activity): Boolean { + if (Build.VERSION.SDK_INT >= 23) { + if (ContextCompat.checkSelfPermission(getApplicationContext(), android.Manifest.permission.WRITE_EXTERNAL_STORAGE) === PackageManager.PERMISSION_GRANTED) { + Log.v(TAG, "Permission granted") + return true + } else { + Log.v(TAG, "Permission denied") + ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 1) + return false + } + } else { //permission is automatically granted on sdk<23 upon installation + Log.v(TAG, "Permission granted") + return true + } + } + + companion object { + + private val TAG = "PreferencesActivity" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.java b/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.java deleted file mode 100644 index 1b6ad25..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.nealgosalia.timetable.activities; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.view.View; -import android.view.Window; - -import com.nealgosalia.timetable.MainActivity; -import com.nealgosalia.timetable.R; - -public class SplashActivity extends Activity { - private Runnable runnable; - private Handler handler; - - protected void onCreate(Bundle savedInstanceState) { - requestWindowFeature(Window.FEATURE_NO_TITLE); - Window window = getWindow(); - window.getDecorView().setOverScrollMode(View.OVER_SCROLL_NEVER); - window.getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - super.onCreate(savedInstanceState); - setContentView(R.layout.splash); - initialize(); - } - private void initialize() - { - handler = new Handler(); - runnable = new Runnable() - { - @Override - public void run() - { - Intent intent = new Intent(SplashActivity.this, MainActivity.class); - startActivity(intent); - } - }; - handler.postDelayed(runnable, 1000); - } - - @Override - public void onBackPressed() { - finish(); - handler.removeCallbacks(runnable); - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.kt b/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.kt new file mode 100644 index 0000000..35e980f --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/activities/SplashActivity.kt @@ -0,0 +1,51 @@ +package com.nealgosalia.timetable.activities + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import android.os.Handler +import android.view.View +import android.view.Window + +import com.nealgosalia.timetable.MainActivity +import com.nealgosalia.timetable.R + +class SplashActivity : Activity() { + private var runnable: Runnable? = null + private var handler: Handler? = null + + protected fun onCreate(savedInstanceState: Bundle) { + requestWindowFeature(Window.FEATURE_NO_TITLE) + val window = getWindow() + window.getDecorView().setOverScrollMode(View.OVER_SCROLL_NEVER) + window.getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) + super.onCreate(savedInstanceState) + setContentView(R.layout.splash) + initialize() + } + + private fun initialize() { + handler = Handler() + runnable = object : Runnable() { + @Override + fun run() { + val intent = Intent(this@SplashActivity, MainActivity::class.java) + startActivity(intent) + } + } + handler!!.postDelayed(runnable, 1000) + } + + @Override + fun onBackPressed() { + finish() + handler!!.removeCallbacks(runnable) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.java b/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.java deleted file mode 100644 index c6c3759..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.nealgosalia.timetable.adapters; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.daimajia.numberprogressbar.NumberProgressBar; -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.utils.Subject; - -import java.util.List; - -public class AttendanceAdapter extends RecyclerView.Adapter { - - private List subjectList; - private List progressList; - - public class MyViewHolder extends RecyclerView.ViewHolder { - public TextView subjectName; - public NumberProgressBar attendance; - - public MyViewHolder(View view) { - super(view); - subjectName = view.findViewById(R.id.subjectNameAttendance); - attendance = view.findViewById(R.id.attendance_progress_bar); - } - } - - public AttendanceAdapter(List subjectList, List progress) { - this.subjectList = subjectList; - this.progressList = progress; - } - - @Override - public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View itemView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.row_attendance, parent, false); - - return new MyViewHolder(itemView); - } - - @Override - public void onBindViewHolder(MyViewHolder holder, int position) { - Subject subject = subjectList.get(position); - holder.subjectName.setText(subject.getSubjectName()); - holder.attendance.setProgress(progressList.get(position)); - } - - @Override - public int getItemCount() { - return subjectList.size(); - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.kt b/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.kt new file mode 100644 index 0000000..cc35b3a --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/adapters/AttendanceAdapter.kt @@ -0,0 +1,43 @@ +package com.nealgosalia.timetable.adapters + +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.daimajia.numberprogressbar.NumberProgressBar +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.utils.Subject + +class AttendanceAdapter(private val subjectList: List, private val progressList: List) : RecyclerView.Adapter() { + + val itemCount: Int + @Override + get() = subjectList.size() + + inner class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var subjectName: TextView + var attendance: NumberProgressBar + + init { + subjectName = view.findViewById(R.id.subjectNameAttendance) + attendance = view.findViewById(R.id.attendance_progress_bar) + } + } + + @Override + fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { + val itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.row_attendance, parent, false) + + return MyViewHolder(itemView) + } + + @Override + fun onBindViewHolder(holder: MyViewHolder, position: Int) { + val subject = subjectList[position] + holder.subjectName.setText(subject.getSubjectName()) + holder.attendance.setProgress(progressList[position]) + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.java b/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.java deleted file mode 100644 index f5793c1..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.nealgosalia.timetable.adapters; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.utils.Lecture; - -import java.util.List; - -public class LecturesAdapter extends RecyclerView.Adapter { - - private List lectureList; - - public class MyViewHolder extends RecyclerView.ViewHolder { - public TextView lectureName; - public TextView lectureTime; - public TextView lectureroom; - - public MyViewHolder(View view) { - super(view); - lectureName = view.findViewById(R.id.lectureName); - lectureTime = view.findViewById(R.id.lectureTime); - lectureroom = view.findViewById(R.id.lectureroom); - - } - } - - public LecturesAdapter(List lectureList) { - this.lectureList = lectureList; - } - - @Override - public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View itemView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.row_lectures, parent, false); - - return new MyViewHolder(itemView); - } - - @Override - public void onBindViewHolder(MyViewHolder holder, int position) { - Lecture lecture = lectureList.get(position); - holder.lectureName.setText(lecture.getSubjectName()); - holder.lectureTime.setText(lecture.getStartTime() + " - " + lecture.getEndTime()); - holder.lectureroom.setText(lecture.getRoomNo()); - } - - @Override - public int getItemCount() { - return lectureList.size(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.kt b/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.kt new file mode 100644 index 0000000..59122ef --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/adapters/LecturesAdapter.kt @@ -0,0 +1,46 @@ +package com.nealgosalia.timetable.adapters + +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.utils.Lecture + +class LecturesAdapter(private val lectureList: List) : RecyclerView.Adapter() { + + val itemCount: Int + @Override + get() = lectureList.size() + + inner class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var lectureName: TextView + var lectureTime: TextView + var lectureroom: TextView + + init { + lectureName = view.findViewById(R.id.lectureName) + lectureTime = view.findViewById(R.id.lectureTime) + lectureroom = view.findViewById(R.id.lectureroom) + + } + } + + @Override + fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { + val itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.row_lectures, parent, false) + + return MyViewHolder(itemView) + } + + @Override + fun onBindViewHolder(holder: MyViewHolder, position: Int) { + val lecture = lectureList[position] + holder.lectureName.setText(lecture.getSubjectName()) + holder.lectureTime.setText(lecture.getStartTime() + " - " + lecture.getEndTime()) + holder.lectureroom.setText(lecture.getRoomNo()) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.java b/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.java deleted file mode 100644 index f79f1b5..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.nealgosalia.timetable.adapters; - -import android.content.Context; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.fragments.FridayFragment; -import com.nealgosalia.timetable.fragments.MondayFragment; -import com.nealgosalia.timetable.fragments.SaturdayFragment; -import com.nealgosalia.timetable.fragments.SundayFragment; -import com.nealgosalia.timetable.fragments.ThursdayFragment; -import com.nealgosalia.timetable.fragments.TuesdayFragment; -import com.nealgosalia.timetable.fragments.WednesdayFragment; - -public class SimpleFragmentPagerAdapter extends FragmentPagerAdapter { - - private Context mContext; - - public SimpleFragmentPagerAdapter(FragmentManager fm, Context context) { - super(fm); - mContext = context; - } - - @Override - public Fragment getItem(int position) { - if (position == 0) { - return new MondayFragment(); - } else if (position == 1) { - return new TuesdayFragment(); - } else if (position == 2) { - return new WednesdayFragment(); - } else if (position == 3) { - return new ThursdayFragment(); - } else if (position == 4) { - return new FridayFragment(); - } else if (position == 5) { - return new SaturdayFragment(); - } else { - return new SundayFragment(); - } - } - - @Override - public int getItemPosition(Object object) { - return POSITION_NONE; - } - - @Override - public int getCount() { - return 7; - } - - @Override - public CharSequence getPageTitle(int position) { - if (position == 0) { - return mContext.getString(R.string.monday); - } else if (position == 1) { - return mContext.getString(R.string.tuesday); - } else if (position == 2) { - return mContext.getString(R.string.wednesday); - } else if (position == 3) { - return mContext.getString(R.string.thursday); - } else if (position == 4) { - return mContext.getString(R.string.friday); - } else if (position == 5) { - return mContext.getString(R.string.saturday); - } else { - return mContext.getString(R.string.sunday); - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.kt b/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.kt new file mode 100644 index 0000000..2714719 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/adapters/SimpleFragmentPagerAdapter.kt @@ -0,0 +1,65 @@ +package com.nealgosalia.timetable.adapters + +import android.content.Context +import android.support.v4.app.Fragment +import android.support.v4.app.FragmentManager +import android.support.v4.app.FragmentPagerAdapter + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.fragments.FridayFragment +import com.nealgosalia.timetable.fragments.MondayFragment +import com.nealgosalia.timetable.fragments.SaturdayFragment +import com.nealgosalia.timetable.fragments.SundayFragment +import com.nealgosalia.timetable.fragments.ThursdayFragment +import com.nealgosalia.timetable.fragments.TuesdayFragment +import com.nealgosalia.timetable.fragments.WednesdayFragment + +class SimpleFragmentPagerAdapter(fm: FragmentManager, private val mContext: Context) : FragmentPagerAdapter(fm) { + + val count: Int + @Override + get() = 7 + + @Override + fun getItem(position: Int): Fragment { + return if (position == 0) { + MondayFragment() + } else if (position == 1) { + TuesdayFragment() + } else if (position == 2) { + WednesdayFragment() + } else if (position == 3) { + ThursdayFragment() + } else if (position == 4) { + FridayFragment() + } else if (position == 5) { + SaturdayFragment() + } else { + SundayFragment() + } + } + + @Override + fun getItemPosition(`object`: Object): Int { + return POSITION_NONE + } + + @Override + fun getPageTitle(position: Int): CharSequence { + return if (position == 0) { + mContext.getString(R.string.monday) + } else if (position == 1) { + mContext.getString(R.string.tuesday) + } else if (position == 2) { + mContext.getString(R.string.wednesday) + } else if (position == 3) { + mContext.getString(R.string.thursday) + } else if (position == 4) { + mContext.getString(R.string.friday) + } else if (position == 5) { + mContext.getString(R.string.saturday) + } else { + mContext.getString(R.string.sunday) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.java b/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.java deleted file mode 100644 index 685b9ce..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.nealgosalia.timetable.adapters; - -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.utils.Subject; - -import java.util.List; - -public class SubjectsAdapter extends RecyclerView.Adapter { - - private List subjectsList; - - public class MyViewHolder extends RecyclerView.ViewHolder { - public TextView subjectName; - - public MyViewHolder(View view) { - super(view); - subjectName = view.findViewById(R.id.subjectName); - } - } - - public SubjectsAdapter(List subjectsList) { - this.subjectsList = subjectsList; - } - - @Override - public MyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View itemView = LayoutInflater.from(parent.getContext()) - .inflate(R.layout.list_subjects, parent, false); - - return new MyViewHolder(itemView); - } - - @Override - public void onBindViewHolder(MyViewHolder holder, int position) { - Subject subject = subjectsList.get(position); - holder.subjectName.setText(subject.getSubjectName()); - } - - @Override - public int getItemCount() { - return subjectsList.size(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.kt b/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.kt new file mode 100644 index 0000000..0401988 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/adapters/SubjectsAdapter.kt @@ -0,0 +1,39 @@ +package com.nealgosalia.timetable.adapters + +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.utils.Subject + +class SubjectsAdapter(private val subjectsList: List) : RecyclerView.Adapter() { + + val itemCount: Int + @Override + get() = subjectsList.size() + + inner class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var subjectName: TextView + + init { + subjectName = view.findViewById(R.id.subjectName) + } + } + + @Override + fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyViewHolder { + val itemView = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.list_subjects, parent, false) + + return MyViewHolder(itemView) + } + + @Override + fun onBindViewHolder(holder: MyViewHolder, position: Int) { + val subject = subjectsList[position] + holder.subjectName.setText(subject.getSubjectName()) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.java b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.java deleted file mode 100644 index cc6016c..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.nealgosalia.timetable.database; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; - -import com.nealgosalia.timetable.utils.Lecture; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -public class FragmentDatabase extends SQLiteOpenHelper { - - private static final String TAG = "FragmentDatabase"; - private static final int DATABASE_VERSION = 1; - private static final String DATABASE_NAME = "lecture.db"; - private static final String TABLE_DETAIL = "lectureDetails"; - private static final String DAY = "day"; - private static final String SUBJECT = "subject"; - private static final String START_HOUR = "startHour"; - private static final String END_HOUR = "endHour"; - private static final String START_MINUTE = "startMinute"; - private static final String END_MINUTE = "endMinute"; - private static final String ROOM_NUMBER = "roomNo"; - private static final String CREATE_TABLE = "create table " - + TABLE_DETAIL + "(" + DAY + " integer not null, " + SUBJECT + " varchar not null," - + START_HOUR + " integer not null," + START_MINUTE + " integer not null," - + END_HOUR + " integer not null," + END_MINUTE + " integer not null," + ROOM_NUMBER + " varchar not null);"; - private List lecturesList = new ArrayList<>(); - - public FragmentDatabase(Context context) { - super(context, DATABASE_NAME, null, DATABASE_VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL(CREATE_TABLE); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE_DETAIL); - onCreate(db); - } - - public void add(FragmentDetails fd) { - SQLiteDatabase db = this.getWritableDatabase(); - ContentValues values = new ContentValues(); - values.put(DAY, fd.getDay()); - values.put(SUBJECT, fd.getSubject()); - values.put(START_HOUR, fd.getStartHour()); - values.put(START_MINUTE, fd.getStartMinute()); - values.put(END_HOUR, fd.getEndHour()); - values.put(END_MINUTE, fd.getEndMinute()); - values.put(ROOM_NUMBER,fd.getRoomNo()); - db.insert(TABLE_DETAIL, null, values); - db.close(); - } - - public void remove(FragmentDetails fd) { - SQLiteDatabase db = this.getWritableDatabase(); - String selection = FragmentDatabase.DAY + "=? AND " + FragmentDatabase.START_HOUR + "=? AND "+ FragmentDatabase.START_MINUTE + "=?"; - String[] selectionArgs = { Integer.toString(fd.getDay()),Integer.toString(fd.getStartHour()),Integer.toString(fd.getEndMinute()) }; - db.delete(FragmentDatabase.TABLE_DETAIL, selection, selectionArgs); - } - - public List getLectureList() { - String sql = "select * from " + TABLE_DETAIL; - SQLiteDatabase db = this.getReadableDatabase(); - Cursor cursor = db.rawQuery(sql, null); - try { - lecturesList.clear(); - while (cursor.moveToNext()) { - Lecture lecture = new Lecture(); - lecture.setSubjectName(cursor.getString(1)); - lecture.setStartTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(2), cursor.getInt(3))); - lecture.setEndTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(4), cursor.getInt(5))); - lecture.setDay(cursor.getInt(0)); - lecture.setRoomNo(cursor.getString(6)); - lecturesList.add(lecture); - } - } catch (Exception e) { - } finally { - cursor.close(); - } - db.close(); - return lecturesList; - } - - public List getLectureList(int pos) { - String sql = "select * from " + TABLE_DETAIL + " where day=" + pos + " order by " + START_HOUR + "," + START_MINUTE; - SQLiteDatabase db = this.getReadableDatabase(); - Cursor cursor = db.rawQuery(sql, null); - try { - lecturesList.clear(); - while (cursor.moveToNext()) { - Lecture lecture = new Lecture(); - lecture.setSubjectName(cursor.getString(1)); - lecture.setStartTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(2), cursor.getInt(3))); - lecture.setEndTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(4), cursor.getInt(5))); - lecture.setDay(cursor.getInt(0)); - lecture.setRoomNo(cursor.getString(6)); - lecturesList.add(lecture); - } - } catch (Exception e) { - } finally { - cursor.close(); - } - db.close(); - return lecturesList; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.kt b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.kt new file mode 100644 index 0000000..377f5a0 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDatabase.kt @@ -0,0 +1,114 @@ +package com.nealgosalia.timetable.database + +import android.content.ContentValues +import android.content.Context +import android.database.Cursor +import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper + +import com.nealgosalia.timetable.utils.Lecture + +import java.util.ArrayList +import java.util.Locale + +class FragmentDatabase(context: Context) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) { + private val lecturesList = ArrayList() + + val lectureList: List + get() { + val sql = "select * from $TABLE_DETAIL" + val db = this.getReadableDatabase() + val cursor = db.rawQuery(sql, null) + try { + lecturesList.clear() + while (cursor.moveToNext()) { + val lecture = Lecture() + lecture.setSubjectName(cursor.getString(1)) + lecture.setStartTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(2), cursor.getInt(3))) + lecture.setEndTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(4), cursor.getInt(5))) + lecture.setDay(cursor.getInt(0)) + lecture.setRoomNo(cursor.getString(6)) + lecturesList.add(lecture) + } + } catch (e: Exception) { + } finally { + cursor.close() + } + db.close() + return lecturesList + } + + @Override + fun onCreate(db: SQLiteDatabase) { + db.execSQL(CREATE_TABLE) + } + + @Override + fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { + db.execSQL("DROP TABLE IF EXISTS $TABLE_DETAIL") + onCreate(db) + } + + fun add(fd: FragmentDetails) { + val db = this.getWritableDatabase() + val values = ContentValues() + values.put(DAY, fd.getDay()) + values.put(SUBJECT, fd.getSubject()) + values.put(START_HOUR, fd.getStartHour()) + values.put(START_MINUTE, fd.getStartMinute()) + values.put(END_HOUR, fd.getEndHour()) + values.put(END_MINUTE, fd.getEndMinute()) + values.put(ROOM_NUMBER, fd.getRoomNo()) + db.insert(TABLE_DETAIL, null, values) + db.close() + } + + fun remove(fd: FragmentDetails) { + val db = this.getWritableDatabase() + val selection = FragmentDatabase.DAY + "=? AND " + FragmentDatabase.START_HOUR + "=? AND " + FragmentDatabase.START_MINUTE + "=?" + val selectionArgs = arrayOf(Integer.toString(fd.getDay()), Integer.toString(fd.getStartHour()), Integer.toString(fd.getEndMinute())) + db.delete(FragmentDatabase.TABLE_DETAIL, selection, selectionArgs) + } + + fun getLectureList(pos: Int): List { + val sql = "select * from $TABLE_DETAIL where day=$pos order by $START_HOUR,$START_MINUTE" + val db = this.getReadableDatabase() + val cursor = db.rawQuery(sql, null) + try { + lecturesList.clear() + while (cursor.moveToNext()) { + val lecture = Lecture() + lecture.setSubjectName(cursor.getString(1)) + lecture.setStartTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(2), cursor.getInt(3))) + lecture.setEndTime(String.format(Locale.US, "%02d:%02d", cursor.getInt(4), cursor.getInt(5))) + lecture.setDay(cursor.getInt(0)) + lecture.setRoomNo(cursor.getString(6)) + lecturesList.add(lecture) + } + } catch (e: Exception) { + } finally { + cursor.close() + } + db.close() + return lecturesList + } + + companion object { + + private val TAG = "FragmentDatabase" + private val DATABASE_VERSION = 1 + private val DATABASE_NAME = "lecture.db" + private val TABLE_DETAIL = "lectureDetails" + private val DAY = "day" + private val SUBJECT = "subject" + private val START_HOUR = "startHour" + private val END_HOUR = "endHour" + private val START_MINUTE = "startMinute" + private val END_MINUTE = "endMinute" + private val ROOM_NUMBER = "roomNo" + private val CREATE_TABLE = ("create table " + + TABLE_DETAIL + "(" + DAY + " integer not null, " + SUBJECT + " varchar not null," + + START_HOUR + " integer not null," + START_MINUTE + " integer not null," + + END_HOUR + " integer not null," + END_MINUTE + " integer not null," + ROOM_NUMBER + " varchar not null);") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.java b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.java deleted file mode 100644 index 7082d9c..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.nealgosalia.timetable.database; - -/** - * Created by men_in_black007 on 10/12/16. - */ - -public class FragmentDetails { - - private int day; - private String subject; - private int startHour; - private int endHour; - private int startMinute; - private int endMinute; - private String roomNo; - - public FragmentDetails(int day, String subject, int startHour, int startMinute, int endHour, int endMinute, String roomNo) { - this.day = day; - this.subject = subject; - this.startHour = startHour; - this.startMinute = startMinute; - this.endHour = endHour; - this.endMinute = endMinute; - this.roomNo = roomNo; - } - - public int getDay() { - return day; - } - - public String getSubject() { - return subject; - } - - public int getStartHour() { - return startHour; - } - - public int getEndHour() { - return endHour; - } - - public int getStartMinute() { - return startMinute; - } - - public int getEndMinute() { - return endMinute; - } - public String getRoomNo(){ - return roomNo; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.kt b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.kt new file mode 100644 index 0000000..767e108 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/database/FragmentDetails.kt @@ -0,0 +1,7 @@ +package com.nealgosalia.timetable.database + +/** + * Created by men_in_black007 on 10/12/16. + */ + +class FragmentDetails(val day: Int, val subject: String, val startHour: Int, val startMinute: Int, val endHour: Int, val endMinute: Int, val roomNo: String) \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.java b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.java deleted file mode 100644 index 4e30e49..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.nealgosalia.timetable.database; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.SQLException; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.util.Log; - -import java.util.ArrayList; - -/** - * Created by men_in_black007 on 11/12/16. - */ - -public class SubjectDatabase extends SQLiteOpenHelper { - - private static final String TAG = "SubjectDatabase"; - private static final int DATABASE_VERSION = 1; - private static final String DATABASE_NAME = "subject.db"; - private static final String TABLE_DETAIL = "subject"; - private static final String SUBJECT = "subjectName"; - private static final String ATT_LECTURES = "att_lectures"; - private static final String TOT_LECTURES = "tot_lectures"; - private static final String CREATE_TABLE = "create table " + TABLE_DETAIL + "(" + SUBJECT + " varchar, " + ATT_LECTURES + " int, " + TOT_LECTURES + " int);"; - - public SubjectDatabase(Context context) { - super(context, DATABASE_NAME, null, DATABASE_VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL(CREATE_TABLE); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - db.execSQL("DROP TABLE IF EXISTS " + TABLE_DETAIL); - onCreate(db); - } - - public void addSubject(SubjectDetails sd) { - SQLiteDatabase db = this.getWritableDatabase(); - ContentValues values = new ContentValues(); - values.put(SUBJECT, sd.getSubject()); - values.put(ATT_LECTURES, sd.getAttendedLectures()); - values.put(TOT_LECTURES, sd.getTotalLectures()); - db.insert(TABLE_DETAIL, null, values); - db.close(); - } - - public void removeSubject(SubjectDetails sd) { - SQLiteDatabase db = this.getWritableDatabase(); - String selection = SubjectDatabase.SUBJECT + " LIKE ?"; - String[] selectionArgs = {sd.getSubject()}; - db.delete(SubjectDatabase.TABLE_DETAIL, selection, selectionArgs); - } - - public void updateSubject(SubjectDetails sd) { - SQLiteDatabase db = this.getWritableDatabase(); - ContentValues values = new ContentValues(); - Log.d("SubjectDatabase", sd.getAttendedLectures() + " " + sd.getTotalLectures()); - values.put(ATT_LECTURES, sd.getAttendedLectures()); - values.put(TOT_LECTURES, sd.getTotalLectures()); - String[] args = new String[]{sd.getSubject()}; - db.update(TABLE_DETAIL, values, SUBJECT + " LIKE ?", args); - } - - public ArrayList getSubjectDetail() { - ArrayList allSubjects = new ArrayList(); - String sql = "select distinct * from " + TABLE_DETAIL + " order by " + SUBJECT; - SQLiteDatabase db = this.getReadableDatabase(); - Cursor c = db.rawQuery(sql, null); - try { - while (c.moveToNext()) { - SubjectDetails subjectDetails = new SubjectDetails(); - subjectDetails.setSubject(c.getString(c.getColumnIndex(SUBJECT))); - subjectDetails.setAttendedLectures(c.getInt(c.getColumnIndex(ATT_LECTURES))); - subjectDetails.setTotalLectures(c.getInt(c.getColumnIndex(TOT_LECTURES))); - allSubjects.add(subjectDetails); - } - } catch (SQLException e) { - e.printStackTrace(); - } finally { - c.close(); - } - db.close(); - return allSubjects; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.kt b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.kt new file mode 100644 index 0000000..663ccde --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDatabase.kt @@ -0,0 +1,91 @@ +package com.nealgosalia.timetable.database + +import android.content.ContentValues +import android.content.Context +import android.database.Cursor +import android.database.SQLException +import android.database.sqlite.SQLiteDatabase +import android.database.sqlite.SQLiteOpenHelper +import android.util.Log + +import java.util.ArrayList + +/** + * Created by men_in_black007 on 11/12/16. + */ + +class SubjectDatabase(context: Context) : SQLiteOpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION) { + + val subjectDetail: ArrayList + get() { + val allSubjects = ArrayList() + val sql = "select distinct * from $TABLE_DETAIL order by $SUBJECT" + val db = this.getReadableDatabase() + val c = db.rawQuery(sql, null) + try { + while (c.moveToNext()) { + val subjectDetails = SubjectDetails() + subjectDetails.setSubject(c.getString(c.getColumnIndex(SUBJECT))) + subjectDetails.setAttendedLectures(c.getInt(c.getColumnIndex(ATT_LECTURES))) + subjectDetails.setTotalLectures(c.getInt(c.getColumnIndex(TOT_LECTURES))) + allSubjects.add(subjectDetails) + } + } catch (e: SQLException) { + e.printStackTrace() + } finally { + c.close() + } + db.close() + return allSubjects + } + + @Override + fun onCreate(db: SQLiteDatabase) { + db.execSQL(CREATE_TABLE) + } + + @Override + fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) { + db.execSQL("DROP TABLE IF EXISTS $TABLE_DETAIL") + onCreate(db) + } + + fun addSubject(sd: SubjectDetails) { + val db = this.getWritableDatabase() + val values = ContentValues() + values.put(SUBJECT, sd.getSubject()) + values.put(ATT_LECTURES, sd.getAttendedLectures()) + values.put(TOT_LECTURES, sd.getTotalLectures()) + db.insert(TABLE_DETAIL, null, values) + db.close() + } + + fun removeSubject(sd: SubjectDetails) { + val db = this.getWritableDatabase() + val selection = SubjectDatabase.SUBJECT + " LIKE ?" + val selectionArgs = arrayOf(sd.getSubject()) + db.delete(SubjectDatabase.TABLE_DETAIL, selection, selectionArgs) + } + + fun updateSubject(sd: SubjectDetails) { + val db = this.getWritableDatabase() + val values = ContentValues() + Log.d("SubjectDatabase", sd.getAttendedLectures() + " " + sd.getTotalLectures()) + values.put(ATT_LECTURES, sd.getAttendedLectures()) + values.put(TOT_LECTURES, sd.getTotalLectures()) + val args = arrayOf(sd.getSubject()) + db.update(TABLE_DETAIL, values, "$SUBJECT LIKE ?", args) + } + + companion object { + + private val TAG = "SubjectDatabase" + private val DATABASE_VERSION = 1 + private val DATABASE_NAME = "subject.db" + private val TABLE_DETAIL = "subject" + private val SUBJECT = "subjectName" + private val ATT_LECTURES = "att_lectures" + private val TOT_LECTURES = "tot_lectures" + private val CREATE_TABLE = "create table $TABLE_DETAIL($SUBJECT varchar, $ATT_LECTURES int, $TOT_LECTURES int);" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.java b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.java deleted file mode 100644 index ba941e3..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.nealgosalia.timetable.database; - -/** - * Created by men_in_black007 on 11/12/16. - */ - -public class SubjectDetails { - - private String subject; - private int attendedLectures; - private int totalLectures; - - public SubjectDetails() { - } - - public int getAttendedLectures() { - return attendedLectures; - } - - public void setAttendedLectures(int attendedLectures) { - this.attendedLectures = attendedLectures; - } - - public int getTotalLectures() { - return totalLectures; - } - - public void setTotalLectures(int totalLectures) { - this.totalLectures = totalLectures; - } - - public SubjectDetails(String subject, int attendedLectures, int totalLectures) { - this.subject = subject; - this.attendedLectures = attendedLectures; - this.totalLectures = totalLectures; - } - - public String getSubject() { - return subject; - } - - public void setSubject(String subject) { - this.subject = subject; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.kt b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.kt new file mode 100644 index 0000000..e6f8ab3 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/database/SubjectDetails.kt @@ -0,0 +1,20 @@ +package com.nealgosalia.timetable.database + +/** + * Created by men_in_black007 on 11/12/16. + */ + +class SubjectDetails { + + var subject: String? = null + var attendedLectures: Int = 0 + var totalLectures: Int = 0 + + constructor() {} + + constructor(subject: String, attendedLectures: Int, totalLectures: Int) { + this.subject = subject + this.attendedLectures = attendedLectures + this.totalLectures = totalLectures + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.java deleted file mode 100644 index a35b6c4..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.java +++ /dev/null @@ -1,192 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.AttendanceAdapter; -import com.nealgosalia.timetable.database.SubjectDatabase; -import com.nealgosalia.timetable.database.SubjectDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; -import com.nealgosalia.timetable.utils.Subject; -import com.shawnlin.numberpicker.NumberPicker; - -import java.util.ArrayList; -import java.util.List; - -public class AttendanceFragment extends Fragment { - - private List subjectsList = new ArrayList<>(); - private RecyclerView listSubjects; - private AttendanceAdapter mAttendanceAdapter; - private SubjectDatabase subjectDatabase; - private TextView placeholderText; - private View view; - private List progressList = new ArrayList<>(); - private Paint p = new Paint(); - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_attendance, container, false); - listSubjects = view.findViewById(R.id.listAttendance); - placeholderText = view.findViewById(R.id.attendancePlaceholderText); - subjectDatabase = new SubjectDatabase(getActivity()); - subjectsList.clear(); - for (SubjectDetails subjectDetails : subjectDatabase.getSubjectDetail()) { - int progress; - Subject subject = new Subject(); - subject.setSubjectName(subjectDetails.getSubject()); - subject.setAttendedLectures(subjectDetails.getAttendedLectures()); - subject.setTotalLectures(subjectDetails.getTotalLectures()); - if (subjectDetails.getTotalLectures() != 0) { - progress = (subjectDetails.getAttendedLectures() * 100 / subjectDetails.getTotalLectures()); - } else { - progress = 0; - } - progressList.add(progress); - subjectsList.add(subject); - } - if (subjectsList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - mAttendanceAdapter = new AttendanceAdapter(subjectsList, progressList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - listSubjects.setLayoutManager(mLayoutManager); - listSubjects.setItemAnimator(new DefaultItemAnimator()); - listSubjects.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL)); - listSubjects.setAdapter(mAttendanceAdapter); - listSubjects.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override - public void onItemClick(View view, int position) { - Subject subject = subjectsList.get(position); - showAttendanceDialog(subject, position); - } - })); - initSwipe(); - return view; - } - - private void initSwipe() { - ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) { - @Override - public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { - return false; - } - - @Override - public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { - int position = viewHolder.getAdapterPosition(); - Subject subjectNew = new Subject(); - int attended = subjectsList.get(position).getAttendedLectures(); - int total = subjectsList.get(position).getTotalLectures(); - int progress; - if (direction == ItemTouchHelper.LEFT) { - progress = attended * 100 / (++total); - } else { - progress = (++attended) * 100 / (++total); - } - subjectNew.setSubjectName(subjectsList.get(position).getSubjectName()); - subjectNew.setAttendedLectures(attended); - subjectNew.setTotalLectures(total); - SubjectDetails sdNew = new SubjectDetails(); - sdNew.setSubject(subjectNew.getSubjectName()); - sdNew.setAttendedLectures(subjectNew.getAttendedLectures()); - sdNew.setTotalLectures(subjectNew.getTotalLectures()); - subjectDatabase.updateSubject(sdNew); - progressList.set(position, progress); - subjectsList.set(position, subjectNew); - mAttendanceAdapter.notifyDataSetChanged(); - } - - @Override - public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) { - - Bitmap icon; - if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { - - View itemView = viewHolder.itemView; - float height = (float) itemView.getBottom() - (float) itemView.getTop(); - float width = height / 3; - - if (dX > 0) { - p.setColor(Color.parseColor("#4CAF50")); - RectF background = new RectF((float) itemView.getLeft(), (float) itemView.getTop(), dX, (float) itemView.getBottom()); - c.drawRect(background, p); - icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_done); - RectF icon_dest = new RectF((float) itemView.getLeft() + width, (float) itemView.getTop() + width, (float) itemView.getLeft() + 2 * width, (float) itemView.getBottom() - width); - c.drawBitmap(icon, null, icon_dest, p); - } else if (dX < 0) { - p.setColor(Color.parseColor("#F44336")); - RectF background = new RectF((float) itemView.getRight() + dX, (float) itemView.getTop(), (float) itemView.getRight(), (float) itemView.getBottom()); - c.drawRect(background, p); - icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_clear); - RectF icon_dest = new RectF((float) itemView.getRight() - 2 * width, (float) itemView.getTop() + width, (float) itemView.getRight() - width, (float) itemView.getBottom() - width); - c.drawBitmap(icon, null, icon_dest, p); - } - } - super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); - } - }; - ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback); - itemTouchHelper.attachToRecyclerView(listSubjects); - } - - public void showAttendanceDialog(final Subject subject, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - LayoutInflater inflater = getActivity().getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.dialog_edit_attendance, null); - final NumberPicker attendedLecturesNumberPicker = dialogView.findViewById(R.id.attendedLecturesNumberPicker); - final NumberPicker totalLecturesNumberPicker = dialogView.findViewById(R.id.totalLecturesNumberPicker); - attendedLecturesNumberPicker.setValue(subject.getAttendedLectures()); - totalLecturesNumberPicker.setValue(subject.getTotalLectures()); - //int attendedLectures = attendedLecturesNumberPicker.getValue(); - //int totalLectures = ; - attendedLecturesNumberPicker.setMaxValue(totalLecturesNumberPicker.getValue()); - totalLecturesNumberPicker.setOnValueChangedListener(new NumberPicker.OnValueChangeListener() { - @Override - public void onValueChange(NumberPicker numberPicker, int i, int i1) { - attendedLecturesNumberPicker.setMaxValue(totalLecturesNumberPicker.getValue()); - } - }); - dialogBuilder.setView(dialogView); - dialogBuilder.setTitle(getResources().getString(R.string.attendance) + ": " + subject.getSubjectName()); - dialogBuilder.setPositiveButton(getResources().getString(R.string.save), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - int attendedLectures = attendedLecturesNumberPicker.getValue(); - int totalLectures = totalLecturesNumberPicker.getValue(); - SubjectDetails subjectDetails = new SubjectDetails( - subject.getSubjectName(), - attendedLectures, - totalLectures - ); - subjectDatabase.updateSubject(subjectDetails); - progressList.set(position, attendedLectures * 100 / totalLectures); - subject.setAttendedLectures(attendedLectures); - subject.setTotalLectures(totalLectures); - subjectsList.set(position, subject); - mAttendanceAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.cancel), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.kt new file mode 100644 index 0000000..c7d36bf --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/AttendanceFragment.kt @@ -0,0 +1,191 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.RectF +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.support.v7.widget.helper.ItemTouchHelper +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.AttendanceAdapter +import com.nealgosalia.timetable.database.SubjectDatabase +import com.nealgosalia.timetable.database.SubjectDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.RecyclerItemClickListener +import com.nealgosalia.timetable.utils.Subject +import com.shawnlin.numberpicker.NumberPicker + +import java.util.ArrayList + +class AttendanceFragment : Fragment() { + + private val subjectsList = ArrayList() + private var listSubjects: RecyclerView? = null + private var mAttendanceAdapter: AttendanceAdapter? = null + private var subjectDatabase: SubjectDatabase? = null + private var placeholderText: TextView? = null + private var view: View? = null + private val progressList = ArrayList() + private val p = Paint() + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_attendance, container, false) + listSubjects = view!!.findViewById(R.id.listAttendance) + placeholderText = view!!.findViewById(R.id.attendancePlaceholderText) + subjectDatabase = SubjectDatabase(getActivity()) + subjectsList.clear() + for (subjectDetails in subjectDatabase!!.getSubjectDetail()) { + val progress: Int + val subject = Subject() + subject.setSubjectName(subjectDetails.getSubject()) + subject.setAttendedLectures(subjectDetails.getAttendedLectures()) + subject.setTotalLectures(subjectDetails.getTotalLectures()) + if (subjectDetails.getTotalLectures() !== 0) { + progress = subjectDetails.getAttendedLectures() * 100 / subjectDetails.getTotalLectures() + } else { + progress = 0 + } + progressList.add(progress) + subjectsList.add(subject) + } + if (subjectsList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + mAttendanceAdapter = AttendanceAdapter(subjectsList, progressList) + val mLayoutManager = LinearLayoutManager(getActivity()) + listSubjects!!.setLayoutManager(mLayoutManager) + listSubjects!!.setItemAnimator(DefaultItemAnimator()) + listSubjects!!.addItemDecoration(DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL)) + listSubjects!!.setAdapter(mAttendanceAdapter) + listSubjects!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val subject = subjectsList.get(position) + showAttendanceDialog(subject, position) + } + })) + initSwipe() + return view + } + + private fun initSwipe() { + val simpleItemTouchCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) { + @Override + fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { + return false + } + + @Override + fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + val position = viewHolder.getAdapterPosition() + val subjectNew = Subject() + var attended = subjectsList.get(position).getAttendedLectures() + var total = subjectsList.get(position).getTotalLectures() + val progress: Int + if (direction == ItemTouchHelper.LEFT) { + progress = attended * 100 / ++total + } else { + progress = ++attended * 100 / ++total + } + subjectNew.setSubjectName(subjectsList.get(position).getSubjectName()) + subjectNew.setAttendedLectures(attended) + subjectNew.setTotalLectures(total) + val sdNew = SubjectDetails() + sdNew.setSubject(subjectNew.getSubjectName()) + sdNew.setAttendedLectures(subjectNew.getAttendedLectures()) + sdNew.setTotalLectures(subjectNew.getTotalLectures()) + subjectDatabase!!.updateSubject(sdNew) + progressList.set(position, progress) + subjectsList.set(position, subjectNew) + mAttendanceAdapter!!.notifyDataSetChanged() + } + + @Override + fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + + val icon: Bitmap + if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { + + val itemView = viewHolder.itemView + val height = itemView.getBottom() as Float - itemView.getTop() as Float + val width = height / 3 + + if (dX > 0) { + p.setColor(Color.parseColor("#4CAF50")) + val background = RectF(itemView.getLeft() as Float, itemView.getTop() as Float, dX, itemView.getBottom() as Float) + c.drawRect(background, p) + icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_done) + val icon_dest = RectF(itemView.getLeft() as Float + width, itemView.getTop() as Float + width, itemView.getLeft() as Float + 2 * width, itemView.getBottom() as Float - width) + c.drawBitmap(icon, null, icon_dest, p) + } else if (dX < 0) { + p.setColor(Color.parseColor("#F44336")) + val background = RectF(itemView.getRight() as Float + dX, itemView.getTop() as Float, itemView.getRight() as Float, itemView.getBottom() as Float) + c.drawRect(background, p) + icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_clear) + val icon_dest = RectF(itemView.getRight() as Float - 2 * width, itemView.getTop() as Float + width, itemView.getRight() as Float - width, itemView.getBottom() as Float - width) + c.drawBitmap(icon, null, icon_dest, p) + } + } + super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) + } + } + val itemTouchHelper = ItemTouchHelper(simpleItemTouchCallback) + itemTouchHelper.attachToRecyclerView(listSubjects) + } + + fun showAttendanceDialog(subject: Subject, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + val inflater = getActivity().getLayoutInflater() + val dialogView = inflater.inflate(R.layout.dialog_edit_attendance, null) + val attendedLecturesNumberPicker = dialogView.findViewById(R.id.attendedLecturesNumberPicker) + val totalLecturesNumberPicker = dialogView.findViewById(R.id.totalLecturesNumberPicker) + attendedLecturesNumberPicker.setValue(subject.getAttendedLectures()) + totalLecturesNumberPicker.setValue(subject.getTotalLectures()) + //int attendedLectures = attendedLecturesNumberPicker.getValue(); + //int totalLectures = ; + attendedLecturesNumberPicker.setMaxValue(totalLecturesNumberPicker.getValue()) + totalLecturesNumberPicker.setOnValueChangedListener(object : NumberPicker.OnValueChangeListener() { + @Override + fun onValueChange(numberPicker: NumberPicker, i: Int, i1: Int) { + attendedLecturesNumberPicker.setMaxValue(totalLecturesNumberPicker.getValue()) + } + }) + dialogBuilder.setView(dialogView) + dialogBuilder.setTitle(getResources().getString(R.string.attendance) + ": " + subject.getSubjectName()) + dialogBuilder.setPositiveButton(getResources().getString(R.string.save), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val attendedLectures = attendedLecturesNumberPicker.getValue() + val totalLectures = totalLecturesNumberPicker.getValue() + val subjectDetails = SubjectDetails( + subject.getSubjectName(), + attendedLectures, + totalLectures + ) + subjectDatabase!!.updateSubject(subjectDetails) + progressList.set(position, attendedLectures * 100 / totalLectures) + subject.setAttendedLectures(attendedLectures) + subject.setTotalLectures(totalLectures) + subjectsList.set(position, subject) + mAttendanceAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.cancel), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.java deleted file mode 100644 index 6f96236..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class FridayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_friday, container, false); - placeholderText = view.findViewById(R.id.fridayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(4)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listFriday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.kt new file mode 100644 index 0000000..6165d4f --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/FridayFragment.kt @@ -0,0 +1,85 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class FridayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_friday, container, false) + placeholderText = view!!.findViewById(R.id.fridayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(4)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listFriday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.java deleted file mode 100644 index e9b1206..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class MondayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_monday, container, false); - placeholderText = view.findViewById(R.id.mondayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(0)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listMonday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.kt new file mode 100644 index 0000000..f528c6f --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/MondayFragment.kt @@ -0,0 +1,85 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class MondayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_monday, container, false) + placeholderText = view!!.findViewById(R.id.mondayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(0)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listMonday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.java deleted file mode 100644 index 229bd3d..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlarmManager; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.os.Bundle; -import android.os.Environment; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.util.Log; -import android.widget.Toast; - -import com.nealgosalia.timetable.MainActivity; -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.activities.PreferencesActivity; -import com.nealgosalia.timetable.utils.Alarms; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import static android.content.Context.ALARM_SERVICE; - -/** - * Created by men_in_black007 on 15/12/16. - */ - -public class MyPreferenceFragment extends PreferenceFragment { - - private static final String TAG = "MyPreferenceFragment"; - private static List alarmsList = new ArrayList<>(); - private PreferencesActivity mActivity; - - @Override - public void onCreate(final Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.preference); - mActivity = (PreferencesActivity) getActivity(); - ListPreference notificationTime = (ListPreference) findPreference("notificationTime"); - notificationTime.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object o) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - SharedPreferences.Editor editor = prefs.edit(); - editor.putString("NOTIFICATION_TIME", (String) o); - editor.apply(); - if (alarmsList.size() != 0) { - for (Alarms alarm : alarmsList) { - AlarmManager alarmManager = (AlarmManager) alarm.getContext().getSystemService(ALARM_SERVICE); - alarmManager.cancel(alarm.getPendingIntent()); - } - } - if (!o.equals("-1")) { - Intent i = new Intent(); - i.setAction("com.nealgosalia.timetable.NOTIFY"); - getActivity().sendBroadcast(i); - Log.d(TAG, "Broadcasted"); - } - return true; - } - }); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); - SharedPreferences.Editor editor = prefs.edit(); - editor.putString("NOTIFICATION_TIME", notificationTime.getValue()); - editor.apply(); - Preference backup = findPreference("backup"); - Preference restore = findPreference("restore"); - Preference reset = findPreference("reset"); - backup.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - if (mActivity.isStoragePermissionGranted(getActivity())) { - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity()); - alertDialog.setTitle(getResources().getString(R.string.backup)); - alertDialog.setMessage(getResources().getString(R.string.backup_question)); - alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String backupDBPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Timetable/"; - final File subjectDB = new File(backupDBPath + "subject.db"); - final File lectureDB = new File(backupDBPath + "lecture.db"); - if (!(subjectDB.exists() || lectureDB.exists())) { - if (mActivity.exportDatabase("subject.db") && mActivity.exportDatabase("lecture.db")) { - Toast.makeText(getActivity(), getResources().getString(R.string.backup_successful), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.please_create_timetable), Toast.LENGTH_SHORT).show(); - } - } else { - AlertDialog overwriteDialog = new AlertDialog.Builder(getActivity()) - .setTitle(getResources().getString(R.string.warning)) - .setMessage(getResources().getString(R.string.overwrite_backup)) - .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - subjectDB.delete(); - lectureDB.delete(); - if (mActivity.exportDatabase("subject.db") && mActivity.exportDatabase("lecture.db")) { - Toast.makeText(getActivity(), getResources().getString(R.string.backup_successful), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.please_create_timetable), Toast.LENGTH_SHORT).show(); - } - } - }) - .setNegativeButton(getResources().getString(R.string.no), null) - .create(); - overwriteDialog.show(); - } - } - }); - alertDialog.setNegativeButton(getResources().getString(R.string.no), null); - alertDialog.show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.no_permission_granted), Toast.LENGTH_SHORT).show(); - } - return false; - } - }); - restore.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - if (mActivity.isStoragePermissionGranted(getActivity())) { - AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity()); - alertDialog.setTitle(getResources().getString(R.string.restore)); - alertDialog.setMessage(getResources().getString(R.string.restore_question)); - alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String backupDBPath = "data/data/com.nealgosalia.timetable/databases/"; - final File subjectDB = new File(backupDBPath + "subject.db"); - final File lectureDB = new File(backupDBPath + "lecture.db"); - if (!(subjectDB.exists() || lectureDB.exists())) { - if (mActivity.importDatabase("subject.db") && mActivity.importDatabase("lecture.db")) { - restartApplication(); - Toast.makeText(getActivity(), getResources().getString(R.string.restore_successful), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.backup_not_found), Toast.LENGTH_SHORT).show(); - } - } else { - AlertDialog overwriteDialog = new AlertDialog.Builder(getActivity()) - .setTitle(getResources().getString(R.string.warning)) - .setMessage(getResources().getString(R.string.overwrite_timetable)) - .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - subjectDB.delete(); - lectureDB.delete(); - if (mActivity.importDatabase("subject.db") && mActivity.importDatabase("lecture.db")) { - restartApplication(); - Toast.makeText(getActivity(), getResources().getString(R.string.restore_successful), Toast.LENGTH_SHORT).show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.backup_not_found), Toast.LENGTH_SHORT).show(); - } - } - }) - .setNegativeButton(getResources().getString(R.string.no), null) - .create(); - overwriteDialog.show(); - } - } - }); - alertDialog.setNegativeButton(getResources().getString(R.string.no), null); - alertDialog.show(); - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.no_permission_granted), Toast.LENGTH_SHORT).show(); - } - return false; - } - }); - reset.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - AlertDialog.Builder alertDialog = new AlertDialog.Builder(getActivity()); - alertDialog.setTitle(getResources().getString(R.string.reset_the_timetable)); - alertDialog.setMessage(getResources().getString(R.string.reset_question)); - alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String resetDBPath = "data/data/com.nealgosalia.timetable/databases/"; - final File subjectDB = new File(resetDBPath + "subject.db"); - final File lectureDB = new File(resetDBPath + "lecture.db"); - if (subjectDB.exists() && lectureDB.exists()) { - subjectDB.delete(); - lectureDB.delete(); - } - restartApplication(); - Toast.makeText(mActivity, getResources().getString(R.string.reset_successful), Toast.LENGTH_SHORT).show(); - } - }); - alertDialog.setNegativeButton(getResources().getString(R.string.no), null); - alertDialog.show(); - return false; - } - }); - } - - public void addAlarm(Alarms alarm) { - alarmsList.add(alarm); - } - - private void restartApplication() { - Intent intent = new Intent(getActivity(), MainActivity.class); - getActivity().finish(); - startActivity(intent); - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.kt new file mode 100644 index 0000000..036c698 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/MyPreferenceFragment.kt @@ -0,0 +1,211 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlarmManager +import android.app.AlertDialog +import android.content.DialogInterface +import android.content.Intent +import android.content.SharedPreferences +import android.os.Bundle +import android.os.Environment +import android.preference.ListPreference +import android.preference.Preference +import android.preference.PreferenceFragment +import android.preference.PreferenceManager +import android.util.Log +import android.widget.Toast + +import com.nealgosalia.timetable.MainActivity +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.activities.PreferencesActivity +import com.nealgosalia.timetable.utils.Alarms + +import java.io.File +import java.util.ArrayList + +import android.content.Context.ALARM_SERVICE + +/** + * Created by men_in_black007 on 15/12/16. + */ + +class MyPreferenceFragment : PreferenceFragment() { + private var mActivity: PreferencesActivity? = null + + @Override + fun onCreate(savedInstanceState: Bundle) { + super.onCreate(savedInstanceState) + addPreferencesFromResource(R.xml.preference) + mActivity = getActivity() as PreferencesActivity + val notificationTime = findPreference("notificationTime") as ListPreference + notificationTime.setOnPreferenceChangeListener(object : Preference.OnPreferenceChangeListener() { + @Override + fun onPreferenceChange(preference: Preference, o: Object): Boolean { + val prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()) + val editor = prefs.edit() + editor.putString("NOTIFICATION_TIME", o as String) + editor.apply() + if (alarmsList.size() !== 0) { + for (alarm in alarmsList) { + val alarmManager = alarm.getContext().getSystemService(ALARM_SERVICE) as AlarmManager + alarmManager.cancel(alarm.getPendingIntent()) + } + } + if (!o.equals("-1")) { + val i = Intent() + i.setAction("com.nealgosalia.timetable.NOTIFY") + getActivity().sendBroadcast(i) + Log.d(TAG, "Broadcasted") + } + return true + } + }) + val prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()) + val editor = prefs.edit() + editor.putString("NOTIFICATION_TIME", notificationTime.getValue()) + editor.apply() + val backup = findPreference("backup") + val restore = findPreference("restore") + val reset = findPreference("reset") + backup.setOnPreferenceClickListener(object : Preference.OnPreferenceClickListener() { + @Override + fun onPreferenceClick(preference: Preference): Boolean { + if (mActivity!!.isStoragePermissionGranted(getActivity())) { + val alertDialog = AlertDialog.Builder(getActivity()) + alertDialog.setTitle(getResources().getString(R.string.backup)) + alertDialog.setMessage(getResources().getString(R.string.backup_question)) + alertDialog.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + val backupDBPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Timetable/" + val subjectDB = File(backupDBPath + "subject.db") + val lectureDB = File(backupDBPath + "lecture.db") + if (!(subjectDB.exists() || lectureDB.exists())) { + if (mActivity!!.exportDatabase("subject.db") && mActivity!!.exportDatabase("lecture.db")) { + Toast.makeText(getActivity(), getResources().getString(R.string.backup_successful), Toast.LENGTH_SHORT).show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.please_create_timetable), Toast.LENGTH_SHORT).show() + } + } else { + val overwriteDialog = AlertDialog.Builder(getActivity()) + .setTitle(getResources().getString(R.string.warning)) + .setMessage(getResources().getString(R.string.overwrite_backup)) + .setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + subjectDB.delete() + lectureDB.delete() + if (mActivity!!.exportDatabase("subject.db") && mActivity!!.exportDatabase("lecture.db")) { + Toast.makeText(getActivity(), getResources().getString(R.string.backup_successful), Toast.LENGTH_SHORT).show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.please_create_timetable), Toast.LENGTH_SHORT).show() + } + } + }) + .setNegativeButton(getResources().getString(R.string.no), null) + .create() + overwriteDialog.show() + } + } + }) + alertDialog.setNegativeButton(getResources().getString(R.string.no), null) + alertDialog.show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.no_permission_granted), Toast.LENGTH_SHORT).show() + } + return false + } + }) + restore.setOnPreferenceClickListener(object : Preference.OnPreferenceClickListener() { + @Override + fun onPreferenceClick(preference: Preference): Boolean { + if (mActivity!!.isStoragePermissionGranted(getActivity())) { + val alertDialog = AlertDialog.Builder(getActivity()) + alertDialog.setTitle(getResources().getString(R.string.restore)) + alertDialog.setMessage(getResources().getString(R.string.restore_question)) + alertDialog.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + val backupDBPath = "data/data/com.nealgosalia.timetable/databases/" + val subjectDB = File(backupDBPath + "subject.db") + val lectureDB = File(backupDBPath + "lecture.db") + if (!(subjectDB.exists() || lectureDB.exists())) { + if (mActivity!!.importDatabase("subject.db") && mActivity!!.importDatabase("lecture.db")) { + restartApplication() + Toast.makeText(getActivity(), getResources().getString(R.string.restore_successful), Toast.LENGTH_SHORT).show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.backup_not_found), Toast.LENGTH_SHORT).show() + } + } else { + val overwriteDialog = AlertDialog.Builder(getActivity()) + .setTitle(getResources().getString(R.string.warning)) + .setMessage(getResources().getString(R.string.overwrite_timetable)) + .setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + subjectDB.delete() + lectureDB.delete() + if (mActivity!!.importDatabase("subject.db") && mActivity!!.importDatabase("lecture.db")) { + restartApplication() + Toast.makeText(getActivity(), getResources().getString(R.string.restore_successful), Toast.LENGTH_SHORT).show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.backup_not_found), Toast.LENGTH_SHORT).show() + } + } + }) + .setNegativeButton(getResources().getString(R.string.no), null) + .create() + overwriteDialog.show() + } + } + }) + alertDialog.setNegativeButton(getResources().getString(R.string.no), null) + alertDialog.show() + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.no_permission_granted), Toast.LENGTH_SHORT).show() + } + return false + } + }) + reset.setOnPreferenceClickListener(object : Preference.OnPreferenceClickListener() { + @Override + fun onPreferenceClick(preference: Preference): Boolean { + val alertDialog = AlertDialog.Builder(getActivity()) + alertDialog.setTitle(getResources().getString(R.string.reset_the_timetable)) + alertDialog.setMessage(getResources().getString(R.string.reset_question)) + alertDialog.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + val resetDBPath = "data/data/com.nealgosalia.timetable/databases/" + val subjectDB = File(resetDBPath + "subject.db") + val lectureDB = File(resetDBPath + "lecture.db") + if (subjectDB.exists() && lectureDB.exists()) { + subjectDB.delete() + lectureDB.delete() + } + restartApplication() + Toast.makeText(mActivity, getResources().getString(R.string.reset_successful), Toast.LENGTH_SHORT).show() + } + }) + alertDialog.setNegativeButton(getResources().getString(R.string.no), null) + alertDialog.show() + return false + } + }) + } + + fun addAlarm(alarm: Alarms) { + alarmsList.add(alarm) + } + + private fun restartApplication() { + val intent = Intent(getActivity(), MainActivity::class.java) + getActivity().finish() + startActivity(intent) + } + + companion object { + + private val TAG = "MyPreferenceFragment" + private val alarmsList = ArrayList() + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.java deleted file mode 100644 index b9bb7e7..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class SaturdayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_saturday, container, false); - placeholderText = view.findViewById(R.id.saturdayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(5)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listSaturday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.kt new file mode 100644 index 0000000..e34feaa --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/SaturdayFragment.kt @@ -0,0 +1,85 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class SaturdayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_saturday, container, false) + placeholderText = view!!.findViewById(R.id.saturdayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(5)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listSaturday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.java deleted file mode 100644 index dde576c..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.java +++ /dev/null @@ -1,277 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.content.DialogInterface; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.text.Editable; -import android.text.TextWatcher; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.AutoCompleteTextView; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.SubjectsAdapter; -import com.nealgosalia.timetable.database.SubjectDatabase; -import com.nealgosalia.timetable.database.SubjectDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Subject; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class SubjectsFragment extends Fragment { - - private List subjectsList = new ArrayList<>(); - private RecyclerView listSubjects; - private SubjectsAdapter mSubjectsAdapter; - private SubjectDatabase subjectDatabase; - private TextView placeholderText; - private View view; - private View dialogView; - private Paint p = new Paint(); - private AlertDialog.Builder alertDialog; - private AutoCompleteTextView editSubject; - private AutoCompleteTextView newSubjectName; - - String[] sub; - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.activity_subjects, container, false); - listSubjects = view.findViewById(R.id.listSubjects); - placeholderText = view.findViewById(R.id.subjectsPlaceholderText); - subjectDatabase = new SubjectDatabase(getActivity()); - subjectsList.clear(); - for (SubjectDetails subjectDetails : subjectDatabase.getSubjectDetail()) { - Subject subject = new Subject(); - subject.setSubjectName(subjectDetails.getSubject()); - subjectsList.add(subject); - } - Log.d("SubjectsFragment", String.valueOf(subjectsList.size())); - if (subjectsList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - mSubjectsAdapter = new SubjectsAdapter(subjectsList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - listSubjects.setLayoutManager(mLayoutManager); - listSubjects.setItemAnimator(new DefaultItemAnimator()); - listSubjects.addItemDecoration(new DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL)); - listSubjects.setAdapter(mSubjectsAdapter); - FloatingActionButton fab = view.findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - showSubjectDialog(); - } - }); - initSwipe(); - return view; - } - - public void showSubjectDialog() { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity()); - LayoutInflater inflater = getActivity().getLayoutInflater(); - final View dialogView = inflater.inflate(R.layout.dialog_add_subject, null); - dialogBuilder.setView(dialogView); - newSubjectName = dialogView.findViewById(R.id.newSubjectName); - sub = getResources().getStringArray(R.array.subjectNames); - ArrayAdapter adapter = new ArrayAdapter(getActivity(),android.R.layout.simple_list_item_1,sub); - newSubjectName.setThreshold(2); - newSubjectName.setAdapter(adapter); - dialogBuilder.setTitle(getResources().getString(R.string.subject)); - dialogBuilder.setMessage(getResources().getString(R.string.enter_subject_name)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.add), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - Subject subject = new Subject(); - String tempSubject = newSubjectName.getText().toString().trim(); - subject.setSubjectName(tempSubject); - subjectDatabase.addSubject(new SubjectDetails(tempSubject, 0, 0)); - subjectsList.add(subject); - Collections.sort(subjectsList, Subject.Comparators.NAME); - mSubjectsAdapter.notifyDataSetChanged(); - placeholderText.setVisibility(View.GONE); - newSubjectName.setText(""); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.cancel), null); - final AlertDialog dialog = dialogBuilder.create(); - dialog.show(); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - newSubjectName.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - - } - - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - - } - - @Override - public void afterTextChanged(Editable editable) { - if(editable.length()>=1){ - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true); - } else { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - } - } - }); - } - - private void initSwipe(){ - ItemTouchHelper.SimpleCallback simpleItemTouchCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) { - - @Override - public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { - return false; - } - - @Override - public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { - int position = viewHolder.getAdapterPosition(); - - if (direction == ItemTouchHelper.LEFT){ - deleteSwipe(position); - } else { - initDialog(position); - } - } - - @Override - public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) { - - Bitmap icon; - if(actionState == ItemTouchHelper.ACTION_STATE_SWIPE){ - - View itemView = viewHolder.itemView; - float height = (float) itemView.getBottom() - (float) itemView.getTop(); - float width = height / 3; - - if(dX > 0){ - p.setColor(Color.parseColor("#FF5722")); - RectF background = new RectF((float) itemView.getLeft(), (float) itemView.getTop(), dX,(float) itemView.getBottom()); - c.drawRect(background,p); - icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_edit_white); - RectF icon_dest = new RectF((float) itemView.getLeft() + width ,(float) itemView.getTop() + width,(float) itemView.getLeft()+ 2*width,(float)itemView.getBottom() - width); - c.drawBitmap(icon,null,icon_dest,p); - } else if(dX < 0) { - p.setColor(Color.parseColor("#009688")); - RectF background = new RectF((float) itemView.getRight() + dX, (float) itemView.getTop(),(float) itemView.getRight(), (float) itemView.getBottom()); - c.drawRect(background,p); - icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_delete_white); - RectF icon_dest = new RectF((float) itemView.getRight() - 2*width ,(float) itemView.getTop() + width,(float) itemView.getRight() - width,(float)itemView.getBottom() - width); - c.drawBitmap(icon,null,icon_dest,p); - } - } - super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); - } - }; - ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleItemTouchCallback); - itemTouchHelper.attachToRecyclerView(listSubjects); - } - private void initDialog(final int position){ - alertDialog = new AlertDialog.Builder(getActivity()); - dialogView = getActivity().getLayoutInflater().inflate(R.layout.dialog_edit_subject,null); - editSubject = dialogView.findViewById(R.id.edit_subject); - sub = getResources().getStringArray(R.array.subjectNames); - ArrayAdapter adapte = new ArrayAdapter(getActivity(),android.R.layout.simple_list_item_1,sub); - if(editSubject !=null) { - editSubject.setThreshold(2); - editSubject.setAdapter(adapte); - } - alertDialog.setView(dialogView); - alertDialog.setTitle(getResources().getString(R.string.edit_subject)); - alertDialog.setPositiveButton("Save", new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Subject subject = subjectsList.get(position); - SubjectDetails sd = new SubjectDetails( - editSubject.getText().toString(), - subject.getAttendedLectures(), - subject.getTotalLectures() - ); - subjectDatabase.updateSubject(sd); - subjectsList.set(position, subject); - Collections.sort(subjectsList, Subject.Comparators.NAME); - mSubjectsAdapter.notifyDataSetChanged(); - dialog.dismiss(); - } - }); - alertDialog.setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener(){ - @Override - public void onClick(DialogInterface dialog, int which) { - mSubjectsAdapter.notifyDataSetChanged(); - dialog.dismiss(); - } - }); - final AlertDialog dialog = alertDialog.create(); - dialog.show(); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - editSubject.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { - - } - - @Override - public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { - - } - - @Override - public void afterTextChanged(Editable editable) { - if (editable.length() >= 1) { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true); - mSubjectsAdapter.notifyDataSetChanged(); - } else { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false); - mSubjectsAdapter.notifyDataSetChanged(); - } - } - }); - mSubjectsAdapter.notifyDataSetChanged(); - } - - public void deleteSwipe(final int position) { - android.app.AlertDialog.Builder alertDialog = new android.app.AlertDialog.Builder(getActivity()); - alertDialog.setTitle(getResources().getString(R.string.warning)); - alertDialog.setMessage(getResources().getString(R.string.subject_question)); - alertDialog.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Subject subject = subjectsList.get(position); - SubjectDetails sd = new SubjectDetails(); - sd.setSubject(subject.getSubjectName()); - subjectDatabase.removeSubject(sd); - subjectsList.remove(position); - mSubjectsAdapter.notifyDataSetChanged(); - } - }); - alertDialog.setNegativeButton(getResources().getString(R.string.no), new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - mSubjectsAdapter.notifyDataSetChanged(); - } - }); - alertDialog.show(); - mSubjectsAdapter.notifyDataSetChanged(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.kt new file mode 100644 index 0000000..8d2b671 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/SubjectsFragment.kt @@ -0,0 +1,277 @@ +package com.nealgosalia.timetable.fragments + +import android.content.DialogInterface +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.RectF +import android.os.Bundle +import android.support.design.widget.FloatingActionButton +import android.support.v4.app.Fragment +import android.support.v7.app.AlertDialog +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.support.v7.widget.helper.ItemTouchHelper +import android.text.Editable +import android.text.TextWatcher +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.AutoCompleteTextView +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.SubjectsAdapter +import com.nealgosalia.timetable.database.SubjectDatabase +import com.nealgosalia.timetable.database.SubjectDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Subject + +import java.util.ArrayList +import java.util.Collections + +class SubjectsFragment : Fragment() { + + private val subjectsList = ArrayList() + private var listSubjects: RecyclerView? = null + private var mSubjectsAdapter: SubjectsAdapter? = null + private var subjectDatabase: SubjectDatabase? = null + private var placeholderText: TextView? = null + private var view: View? = null + private var dialogView: View? = null + private val p = Paint() + private var alertDialog: AlertDialog.Builder? = null + private var editSubject: AutoCompleteTextView? = null + private var newSubjectName: AutoCompleteTextView? = null + + internal var sub: Array + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.activity_subjects, container, false) + listSubjects = view!!.findViewById(R.id.listSubjects) + placeholderText = view!!.findViewById(R.id.subjectsPlaceholderText) + subjectDatabase = SubjectDatabase(getActivity()) + subjectsList.clear() + for (subjectDetails in subjectDatabase!!.getSubjectDetail()) { + val subject = Subject() + subject.setSubjectName(subjectDetails.getSubject()) + subjectsList.add(subject) + } + Log.d("SubjectsFragment", String.valueOf(subjectsList.size())) + if (subjectsList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + mSubjectsAdapter = SubjectsAdapter(subjectsList) + val mLayoutManager = LinearLayoutManager(getActivity()) + listSubjects!!.setLayoutManager(mLayoutManager) + listSubjects!!.setItemAnimator(DefaultItemAnimator()) + listSubjects!!.addItemDecoration(DividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL)) + listSubjects!!.setAdapter(mSubjectsAdapter) + val fab = view!!.findViewById(R.id.fab) + fab.setOnClickListener(object : View.OnClickListener() { + @Override + fun onClick(view: View) { + showSubjectDialog() + } + }) + initSwipe() + return view + } + + fun showSubjectDialog() { + val dialogBuilder = AlertDialog.Builder(getActivity()) + val inflater = getActivity().getLayoutInflater() + val dialogView = inflater.inflate(R.layout.dialog_add_subject, null) + dialogBuilder.setView(dialogView) + newSubjectName = dialogView.findViewById(R.id.newSubjectName) + sub = getResources().getStringArray(R.array.subjectNames) + val adapter = ArrayAdapter(getActivity(), android.R.layout.simple_list_item_1, sub) + newSubjectName!!.setThreshold(2) + newSubjectName!!.setAdapter(adapter) + dialogBuilder.setTitle(getResources().getString(R.string.subject)) + dialogBuilder.setMessage(getResources().getString(R.string.enter_subject_name)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.add), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val subject = Subject() + val tempSubject = newSubjectName!!.getText().toString().trim() + subject.setSubjectName(tempSubject) + subjectDatabase!!.addSubject(SubjectDetails(tempSubject, 0, 0)) + subjectsList.add(subject) + Collections.sort(subjectsList, Subject.Comparators.NAME) + mSubjectsAdapter!!.notifyDataSetChanged() + placeholderText!!.setVisibility(View.GONE) + newSubjectName!!.setText("") + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.cancel), null) + val dialog = dialogBuilder.create() + dialog.show() + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false) + newSubjectName!!.addTextChangedListener(object : TextWatcher() { + @Override + fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { + + } + + @Override + fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { + + } + + @Override + fun afterTextChanged(editable: Editable) { + if (editable.length() >= 1) { + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true) + } else { + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false) + } + } + }) + } + + private fun initSwipe() { + val simpleItemTouchCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) { + + @Override + fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { + return false + } + + @Override + fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + val position = viewHolder.getAdapterPosition() + + if (direction == ItemTouchHelper.LEFT) { + deleteSwipe(position) + } else { + initDialog(position) + } + } + + @Override + fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + + val icon: Bitmap + if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { + + val itemView = viewHolder.itemView + val height = itemView.getBottom() as Float - itemView.getTop() as Float + val width = height / 3 + + if (dX > 0) { + p.setColor(Color.parseColor("#FF5722")) + val background = RectF(itemView.getLeft() as Float, itemView.getTop() as Float, dX, itemView.getBottom() as Float) + c.drawRect(background, p) + icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_edit_white) + val icon_dest = RectF(itemView.getLeft() as Float + width, itemView.getTop() as Float + width, itemView.getLeft() as Float + 2 * width, itemView.getBottom() as Float - width) + c.drawBitmap(icon, null, icon_dest, p) + } else if (dX < 0) { + p.setColor(Color.parseColor("#009688")) + val background = RectF(itemView.getRight() as Float + dX, itemView.getTop() as Float, itemView.getRight() as Float, itemView.getBottom() as Float) + c.drawRect(background, p) + icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_delete_white) + val icon_dest = RectF(itemView.getRight() as Float - 2 * width, itemView.getTop() as Float + width, itemView.getRight() as Float - width, itemView.getBottom() as Float - width) + c.drawBitmap(icon, null, icon_dest, p) + } + } + super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive) + } + } + val itemTouchHelper = ItemTouchHelper(simpleItemTouchCallback) + itemTouchHelper.attachToRecyclerView(listSubjects) + } + + private fun initDialog(position: Int) { + alertDialog = AlertDialog.Builder(getActivity()) + dialogView = getActivity().getLayoutInflater().inflate(R.layout.dialog_edit_subject, null) + editSubject = dialogView!!.findViewById(R.id.edit_subject) + sub = getResources().getStringArray(R.array.subjectNames) + val adapte = ArrayAdapter(getActivity(), android.R.layout.simple_list_item_1, sub) + if (editSubject != null) { + editSubject!!.setThreshold(2) + editSubject!!.setAdapter(adapte) + } + alertDialog!!.setView(dialogView) + alertDialog!!.setTitle(getResources().getString(R.string.edit_subject)) + alertDialog!!.setPositiveButton("Save", object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + val subject = subjectsList.get(position) + val sd = SubjectDetails( + editSubject!!.getText().toString(), + subject.getAttendedLectures(), + subject.getTotalLectures() + ) + subjectDatabase!!.updateSubject(sd) + subjectsList.set(position, subject) + Collections.sort(subjectsList, Subject.Comparators.NAME) + mSubjectsAdapter!!.notifyDataSetChanged() + dialog.dismiss() + } + }) + alertDialog!!.setNegativeButton(getResources().getString(R.string.cancel), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + mSubjectsAdapter!!.notifyDataSetChanged() + dialog.dismiss() + } + }) + val dialog = alertDialog!!.create() + dialog.show() + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false) + editSubject!!.addTextChangedListener(object : TextWatcher() { + @Override + fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { + + } + + @Override + fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) { + + } + + @Override + fun afterTextChanged(editable: Editable) { + if (editable.length() >= 1) { + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(true) + mSubjectsAdapter!!.notifyDataSetChanged() + } else { + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false) + mSubjectsAdapter!!.notifyDataSetChanged() + } + } + }) + mSubjectsAdapter!!.notifyDataSetChanged() + } + + fun deleteSwipe(position: Int) { + val alertDialog = android.app.AlertDialog.Builder(getActivity()) + alertDialog.setTitle(getResources().getString(R.string.warning)) + alertDialog.setMessage(getResources().getString(R.string.subject_question)) + alertDialog.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + val subject = subjectsList.get(position) + val sd = SubjectDetails() + sd.setSubject(subject.getSubjectName()) + subjectDatabase!!.removeSubject(sd) + subjectsList.remove(position) + mSubjectsAdapter!!.notifyDataSetChanged() + } + }) + alertDialog.setNegativeButton(getResources().getString(R.string.no), object : DialogInterface.OnClickListener() { + @Override + fun onClick(dialog: DialogInterface, which: Int) { + mSubjectsAdapter!!.notifyDataSetChanged() + } + }) + alertDialog.show() + mSubjectsAdapter!!.notifyDataSetChanged() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.java deleted file mode 100644 index dd82460..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class SundayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_sunday, container, false); - placeholderText = view.findViewById(R.id.sundayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(6)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listSunday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - - - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.kt new file mode 100644 index 0000000..7ac4e1f --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/SundayFragment.kt @@ -0,0 +1,87 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class SundayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_sunday, container, false) + placeholderText = view!!.findViewById(R.id.sundayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(6)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listSunday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + + + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.java deleted file mode 100644 index ca97e13..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class ThursdayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_thursday, container, false); - placeholderText = view.findViewById(R.id.thursdayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(3)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listThursday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - - - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.kt new file mode 100644 index 0000000..037ff66 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/ThursdayFragment.kt @@ -0,0 +1,87 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class ThursdayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_thursday, container, false) + placeholderText = view!!.findViewById(R.id.thursdayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(3)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listThursday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + + + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.java deleted file mode 100644 index b8f2b79..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.annotation.SuppressLint; -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.Intent; -import android.content.SharedPreferences; -import android.graphics.Color; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AlertDialog; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.EditText; -import android.widget.Spinner; -import android.widget.TextView; -import android.widget.TimePicker; -import android.widget.Toast; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.SimpleFragmentPagerAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.database.SubjectDatabase; -import com.nealgosalia.timetable.database.SubjectDetails; -import com.nealgosalia.timetable.receivers.MyReceiver; -import com.nealgosalia.timetable.utils.Alarms; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Locale; - -import static android.content.Context.ALARM_SERVICE; - - -public class TimetableFragment extends Fragment { - - private static final int MINUTE = 60000; - private static final String TAG = "TimetableFragment"; - private Button btnNext; - private List subjectsList = new ArrayList<>(); - private Spinner spinnerSubjects; - private TabLayout tabLayout; - private TextView textDialog; - private TimePicker startTime; - private TimePicker endTime; - private ViewPager viewPager; - private EditText roomN; - private int count; - private FragmentDatabase fragmentDatabase; - private SubjectDatabase subjectDatabase; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.activity_timetable, container, false); - fragmentDatabase = new FragmentDatabase(getActivity()); - subjectDatabase = new SubjectDatabase(getActivity()); - viewPager = view.findViewById(R.id.viewpager); - viewPager.setAdapter(new SimpleFragmentPagerAdapter(getChildFragmentManager(), getActivity())); - tabLayout = view.findViewById(R.id.sliding_tabs); - tabLayout.setupWithViewPager(viewPager); - Calendar c = Calendar.getInstance(); - int dayOfWeek = c.get(Calendar.DAY_OF_WEEK); - if (Calendar.MONDAY == dayOfWeek) { - viewPager.setCurrentItem(0); - } else if (Calendar.TUESDAY == dayOfWeek) { - viewPager.setCurrentItem(1); - } else if (Calendar.WEDNESDAY == dayOfWeek) { - viewPager.setCurrentItem(2); - } else if (Calendar.THURSDAY == dayOfWeek) { - viewPager.setCurrentItem(3); - } else if (Calendar.FRIDAY == dayOfWeek) { - viewPager.setCurrentItem(4); - } else if (Calendar.SATURDAY == dayOfWeek) { - viewPager.setCurrentItem(5); - } else if (Calendar.SUNDAY == dayOfWeek) { - viewPager.setCurrentItem(6); - } - FloatingActionButton fab = view.findViewById(R.id.fabTimeTable); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - count = 0; - showTimeTableDialog(); - } - }); - return view; - } - - public void showTimeTableDialog() { - final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getActivity()); - final LayoutInflater inflater = getActivity().getLayoutInflater(); - @SuppressLint("InflateParams") final View dialogView = inflater.inflate(R.layout.dialog_add_timetable, null); - - startTime = dialogView.findViewById(R.id.startTime); - endTime = dialogView.findViewById(R.id.endTime); - Button btnCancel = dialogView.findViewById(R.id.btnCancel); - btnNext = dialogView.findViewById(R.id.btnNext); - textDialog = dialogView.findViewById(R.id.textDialog); - spinnerSubjects = dialogView.findViewById(R.id.spinnerSubjects); - roomN = dialogView.findViewById(R.id.room); - setSubjectList(); - ArrayAdapter spinnerAdapter = new ArrayAdapter(getActivity(), android.R.layout.simple_spinner_item, subjectsList) { - @Override - public boolean isEnabled(int position) { - return position != 0; - } - - @Override - public View getDropDownView(int position, View convertView, @NonNull ViewGroup parent) { - View view = super.getDropDownView(position, convertView, parent); - TextView tv = (TextView) view; - if (position == 0) { - tv.setTextColor(Color.GRAY); - } else { - tv.setTextColor(Color.BLACK); - } - return view; - } - }; - spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinnerSubjects.setAdapter(spinnerAdapter); - - startTime.setVisibility(View.GONE); - endTime.setVisibility(View.GONE); - roomN.setVisibility(View.GONE); - dialogBuilder.setView(dialogView); - textDialog.setText(getResources().getString(R.string.choose_subject)); - final AlertDialog dialog = dialogBuilder.create(); - btnCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dialog.dismiss(); - } - }); - btnNext.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - count++; - if (count == 1) { - if (spinnerSubjects.getSelectedItemPosition() != 0) { - spinnerSubjects.setVisibility(View.GONE); - textDialog.setText(getResources().getString(R.string.enter_room_number)); - roomN.setVisibility(View.VISIBLE); - } else { - Toast.makeText(getActivity(), "Please select a subject", Toast.LENGTH_SHORT).show(); - count--; - } - } else if(count==2) { - roomN.setVisibility(View.GONE); - textDialog.setText(getResources().getString(R.string.enter_start_time)); - startTime.setVisibility(View.VISIBLE); - btnNext.setText(getResources().getString(R.string.next)); - } - else if (count == 3) { - startTime.setVisibility(View.GONE); - textDialog.setText(getResources().getString(R.string.enter_end_time)); - endTime.setVisibility(View.VISIBLE); - btnNext.setText(getResources().getString(R.string.done)); - } else if (count == 4) { - int startHour, startMinute, endHour, endMinute; - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - startHour = startTime.getCurrentHour(); - startMinute = startTime.getCurrentMinute(); - endHour = endTime.getCurrentHour(); - endMinute = endTime.getCurrentMinute(); - - } else { - startHour = startTime.getHour(); - startMinute = startTime.getMinute(); - endHour = endTime.getHour(); - endMinute = endTime.getMinute(); - } - if ((endHour > startHour) || ((endHour == startHour) && (endMinute > startMinute))) { - String edit = roomN.getText().toString().trim(); - int day = tabLayout.getSelectedTabPosition(); - String subjectName = subjectsList.get(spinnerSubjects.getSelectedItemPosition()); - fragmentDatabase.add(new FragmentDetails(day, subjectName, startHour, startMinute, endHour, endMinute,edit)); - dialog.dismiss(); - viewPager.getAdapter().notifyDataSetChanged(); - SharedPreferences mSharedPreference = PreferenceManager.getDefaultSharedPreferences(getActivity().getBaseContext()); - int notificationTime = Integer.parseInt(mSharedPreference.getString("NOTIFICATION_TIME", "-1")); - Log.d(TAG,Integer.toString(notificationTime)); - if (notificationTime != -1) { - setAlarmForNotification(subjectName, day, notificationTime, startHour, startMinute); - } - } else { - Toast.makeText(getActivity(), getResources().getString(R.string.end_time_should_be), Toast.LENGTH_LONG).show(); - count--; - } - } - - } - }); - dialog.show(); - } - - private void setSubjectList() { - int breakFlag = 0; - subjectsList.clear(); - subjectsList.add("Select one"); - for (SubjectDetails subjectDetails : subjectDatabase.getSubjectDetail()) { - if (breakFlag == 0) { - if (subjectDetails.getSubject().compareTo("Break") > 0) { - subjectsList.add(getResources().getString(R.string.Break)); - breakFlag++; - } - } - subjectsList.add(subjectDetails.getSubject()); - } - if (breakFlag == 0) { - subjectsList.add(getResources().getString(R.string.Break)); - } - } - - private void setAlarmForNotification(String subjectName, int day, int notificationTime, int startHour, int startMinute) { - int dayOfWeek = (day + 2) % 7; - Calendar calendar = Calendar.getInstance(); - if (calendar.get(Calendar.DAY_OF_WEEK) > dayOfWeek) { - calendar.set(Calendar.WEEK_OF_MONTH, calendar.get(Calendar.WEEK_OF_MONTH) + 1); - } - calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek); - calendar.set(Calendar.HOUR_OF_DAY, startHour); - calendar.set(Calendar.MINUTE, startMinute); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - calendar.setTimeInMillis(calendar.getTimeInMillis() - notificationTime * MINUTE); - Intent myIntent = new Intent(getActivity(), MyReceiver.class); - int requestCode = (int) System.currentTimeMillis()/1000; - myIntent.putExtra("SUBJECT_NAME", subjectName); - myIntent.putExtra("START_TIME", String.format(Locale.US, "%02d:%02d", startHour, startMinute)); - PendingIntent pendingIntent = PendingIntent.getBroadcast(getActivity(), requestCode, myIntent, PendingIntent.FLAG_UPDATE_CURRENT); - Alarms alarms = new Alarms(); - alarms.setContext(getActivity()); - alarms.setPendingIntent(pendingIntent); - MyPreferenceFragment mpf = new MyPreferenceFragment(); - mpf.addAlarm(alarms); - AlarmManager alarmManager = (AlarmManager) getActivity().getSystemService(ALARM_SERVICE); - alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY * 7, pendingIntent); - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.kt new file mode 100644 index 0000000..441d083 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/TimetableFragment.kt @@ -0,0 +1,256 @@ +package com.nealgosalia.timetable.fragments + +import android.annotation.SuppressLint +import android.app.AlarmManager +import android.app.PendingIntent +import android.content.Intent +import android.content.SharedPreferences +import android.graphics.Color +import android.os.Build +import android.os.Bundle +import android.preference.PreferenceManager +import android.support.design.widget.FloatingActionButton +import android.support.design.widget.TabLayout +import android.support.v4.app.Fragment +import android.support.v4.view.ViewPager +import android.support.v7.app.AlertDialog +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ArrayAdapter +import android.widget.Button +import android.widget.EditText +import android.widget.Spinner +import android.widget.TextView +import android.widget.TimePicker +import android.widget.Toast + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.SimpleFragmentPagerAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.database.SubjectDatabase +import com.nealgosalia.timetable.database.SubjectDetails +import com.nealgosalia.timetable.receivers.MyReceiver +import com.nealgosalia.timetable.utils.Alarms + +import java.util.ArrayList +import java.util.Calendar +import java.util.Locale + +import android.content.Context.ALARM_SERVICE + + +class TimetableFragment : Fragment() { + private var btnNext: Button? = null + private val subjectsList = ArrayList() + private var spinnerSubjects: Spinner? = null + private var tabLayout: TabLayout? = null + private var textDialog: TextView? = null + private var startTime: TimePicker? = null + private var endTime: TimePicker? = null + private var viewPager: ViewPager? = null + private var roomN: EditText? = null + private var count: Int = 0 + private var fragmentDatabase: FragmentDatabase? = null + private var subjectDatabase: SubjectDatabase? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View { + val view = inflater.inflate(R.layout.activity_timetable, container, false) + fragmentDatabase = FragmentDatabase(getActivity()) + subjectDatabase = SubjectDatabase(getActivity()) + viewPager = view.findViewById(R.id.viewpager) + viewPager!!.setAdapter(SimpleFragmentPagerAdapter(getChildFragmentManager(), getActivity())) + tabLayout = view.findViewById(R.id.sliding_tabs) + tabLayout!!.setupWithViewPager(viewPager) + val c = Calendar.getInstance() + val dayOfWeek = c.get(Calendar.DAY_OF_WEEK) + if (Calendar.MONDAY === dayOfWeek) { + viewPager!!.setCurrentItem(0) + } else if (Calendar.TUESDAY === dayOfWeek) { + viewPager!!.setCurrentItem(1) + } else if (Calendar.WEDNESDAY === dayOfWeek) { + viewPager!!.setCurrentItem(2) + } else if (Calendar.THURSDAY === dayOfWeek) { + viewPager!!.setCurrentItem(3) + } else if (Calendar.FRIDAY === dayOfWeek) { + viewPager!!.setCurrentItem(4) + } else if (Calendar.SATURDAY === dayOfWeek) { + viewPager!!.setCurrentItem(5) + } else if (Calendar.SUNDAY === dayOfWeek) { + viewPager!!.setCurrentItem(6) + } + val fab = view.findViewById(R.id.fabTimeTable) + fab.setOnClickListener(object : View.OnClickListener() { + @Override + fun onClick(view: View) { + count = 0 + showTimeTableDialog() + } + }) + return view + } + + fun showTimeTableDialog() { + val dialogBuilder = AlertDialog.Builder(getActivity()) + val inflater = getActivity().getLayoutInflater() + @SuppressLint("InflateParams") val dialogView = inflater.inflate(R.layout.dialog_add_timetable, null) + + startTime = dialogView.findViewById(R.id.startTime) + endTime = dialogView.findViewById(R.id.endTime) + val btnCancel = dialogView.findViewById(R.id.btnCancel) + btnNext = dialogView.findViewById(R.id.btnNext) + textDialog = dialogView.findViewById(R.id.textDialog) + spinnerSubjects = dialogView.findViewById(R.id.spinnerSubjects) + roomN = dialogView.findViewById(R.id.room) + setSubjectList() + val spinnerAdapter = object : ArrayAdapter(getActivity(), android.R.layout.simple_spinner_item, subjectsList) { + @Override + fun isEnabled(position: Int): Boolean { + return position != 0 + } + + @Override + fun getDropDownView(position: Int, convertView: View, @NonNull parent: ViewGroup): View { + val view = super.getDropDownView(position, convertView, parent) + val tv = view as TextView + if (position == 0) { + tv.setTextColor(Color.GRAY) + } else { + tv.setTextColor(Color.BLACK) + } + return view + } + } + spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + spinnerSubjects!!.setAdapter(spinnerAdapter) + + startTime!!.setVisibility(View.GONE) + endTime!!.setVisibility(View.GONE) + roomN!!.setVisibility(View.GONE) + dialogBuilder.setView(dialogView) + textDialog!!.setText(getResources().getString(R.string.choose_subject)) + val dialog = dialogBuilder.create() + btnCancel.setOnClickListener(object : View.OnClickListener() { + @Override + fun onClick(view: View) { + dialog.dismiss() + } + }) + btnNext!!.setOnClickListener(object : View.OnClickListener() { + @Override + fun onClick(view: View) { + count++ + if (count == 1) { + if (spinnerSubjects!!.getSelectedItemPosition() !== 0) { + spinnerSubjects!!.setVisibility(View.GONE) + textDialog!!.setText(getResources().getString(R.string.enter_room_number)) + roomN!!.setVisibility(View.VISIBLE) + } else { + Toast.makeText(getActivity(), "Please select a subject", Toast.LENGTH_SHORT).show() + count-- + } + } else if (count == 2) { + roomN!!.setVisibility(View.GONE) + textDialog!!.setText(getResources().getString(R.string.enter_start_time)) + startTime!!.setVisibility(View.VISIBLE) + btnNext!!.setText(getResources().getString(R.string.next)) + } else if (count == 3) { + startTime!!.setVisibility(View.GONE) + textDialog!!.setText(getResources().getString(R.string.enter_end_time)) + endTime!!.setVisibility(View.VISIBLE) + btnNext!!.setText(getResources().getString(R.string.done)) + } else if (count == 4) { + val startHour: Int + val startMinute: Int + val endHour: Int + val endMinute: Int + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + startHour = startTime!!.getCurrentHour() + startMinute = startTime!!.getCurrentMinute() + endHour = endTime!!.getCurrentHour() + endMinute = endTime!!.getCurrentMinute() + + } else { + startHour = startTime!!.getHour() + startMinute = startTime!!.getMinute() + endHour = endTime!!.getHour() + endMinute = endTime!!.getMinute() + } + if (endHour > startHour || endHour == startHour && endMinute > startMinute) { + val edit = roomN!!.getText().toString().trim() + val day = tabLayout!!.getSelectedTabPosition() + val subjectName = subjectsList.get(spinnerSubjects!!.getSelectedItemPosition()) + fragmentDatabase!!.add(FragmentDetails(day, subjectName, startHour, startMinute, endHour, endMinute, edit)) + dialog.dismiss() + viewPager!!.getAdapter().notifyDataSetChanged() + val mSharedPreference = PreferenceManager.getDefaultSharedPreferences(getActivity().getBaseContext()) + val notificationTime = Integer.parseInt(mSharedPreference.getString("NOTIFICATION_TIME", "-1")) + Log.d(TAG, Integer.toString(notificationTime)) + if (notificationTime != -1) { + setAlarmForNotification(subjectName, day, notificationTime, startHour, startMinute) + } + } else { + Toast.makeText(getActivity(), getResources().getString(R.string.end_time_should_be), Toast.LENGTH_LONG).show() + count-- + } + } + + } + }) + dialog.show() + } + + private fun setSubjectList() { + var breakFlag = 0 + subjectsList.clear() + subjectsList.add("Select one") + for (subjectDetails in subjectDatabase!!.getSubjectDetail()) { + if (breakFlag == 0) { + if (subjectDetails.getSubject().compareTo("Break") > 0) { + subjectsList.add(getResources().getString(R.string.Break)) + breakFlag++ + } + } + subjectsList.add(subjectDetails.getSubject()) + } + if (breakFlag == 0) { + subjectsList.add(getResources().getString(R.string.Break)) + } + } + + private fun setAlarmForNotification(subjectName: String, day: Int, notificationTime: Int, startHour: Int, startMinute: Int) { + val dayOfWeek = (day + 2) % 7 + val calendar = Calendar.getInstance() + if (calendar.get(Calendar.DAY_OF_WEEK) > dayOfWeek) { + calendar.set(Calendar.WEEK_OF_MONTH, calendar.get(Calendar.WEEK_OF_MONTH) + 1) + } + calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek) + calendar.set(Calendar.HOUR_OF_DAY, startHour) + calendar.set(Calendar.MINUTE, startMinute) + calendar.set(Calendar.SECOND, 0) + calendar.set(Calendar.MILLISECOND, 0) + calendar.setTimeInMillis(calendar.getTimeInMillis() - notificationTime * MINUTE) + val myIntent = Intent(getActivity(), MyReceiver::class.java) + val requestCode = System.currentTimeMillis() as Int / 1000 + myIntent.putExtra("SUBJECT_NAME", subjectName) + myIntent.putExtra("START_TIME", String.format(Locale.US, "%02d:%02d", startHour, startMinute)) + val pendingIntent = PendingIntent.getBroadcast(getActivity(), requestCode, myIntent, PendingIntent.FLAG_UPDATE_CURRENT) + val alarms = Alarms() + alarms.setContext(getActivity()) + alarms.setPendingIntent(pendingIntent) + val mpf = MyPreferenceFragment() + mpf.addAlarm(alarms) + val alarmManager = getActivity().getSystemService(ALARM_SERVICE) as AlarmManager + alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY * 7, pendingIntent) + } + + companion object { + + private val MINUTE = 60000 + private val TAG = "TimetableFragment" + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.java deleted file mode 100644 index cae40ed..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class TuesdayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_tuesday, container, false); - placeholderText = view.findViewById(R.id.tuesdayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(1)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listTuesday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - - - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.kt new file mode 100644 index 0000000..70e46c2 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/TuesdayFragment.kt @@ -0,0 +1,87 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class TuesdayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_tuesday, container, false) + placeholderText = view!!.findViewById(R.id.tuesdayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(1)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listTuesday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + + + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.java b/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.java deleted file mode 100644 index b215dd3..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.nealgosalia.timetable.fragments; - -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; - -import com.nealgosalia.timetable.R; -import com.nealgosalia.timetable.adapters.LecturesAdapter; -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.database.FragmentDetails; -import com.nealgosalia.timetable.utils.DividerItemDecoration; -import com.nealgosalia.timetable.utils.Lecture; -import com.nealgosalia.timetable.utils.RecyclerItemClickListener; - -import java.util.ArrayList; -import java.util.List; - -public class WednesdayFragment extends Fragment { - - private FragmentDatabase db; - private List lecturesList = new ArrayList<>(); - private RecyclerView recyclerLectures; - private LecturesAdapter mLectureAdapter; - private TextView placeholderText; - private View view; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - view = inflater.inflate(R.layout.fragment_wednesday, container, false); - placeholderText = view.findViewById(R.id.wednesdayPlaceholderText); - db = new FragmentDatabase(getActivity()); - lecturesList = new ArrayList<>(db.getLectureList(2)); - if (lecturesList.size() != 0) { - placeholderText.setVisibility(View.GONE); - } - recyclerLectures = view.findViewById(R.id.listWednesday); - mLectureAdapter = new LecturesAdapter(lecturesList); - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); - recyclerLectures.setLayoutManager(mLayoutManager); - recyclerLectures.setItemAnimator(new DefaultItemAnimator()); - recyclerLectures.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)); - recyclerLectures.setAdapter(mLectureAdapter); - recyclerLectures.addOnItemTouchListener(new RecyclerItemClickListener(getContext(), new RecyclerItemClickListener.OnItemClickListener() { - @Override public void onItemClick(View view, int position) { - Lecture lecture = lecturesList.get(position); - showDeleteDialog(lecture, position); - } - })); - return view; - } - - public void showDeleteDialog(final Lecture lecture, final int position) { - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getContext()); - dialogBuilder.setTitle(getResources().getString(R.string.delete)); - dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)); - dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int whichButton) { - FragmentDetails fd = new FragmentDetails( - lecture.getDay(), - lecture.getSubjectName(), - Integer.parseInt(lecture.getStartTime().substring(0,2)), - Integer.parseInt(lecture.getStartTime().substring(3,5)), - Integer.parseInt(lecture.getEndTime().substring(0,2)), - Integer.parseInt(lecture.getEndTime().substring(3,5)), - lecture.getRoomNo() - - - ); - db.remove(fd); - lecturesList.remove(position); - mLectureAdapter.notifyDataSetChanged(); - } - }); - dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null); - AlertDialog b = dialogBuilder.create(); - b.show(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.kt b/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.kt new file mode 100644 index 0000000..efd2c6b --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/fragments/WednesdayFragment.kt @@ -0,0 +1,87 @@ +package com.nealgosalia.timetable.fragments + +import android.app.AlertDialog +import android.content.DialogInterface +import android.os.Bundle +import android.support.v4.app.Fragment +import android.support.v7.widget.DefaultItemAnimator +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +import com.nealgosalia.timetable.R +import com.nealgosalia.timetable.adapters.LecturesAdapter +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.database.FragmentDetails +import com.nealgosalia.timetable.utils.DividerItemDecoration +import com.nealgosalia.timetable.utils.Lecture +import com.nealgosalia.timetable.utils.RecyclerItemClickListener + +import java.util.ArrayList + +class WednesdayFragment : Fragment() { + + private var db: FragmentDatabase? = null + private var lecturesList: List = ArrayList() + private var recyclerLectures: RecyclerView? = null + private var mLectureAdapter: LecturesAdapter? = null + private var placeholderText: TextView? = null + private var view: View? = null + + @Override + fun onCreateView(inflater: LayoutInflater, container: ViewGroup, + savedInstanceState: Bundle): View? { + view = inflater.inflate(R.layout.fragment_wednesday, container, false) + placeholderText = view!!.findViewById(R.id.wednesdayPlaceholderText) + db = FragmentDatabase(getActivity()) + lecturesList = ArrayList(db!!.getLectureList(2)) + if (lecturesList.size() !== 0) { + placeholderText!!.setVisibility(View.GONE) + } + recyclerLectures = view!!.findViewById(R.id.listWednesday) + mLectureAdapter = LecturesAdapter(lecturesList) + val mLayoutManager = LinearLayoutManager(getActivity()) + recyclerLectures!!.setLayoutManager(mLayoutManager) + recyclerLectures!!.setItemAnimator(DefaultItemAnimator()) + recyclerLectures!!.addItemDecoration(DividerItemDecoration(getContext(), LinearLayoutManager.VERTICAL)) + recyclerLectures!!.setAdapter(mLectureAdapter) + recyclerLectures!!.addOnItemTouchListener(RecyclerItemClickListener(getContext(), object : RecyclerItemClickListener.OnItemClickListener() { + @Override + fun onItemClick(view: View, position: Int) { + val lecture = lecturesList[position] + showDeleteDialog(lecture, position) + } + })) + return view + } + + fun showDeleteDialog(lecture: Lecture, position: Int) { + val dialogBuilder = AlertDialog.Builder(getContext()) + dialogBuilder.setTitle(getResources().getString(R.string.delete)) + dialogBuilder.setMessage(getResources().getString(R.string.delete_lecture)) + dialogBuilder.setPositiveButton(getResources().getString(R.string.yes), object : DialogInterface.OnClickListener() { + fun onClick(dialog: DialogInterface, whichButton: Int) { + val fd = FragmentDetails( + lecture.getDay(), + lecture.getSubjectName(), + Integer.parseInt(lecture.getStartTime().substring(0, 2)), + Integer.parseInt(lecture.getStartTime().substring(3, 5)), + Integer.parseInt(lecture.getEndTime().substring(0, 2)), + Integer.parseInt(lecture.getEndTime().substring(3, 5)), + lecture.getRoomNo() + + + ) + db!!.remove(fd) + lecturesList.remove(position) + mLectureAdapter!!.notifyDataSetChanged() + } + }) + dialogBuilder.setNegativeButton(getResources().getString(R.string.no), null) + val b = dialogBuilder.create() + b.show() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.java b/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.java deleted file mode 100644 index babe4bc..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.nealgosalia.timetable.receivers; - -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.graphics.Color; -import android.support.v4.app.NotificationCompat; - -import com.nealgosalia.timetable.MainActivity; -import com.nealgosalia.timetable.R; - -/** - * Created by kira on 16/12/16. - */ - -public class MyReceiver extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - String subjectName = intent.getExtras().getString("SUBJECT_NAME"); - String startTime = intent.getExtras().getString("START_TIME"); - showNotification(context, subjectName, startTime); - } - - public void showNotification(Context context, String subjectName, String startTime) { - Intent intent = new Intent(context, MainActivity.class); - PendingIntent pi = PendingIntent.getActivity(context, 0, intent, 0); - NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context) - .setSmallIcon(R.drawable.ic_notification) - .setContentTitle(subjectName) - .setContentText("at " + startTime) - .setColor(Color.argb(255, 67, 133, 244)); - mBuilder.setContentIntent(pi); - mBuilder.setDefaults(Notification.DEFAULT_VIBRATE); - mBuilder.setAutoCancel(true); - NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.cancelAll(); - mNotificationManager.notify(0, mBuilder.build()); - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.kt b/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.kt new file mode 100644 index 0000000..86ae8a9 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/receivers/MyReceiver.kt @@ -0,0 +1,43 @@ +package com.nealgosalia.timetable.receivers + +import android.app.Notification +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.graphics.Color +import android.support.v4.app.NotificationCompat + +import com.nealgosalia.timetable.MainActivity +import com.nealgosalia.timetable.R + +/** + * Created by kira on 16/12/16. + */ + +class MyReceiver : BroadcastReceiver() { + + @Override + fun onReceive(context: Context, intent: Intent) { + val subjectName = intent.getExtras().getString("SUBJECT_NAME") + val startTime = intent.getExtras().getString("START_TIME") + showNotification(context, subjectName, startTime) + } + + fun showNotification(context: Context, subjectName: String, startTime: String) { + val intent = Intent(context, MainActivity::class.java) + val pi = PendingIntent.getActivity(context, 0, intent, 0) + val mBuilder = NotificationCompat.Builder(context) + .setSmallIcon(R.drawable.ic_notification) + .setContentTitle(subjectName) + .setContentText("at $startTime") + .setColor(Color.argb(255, 67, 133, 244)) + mBuilder.setContentIntent(pi) + mBuilder.setDefaults(Notification.DEFAULT_VIBRATE) + mBuilder.setAutoCancel(true) + val mNotificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager + mNotificationManager.cancelAll() + mNotificationManager.notify(0, mBuilder.build()) + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.java b/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.java deleted file mode 100644 index 84fcd8f..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.nealgosalia.timetable.receivers; - -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.util.Log; - -import com.nealgosalia.timetable.database.FragmentDatabase; -import com.nealgosalia.timetable.utils.Lecture; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import static android.content.Context.ALARM_SERVICE; - -/** - * Created by kira on 18/12/16. - */ - -public class OnBootReceiver extends BroadcastReceiver { - - private static final int MINUTE = 60000; - private static final String TAG = "OnBootReceiver"; - private List lecturesList = new ArrayList<>(); - - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED) || intent.getAction().equals("com.nealgosalia.timetable.NOTIFY")) { - SharedPreferences mSharedPreference = PreferenceManager.getDefaultSharedPreferences(context); - int notificationTime = Integer.parseInt(mSharedPreference.getString("NOTIFICATION_TIME", "-1")); - if (notificationTime != -1) { - Log.d(TAG, intent.getAction()); - FragmentDatabase db = new FragmentDatabase(context); - Calendar calendar = Calendar.getInstance(); - lecturesList = new ArrayList<>(db.getLectureList()); - if (lecturesList.size() != 0) { - for (Lecture lecture : lecturesList) { - calendar.setTimeInMillis(System.currentTimeMillis()); - int dayOfWeek = (lecture.getDay() + 2) % 7; - if (calendar.get(Calendar.DAY_OF_WEEK) > dayOfWeek) { - calendar.set(Calendar.WEEK_OF_MONTH, calendar.get(Calendar.WEEK_OF_MONTH) + 1); - } - calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek); - calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(lecture.getStartTime().substring(0, 2))); - calendar.set(Calendar.MINUTE, Integer.parseInt(lecture.getStartTime().substring(3, 5))); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - calendar.setTimeInMillis(calendar.getTimeInMillis() - notificationTime * MINUTE); - Intent i = new Intent(context.getApplicationContext(), MyReceiver.class); - i.putExtra("SUBJECT_NAME", lecture.getSubjectName()); - i.putExtra("START_TIME", lecture.getStartTime()); - int randomRequestCode = (int) (calendar.getTimeInMillis()); - PendingIntent pendingIntent = PendingIntent.getBroadcast(context, randomRequestCode, i, PendingIntent.FLAG_UPDATE_CURRENT); - AlarmManager alarmManager = (AlarmManager) context.getSystemService(ALARM_SERVICE); - alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY * 7, pendingIntent); - Log.d(TAG, "Notification Time: " + String.valueOf(calendar.getTime()) + " " + String.valueOf(calendar.getTimeInMillis())); - } - } - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.kt b/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.kt new file mode 100644 index 0000000..3be15dc --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/receivers/OnBootReceiver.kt @@ -0,0 +1,69 @@ +package com.nealgosalia.timetable.receivers + +import android.app.AlarmManager +import android.app.PendingIntent +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences +import android.preference.PreferenceManager +import android.util.Log + +import com.nealgosalia.timetable.database.FragmentDatabase +import com.nealgosalia.timetable.utils.Lecture + +import java.util.ArrayList +import java.util.Calendar + +import android.content.Context.ALARM_SERVICE + +/** + * Created by kira on 18/12/16. + */ + +class OnBootReceiver : BroadcastReceiver() { + private var lecturesList: List = ArrayList() + + @Override + fun onReceive(context: Context, intent: Intent) { + if (intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED) || intent.getAction().equals("com.nealgosalia.timetable.NOTIFY")) { + val mSharedPreference = PreferenceManager.getDefaultSharedPreferences(context) + val notificationTime = Integer.parseInt(mSharedPreference.getString("NOTIFICATION_TIME", "-1")) + if (notificationTime != -1) { + Log.d(TAG, intent.getAction()) + val db = FragmentDatabase(context) + val calendar = Calendar.getInstance() + lecturesList = ArrayList(db.getLectureList()) + if (lecturesList.size() !== 0) { + for (lecture in lecturesList) { + calendar.setTimeInMillis(System.currentTimeMillis()) + val dayOfWeek = (lecture.getDay() + 2) % 7 + if (calendar.get(Calendar.DAY_OF_WEEK) > dayOfWeek) { + calendar.set(Calendar.WEEK_OF_MONTH, calendar.get(Calendar.WEEK_OF_MONTH) + 1) + } + calendar.set(Calendar.DAY_OF_WEEK, dayOfWeek) + calendar.set(Calendar.HOUR_OF_DAY, Integer.parseInt(lecture.getStartTime().substring(0, 2))) + calendar.set(Calendar.MINUTE, Integer.parseInt(lecture.getStartTime().substring(3, 5))) + calendar.set(Calendar.SECOND, 0) + calendar.set(Calendar.MILLISECOND, 0) + calendar.setTimeInMillis(calendar.getTimeInMillis() - notificationTime * MINUTE) + val i = Intent(context.getApplicationContext(), MyReceiver::class.java) + i.putExtra("SUBJECT_NAME", lecture.getSubjectName()) + i.putExtra("START_TIME", lecture.getStartTime()) + val randomRequestCode = calendar.getTimeInMillis() as Int + val pendingIntent = PendingIntent.getBroadcast(context, randomRequestCode, i, PendingIntent.FLAG_UPDATE_CURRENT) + val alarmManager = context.getSystemService(ALARM_SERVICE) as AlarmManager + alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY * 7, pendingIntent) + Log.d(TAG, "Notification Time: " + String.valueOf(calendar.getTime()) + " " + String.valueOf(calendar.getTimeInMillis())) + } + } + } + } + } + + companion object { + + private val MINUTE = 60000 + private val TAG = "OnBootReceiver" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.java b/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.java deleted file mode 100644 index 25b86cb..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.nealgosalia.timetable.utils; - -import android.app.PendingIntent; -import android.content.Context; - -/** - * Created by kira on 20/12/16. - */ - -public class Alarms { - Context context; - PendingIntent pendingIntent; - - public Context getContext() { - return context; - } - - public void setContext(Context context) { - this.context = context; - } - - public PendingIntent getPendingIntent() { - return pendingIntent; - } - - public void setPendingIntent(PendingIntent pendingIntent) { - this.pendingIntent = pendingIntent; - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.kt b/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.kt new file mode 100644 index 0000000..becca93 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/utils/Alarms.kt @@ -0,0 +1,13 @@ +package com.nealgosalia.timetable.utils + +import android.app.PendingIntent +import android.content.Context + +/** + * Created by kira on 20/12/16. + */ + +class Alarms { + var context: Context + var pendingIntent: PendingIntent +} diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.java b/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.java deleted file mode 100644 index 80def58..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.nealgosalia.timetable.utils; - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.View; - -public class DividerItemDecoration extends RecyclerView.ItemDecoration { - - private static final int[] ATTRS = new int[]{ - android.R.attr.listDivider - }; - - public static final int HORIZONTAL_LIST = LinearLayoutManager.HORIZONTAL; - - public static final int VERTICAL_LIST = LinearLayoutManager.VERTICAL; - - private Drawable mDivider; - - private int mOrientation; - - public DividerItemDecoration(Context context, int orientation) { - final TypedArray a = context.obtainStyledAttributes(ATTRS); - mDivider = a.getDrawable(0); - a.recycle(); - setOrientation(orientation); - } - - public void setOrientation(int orientation) { - if (orientation != HORIZONTAL_LIST && orientation != VERTICAL_LIST) { - throw new IllegalArgumentException("invalid orientation"); - } - mOrientation = orientation; - } - - @Override - public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) { - if (mOrientation == VERTICAL_LIST) { - drawVertical(c, parent); - } else { - drawHorizontal(c, parent); - } - } - - public void drawVertical(Canvas c, RecyclerView parent) { - final int left = parent.getPaddingLeft(); - final int right = parent.getWidth() - parent.getPaddingRight(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View child = parent.getChildAt(i); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int top = child.getBottom() + params.bottomMargin; - final int bottom = top + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - public void drawHorizontal(Canvas c, RecyclerView parent) { - final int top = parent.getPaddingTop(); - final int bottom = parent.getHeight() - parent.getPaddingBottom(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View child = parent.getChildAt(i); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int left = child.getRight() + params.rightMargin; - final int right = left + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - @Override - public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { - if (mOrientation == VERTICAL_LIST) { - outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()); - } else { - outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0); - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.kt b/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.kt new file mode 100644 index 0000000..5c3604b --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/utils/DividerItemDecoration.kt @@ -0,0 +1,90 @@ +package com.nealgosalia.timetable.utils + +import android.content.Context +import android.content.res.TypedArray +import android.graphics.Canvas +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView +import android.view.View + +class DividerItemDecoration(context: Context, orientation: Int) : RecyclerView.ItemDecoration() { + + private val mDivider: Drawable + + private var mOrientation: Int = 0 + + init { + val a = context.obtainStyledAttributes(ATTRS) + mDivider = a.getDrawable(0) + a.recycle() + setOrientation(orientation) + } + + fun setOrientation(orientation: Int) { + if (orientation != HORIZONTAL_LIST && orientation != VERTICAL_LIST) { + throw IllegalArgumentException("invalid orientation") + } + mOrientation = orientation + } + + @Override + fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { + if (mOrientation == VERTICAL_LIST) { + drawVertical(c, parent) + } else { + drawHorizontal(c, parent) + } + } + + fun drawVertical(c: Canvas, parent: RecyclerView) { + val left = parent.getPaddingLeft() + val right = parent.getWidth() - parent.getPaddingRight() + + val childCount = parent.getChildCount() + for (i in 0 until childCount) { + val child = parent.getChildAt(i) + val params = child + .getLayoutParams() as RecyclerView.LayoutParams + val top = child.getBottom() + params.bottomMargin + val bottom = top + mDivider.getIntrinsicHeight() + mDivider.setBounds(left, top, right, bottom) + mDivider.draw(c) + } + } + + fun drawHorizontal(c: Canvas, parent: RecyclerView) { + val top = parent.getPaddingTop() + val bottom = parent.getHeight() - parent.getPaddingBottom() + + val childCount = parent.getChildCount() + for (i in 0 until childCount) { + val child = parent.getChildAt(i) + val params = child + .getLayoutParams() as RecyclerView.LayoutParams + val left = child.getRight() + params.rightMargin + val right = left + mDivider.getIntrinsicHeight() + mDivider.setBounds(left, top, right, bottom) + mDivider.draw(c) + } + } + + @Override + fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + if (mOrientation == VERTICAL_LIST) { + outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()) + } else { + outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0) + } + } + + companion object { + + private val ATTRS = intArrayOf(android.R.attr.listDivider) + + val HORIZONTAL_LIST = LinearLayoutManager.HORIZONTAL + + val VERTICAL_LIST = LinearLayoutManager.VERTICAL + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.java b/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.java deleted file mode 100644 index 416fc98..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.nealgosalia.timetable.utils; - -import java.util.Comparator; - -public class Lecture implements Comparable { - - private String subjectName; - private String startTime; - private String endTime; - private String roomNo; - private int day; - - public int getDay() { - return day; - } - - public void setDay(int day) { - this.day = day; - } - - public String getSubjectName() { - return subjectName; - } - - public void setSubjectName(String subjectName) { - this.subjectName = subjectName; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public String getEndTime() { - return endTime; - } - - public void setEndTime(String endTime) { - this.endTime = endTime; - } - public void setRoomNo(String roomNo) { - this.roomNo = roomNo; - } - public String getRoomNo(){ - return roomNo; - } - - - @Override - public int compareTo(Lecture o) { - return Lecture.Comparators.NAME.compare(this, o); - } - - public static class Comparators { - - public static Comparator NAME = new Comparator() { - @Override - public int compare(Lecture o1, Lecture o2) { - return o1.startTime.compareTo(o2.startTime); - } - }; - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.kt b/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.kt new file mode 100644 index 0000000..c2ab13b --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/utils/Lecture.kt @@ -0,0 +1,28 @@ +package com.nealgosalia.timetable.utils + +import java.util.Comparator + +class Lecture : Comparable { + + var subjectName: String? = null + var startTime: String? = null + var endTime: String? = null + var roomNo: String? = null + var day: Int = 0 + + + @Override + fun compareTo(o: Lecture): Int { + return Lecture.Comparators.NAME.compare(this, o) + } + + object Comparators { + + var NAME: Comparator = object : Comparator() { + @Override + fun compare(o1: Lecture, o2: Lecture): Int { + return o1.startTime!!.compareTo(o2.startTime) + } + } + } +} diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.java b/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.java deleted file mode 100644 index ec4a9cd..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.nealgosalia.timetable.utils; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.view.GestureDetector; -import android.view.MotionEvent; -import android.view.View; - -/** - * Created by kira on 18/1/17. - */ - -public class RecyclerItemClickListener implements RecyclerView.OnItemTouchListener { - private OnItemClickListener mListener; - - public interface OnItemClickListener { - void onItemClick(View view, int position); - } - - GestureDetector mGestureDetector; - - public RecyclerItemClickListener(Context context, OnItemClickListener listener) { - mListener = listener; - mGestureDetector = new GestureDetector(context, new GestureDetector.SimpleOnGestureListener() { - @Override - public boolean onSingleTapUp(MotionEvent e) { - return true; - } - }); - } - - @Override - public boolean onInterceptTouchEvent(RecyclerView view, MotionEvent e) { - View childView = view.findChildViewUnder(e.getX(), e.getY()); - if (childView != null && mListener != null && mGestureDetector.onTouchEvent(e)) { - mListener.onItemClick(childView, view.getChildAdapterPosition(childView)); - } - return false; - } - - @Override - public void onTouchEvent(RecyclerView view, MotionEvent motionEvent) { - } - - @Override - public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) { - } -} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.kt b/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.kt new file mode 100644 index 0000000..0d3f96c --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/utils/RecyclerItemClickListener.kt @@ -0,0 +1,46 @@ +package com.nealgosalia.timetable.utils + +import android.content.Context +import android.support.v7.widget.RecyclerView +import android.view.GestureDetector +import android.view.MotionEvent +import android.view.View + +/** + * Created by kira on 18/1/17. + */ + +class RecyclerItemClickListener(context: Context, private val mListener: OnItemClickListener?) : RecyclerView.OnItemTouchListener { + + internal var mGestureDetector: GestureDetector + + interface OnItemClickListener { + fun onItemClick(view: View, position: Int) + } + + init { + mGestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { + @Override + fun onSingleTapUp(e: MotionEvent): Boolean { + return true + } + }) + } + + @Override + fun onInterceptTouchEvent(view: RecyclerView, e: MotionEvent): Boolean { + val childView = view.findChildViewUnder(e.getX(), e.getY()) + if (childView != null && mListener != null && mGestureDetector.onTouchEvent(e)) { + mListener.onItemClick(childView, view.getChildAdapterPosition(childView)) + } + return false + } + + @Override + fun onTouchEvent(view: RecyclerView, motionEvent: MotionEvent) { + } + + @Override + fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Subject.java b/app/src/main/java/com/nealgosalia/timetable/utils/Subject.java deleted file mode 100644 index 434eb1b..0000000 --- a/app/src/main/java/com/nealgosalia/timetable/utils/Subject.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.nealgosalia.timetable.utils; - -import java.util.Comparator; - -public class Subject implements Comparable { - - private String subjectName; - private int attendedLectures; - private int totalLectures; - - public Subject() { - } - - public int getAttendedLectures() { - return attendedLectures; - } - - public void setAttendedLectures(int attendedLectures) { - this.attendedLectures = attendedLectures; - } - - public int getTotalLectures() { - return totalLectures; - } - - public void setTotalLectures(int totalLectures) { - this.totalLectures = totalLectures; - } - - public String getSubjectName() { - return subjectName; - } - - public void setSubjectName(String subjectName) { - this.subjectName = subjectName; - } - - @Override - public int compareTo(Subject o) { - return Comparators.NAME.compare(this, o); - } - - - public static class Comparators { - - public static Comparator NAME = new Comparator() { - @Override - public int compare(Subject o1, Subject o2) { - return o1.subjectName.compareTo(o2.subjectName); - } - }; - } -} diff --git a/app/src/main/java/com/nealgosalia/timetable/utils/Subject.kt b/app/src/main/java/com/nealgosalia/timetable/utils/Subject.kt new file mode 100644 index 0000000..a2a1b17 --- /dev/null +++ b/app/src/main/java/com/nealgosalia/timetable/utils/Subject.kt @@ -0,0 +1,26 @@ +package com.nealgosalia.timetable.utils + +import java.util.Comparator + +class Subject : Comparable { + + var subjectName: String? = null + var attendedLectures: Int = 0 + var totalLectures: Int = 0 + + @Override + fun compareTo(o: Subject): Int { + return Comparators.NAME.compare(this, o) + } + + + object Comparators { + + var NAME: Comparator = object : Comparator() { + @Override + fun compare(o1: Subject, o2: Subject): Int { + return o1.subjectName!!.compareTo(o2.subjectName) + } + } + } +} diff --git a/build.gradle b/build.gradle index 0a74891..f6f90b2 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta2' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f6b961fd5a86aa5fbfe90f707c3138408be7c718 GIT binary patch literal 54329 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

<5G2M1WZP5 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 F{|7XC?P&l2 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..9a4163a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 9d82f78..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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 ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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 - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +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 @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@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= - 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 @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line