Merge pull request #50 from JairajJangle/develop

Develop
JairajJangle · Jul 1, 2023 · ac8cec7 · ac8cec7
2 parents 01de2e2 + 389425c
commit ac8cec7
Show file tree

Hide file tree

Showing 44 changed files with 4,950 additions and 503 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,26 +1,27 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
     signingConfigs {
     }
-    compileSdk 32
+    compileSdk 33
     defaultConfig {
         applicationId "com.jairaj.janglegmail.motioneye"
         minSdkVersion 27
-        targetSdkVersion 32
-        versionCode 95
-        versionName "0.9.9.2.5"
+        targetSdkVersion 33
+        versionCode 100
+        versionName "1.0.1"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        resConfigs 'en', 'fr', 'de'
+        resourceConfigurations += ['en', 'fr', 'de']
         proguardFiles
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     applicationVariants.all { variant ->
@@ -52,17 +53,19 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.browser:browser:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.preference:preference-ktx:1.2.0"
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.core:core-ktx:1.10.1'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation 'uk.co.samuelwall:material-tap-target-prompt:3.3.2'
     implementation 'io.github.kobakei:ratethisapp:1.2.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
             android:label="Help and FAQ"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".activities.MainActivity"
+            android:name=".activities.MainActivity.MainActivity"
             android:label="@string/motioneye_servers"
             android:theme="@style/AppTheme.NoActionBar" />
 
@@ -76,9 +76,5 @@
         android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-
 </manifest>
diff --git a/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/AddDeviceDetailsActivity.kt b/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/AddDeviceDetailsActivity.kt
@@ -688,6 +688,7 @@ import android.widget.TextView.OnEditorActionListener
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.jairaj.janglegmail.motioneye.R
+import com.jairaj.janglegmail.motioneye.activities.MainActivity.MainActivity
 import com.jairaj.janglegmail.motioneye.databinding.ActivityAddDeviceDetailBinding
 import com.jairaj.janglegmail.motioneye.utils.AppUtils.showKeyboard
 import com.jairaj.janglegmail.motioneye.utils.Constants
@@ -790,6 +791,7 @@ class AddDeviceDetailsActivity : AppCompatActivity() {
         val driveLinkInputString: String = binding.driveInput.text.toString()
         val usernameInputString: String = binding.usernameInput.text.toString()
         val passwordInputString: String = binding.passwordInput.text.toString()
+        val sortIndex = databaseHelper.sortIndexFromLabel(previousLabel)
 
         val isValidDriveURL = Patterns.WEB_URL.matcher(driveLinkInputString)
             .matches() || driveLinkInputString.isEmpty()
@@ -824,6 +826,8 @@ class AddDeviceDetailsActivity : AppCompatActivity() {
             val encryptedCredJSONStr =
                 databaseHelper.getEncryptedCredJSONStr(usernameInputString, passwordInputString)
 
+            val highestSortIndex = databaseHelper.getHighestSortIndex()
+
             when (editMode) {
                 Constants.EDIT_MODE_NEW_DEV -> {
                     val isInserted = databaseHelper.insertData(
@@ -832,6 +836,7 @@ class AddDeviceDetailsActivity : AppCompatActivity() {
                         portInputString,
                         driveLinkInputString,
                         Constants.PREVIEW_ON,
+                        highestSortIndex,
                         encryptedCredJSONStr
                     )
                     if (isInserted) {
@@ -855,6 +860,7 @@ class AddDeviceDetailsActivity : AppCompatActivity() {
                         urlInputString,
                         portInputString,
                         driveLinkInputString,
+                        sortIndex,
                         encryptedCredJSONStr
                     )
                     if (!isUpdate) Toast.makeText(
@@ -912,6 +918,7 @@ class AddDeviceDetailsActivity : AppCompatActivity() {
         return true
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         setResult(DEVICE_ADDITION_CANCELLED_RESULT_CODE, previousScreen)
         finish()

diff --git a/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/HelpFAQActivity.kt b/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/HelpFAQActivity.kt
@@ -683,7 +683,6 @@ import com.jairaj.janglegmail.motioneye.R
 import com.jairaj.janglegmail.motioneye.databinding.ActivityHelpFaqBinding
 import com.jairaj.janglegmail.motioneye.dataclass.QandA
 import com.jairaj.janglegmail.motioneye.views_and_adapters.QAndARVAdapter
-import java.util.*
 
 class HelpFAQActivity : AppCompatActivity() {
     private lateinit var binding: ActivityHelpFaqBinding
@@ -700,14 +699,14 @@ class HelpFAQActivity : AppCompatActivity() {
         binding.toolbar.title = R.string.help_and_faq.toString()
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
-        binding.recycleviewHFAQ.setHasFixedSize(true)
+        binding.recyclerviewHFAQ.setHasFixedSize(true)
         val llm = LinearLayoutManager(this)
         llm.orientation = LinearLayoutManager.VERTICAL
-        binding.recycleviewHFAQ.layoutManager = llm
+        binding.recyclerviewHFAQ.layoutManager = llm
         createList()
 
         val qAndARvAdapter = QAndARVAdapter(qAndAList)
-        binding.recycleviewHFAQ.adapter = qAndARvAdapter
+        binding.recyclerviewHFAQ.adapter = qAndARvAdapter
     }
 
     private fun createList() {

diff --git a/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/LoadingScreenActivity.kt b/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/LoadingScreenActivity.kt
@@ -685,6 +685,7 @@ import android.os.Looper
 import android.view.WindowInsets
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
+import com.jairaj.janglegmail.motioneye.activities.MainActivity.MainActivity
 import com.jairaj.janglegmail.motioneye.databinding.ActivityLoadingScreenBinding
 import com.jairaj.janglegmail.motioneye.utils.Constants.SPLASH_SCREEN_TIME
 

diff --git a/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/LoadingScreenTvActivity.kt b/app/src/main/java/com/jairaj/janglegmail/motioneye/activities/LoadingScreenTvActivity.kt
@@ -684,6 +684,7 @@ import android.view.Window
 import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import com.jairaj.janglegmail.motioneye.R
+import com.jairaj.janglegmail.motioneye.activities.MainActivity.MainActivity
 import com.jairaj.janglegmail.motioneye.utils.Constants.SPLASH_SCREEN_TIME
 
 class LoadingScreenTvActivity : AppCompatActivity() {