Calender View Updated

Taffsigg · Dec 27, 2020 · 0c50299 · 0c50299
1 parent 235993f
commit 0c50299
Show file tree

Hide file tree

Showing 20 changed files with 186 additions and 76 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,17 +2,17 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.mystreetprayer.app"
         manifestPlaceholders = [bootPriority: "999"]
         minSdkVersion 22
         multiDexEnabled true;
-        targetSdkVersion 29
-        versionCode 210
-        versionName "2.3.0"
+        targetSdkVersion 30
+        versionCode 250
+        versionName "2.5.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -36,13 +36,13 @@ dependencies {
 
     // google support library ---------------------------------------------------------------------
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
 
@@ -52,9 +52,9 @@ dependencies {
 
     //Runtime Permission
     implementation 'com.karumi:dexter:6.1.0'
-//
-//    //Audio Player Library
-//    implementation 'com.github.jeancsanchez:JcPlayer:2.6.16'
+
+    //Audio Player Library
+    //implementation 'com.github.jeancsanchez:JcPlayer:2.6.16'
 
     //Volley for http
     implementation 'com.android.volley:volley:1.1.1'
@@ -68,16 +68,16 @@ dependencies {
     // ripple effect for music library
     implementation 'com.balysv:material-ripple:1.0.2'
 
-    implementation 'com.google.firebase:firebase-auth:19.3.1'
-    implementation 'com.google.firebase:firebase-firestore:21.4.3'
-    implementation 'com.google.firebase:firebase-storage:19.1.1'
-    implementation 'com.google.firebase:firebase-database:19.3.0'
-    implementation 'com.google.firebase:firebase-messaging:20.1.6'
-    implementation 'com.google.firebase:firebase-core:17.4.0'
+    implementation 'com.google.firebase:firebase-auth:20.0.1'
+    implementation 'com.google.firebase:firebase-firestore:22.0.1'
+    implementation 'com.google.firebase:firebase-storage:19.2.1'
+    implementation 'com.google.firebase:firebase-database:19.6.0'
+    implementation 'com.google.firebase:firebase-messaging:21.0.1'
+    implementation 'com.google.firebase:firebase-core:18.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'androidx.navigation:navigation-fragment:2.2.2'
-    implementation 'androidx.navigation:navigation-ui:2.2.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.navigation:navigation-fragment:2.3.2'
+    implementation 'androidx.navigation:navigation-ui:2.3.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,7 @@
         <activity android:name=".PrayerRequests" />
         <activity android:name=".UploadVideos" />
         <activity android:name=".CreateNotificationActivity" />
+
         <activity
             android:name=".NotificationActivity"
             android:theme="@style/AppTheme.NoActionBar">
@@ -77,10 +78,20 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".VideosActivity"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".Testimonial" />
+
+        <activity
+            android:name=".PrayerCalender">
+            <intent-filter>
+                <action android:name="CALENDAR" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+
         <activity android:name=".PrayerPoints">
             <intent-filter>
                 <action android:name="PRAYER" />

diff --git a/app/src/main/java/com/mystreetprayer/app/Fragment_Home.java b/app/src/main/java/com/mystreetprayer/app/Fragment_Home.java
@@ -1,10 +1,9 @@
 package com.mystreetprayer.app;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
@@ -25,16 +24,11 @@
 import com.getkeepsafe.taptargetview.TapTarget;
 import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.OnFailureListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.auth.FirebaseAuth;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.firestore.CollectionReference;
-import com.google.firebase.firestore.DocumentReference;
 import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.FirebaseFirestore;
-import com.google.firebase.firestore.Query;
 import com.mystreetprayer.app.alarmclock.ui.AlarmMainActivity;
 
 
@@ -95,7 +89,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         CardView knowthetruth = (CardView) rootView.findViewById(R.id.knowtheTruth);
         CardView covid19page = (CardView) rootView.findViewById(R.id.covid_19);
         CardView prayerRequestPage = (CardView) rootView.findViewById(R.id.prayer_request);
-        CardView testimonialPage = (CardView) rootView.findViewById(R.id.testimonial_view);
+        CardView calenderPage = (CardView) rootView.findViewById(R.id.testimonial_view);
         CardView videoPage = (CardView) rootView.findViewById(R.id.videoViewCard);
         CardView prayerRequest = (CardView) rootView.findViewById(R.id.prayerRequestView);
 
@@ -168,11 +162,19 @@ public void onClick(View v) {
             }
         });
 
+//        calenderPage.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    Uri uri = Uri.parse("https://kpc-prayer-calendar.web.app");
+//                    Intent visitWebsiteIntent = new Intent(Intent.ACTION_VIEW, uri);
+//                    startActivity(visitWebsiteIntent);
+//                }
+//            });
 
