diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a2d7c21..ae388c2 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 773fe0f..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index c5a4cd9..e6d786a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,6 +40,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' implementation 'androidx.navigation:navigation-fragment:2.5.2' implementation 'androidx.navigation:navigation-ui:2.5.2' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/contact/contactus.java b/app/src/main/java/com/futureinsight/futureinsight/ui/contact/contactus.java new file mode 100644 index 0000000..76ba7f4 --- /dev/null +++ b/app/src/main/java/com/futureinsight/futureinsight/ui/contact/contactus.java @@ -0,0 +1,108 @@ +package com.futureinsight.futureinsight.ui.contact; + +import android.content.ActivityNotFoundException; +import android.graphics.Bitmap; +import android.os.Bundle; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import android.view.KeyEvent; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.webkit.WebSettings; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.ProgressBar; + +import com.org.futureinsight.databinding.FragmentContactusBinding; + + + public class contactus extends Fragment { + private FragmentContactusBinding binding; + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { + binding = FragmentContactusBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + try { + final WebView ContactusView = binding.WebViewContact; + String Future_Insight_ContactPage_URL="https://future-insight.blog/contact"; + + final ProgressBar loadingPB = binding.PBLoading; + + WebSettings webSettings = ContactusView.getSettings(); + + //Enable Javascript & alot for the webview loading properties + ContactusView.getSettings().setJavaScriptEnabled(true); + ContactusView.getSettings().setDomStorageEnabled(true); + ContactusView.getSettings().setLoadWithOverviewMode(true); + ContactusView.getSettings().setUseWideViewPort(true); + ContactusView.getSettings().setBuiltInZoomControls(true); + ContactusView.getSettings().setDisplayZoomControls(false); + ContactusView.getSettings().setSupportZoom(true); + ContactusView.getSettings().setDefaultTextEncodingName("utf-8"); + + ContactusView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); + ContactusView.getSettings().setGeolocationEnabled(true); + ContactusView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); + ContactusView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); + webSettings.setUseWideViewPort(true); + webSettings.setSavePassword(true); + webSettings.setSaveFormData(true); + webSettings.setEnableSmoothTransition(true); + + ContactusView.loadUrl(Future_Insight_ContactPage_URL); + + ContactusView.setWebViewClient(new WebViewClient() { + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + loadingPB.setVisibility(View.VISIBLE); + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + loadingPB.setVisibility(View.GONE); + } + }); + + ContactusView.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View view, int keycode, KeyEvent event) { + if (event.getAction() == KeyEvent.ACTION_DOWN) + { + switch (keycode) + { + case KeyEvent.KEYCODE_BACK: + if (ContactusView.canGoBack()) + { + ContactusView.goBack(); + } + break; + } + } + return false; + } + }); + } + catch (ActivityNotFoundException e) { + System.out.println("error: "+ e.getMessage()); + } + return root; + } + + @Override + public void onDestroyView() { + try { + super.onDestroyView(); + binding = null; + } + catch (ActivityNotFoundException e) { + System.out.println("error: "+ e.getMessage()); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryFragment.java b/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryFragment.java index b9a2464..efb6e83 100644 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryFragment.java +++ b/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryFragment.java @@ -1,5 +1,6 @@ package com.futureinsight.futureinsight.ui.gallery; +import android.annotation.SuppressLint; import android.graphics.Bitmap; import android.os.Bundle; import android.view.KeyEvent; @@ -20,85 +21,86 @@ public class GalleryFragment extends Fragment { private FragmentGalleryBinding binding; + @SuppressLint("SetJavaScriptEnabled") public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - GalleryViewModel galleryViewModel = - new ViewModelProvider(this).get(GalleryViewModel.class); - - binding = FragmentGalleryBinding.inflate(inflater, container, false); - View root = binding.getRoot(); - - //Loading web View - final WebView BlogWebView = binding.idWebViewBlog; - // URL of the blog Page - String FutureInsightsBlogURL = "https://future-insight.blog/post/"; - - //Loading Progress Bar - final ProgressBar loadingPB = binding.PBLoading; - - WebSettings webSettings = BlogWebView.getSettings(); - - //Enable Javascript & alot for the webview loading properties - BlogWebView.getSettings().setJavaScriptEnabled(true); - BlogWebView.getSettings().setDomStorageEnabled(true); - BlogWebView.getSettings().setLoadWithOverviewMode(true); - BlogWebView.getSettings().setUseWideViewPort(true); - BlogWebView.getSettings().setBuiltInZoomControls(true); - BlogWebView.getSettings().setDisplayZoomControls(false); - BlogWebView.getSettings().setSupportZoom(true); - BlogWebView.getSettings().setDefaultTextEncodingName("utf-8"); - - //performace improvement settings - BlogWebView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); - BlogWebView.getSettings().setGeolocationEnabled(true); - BlogWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); - BlogWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); - webSettings.setUseWideViewPort(true); - webSettings.setSavePassword(true); - webSettings.setSaveFormData(true); - webSettings.setEnableSmoothTransition(true); - - + ViewGroup container, Bundle savedInstanceState) { + try { + + binding = FragmentGalleryBinding.inflate(inflater, container, false); + View root = binding.getRoot(); + + //Loading web View + final WebView BlogWebView = binding.idWebViewBlog; + // URL of the blog Page + String FutureInsightsBlogURL = "https://future-insight.blog/post/"; + + //Loading Progress Bar + final ProgressBar loadingPB = binding.PBLoading; + + WebSettings webSettings = BlogWebView.getSettings(); + + //Enable Javascript & alot for the webview loading properties + BlogWebView.getSettings().setJavaScriptEnabled(true); + BlogWebView.getSettings().setDomStorageEnabled(true); + BlogWebView.getSettings().setLoadWithOverviewMode(true); + BlogWebView.getSettings().setUseWideViewPort(true); + BlogWebView.getSettings().setBuiltInZoomControls(true); + BlogWebView.getSettings().setDisplayZoomControls(false); + BlogWebView.getSettings().setSupportZoom(true); + BlogWebView.getSettings().setDefaultTextEncodingName("utf-8"); + + //performace improvement settings + BlogWebView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); + BlogWebView.getSettings().setGeolocationEnabled(true); + BlogWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); + BlogWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); + webSettings.setUseWideViewPort(true); + webSettings.setSavePassword(true); + webSettings.setSaveFormData(true); + webSettings.setEnableSmoothTransition(true); +// Loading URL into the Blog Post + BlogWebView.loadUrl(FutureInsightsBlogURL); + BlogWebView.setWebViewClient(new WebViewClient() { + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + loadingPB.setVisibility(View.VISIBLE); + } + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + loadingPB.setVisibility(View.GONE); + } + }); -// Loading URL into the Blog Post - BlogWebView.loadUrl(FutureInsightsBlogURL); - BlogWebView.setWebViewClient(new WebViewClient() { - @Override - public void onPageStarted(WebView view, String url, Bitmap favicon) { - super.onPageStarted(view, url, favicon); - loadingPB.setVisibility(View.VISIBLE); - } - - @Override - public void onPageFinished(WebView view, String url) { - super.onPageFinished(view, url); - loadingPB.setVisibility(View.GONE); - } - }); - - BlogWebView.setOnKeyListener(new View.OnKeyListener() { - @Override - public boolean onKey(View view, int keycode, KeyEvent event) { - if (event.getAction() == KeyEvent.ACTION_DOWN) - { - switch (keycode) + BlogWebView.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View view, int keycode, KeyEvent event) { + if (event.getAction() == KeyEvent.ACTION_DOWN) { - case KeyEvent.KEYCODE_BACK: - if (BlogWebView.canGoBack()) - { - BlogWebView.goBack(); - } - break; + switch (keycode) + { + case KeyEvent.KEYCODE_BACK: + if (BlogWebView.canGoBack()) + { + BlogWebView.goBack(); + } + break; + } } + return false; } - return false; - } - }); + }); + return root; - return root; + }catch(Exception e) { + e.printStackTrace(); + System.out.println(e.getMessage()); + } + return null; } @Override diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryViewModel.java b/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryViewModel.java deleted file mode 100644 index 5b48de8..0000000 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/gallery/GalleryViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.futureinsight.futureinsight.ui.gallery; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class GalleryViewModel extends ViewModel { - - private final MutableLiveData mText; - - public GalleryViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is gallery fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeFragment.java b/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeFragment.java index 8f54b19..1bac1ca 100644 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeFragment.java +++ b/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeFragment.java @@ -1,5 +1,6 @@ package com.futureinsight.futureinsight.ui.home; +import android.annotation.SuppressLint; import android.graphics.Bitmap; import android.os.Bundle; import android.view.KeyEvent; @@ -19,69 +20,69 @@ public class HomeFragment extends Fragment { private FragmentHomeBinding binding; + @SuppressLint("SetJavaScriptEnabled") public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - HomeViewModel homeViewModel = - new ViewModelProvider(this).get(HomeViewModel.class); - - binding = FragmentHomeBinding.inflate(inflater, container, false); - View root = binding.getRoot(); -// web Site URL - String future_insight_home= "https://future-insight.blog/"; -// Web View Client - final WebView homeWebview = binding.idWebViewHome; -// Progress bar - final ProgressBar loadingPb = binding.PBLoading; - - WebSettings webSettings = homeWebview.getSettings(); - -// Loading Url - homeWebview.loadUrl(future_insight_home); - - // Enable Javascript - homeWebview.getSettings().setJavaScriptEnabled(true); - homeWebview.getSettings().setDomStorageEnabled(true); - homeWebview.getSettings().setLoadWithOverviewMode(true); - homeWebview.getSettings().setUseWideViewPort(true); - homeWebview.getSettings().setBuiltInZoomControls(true); - homeWebview.getSettings().setDisplayZoomControls(false); - homeWebview.getSettings().setSupportZoom(true); - homeWebview.getSettings().setDefaultTextEncodingName("utf-8"); - - //performace improvement settings - homeWebview.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); - homeWebview.getSettings().setGeolocationEnabled(true); - homeWebview.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); - homeWebview.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); - webSettings.setUseWideViewPort(true); - webSettings.setSavePassword(true); - webSettings.setSaveFormData(true); - webSettings.setEnableSmoothTransition(true); - - - -// logic for showing or not showing progress bar - homeWebview.setWebViewClient(new WebViewClient(){ - @Override - public void onPageStarted(WebView view, String url, Bitmap favicon) { - super.onPageStarted(view, url, favicon); - loadingPb.setVisibility(View.VISIBLE); - } - - @Override - public void onPageFinished(WebView view, String url) { - super.onPageFinished(view, url); - loadingPb.setVisibility(View.GONE); - } - }); - -// Local for Back button - homeWebview.setOnKeyListener(new View.OnKeyListener() { - @Override - public boolean onKey(View view, int keycode, KeyEvent event) { - if (event.getAction() == KeyEvent.ACTION_DOWN) - { - switch (keycode) + ViewGroup container, Bundle savedInstanceState) { + + try { + binding = FragmentHomeBinding.inflate(inflater, container, false); + View root = binding.getRoot(); +// web Site URL + String future_insight_home= "https://future-insight.blog/"; +// Web View Client + final WebView homeWebview = binding.idWebViewHome; +// Progress bar + final ProgressBar loadingPb = binding.PBLoading; + + WebSettings webSettings = homeWebview.getSettings(); + +// Loading Url + homeWebview.loadUrl(future_insight_home); + + // Enable Javascript + homeWebview.getSettings().setJavaScriptEnabled(true); + homeWebview.getSettings().setDomStorageEnabled(true); + homeWebview.getSettings().setLoadWithOverviewMode(true); + homeWebview.getSettings().setUseWideViewPort(true); + homeWebview.getSettings().setBuiltInZoomControls(true); + homeWebview.getSettings().setDisplayZoomControls(false); + homeWebview.getSettings().setSupportZoom(true); + homeWebview.getSettings().setDefaultTextEncodingName("utf-8"); + + //performace improvement settings + homeWebview.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); + homeWebview.getSettings().setGeolocationEnabled(true); + homeWebview.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); + homeWebview.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); + webSettings.setUseWideViewPort(true); + webSettings.setSavePassword(true); + webSettings.setSaveFormData(true); + webSettings.setEnableSmoothTransition(true); + + + +// logic for showing or not showing progress bar + homeWebview.setWebViewClient(new WebViewClient(){ + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + loadingPb.setVisibility(View.VISIBLE); + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + loadingPb.setVisibility(View.GONE); + } + }); + +// Local for Back button + homeWebview.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View view, int keycode, KeyEvent event) { + if (event.getAction() == KeyEvent.ACTION_DOWN) + { + switch (keycode) { case KeyEvent.KEYCODE_BACK: if (homeWebview.canGoBack()) @@ -90,13 +91,17 @@ public boolean onKey(View view, int keycode, KeyEvent event) { } break; } + } + return false; } - return false; - } - }); + }); + return root; + }catch (Exception e) { + System.out.println(e.getMessage()); + } - return root; + return null; } @Override diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeViewModel.java b/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeViewModel.java deleted file mode 100644 index ce68489..0000000 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/home/HomeViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.futureinsight.futureinsight.ui.home; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class HomeViewModel extends ViewModel { - - private final MutableLiveData mText; - - public HomeViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is home fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowFragment.java b/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowFragment.java index 04b4847..300a6b0 100644 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowFragment.java +++ b/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowFragment.java @@ -2,6 +2,7 @@ import android.graphics.Bitmap; import android.os.Bundle; +import android.os.DeadSystemException; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -21,75 +22,79 @@ public class SlideshowFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - SlideshowViewModel slideshowViewModel = - new ViewModelProvider(this).get(SlideshowViewModel.class); - binding = FragmentSlideshowBinding.inflate(inflater, container, false); - View root = binding.getRoot(); + try{ + binding = FragmentSlideshowBinding.inflate(inflater, container, false); + View root = binding.getRoot(); - final WebView ServicesWebView = binding.WebViewServices; - String FutureInsightSerciesURL = "https://future-insight.blog/services/"; - final ProgressBar loadingPb = binding.PBLoading; + final WebView ServicesWebView = binding.WebViewServices; + String FutureInsightSerciesURL = "https://future-insight.blog/services/"; + final ProgressBar loadingPb = binding.PBLoading; - WebSettings webSettings = ServicesWebView.getSettings(); + WebSettings webSettings = ServicesWebView.getSettings(); - //enable Javascript - ServicesWebView.getSettings().setJavaScriptEnabled(true); - ServicesWebView.getSettings().setDomStorageEnabled(true); - ServicesWebView.getSettings().setLoadWithOverviewMode(true); - ServicesWebView.getSettings().setUseWideViewPort(true); - ServicesWebView.getSettings().setBuiltInZoomControls(true); - ServicesWebView.getSettings().setDisplayZoomControls(false); - ServicesWebView.getSettings().setSupportZoom(true); - ServicesWebView.getSettings().setDefaultTextEncodingName("utf-8"); + //enable Javascript + ServicesWebView.getSettings().setJavaScriptEnabled(true); + ServicesWebView.getSettings().setDomStorageEnabled(true); + ServicesWebView.getSettings().setLoadWithOverviewMode(true); + ServicesWebView.getSettings().setUseWideViewPort(true); + ServicesWebView.getSettings().setBuiltInZoomControls(true); + ServicesWebView.getSettings().setDisplayZoomControls(false); + ServicesWebView.getSettings().setSupportZoom(true); + ServicesWebView.getSettings().setDefaultTextEncodingName("utf-8"); - // Performace improvement settings + // Performace improvement settings - ServicesWebView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); - ServicesWebView.getSettings().setGeolocationEnabled(true); - ServicesWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); - ServicesWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); - webSettings.setUseWideViewPort(true); - webSettings.setSavePassword(true); - webSettings.setSaveFormData(true); - webSettings.setEnableSmoothTransition(true); + ServicesWebView.getSettings().setRenderPriority(WebSettings.RenderPriority.HIGH); + ServicesWebView.getSettings().setGeolocationEnabled(true); + ServicesWebView.getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); + ServicesWebView.setScrollBarStyle(View.SCROLLBARS_INSIDE_OVERLAY); + webSettings.setUseWideViewPort(true); + webSettings.setSavePassword(true); + webSettings.setSaveFormData(true); + webSettings.setEnableSmoothTransition(true); - //loading URl into WebView - ServicesWebView.loadUrl(FutureInsightSerciesURL); + //loading URl into WebView + ServicesWebView.loadUrl(FutureInsightSerciesURL); - ServicesWebView.setWebViewClient(new WebViewClient() { - @Override - public void onPageStarted(WebView view, String url, Bitmap favicon) { - super.onPageStarted(view, url, favicon); - loadingPb.setVisibility(View.VISIBLE); - } + ServicesWebView.setWebViewClient(new WebViewClient() { + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + loadingPb.setVisibility(View.VISIBLE); + } - @Override - public void onPageFinished(WebView view, String url) { - super.onPageFinished(view, url); - loadingPb.setVisibility(View.GONE); - } - }); + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + loadingPb.setVisibility(View.GONE); + } + }); - ServicesWebView.setOnKeyListener(new View.OnKeyListener() { - @Override - public boolean onKey(View view, int keycode, KeyEvent event) { - if (event.getAction() == KeyEvent.ACTION_DOWN) - { - switch (keycode) + ServicesWebView.setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View view, int keycode, KeyEvent event) { + if (event.getAction() == KeyEvent.ACTION_DOWN) { - case KeyEvent.KEYCODE_BACK: - if (ServicesWebView.canGoBack()) - { - ServicesWebView.goBack(); - } - break; + switch (keycode) + { + case KeyEvent.KEYCODE_BACK: + if (ServicesWebView.canGoBack()) + { + ServicesWebView.goBack(); + } + break; + } } + return false; } - return false; - } - }); - return root; + }); + return root; + } + catch(Exception e) { + System.out.println("DeadSystemException: " + e.getMessage()); + } + return null; } @Override diff --git a/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowViewModel.java b/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowViewModel.java deleted file mode 100644 index 95c0776..0000000 --- a/app/src/main/java/com/futureinsight/futureinsight/ui/slideshow/SlideshowViewModel.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.futureinsight.futureinsight.ui.slideshow; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class SlideshowViewModel extends ViewModel { - - private final MutableLiveData mText; - - public SlideshowViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("This is slideshow fragment"); - } - - public LiveData getText() { - return mText; - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/android_development.xml b/app/src/main/res/drawable/android_development.xml new file mode 100644 index 0000000..ecd54af --- /dev/null +++ b/app/src/main/res/drawable/android_development.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/assignment.xml b/app/src/main/res/drawable/assignment.xml new file mode 100644 index 0000000..876fe5f --- /dev/null +++ b/app/src/main/res/drawable/assignment.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/app/src/main/res/drawable/contact_us.xml b/app/src/main/res/drawable/contact_us.xml new file mode 100644 index 0000000..4156d53 --- /dev/null +++ b/app/src/main/res/drawable/contact_us.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_machine_learning.xml b/app/src/main/res/drawable/ic_machine_learning.xml new file mode 100644 index 0000000..a9ef9cb --- /dev/null +++ b/app/src/main/res/drawable/ic_machine_learning.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/web_development.xml b/app/src/main/res/drawable/web_development.xml new file mode 100644 index 0000000..6899409 --- /dev/null +++ b/app/src/main/res/drawable/web_development.xml @@ -0,0 +1,26 @@ + + + + + + + diff --git a/app/src/main/res/layout/fragment_contactus.xml b/app/src/main/res/layout/fragment_contactus.xml new file mode 100644 index 0000000..100e978 --- /dev/null +++ b/app/src/main/res/layout/fragment_contactus.xml @@ -0,0 +1,27 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml index a23d1e0..fba92e0 100644 --- a/app/src/main/res/layout/fragment_gallery.xml +++ b/app/src/main/res/layout/fragment_gallery.xml @@ -25,10 +25,4 @@ android:id="@+id/PBLoading" /> - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 84fe870..f14b1c2 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -2,9 +2,11 @@ + tools:showIn="navigation_view" + > + + android:title="@string/menu_blogs" + /> + + android:title="@string/menu_services" + /> + - \ No newline at end of file + + diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 6db75c9..b925616 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -24,4 +24,11 @@ android:label="@string/services" tools:layout="@layout/fragment_slideshow" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 818e0ad..472ff10 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,12 +13,15 @@ Slideshow - Blogs - Services + Blogs + Services futureinsightblog@gmail.com OOPS! No Internet Connection Please check your connection Retry + + Hello blank fragment + Contact US \ No newline at end of file diff --git a/new.xml b/new.xml new file mode 100644 index 0000000..27e860f --- /dev/null +++ b/new.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +