refractored everything

kamaravichow · May 14, 2021 · 54304dc · 54304dc
1 parent ae4cac2
commit 54304dc
Show file tree

Hide file tree

Showing 11 changed files with 381 additions and 52 deletions.
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,48 @@
+{
+  "project_info": {
+    "project_number": "957309260090",
+    "firebase_url": "https://clapoutsocial.firebaseio.com",
+    "project_id": "clapoutsocial",
+    "storage_bucket": "clapoutsocial.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:957309260090:android:4c0b28fe3e19c793d60003",
+        "android_client_info": {
+          "package_name": "com.aravi.dot"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "957309260090-4i41f1areom9obbifkj2bduoavo4kqoq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.aravi.dot",
+            "certificate_hash": "fd2cbfcce4368a6e2264f20857921cd9196d675b"
+          }
+        },
+        {
+          "client_id": "957309260090-f0mo8sm1kva49kepuupk86in153n5ssu.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA_FgoC5o4YsU6vji-tEjXovmUzg_ldWzI"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "957309260090-f0mo8sm1kva49kepuupk86in153n5ssu.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/...i/dotpro/activities/log/LogsActivity.java → ...ravi/dot/activities/log/LogsActivity.java b/...i/dotpro/activities/log/LogsActivity.java → ...ravi/dot/activities/log/LogsActivity.java
@@ -15,18 +15,18 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.activities.log;
+package com.aravi.dot.activities.log;
 
 import android.os.Bundle;
 import android.view.View;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProviders;
 
-import com.aravi.dotpro.R;
-import com.aravi.dotpro.adapter.LogAdapter;
-import com.aravi.dotpro.databinding.ActivityLogsBinding;
-import com.aravi.dotpro.model.Logs;
+import com.aravi.dot.R;
+import com.aravi.dot.activities.log.adapter.LogAdapter;
+import com.aravi.dot.databinding.ActivityLogsBinding;
+import com.aravi.dot.model.Logs;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.ArrayList;
@@ -102,14 +102,14 @@ private void showSnackBar(String message) {
     @Override
     public void onBackPressed() {
 //        try {
-//            Intent adIntent = new Intent().setClassName(this, "com.aravi.dotpro.ads.AdvertisementActivity");
+//            Intent adIntent = new Intent().setClassName(this, "com.aravi.dot.ads.AdvertisementActivity");
 //            startActivity(adIntent);
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
 
 
-//        Intent launchIntent = getPackageManager().getLaunchIntentForPackage("com.aravi.dotpro.ads.AdvertisementActivity");
+//        Intent launchIntent = getPackageManager().getLaunchIntentForPackage("com.aravi.dot.ads.AdvertisementActivity");
 //        if (launchIntent != null) {
 //            startActivity(launchIntent);//null pointer check in case package name was not found
 //        }

diff --git a/.../dotpro/activities/log/LogsViewModel.java → ...avi/dot/activities/log/LogsViewModel.java b/.../dotpro/activities/log/LogsViewModel.java → ...avi/dot/activities/log/LogsViewModel.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.activities.log;
+package com.aravi.dot.activities.log;
 
 /**
  * Created by Aravind Chowdary on
@@ -26,7 +26,8 @@
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 
-import com.aravi.dotpro.model.Logs;
+import com.aravi.dot.activities.log.database.LogsRepository;
+import com.aravi.dot.model.Logs;
 
 import java.util.List;
 

diff --git a/.../com/aravi/dotpro/adapter/LogAdapter.java → ...ot/activities/log/adapter/LogAdapter.java b/.../com/aravi/dotpro/adapter/LogAdapter.java → ...ot/activities/log/adapter/LogAdapter.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.adapter;
+package com.aravi.dot.activities.log.adapter;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -27,9 +27,9 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.aravi.dotpro.R;
-import com.aravi.dotpro.Utils;
-import com.aravi.dotpro.model.Logs;
+import com.aravi.dot.R;
+import com.aravi.dot.util.Utils;
+import com.aravi.dot.model.Logs;
 
 import java.util.List;
 
@@ -100,6 +100,26 @@ public void onBindViewHolder(@NonNull final LogHolder holder, int position) {
                 break;
 
         }
+
+
+        switch (item.getLoc_state()) {
+            case 0:
+                holder.locStart.setVisibility(View.INVISIBLE);
+                holder.locStop.setVisibility(View.INVISIBLE);
+                holder.logLocDot.setVisibility(View.INVISIBLE);
+                break;
+            case 1:
+                holder.logLocDot.setVisibility(View.VISIBLE);
+                holder.locStart.setVisibility(View.VISIBLE);
+                holder.locStop.setVisibility(View.INVISIBLE);
+                break;
+            case 2:
+                holder.logLocDot.setVisibility(View.VISIBLE);
+                holder.locStart.setVisibility(View.INVISIBLE);
+                holder.locStop.setVisibility(View.VISIBLE);
+                break;
+
+        }
     }
 
     @Override
@@ -111,6 +131,5 @@ public int getItemCount() {
     }
 
 
-
 }
 
diff --git a/...a/com/aravi/dotpro/adapter/LogHolder.java → ...dot/activities/log/adapter/LogHolder.java b/...a/com/aravi/dotpro/adapter/LogHolder.java → ...dot/activities/log/adapter/LogHolder.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.adapter;
+package com.aravi.dot.activities.log.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -24,7 +24,7 @@
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.aravi.dotpro.R;
+import com.aravi.dot.R;
 
 import de.hdodenhof.circleimageview.CircleImageView;
 
@@ -35,9 +35,9 @@ public class LogHolder extends RecyclerView.ViewHolder {
 
     public final RelativeLayout item;
     public final CircleImageView appIcon;
-    public final ImageView logCamDot, logMicDot;
+    public final ImageView logCamDot, logMicDot, logLocDot;
     public final TextView appName, appPackage, appTimestamp;
-    public final View cameraStart, cameraStop, micStart, micStop;
+    public final View cameraStart, cameraStop, micStart, micStop, locStart, locStop;
 
     public LogHolder(View itemView) {
         super(itemView);
@@ -49,10 +49,13 @@ public LogHolder(View itemView) {
 
         logCamDot = itemView.findViewById(R.id.logCameraDot);
         logMicDot = itemView.findViewById(R.id.logMicDot);
+        logLocDot = itemView.findViewById(R.id.logLocDot);
 
         cameraStart = itemView.findViewById(R.id.lineCameraStart);
         cameraStop = itemView.findViewById(R.id.lineCameraStop);
         micStart = itemView.findViewById(R.id.lineMicStart);
         micStop = itemView.findViewById(R.id.lineMicStop);
+        locStart = itemView.findViewById(R.id.lineLocStart);
+        locStop = itemView.findViewById(R.id.lineLocStop);
     }
 }
diff --git a/app/src/main/java/com/aravi/dot/activities/log/database/LogsDao.java b/app/src/main/java/com/aravi/dot/activities/log/database/LogsDao.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021.  Aravind Chowdary (@kamaravichow)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.aravi.dot.activities.log.database;
+
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
+
+import com.aravi.dot.model.Logs;
+
+import java.util.List;
+
+@Dao
+public interface LogsDao {
+
+    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    void insert(Logs logs);
+
+    @Query("DELETE FROM logs_database")
+    void clearAllLogs();
+
+    @Query("SELECT * FROM logs_database ORDER BY timestamp DESC")
+    LiveData<List<Logs>> getOrderedLogs();
+}
diff --git a/...dotpro/activities/log/LogsRepository.java → ...tivities/log/database/LogsRepository.java b/...dotpro/activities/log/LogsRepository.java → ...tivities/log/database/LogsRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020.  Aravind Chowdary (@kamaravichow)
+ * Copyright (C) 2021.  Aravind Chowdary (@kamaravichow)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.activities.log;
+package com.aravi.dot.activities.log.database;
 
 /**
  * Created by Aravind Chowdary on
@@ -25,7 +25,9 @@
 
 import androidx.lifecycle.LiveData;
 
-import com.aravi.dotpro.model.Logs;
+import com.aravi.dot.activities.log.database.LogsDao;
+import com.aravi.dot.activities.log.database.LogsRoomDatabase;
+import com.aravi.dot.model.Logs;
 
 import java.util.List;
 
@@ -46,7 +48,7 @@ public LogsRepository(Application application) {
     /**
      * @return
      */
-    LiveData<List<Logs>> getLogs() {
+    public LiveData<List<Logs>> getLogs() {
         // Room executes all queries on a separate thread.
         // Observed LiveData will notify the observer when the data has changed.
         return logLiveData;

diff --git a/...tpro/activities/log/LogsRoomDatabase.java → ...vities/log/database/LogsRoomDatabase.java b/...tpro/activities/log/LogsRoomDatabase.java → ...vities/log/database/LogsRoomDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020.  Aravind Chowdary (@kamaravichow)
+ * Copyright (C) 2021.  Aravind Chowdary (@kamaravichow)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.aravi.dotpro.activities.log;
+package com.aravi.dot.activities.log.database;
 
 
 import android.content.Context;
@@ -26,7 +26,7 @@
 import androidx.room.RoomDatabase;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
-import com.aravi.dotpro.model.Logs;
+import com.aravi.dot.model.Logs;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -35,11 +35,12 @@
  * Created by Aravind Chowdary on
  **/
 
-@Database(entities = {Logs.class}, version = 1, exportSchema = true)
+@Database(entities = {Logs.class}, version = 3, exportSchema = true)
 public abstract class LogsRoomDatabase extends RoomDatabase {
     private static final int NUMBER_OF_THREADS = 4;
 
     public abstract LogsDao logsDao();
+
     private static volatile LogsRoomDatabase INSTANCE;
     static final ExecutorService databaseWriteExecutor = Executors.newFixedThreadPool(NUMBER_OF_THREADS);
 
@@ -52,7 +53,7 @@ static LogsRoomDatabase getDatabase(final Context context) {
             synchronized (LogsRoomDatabase.class) {
                 if (INSTANCE == null) {
                     INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-                            LogsRoomDatabase.class, "logs_database")
+                            LogsRoomDatabase.class, "logsfree")
                             .addCallback(sRoomDatabaseCallback)
                             .build();
                 }