Merge pull request #4 from cpcincubator/branch-shuvo-fragment

ready to release the alpha version

Author: smnshuvo

.idea/misc.xml

@@ -13,6 +13,10 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     buildTypes {
         release {
@@ -33,6 +37,17 @@ dependencies {
     // Room
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
+    // ButterKnife
+    implementation 'com.jakewharton:butterknife:10.2.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    // Material Design
+    implementation 'com.google.android.material:material:1.1.0'
+    // SpinKit
+    implementation 'com.github.ybq:Android-SpinKit:1.4.0'
+    // OK http
+    implementation "com.squareup.okhttp3:okhttp:4.7.2"
+    // GSON
+    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'

app/build.gradle

@@ -2,14 +2,29 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="cpc.class_planner.sam">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM"/>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".view.BaseActivity">
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
+        <activity android:name=".view.CloudExportActivity"
+            android:exported="true"></activity>
+        <activity
+            android:name=".view.SetupWizardActivity"
+            android:exported="true" />
+        <activity
+            android:name=".view.InputRoutineActivity"
+            android:exported="true" />
+        <activity android:name=".view.BaseActivity"
+
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/AndroidManifest.xml

@@ -1,7 +1,12 @@
 package cpc.class_planner.sam.data;
 
+import androidx.lifecycle.LiveData;
 import androidx.room.Dao;
+import androidx.room.Delete;
 import androidx.room.Insert;
+import androidx.room.Query;
+
+import java.util.List;
 
 import cpc.class_planner.sam.model.Routine;
 
@@ -10,4 +15,21 @@ public interface RoutineDao {
 
     @Insert
     void insertData(Routine routine);
+
+    @Query("SELECT * FROM routine WHERE dayOfTheWeek LIKE :today ORDER BY startingTime")
+    LiveData<List<Routine>> getTodayRoutine(String today);
+
+    @Query("SELECT DISTINCT courseTitle FROM routine")
+    List<String> getCourseNames();
+
+    @Query("SELECT * FROM routine WHERE courseTitle = :courseTitle LIMIT 1")
+    Routine getRoutineByCourseName(String courseTitle);
+
+    @Delete
+    void deleteData(Routine routine);
+
+    @Query("SELECT * FROM routine")
+    List<Routine> getFullRoutine();
+    @Query("DELETE FROM routine")
+    void deleteAll();
 }

app/src/main/ic_launcher-playstore.png

@@ -3,9 +3,11 @@
 import android.content.Context;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 
 import cpc.class_planner.sam.model.Routine;
 
@@ -37,11 +39,28 @@ public static RoutineDatabase getInstance(final Context context){
             routineDatabaseInstance = Room.databaseBuilder(context.getApplicationContext(),
                                         RoutineDatabase.class,
                                             databaseName)
+                                                .addCallback(roomCallBack)
+                                                .allowMainThreadQueries()
                                                 .build();
         }
 
         return routineDatabaseInstance;
     }
 
+    private static RoomDatabase.Callback roomCallBack = new RoomDatabase.Callback(){
+        @Override
+        public void onCreate(@NonNull SupportSQLiteDatabase db) {
+            super.onCreate(db);
+            final RoutineDao routineDao;
+            routineDao = routineDatabaseInstance.routineDao();
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    routineDao.insertData(new Routine("Saturday",1000,1130,"Test Course","SE442","SMN Shuvo","Meet","Z"));
+                }
+            }).start();
+        }
+    };
+
 }
 

app/src/main/java/cpc/class_planner/sam/data/RoutineDao.java

@@ -0,0 +1,51 @@
+package cpc.class_planner.sam.data.repo;
+// This class should have been utilized better
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+
+import org.jetbrains.annotations.NotNull;
+import org.json.JSONArray;
+import org.json.JSONException;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class CloudApi {
+
+
+
+
+
+    // reused the existing version
+    public int getVersion(){
+        OkHttpClient httpClient = new OkHttpClient();
+        String URL = "http://smnshuvo.000webhostapp.com/cpc_getList.php?query=Serial";
+        List<String> spinnerDataList = new ArrayList<String>();
+        String responseText;
+        int cloudVersion = 0;
+        Request request = new Request.Builder()
+                .url(URL)
+                .build();
+        try {
+            Response response = httpClient.newCall(request).execute();
+            responseText = response.body().string();
+            JSONArray jsonArray = new JSONArray(responseText);
+            cloudVersion = jsonArray.optInt(0);
+        } catch (IOException | JSONException e) {
+            e.printStackTrace();
+        }
+
+        return cloudVersion;
+
+    }
+
+}

