Initial_Commit

GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java

@@ -10,7 +10,6 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -26,28 +25,22 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-//import com.crashlytics.android.Crashlytics;
-
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
 import com.google.gson.Gson;
 
 import org.json.JSONObject;
-
-import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -68,11 +61,10 @@ import cpm.com.gskmtorange.dailyentry.StoreListActivity;
 import cpm.com.gskmtorange.dailyentry.WebViewActivity;
 import cpm.com.gskmtorange.download.DownloadActivity;
 import cpm.com.gskmtorange.password.ChangePasswordActivity;
-import cpm.com.gskmtorange.pharma_stores.PharmaActivity;
-import cpm.com.gskmtorange.pharma_stores.PharmaActivityFragment;
 import cpm.com.gskmtorange.upload.PreviousDataUploadActivity;
 import cpm.com.gskmtorange.upload.UploadActivity;
 import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
+import cpm.com.gskmtorange.xmlGetterSetter.NoticeItem;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
@@ -83,6 +75,7 @@ public class MainActivity extends AppCompatActivity
     private Handler sliderHandler = new Handler();
     private Runnable sliderRunnable;
     private List<ImageView> dots = new ArrayList<>();
+    List<NoticeItem>bannerlist = null;
     String date;
     String app_ver;
     private SharedPreferences preferences = null;
@@ -111,25 +104,31 @@ public class MainActivity extends AppCompatActivity
         imageView = (ImageView) findViewById(R.id.img_main);
         dotsLayout = findViewById(R.id.dotsLayout);
         webView = (WebView) findViewById(R.id.webview);
-       // String url = preferences.getString(CommonString.KEY_NOTICE_BOARD_LINK, "");
-        String url = "https://dle.parinaam.in/OneApp/Dabur/brand-spiels/dabur-brand-spiels.html";
+        String url = preferences.getString(CommonString.KEY_NOTICE_BOARD_LINK, "");
+      //  String url = "https://dle.parinaam.in/OneApp/Dabur/brand-spiels/dabur-brand-spiels.html";
         user_name = preferences.getString(CommonString.KEY_USERNAME, null);
         country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
         db = new GSKOrangeDB(MainActivity.this);
+        db.open();
         webView.setWebViewClient(new MyWebViewClient());
         webView.getSettings().setJavaScriptEnabled(true);
 
-        String json = loadJSONFromAsset();
+        String json = preferences.getString("NOTICEBOARD_DATA", null);
+        Log.d("noticejsondata",json);
+        if (json != null) {
+            Gson gson = new Gson();
+            NoticeResponse response =
+                    gson.fromJson(json, NoticeResponse.class);
+           bannerlist = response.Mer_NoticeBoard;
+            Log.d("SIZE", String.valueOf(bannerlist.size()));
+        }
 
-        Gson gson = new Gson();
-        NoticeResponse response = gson.fromJson(json, NoticeResponse.class);
-        List<NoticeItem> list = response.getMer_NoticeBoard();
-        Log.d("listdata", String.valueOf(list.size()));
-        setupDots(list.size());
 
-        viewPager.setAdapter(new NoticeAdapter(list, item -> handleClick(item)));
+        if(bannerlist!=null && bannerlist.size()>0){
+            setupDots(bannerlist.size());
+            viewPager.setAdapter(new NoticeAdapter(bannerlist, this::handleClick));
+        }
         viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-
             @Override
             public void onPageSelected(int position) {
                 super.onPageSelected(position);
@@ -241,14 +240,16 @@ public class MainActivity extends AppCompatActivity
 
     private void handleClick(NoticeItem item) {
 
-        String url = item.getNoticeLink_FullPage();
-        String type = item.getFullPageTarget();
+        String url = String.valueOf(item.getNoticeLink_FullPage());
+        String type = String.valueOf(item.getFullPageTarget());
+        Log.d("clickdata",url + ","+type);
 
         if (type == null) return;
 
         switch (type.toLowerCase()) {
 
             case "html-webview":
+                Log.d("itemdata", String.valueOf(item.getFullPageTarget()));
                 Intent webIntent = new Intent(this, WebViewActivity.class);
                 webIntent.putExtra("url", url);
                 webIntent.putExtra("type", item.getFullPageTarget());
@@ -378,7 +379,7 @@ public class MainActivity extends AppCompatActivity
         nav_route_plan14.setTitle(getResources().getString(R.string.menu_services));
 
         MenuItem nav_route_plan15 = menu.findItem(R.id.nav_version);
-        nav_route_plan15.setTitle("Version/Versiyon - " + app_ver + "-T2");
+        nav_route_plan15.setTitle("Version/Versiyon - " + app_ver + "-T3");
         //Enable disable According to Configuration
         ArrayList<ConfigurationMasterGetterSetter> configurationData = db.getConfigurationMasterData(country_id);
         if (!configurationData.isEmpty()) {
@@ -454,6 +455,7 @@ public class MainActivity extends AppCompatActivity
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         if (drawer.isDrawerOpen(GravityCompat.START)) {
             drawer.closeDrawer(GravityCompat.START);
@@ -766,8 +768,10 @@ public class MainActivity extends AppCompatActivity
         public void onBindViewHolder(NoticeAdapter.ViewHolder holder, int position) {
             NoticeItem item = list.get(position);
 
+            String url = String.valueOf(item.getNoticeLink_Thumbnail());
             Glide.with(holder.itemView.getContext())
-                    .load(item.getNoticeLink_Thumbnail())
+                    .load(url)
+                    .transform(new RoundedCorners(30))
                     .into(holder.image);
 
             holder.itemView.setOnClickListener(v -> {