Merge pull request #5 from mshaileshr/development

Development

app/build.gradle

@@ -78,7 +78,6 @@ dependencies {
     implementation 'com.irozon.alertview:alertview:1.0.1'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.irozon.sneaker:sneaker:2.0.0'
-    implementation 'com.github.halilozercan:BetterVideoPlayer:kotlin-SNAPSHOT'
     implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.1'
 
     implementation('com.paytm:pgplussdk:1.3.3') { transitive = true; }

app/debug/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"AppBoat v1.0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]

app/google-services.json

@@ -15,16 +15,12 @@
       },
       "oauth_client": [
         {
-          "client_id": "534879477500-jn3fjsh786273ltt8f14qf55u2v1i8sl.apps.googleusercontent.com",
+          "client_id": "534879477500-0d8a3n7sc0gqhi8tsb2t93neqil3ude3.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.pravrajya.diamond",
-            "certificate_hash": "cbbd5e12583101441e56dcecb8cbf2d30d8e8edc"
+            "certificate_hash": "129c9510d985b6c650a52c783317b50db4afae0a"
           }
-        },
-        {
-          "client_id": "534879477500-hce79pt2b4iqtsdtesdlj3qgt9g9ef9g.apps.googleusercontent.com",
-          "client_type": 3
         }
       ],
       "api_key": [
@@ -33,20 +29,13 @@
         }
       ],
       "services": {
-        "analytics_service": {
-          "status": 1
-        },
         "appinvite_service": {
-          "status": 2,
           "other_platform_oauth_client": [
             {
               "client_id": "534879477500-hce79pt2b4iqtsdtesdlj3qgt9g9ef9g.apps.googleusercontent.com",
               "client_type": 3
             }
           ]
-        },
-        "ads_service": {
-          "status": 2
         }
       }
     }

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"AppBoat v1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -51,10 +51,10 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".views.admin.views.products.AdminProductsActivity" />
+        <!--<activity android:name=".views.admin.views.products.AdminProductsActivity" />-->
         <meta-data android:name="preloaded_fonts" android:resource="@array/preloaded_fonts" />
         <activity
-            android:name=".api.video_player.PDLPlayerActivity"
+            android:name=".api.video_player.WatchVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenLayout|screenSize"
             android:label="@string/my_player_activity" />
     </application>

app/src/main/java/com/pravrajya/diamond/api/video_player/WatchVideoActivity.java

@@ -0,0 +1,66 @@
+package com.pravrajya.diamond.api.video_player;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.databinding.DataBindingUtil;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.pravrajya.diamond.R;
+import com.pravrajya.diamond.databinding.ActivityPdlplayerBinding;
+
+
+public class WatchVideoActivity extends AppCompatActivity {
+
+    private ActivityPdlplayerBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getSupportActionBar().hide();
+        binding = DataBindingUtil.setContentView(this, R.layout.activity_pdlplayer);
+        Intent intent = getIntent();
+        String vedio_link = intent.getStringExtra("vedio_link");
+
+        //pd = new ProgressDialog(WatchVideoActivity.this);
+        //pd.setMessage("Please wait Loading...");
+        binding.progressBar.setVisibility(View.VISIBLE);
+        binding.webview.setWebViewClient(new MyWebViewClient());
+        if (vedio_link!=null && !vedio_link.isEmpty()){
+            binding.webview.loadUrl(vedio_link);
+        }else {
+            binding.webview.loadUrl("https://cutwise.com/diamond/30672");
+        }
+
+    }
+
+
+    private class MyWebViewClient extends WebViewClient {
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+            view.loadUrl(url);
+
+            binding.progressBar.setVisibility(View.VISIBLE);
+
+            return true;
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            System.out.println("on finish");
+            binding.progressBar.setVisibility(View.INVISIBLE);
+
+        }
+    }
+
+
+
+
+
+}

app/src/main/java/com/pravrajya/diamond/tables/RealmManager.java

@@ -1,11 +1,11 @@
 package com.pravrajya.diamond.tables;
