Skip to content

Commit

Permalink
Merge pull request #3 from killerninjacat/storage
Browse files Browse the repository at this point in the history 
feat: added scoped storage, bumped minSDK
  • Loading branch information
@killerninjacat
killerninjacat authored Jun 26, 2024
2 parents 1c355e9 + 515d9da commit dc791bf
Show file tree
Hide file tree
Showing 27 changed files with 260 additions and 189 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ android {

defaultConfig {
applicationId 'com.nithinbalan.academease'
minSdk 27
minSdk 29
targetSdk 34
versionCode 3
versionName "2.1"
versionCode 8
versionName "2.3.3"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
94 changes: 76 additions & 18 deletions app/src/main/java/com/nithinbalan/academease/UpcomingClassesWidget.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.util.Log;
import android.widget.RemoteViews;

import androidx.core.content.ContextCompat;
Expand Down Expand Up @@ -48,10 +49,17 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
currentMinute = calendar.get(Calendar.MINUTE);
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -82,10 +90,17 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
currentMinute = calendar.get(Calendar.MINUTE);
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -116,10 +131,17 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
currentMinute = calendar.get(Calendar.MINUTE);
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -148,12 +170,23 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
times = new ArrayList<>();
hour = calendar.get(Calendar.HOUR_OF_DAY);
currentMinute = calendar.get(Calendar.MINUTE);
Log.d("hour", String.valueOf(hour));
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
Log.d("loop", String.valueOf(times.get(i)/60-hour));
if(times.get(i)/60-hour>0)
{
Log.d("first loop","entered");
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
Log.d("minute", String.valueOf(times.get(i) % 60 - currentMinute));
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -184,10 +217,17 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
currentMinute = calendar.get(Calendar.MINUTE);
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -218,10 +258,17 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
currentMinute = calendar.get(Calendar.MINUTE);
min = 0;
for (int i = times.size() - 1; i >= 0; i--) {
if (times.get(i) / 60 - hour >= 0) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -251,12 +298,18 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
hour=calendar.get(Calendar.HOUR_OF_DAY);
currentMinute=calendar.get(Calendar.MINUTE);
min=0;
for(int i=times.size()-1;i>=0;i--)
{
if(times.get(i)/60-hour>=0) {
if(times.get(i)%60-currentMinute>=0) {
for (int i = times.size() - 1; i >= 0; i--) {
if(times.get(i)/60-hour>0)
{
min=i;
f=1;
break;
}
else if (times.get(i) / 60 == hour ) {
if (times.get(i) % 60 - currentMinute >= 0) {
min = i;
f = 1;
break;
}
}
}
Expand Down Expand Up @@ -285,16 +338,21 @@ static void updateAppWidget(Context context, AppWidgetManager appWidgetManager,
@Override
public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
for (int appWidgetId : appWidgetIds) {
Intent intent = new Intent(context, UpcomingClassesWidget.class);
intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
if (alarmManager != null) {
alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), 600000, pendingIntent);
}
Intent i1=new Intent(context, TimetableActivity.class);
PendingIntent pi=PendingIntent.getActivity(context,0,i1, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.upcoming_classes_widget);
views.setOnClickPendingIntent(R.id.appwidget_text, pi);
appWidgetManager.updateAppWidget(appWidgetId, views);
updateAppWidget(context, appWidgetManager, appWidgetId);
}
Intent intent = new Intent(context, UpcomingClassesWidget.class);
intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds);
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
if (alarmManager != null) {
alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), 900000, pendingIntent);
}
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/nithinbalan/academease/activities/AttendanceActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

Expand Down Expand Up @@ -202,6 +203,7 @@ else if (target.getText().toString().isEmpty())
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_attendance);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
subjectsList=new ArrayList<>();
targetsList=new ArrayList<>();
attendanceDataList=new ArrayList<>();
Expand Down
14 changes: 11 additions & 3 deletions app/src/main/java/com/nithinbalan/academease/activities/CalendarActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.ViewGroup;
import android.view.Window;
Expand All @@ -17,6 +18,7 @@
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;

import com.applandeo.materialcalendarview.CalendarView;
import com.nithinbalan.academease.AttendanceData;
Expand All @@ -43,6 +45,8 @@ public class CalendarActivity extends AppCompatActivity {
Button home;
CalendarView calendar;
List<Double>targetsList;
int screenWidth;
DisplayMetrics displayMetrics;
int targetValue;
String att;
Gson gson;
Expand Down Expand Up @@ -74,7 +78,7 @@ public void showDates(List<String> dates1, int id)
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setCancelable(true);
dialog.setContentView(R.layout.dates_view);
Objects.requireNonNull(dialog.getWindow()).setLayout(750, 750);
Objects.requireNonNull(dialog.getWindow()).setLayout(screenWidth-100, 750);
dialog.getWindow().setBackgroundDrawableResource(R.drawable.dark_layout_rounded);
ListView listView=dialog.findViewById(R.id.listView);
TextView textView = dialog.findViewById(R.id.textView);
Expand All @@ -101,7 +105,7 @@ public void setAttendance(String date)
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setCancelable(true);
dialog.setContentView(R.layout.set_attendance);
Objects.requireNonNull(dialog.getWindow()).setLayout(750, ViewGroup.LayoutParams.WRAP_CONTENT);
Objects.requireNonNull(dialog.getWindow()).setLayout(screenWidth-200, ViewGroup.LayoutParams.WRAP_CONTENT);
dialog.getWindow().setBackgroundDrawableResource(R.drawable.dark_layout_rounded);
present=dialog.findViewById(R.id.presentButton);
date_display=dialog.findViewById(R.id.date_display);
Expand Down Expand Up @@ -237,6 +241,7 @@ private String formatDate(int year, int month, int dayOfMonth) {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_calendar);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
sp = getSharedPreferences("com.example.academease", 0);
gson=new Gson();
calendar=findViewById(R.id.calendarView);
Expand All @@ -253,6 +258,9 @@ protected void onCreate(Bundle savedInstanceState) {
allDates = new ArrayList<>();
absentDates = new ArrayList<>();
attendedDates = new ArrayList<>();
DisplayMetrics displayMetrics = new DisplayMetrics();
this.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
screenWidth=displayMetrics.widthPixels;
String json3=sp.getString("targets",null);
targetsList=gson.fromJson(json3, ArrayList.class);
if(targetsList==null)
Expand Down Expand Up @@ -314,7 +322,7 @@ else if(totalclasses!=0) {
String selectedDate = formatDate(clickedDayCalendar.get(Calendar.YEAR),
clickedDayCalendar.get(Calendar.MONTH),
clickedDayCalendar.get(Calendar.DAY_OF_MONTH));
setAttendance(selectedDate);
setAttendance(" "+selectedDate+" ");
});
}
private Calendar convertStringToCalendar(String dateString) {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/nithinbalan/academease/activities/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;

import com.example.academease.R;

Expand Down Expand Up @@ -109,6 +110,7 @@ else if (current.getHour() > 20 && current.getHour() <= 23)
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
timetable= findViewById(R.id.button);
attendance= findViewById(R.id.button2);
notes= findViewById(R.id.button3);
Expand All @@ -124,7 +126,7 @@ protected void onCreate(Bundle savedInstanceState) {
tips.add("Tap the number of classes in the calendar page to view your dates.");
tips.add("Most list items and text items are long-clickable.");
tips.add("Heads up! Uninstalling erases all your local data.");
tips.add("Coming soon: Feature to organize PDFs within the app.");
tips.add("Organize PDFs scanned in the app by creating sub-folders.");
tips.add("Tip: You can save your doodle by clicking on the save icon.");
tips.add("Long press a subject in the attendance page to edit.");
tips.add("Fork the project on GitHub to contribute!");
Expand Down
Loading

0 comments on commit dc791bf

Please sign in to comment.