Fixing Issue #23

roseacademies · Oct 11, 2018 · 2b7254d · 2b7254d
1 parent a8b951e
commit 2b7254d
Show file tree

Hide file tree

Showing 42 changed files with 19 additions and 1,878 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,7 +35,6 @@ dependencies {
     implementation 'com.android.support:gridlayout-v7:26.1.0'
     implementation 'com.google.android.gms:play-services-maps:11.8.0'
     implementation 'com.google.android.gms:play-services-auth:11.8.0'
-    compile 'sun.bob:mcalendarview:1.0.0'
 }
 
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.roseacademies.hedhihelp">
 
-    <!-- To auto-complete the email text field in the login form with the user's emails -->
+    <!-- To auto-complete the email text field in the login form with the user's emails
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.READ_PROFILE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" /> -->
 
     <application
         android:allowBackup="true"
@@ -14,7 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".HomeActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -26,16 +26,10 @@
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />
 
-        <activity android:name=".AccountActivity" />
-        <activity android:name=".HomeActivity" />
         <activity android:name=".LessonActivity" />
         <activity android:name=".ResourceActivity" />
         <activity android:name=".SurveyActivity" />
         <activity android:name=".CalendarActivity" />
-        <activity
-            android:name=".CalendarSettingsActivity"
-            android:label="@string/title_activity_period_settings"
-            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".FullscreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -52,11 +46,8 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".AboutActivity"
-            android:label="@string/title_activity_forum"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".about"
             android:label="@string/about_module"
-            android:theme="@style/AppTheme.NoActionBar"/>
+            android:theme="@style/AppTheme.NoActionBar" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/roseacademies/hedhihelp/AccountActivity.java b/app/src/main/java/org/roseacademies/hedhihelp/AccountActivity.java
diff --git a/app/src/main/java/org/roseacademies/hedhihelp/CalendarSettingsActivity.java b/app/src/main/java/org/roseacademies/hedhihelp/CalendarSettingsActivity.java
diff --git a/app/src/main/java/org/roseacademies/hedhihelp/ClinicView.java b/app/src/main/java/org/roseacademies/hedhihelp/ClinicView.java
@@ -30,25 +30,25 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.clinic_info);
 
-        webview = (WebView) findViewById(R.id.myWebView);
+        webview = findViewById(R.id.myWebView);
         webview.setVisibility(View.GONE);
 
         this.selected = (Clinic) getIntent().getSerializableExtra("SelectedClinic");
 
-        TextView mT1 = (TextView) findViewById(R.id.clinic_name);
+        TextView mT1 = findViewById(R.id.clinic_name);
         mT1.setText(selected.getName());
 
-        TextView mT2 = (TextView) findViewById(R.id.clinic_address);
+        TextView mT2 = findViewById(R.id.clinic_address);
         mT2.setText(selected.getAddress());
 
-        TextView mT3 = (TextView) findViewById(R.id.clinic_phone);
+        TextView mT3 = findViewById(R.id.clinic_phone);
         mT3.setText(selected.getPhone());
 
-        mWebButton = (Button) findViewById(R.id.directions_button);
+        mWebButton = findViewById(R.id.directions_button);
         mWebButton.setVisibility(View.VISIBLE);
         mWebButton.setOnClickListener(this);
 
-        mHideButton = (Button) findViewById(R.id.hide_button);
+        mHideButton = findViewById(R.id.hide_button);
         mHideButton.setVisibility(View.GONE);
         mHideButton.setOnClickListener(this);
     }

diff --git a/app/src/main/java/org/roseacademies/hedhihelp/ClinicsActivity.java b/app/src/main/java/org/roseacademies/hedhihelp/ClinicsActivity.java
@@ -30,7 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
         initClinics();
         ArrayAdapter adapter = new ArrayAdapter<String>(this, R.layout.activity_clinics,R.id.textview, clinicNames);
 
-        ListView listView = (ListView) findViewById(R.id.mobile_list);
+        ListView listView = findViewById(R.id.mobile_list);
         listView.setAdapter(adapter);
         listView.setOnItemClickListener(this);
     }

diff --git a/app/src/main/java/org/roseacademies/hedhihelp/DataModels/AppUser.java b/app/src/main/java/org/roseacademies/hedhihelp/DataModels/AppUser.java