-        testimonialPage.setOnClickListener(new View.OnClickListener() {
+        calenderPage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent testimonial = new Intent(getActivity(), Testimonial.class);
+                Intent testimonial = new Intent(getActivity(), PrayerCalender.class);
                 startActivity(testimonial);
             }
         });
@@ -205,6 +207,8 @@ public void onClick(View v) {
     }
 
 
+
+
     //Greeting Message
     private void greetingMessage() {
         greetingText = (TextView) rootView.findViewById(R.id.user_greeting);

diff --git a/app/src/main/java/com/mystreetprayer/app/Fragment_Ignite.java b/app/src/main/java/com/mystreetprayer/app/Fragment_Ignite.java
@@ -67,7 +67,7 @@ public void onRefresh() {
 
 
     private void ingiteWebView() {
-        webView_ignite.loadUrl("https://mystreetprayer.com/ignite-service/");
+        webView_ignite.loadUrl("https://mystreetprayer.com/ignite-service");
         progressBarIgnite.setMax(50);
 
         WebSettings webSettings= webView_ignite.getSettings();

diff --git a/app/src/main/java/com/mystreetprayer/app/Lyrics_MainActivity.java b/app/src/main/java/com/mystreetprayer/app/Lyrics_MainActivity.java
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         FloatingActionButton floatingActionButton = findViewById(R.id.create_new_lyrics);
         //Enable only for admin
-        floatingActionButton.setVisibility(View.VISIBLE);
+        floatingActionButton.setVisibility(View.INVISIBLE);
         floatingActionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/app/src/main/java/com/mystreetprayer/app/NotificationActivity.java b/app/src/main/java/com/mystreetprayer/app/NotificationActivity.java
@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         FloatingActionButton floatingActionButton = findViewById(R.id.create_new_notify);
         //Enable only for admin
-        floatingActionButton.setVisibility(View.VISIBLE);
+        floatingActionButton.setVisibility(View.INVISIBLE);
         floatingActionButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/...a/com/mystreetprayer/app/Testimonial.java → ...om/mystreetprayer/app/PrayerCalender.java b/...a/com/mystreetprayer/app/Testimonial.java → ...om/mystreetprayer/app/PrayerCalender.java
@@ -15,33 +15,32 @@
 
 import java.util.Objects;
 
-public class Testimonial extends AppCompatActivity {
+public class PrayerCalender extends AppCompatActivity {
     private WebView webView_Testimonial;
     ProgressBar progressbarTestimonial;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_testimonial);
+        setContentView(R.layout.activity_prayer_calender);
 
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setTitle("Testimonial");
+        getSupportActionBar().setTitle("Prayer Calendar");
 
         webView_Testimonial =(WebView) findViewById(R.id.testimonialweb);
         progressbarTestimonial = (ProgressBar) findViewById(R.id.testimonialProgressBar);
 
-
-        final SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.testimonial_sr);
-        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                covidWebView();
-                swipeRefreshLayout.setRefreshing(false);
-            }
-        });
+//        final SwipeRefreshLayout swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.testimonial_sr);
+//        swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+//            @Override
+//            public void onRefresh() {
+//                calenderWebView();
+//                swipeRefreshLayout.setRefreshing(false);
+//            }
+//        });
 
 
-        covidWebView();
+        calenderWebView();
 
     }
 
@@ -52,14 +51,15 @@ public boolean onSupportNavigateUp() {
         return true;
     }
 
-    private void covidWebView() {
+    private void calenderWebView() {
 
-        webView_Testimonial.loadUrl("https://mystreetprayer.com/testimony/");
+        webView_Testimonial.loadUrl("https://kpc-prayer-calendar.web.app");
 
         progressbarTestimonial.setMax(50);
         WebSettings webSettings= webView_Testimonial.getSettings();
         webView_Testimonial.getSettings().setDomStorageEnabled(true);
         webView_Testimonial.getSettings().setAppCacheEnabled(true);
+        webView_Testimonial.getSettings().getJavaScriptEnabled();
         webView_Testimonial.getSettings().setLoadsImagesAutomatically(true);
         webView_Testimonial.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         webSettings.setJavaScriptEnabled(true);

diff --git a/app/src/main/java/com/mystreetprayer/app/PrayerPoints.java b/app/src/main/java/com/mystreetprayer/app/PrayerPoints.java
@@ -26,7 +26,6 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_prayer_points);
 
-
         Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setTitle("Prayer Request to Pray");
 
@@ -55,7 +54,7 @@ public boolean onSupportNavigateUp() {
 
     private void prayerPointsWebView() {
 
-        prayerView.loadUrl("https://mystreetprayer.com/prayer-slot/");
+        prayerView.loadUrl("https://mystreetprayer.com/prayer-slot");
 
         progressbarPrayer.setMax(50);
         WebSettings webSettings= prayerView.getSettings();