+import com.pravrajya.diamond.tables.diamondClarity.DiamondClarityDao;
 import com.pravrajya.diamond.tables.diamondColor.DiamondColorDao;
 import com.pravrajya.diamond.tables.diamondCut.DiamondCutDao;
 import com.pravrajya.diamond.tables.diamondSize.DiamondSizeDao;
 import com.pravrajya.diamond.tables.faq.FaqDao;
 import com.pravrajya.diamond.tables.offers.OfferTableDao;
 import com.pravrajya.diamond.tables.order.CartTableDao;
-import com.pravrajya.diamond.tables.product.ProductList;
 import com.pravrajya.diamond.tables.product.ProductTableDao;
 
 import io.realm.Realm;
@@ -51,6 +51,11 @@ public static DiamondColorDao diamondColorDao() {
         return new DiamondColorDao(mRealm);
     }
 
+    public static DiamondClarityDao diamondClarityDao() {
+        checkForOpenRealm();
+        return new DiamondClarityDao(mRealm);
+    }
+
     public static DiamondSizeDao diamondSizeDao(){
         checkForOpenRealm();
         return new DiamondSizeDao(mRealm);
@@ -67,12 +72,6 @@ public static FaqDao faqDao(){
         return new AdminPanelDao(mRealm);
     }*/
 
-    public static void clear() {
-        checkForOpenRealm();
-        mRealm.executeTransaction(realm -> {
-            realm.delete(ProductList.class);
-        });
-    }
 
     private static void checkForOpenRealm() {
         if (mRealm == null || mRealm.isClosed()) {

app/src/main/java/com/pravrajya/diamond/tables/diamondClarity/DiamondClarity.java

@@ -0,0 +1,36 @@
+package com.pravrajya.diamond.tables.diamondClarity;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class DiamondClarity extends RealmObject {
+
+    @PrimaryKey
+    private String clarity;
+    private String clarityCode;
+
+    public DiamondClarity() {
+    }
+
+
+    public DiamondClarity(String clarity, String clarityCode) {
+        this.clarity = clarity;
+        this.clarityCode = clarityCode;
+    }
+
+    public String getClarity() {
+        return clarity;
+    }
+
+    public void setClarity(String clarity) {
+        this.clarity = clarity;
+    }
+
+    public String getClarityCode() {
+        return clarityCode;
+    }
+
+    public void setClarityCode(String clarityCode) {
+        this.clarityCode = clarityCode;
+    }
+}

app/src/main/java/com/pravrajya/diamond/tables/diamondClarity/DiamondClarityDao.java

@@ -0,0 +1,52 @@
+package com.pravrajya.diamond.tables.diamondClarity;
+
+
+import com.pravrajya.diamond.tables.diamondColor.DiamondColor;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import io.realm.Realm;
+import io.realm.RealmObject;
+import io.realm.RealmResults;
+
+public class DiamondClarityDao {
+
+    private Realm mRealm;
+
+    public DiamondClarityDao(@NonNull Realm realm) {
+        mRealm = realm;
+    }
+
+    public void save(final DiamondClarity diamondClarity) {
+        mRealm.executeTransaction(realm -> realm.copyToRealmOrUpdate(diamondClarity));
+    }
+
+    public void save(final List<DiamondClarity> list) {
+        mRealm.executeTransaction(realm -> realm.copyToRealmOrUpdate(list));
+    }
+
+    public RealmResults<DiamondClarity> loadAll() {
+        return mRealm.where(DiamondClarity.class).findAll();
+    }
+
+    public RealmResults<DiamondClarity> loadAllAsync() {
+        return mRealm.where(DiamondClarity.class).findAll();
+    }
+
+    public RealmObject loadBy(String uid) {
+        return mRealm.where(DiamondClarity.class).equalTo("uid", uid).findFirst();
+    }
+
+    public void remove(@NonNull final RealmObject object) {
+        mRealm.executeTransaction(realm -> object.deleteFromRealm());
+    }
+
+    public void removeAll() {
+        mRealm.executeTransaction(realm -> mRealm.delete(DiamondClarity.class));
+    }
+
+    public long count() {
+        return mRealm.where(DiamondClarity.class).count();
+    }
+}