updated design

vamsii777 · Dec 24, 2021 · f6731c4 · f6731c4
1 parent 9dd29ff
commit f6731c4
Show file tree

Hide file tree

Showing 47 changed files with 144 additions and 120 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,19 +4,18 @@ apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "com.bugsnag.android.gradle"
-apply plugin: 'com.google.firebase.firebase-perf'
+//apply plugin: 'com.google.firebase.firebase-perf'
 
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
     defaultConfig {
         applicationId "download.crossally.apps.hizkiyyah"
         minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 20
-        multiDexEnabled true
-        versionName  "1.4.21"
+        targetSdkVersion 31
+        versionCode 21
+        versionName  "1.6.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -26,102 +25,100 @@ android {
         release {
             minifyEnabled true
             shrinkResources true
-            multiDexKeepFile file('multidex-config.txt')
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            minifyEnabled false
-            shrinkResources false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     packagingOptions {
         exclude 'AndroidManifest.xml'
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
     ndkVersion '22.0.6917172 rc1'
-
+    googleServices.disableVersionCheck = true
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // Import the Firebase BoM
     implementation platform('com.google.firebase:firebase-bom:26.3.0')
-    implementation "org.jetbrains.kotlin:kotlin-reflect:1.4.32"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.6.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0"
     implementation('com.smartlook.recording:app:1.5.2-native')
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'com.google.android.material:material:1.4.0-alpha02'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'com.google.android.material:material:1.6.0-alpha01'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.google.firebase:firebase-database-ktx'
     implementation 'com.google.firebase:firebase-auth-ktx'
     implementation 'com.google.firebase:firebase-storage-ktx'
-    implementation 'com.google.android.gms:play-services-ads:20.2.0'
-    implementation 'com.facebook.stetho:stetho:1.5.1'
-    implementation 'com.facebook.stetho:stetho-okhttp:1.5.1'
-    implementation 'com.facebook.stetho:stetho-js-rhino:1.5.1'
+    implementation 'com.google.android.gms:play-services-ads:20.5.0'
+    implementation 'com.facebook.stetho:stetho:1.6.0'
+    implementation 'com.facebook.stetho:stetho-okhttp:1.6.0'
+    implementation 'com.facebook.stetho:stetho-js-rhino:1.6.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.jakewharton:butterknife:10.2.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.firebase:firebase-inappmessaging-display-ktx'
-    implementation 'com.google.firebase:firebase-firestore:22.1.2'
+    implementation 'com.google.firebase:firebase-firestore:24.0.0'
     kapt 'com.jakewharton:butterknife-compiler:10.2.3'
     implementation 'io.github.inflationx:calligraphy3:3.1.1'
     implementation 'io.github.inflationx:viewpump:2.0.3'
     implementation 'com.mikhaellopez:circularimageview:4.2.0'
     implementation 'me.relex:circleindicator:2.1.4'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'com.google.firebase:firebase-crashlytics:17.4.1'
+    implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
     // Jetpack Navigation
-    def nav_version = '2.3.2'
+    def nav_version = '2.3.5'
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
     // FirebaseUI for Real-time database
-    implementation 'com.firebaseui:firebase-ui-database:7.1.1'
+    implementation 'com.firebaseui:firebase-ui-database:8.0.0'
     // Paging Library (For Pagination Only)
-    implementation 'androidx.paging:paging-runtime-ktx:3.0.0'
+    implementation 'androidx.paging:paging-runtime-ktx:3.1.0'
     // Recommended: Add the Firebase SDK for Google Analytics.
     implementation 'com.google.firebase:firebase-analytics-ktx'
     // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:17.4.1'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.6'
     // debugImplementation because LeakCanary should only run in debug builds.
     implementation 'com.squareup.picasso:picasso:2.71828'  // picasso library
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
-    implementation('org.jitsi.react:jitsi-meet-sdk:3.0.0') { transitive = true }
+    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
+    implementation('org.jitsi.react:jitsi-meet-sdk:4.1.0') { transitive = true }
 
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
     implementation 'com.github.ajalt:timberkt:1.5.1'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'com.github.sephiroth74:NumberSlidingPicker:1.0.3'
     implementation 'com.github.florent37:diagonallayout:1.0.9'
     implementation 'com.github.javiersantos:AppUpdater:2.7'
-    implementation 'com.vungle:publisher-sdk-android:6.7.0'
-    implementation 'com.google.ads.mediation:vungle:6.9.1.1'
-    implementation 'com.google.ads.mediation:mopub:5.17.0.0'
-    implementation 'com.google.android.play:core:1.10.0'
-    implementation 'com.adcolony:sdk:4.5.0'
+    implementation 'com.vungle:publisher-sdk-android:6.10.2'
+    implementation 'com.google.ads.mediation:vungle:6.10.2.0'
+    implementation 'com.google.ads.mediation:mopub:5.18.0.0'
+    implementation 'com.google.android.play:core:1.10.2'
+    implementation 'com.adcolony:sdk:4.6.5'
     implementation 'com.pierfrancescosoffritti.androidyoutubeplayer:core:10.0.5'
     //implementation 'com.github.HamidrezaAmz:MagicalExoPlayer:1.0.16'
     //implementation 'com.github.halilozercan:BetterVideoPlayer:kotlin-SNAPSHOT'
-    implementation 'com.google.ads.mediation:facebook:6.5.0.0'
-    implementation 'com.google.ads.mediation:adcolony:4.5.0.0'
+    implementation 'com.google.ads.mediation:facebook:6.8.0.0'
+    implementation 'com.google.ads.mediation:adcolony:4.6.5.0'
     // Add the dependency for the Performance Monitoring library
-    implementation 'com.google.firebase:firebase-perf-ktx'
-    implementation "com.bugsnag:bugsnag-android:5.0.2"
+    //implementation 'com.google.firebase:firebase-perf-ktx'
+    implementation 'com.bugsnag:bugsnag-android:5.17.0'
     testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
 
 android.buildTypes.release.ndk.debugSymbolLevel = 'FULL'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -54,6 +54,7 @@
             android:configChanges="orientation|screenSize"
             android:label="@string/app_name"
             android:noHistory="true"
+            android:exported="true"
             android:screenOrientation="sensorPortrait"
             android:theme="@style/AppTheme.Splash">
             <intent-filter>

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/download/crossally/apps/hizkiyyah/IntroActivity.kt b/app/src/main/java/download/crossally/apps/hizkiyyah/IntroActivity.kt
@@ -111,7 +111,7 @@ class IntroActivity : AppCompatActivity() {
         //arrSlider.add(Intro(ContextCompat.getDrawable(this@IntroActivity, R.drawable.ic_slider_1), "Start a Meeting"))
         //arrSlider.add(Intro(ContextCompat.getDrawable(this@IntroActivity, R.drawable.ic_slider_2), "Schedule Your Meeting"))
         //arrSlider.add(Intro(ContextCompat.getDrawable(this@IntroActivity, R.drawable.ic_slider_3), "Message Your Team"))
-        arrSlider.add(Intro(ContextCompat.getDrawable(this@IntroActivity, R.drawable.ic_meeting), "Welcome to Meetp!"))
+        arrSlider.add(Intro(ContextCompat.getDrawable(this@IntroActivity, R.mipmap.ic_launcher), "Welcome to Meetp!"))
         introPagerAdapter = IntroPagerAdapter(this@IntroActivity, arrSlider)
         viewPager!!.adapter = introPagerAdapter
         circleIndicator!!.setViewPager(viewPager)

diff --git a/app/src/main/java/download/crossally/apps/hizkiyyah/meeting/MeetingActivity.kt b/app/src/main/java/download/crossally/apps/hizkiyyah/meeting/MeetingActivity.kt
@@ -85,14 +85,13 @@ class MeetingActivity : FragmentActivity(), JitsiMeetActivityInterface {
                     .setFeatureFlag("meeting-password.enabled", false)
                     .setVideoMuted(true)
                     .setAudioMuted(true)
-                    .setWelcomePageEnabled(false)
                     .build()
         } catch (e: MalformedURLException) {
             e.printStackTrace()
         }
-        if (meetingHistory != null) {
-            meetingHistory!!.subject = options!!.subject
-        }
+//        if (meetingHistory != null) {
+//            meetingHistory!!.subject = options!!.room.
+//        }
         view!!.join(options)
         view!!.listener = object : JitsiMeetViewListener {
             override fun onConferenceJoined(map: Map<String, Any>) {
@@ -198,6 +197,7 @@ class MeetingActivity : FragmentActivity(), JitsiMeetActivityInterface {
             requestCode: Int,
             permissions: Array<String>,
             grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 

diff --git a/app/src/main/java/download/crossally/apps/hizkiyyah/meeting/NewMeetingActivity.kt b/app/src/main/java/download/crossally/apps/hizkiyyah/meeting/NewMeetingActivity.kt
@@ -85,14 +85,14 @@ class NewMeetingActivity : FragmentActivity(), JitsiMeetActivityInterface {
                     .setFeatureFlag("call-integration.enabled", false)
                     .setVideoMuted(true)
                     .setAudioMuted(true)
-                    .setWelcomePageEnabled(false)
+
                     .build()
         } catch (e: MalformedURLException) {
             e.printStackTrace()
         }
-        if (meetingHistory != null) {
-            meetingHistory!!.subject = options!!.subject
-        }
+//        if (meetingHistory != null) {
+//            meetingHistory!!.subject = options!!.subject
+//        }
         view!!.join(options)
         view!!.listener = object : JitsiMeetViewListener {
             override fun onConferenceJoined(map: Map<String, Any>) {
@@ -223,6 +223,7 @@ class NewMeetingActivity : FragmentActivity(), JitsiMeetActivityInterface {
             requestCode: Int,
             permissions: Array<String>,
             grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         JitsiMeetActivityDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 

diff --git a/app/src/main/java/download/crossally/apps/hizkiyyah/utils/SharedObjects.kt b/app/src/main/java/download/crossally/apps/hizkiyyah/utils/SharedObjects.kt
@@ -1,6 +1,7 @@
 package download.crossally.apps.hizkiyyah.utils
 
 import android.annotation.SuppressLint
+import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -9,7 +10,6 @@ import android.os.Build
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.app.AppCompatDelegate
-import androidx.multidex.MultiDexApplication
 import com.bugsnag.android.Bugsnag
 import com.facebook.stetho.Stetho
 import com.google.firebase.database.FirebaseDatabase
@@ -25,7 +25,7 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
-class SharedObjects : MultiDexApplication {
+class SharedObjects : Application {
     var sharedPreference: SharedPreferences? = null
     var editor: SharedPreferences.Editor? = null
 

diff --git a/app/src/main/res/color/nav_selector.xml b/app/src/main/res/color/nav_selector.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimary" android:state_checked="true" />
-    <item android:color="@color/secondaryText" />
+    <item android:color="@color/appBg" android:state_checked="true" />
+    <item android:color="#E2E2E2" />
 </selector>
diff --git a/app/src/main/res/color/nav_text_selector.xml b/app/src/main/res/color/nav_text_selector.xml
@@ -1,4 +1,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/colorPrimary" android:state_checked="true" />
-    <item android:color="@color/secondaryText" />
+    <item android:color="@color/appBg" android:state_checked="true" />
+    <item android:color="#E2E2E2" />
 </selector>
diff --git a/app/src/main/res/drawable/grad.xml b/app/src/main/res/drawable/grad.xml
@@ -4,5 +4,5 @@
         android:type="linear"
         android:angle="-135"
         android:startColor="@color/colorPrimary"
-        android:endColor="#0476D8" />
+        android:endColor="#1204D8" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_round_home_24.xml b/app/src/main/res/drawable/ic_round_home_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,19v-5h4v5c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1v-7h1.7c0.46,0 0.68,-0.57 0.33,-0.87L12.67,3.6c-0.38,-0.34 -0.96,-0.34 -1.34,0l-8.36,7.53c-0.34,0.3 -0.13,0.87 0.33,0.87H5v7c0,0.55 0.45,1 1,1h3c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_round_settings_24.xml b/app/src/main/res/drawable/ic_round_settings_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_email_verification.xml b/app/src/main/res/layout/activity_email_verification.xml
@@ -28,7 +28,7 @@
                 android:layout_height="match_parent">
 
                 <ImageView
-                    android:background="@drawable/ic_meeting"
+                    android:background="@mipmap/ic_launcher"
                     android:layout_width="115dp"
                     android:layout_height="115dp" />