app/src/main/java/cpc/class_planner/sam/data/RoutineDatabase.java

@@ -14,9 +14,9 @@ public class Routine {
     @ColumnInfo
     private String dayOfTheWeek;    // this is the day of the week. ie: Saturday
     @ColumnInfo
-    private String startingTime;    // the time when the class changes, data type may change in future
+    private int startingTime;    // the time when the class changes, data type may change in future
     @ColumnInfo
-    private String endingTime;      // time when class ends, ie: 10 PM
+    private int endingTime;      // time when class ends, ie: 10 PM
     @ColumnInfo
     private String courseTitle;     // Title of the course
     @ColumnInfo
@@ -25,18 +25,21 @@ public class Routine {
     private String teacher;         // Professor who conducts the course
     @ColumnInfo
     private String roomNo;          // the room no that has been assigned for the course
+    @ColumnInfo
+    private String section;          // the room no that has been assigned for the course
 
     // constructor
 
 
-    public Routine(@NonNull String dayOfTheWeek, String startingTime, String endingTime, String courseTitle, String courseCode, String teacher, String roomNo) {
+    public Routine(@NonNull String dayOfTheWeek, int startingTime, int endingTime, String courseTitle, String courseCode, String teacher, String roomNo, String section) {
         this.dayOfTheWeek = dayOfTheWeek;
         this.startingTime = startingTime;
         this.endingTime = endingTime;
         this.courseTitle = courseTitle;
         this.courseCode = courseCode;
         this.teacher = teacher;
         this.roomNo = roomNo;
+        this.section = section;
     }
 
     // Getters
@@ -50,11 +53,11 @@ public String getDayOfTheWeek() {
         return dayOfTheWeek;
     }
 
-    public String getStartingTime() {
+    public int getStartingTime() {
         return startingTime;
     }
 
-    public String getEndingTime() {
+    public int getEndingTime() {
         return endingTime;
     }
 
@@ -74,6 +77,10 @@ public String getRoomNo() {
         return roomNo;
     }
 
+    public String getSection() {
+        return this.section;
+    }
+
     // Setter
 
     public void setId(long id) {

app/src/main/java/cpc/class_planner/sam/data/repo/CloudApi.java

@@ -0,0 +1,68 @@
+package cpc.class_planner.sam.model;
+
+import android.app.AlertDialog;
+import android.app.AliasActivity;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import cpc.class_planner.sam.R;
+import cpc.class_planner.sam.model.adapter.RoutineItemVIewAdapter;
+import cpc.class_planner.sam.view.BaseActivity;
+import cpc.class_planner.sam.viewmodel.BaseActivityViewModel;
+
+public class RoutineFragment extends Fragment {
+    @BindView(R.id.routine_no_class_bg)
+    ImageView noClassBg;
+    BaseActivityViewModel viewModel;
+    private String dayOfTheWeek;
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.routine_view_pager, container, false);
+        viewModel = ViewModelProviders.of(this).get(BaseActivityViewModel.class);
+        ButterKnife.bind(this, view);
+        // TODO: Need the change the listView ID
+        ListView listView = view.findViewById(R.id.sample_list_view);
+        // get the routine for today's day of the week
+        //List<Routine> routines =
+        viewModel.getDailyRoutine(this.dayOfTheWeek).observe(this, new Observer<List<Routine>>() {
+            @Override
+            public void onChanged(List<Routine> routines) {
+                if(routines.size() == 0){
+                    noClassBg.setVisibility(View.VISIBLE);
+                } else{
+                    RoutineItemVIewAdapter adapter = new RoutineItemVIewAdapter((ArrayList<Routine>) routines, getContext());
+                    listView.setAdapter(adapter);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        });
+
+
+        return view;
+    }
+
+    public RoutineFragment(String text){
+        this.dayOfTheWeek = text;
+    }
+}