stablize the application, notifications fix for real, bigger fancier …

…buttons
00xkhaled · Mar 25, 2021 · d871cbf · d871cbf
1 parent 224280a
commit d871cbf
Show file tree

Hide file tree

Showing 159 changed files with 8,385 additions and 7,862 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/Houseclub/.idea/.gitignore b/Houseclub/.idea/.gitignore
diff --git a/Houseclub/.idea/gradle.xml b/Houseclub/.idea/gradle.xml
diff --git a/Houseclub/.idea/misc.xml b/Houseclub/.idea/misc.xml
diff --git a/Houseclub/.idea/modules.xml b/Houseclub/.idea/modules.xml
diff --git a/Houseclub/.idea/vcs.xml b/Houseclub/.idea/vcs.xml
diff --git a/Houseclub/build.gradle b/Houseclub/build.gradle
@@ -1,51 +1,69 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
-    defaultConfig {
-        applicationId "me.grishka.houseclub"
-        minSdkVersion 24
-        versionCode 10
-        versionName "1.0.11"
-        resConfig "en"
-        vectorDrawables.useSupportLibrary = true
-        Properties properties = new Properties()
-		if (project.rootProject.file('local.properties').canRead()) {
-			properties.load(project.rootProject.file("local.properties").newDataInputStream())
-		}
-		buildConfigField "String", "INSTAGRAM_APP_ID", '"'+properties.getProperty("instagramAppId")+'"'
-    }
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            ndk {
-                abiFilters "arm64-v8a", "armeabi-v7a"
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    lintOptions {
-        disable 'MissingTranslation'
-        abortOnError false
-    }
-}
-
-dependencies {
-    implementation 'com.github.grishka.litex:recyclerview:1.0'
-    implementation 'com.github.grishka.litex:swiperefreshlayout:1.0'
-    implementation 'com.github.grishka.litex:viewpager2:1.0'
-    implementation 'com.github.grishka:appkit:c7854a3'
-    implementation 'com.squareup.okhttp3:okhttp:3.14.7'
-    api 'com.github.grishka.litex:annotation:1.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'io.agora.rtc:voice-sdk:3.3.0'
-    implementation group: 'com.pubnub', name: 'pubnub-gson', version: '4.33.3'
-    implementation('com.github.joielechong:countrycodepicker:2.4.2') {
-        exclude group: 'androidx.annotation'
-    }
-}
+apply plugin: 'com.android.application'
+
+android {
+	compileSdkVersion 30
+	buildToolsVersion "30.0.3"
+	defaultConfig {
+		applicationId "me.grishka.houseclub"
+		minSdkVersion 24
+		targetSdkVersion 30
+		versionCode 9
+		versionName "1.0.8"
+
+		Properties properties = new Properties()
+		if (project.rootProject.file('local.properties').canRead()) {
+			properties.load(project.rootProject.file("local.properties").newDataInputStream())
+		}
+
+		buildConfigField "String", "INSTAGRAM_APP_ID", '"'+properties.getProperty("instagramAppId")+'"'
+	}
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+			ndk{
+				abiFilters "arm64-v8a", "armeabi-v7a"
+			}
+		}
+	}
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_8
+		targetCompatibility JavaVersion.VERSION_1_8
+	}
+//	sourceSets{
+//		main{
+//			jniLibs.srcDirs=['../AgoraSDK']
+//		}
+//	}
+}
+
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
+
+
+dependencies {
+	implementation platform('com.google.firebase:firebase-bom:26.7.0')
+
+	// Declare the dependencies for the Crashlytics and Analytics libraries
+	// When using the BoM, you don't specify versions in Firebase library dependencies
+	implementation 'com.google.firebase:firebase-crashlytics'
+	implementation 'com.google.firebase:firebase-analytics'
+
+	implementation "androidx.recyclerview:recyclerview:1.1.0"
+	implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
+	implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+	implementation "androidx.viewpager2:viewpager2:1.0.0"
+	implementation 'com.github.omarss:appkit:c12bec5'
+	implementation 'com.squareup.okhttp3:okhttp:3.14.7'
+	implementation "androidx.annotation:annotation:1.1.0"
+
+	implementation 'com.google.code.gson:gson:2.8.6'
+//	implementation 'com.squareup:otto:1.3.8'
+//	implementation 'de.psdev:async-otto:1.0.3'
+
+	implementation 'io.agora.rtc:voice-sdk:3.3.0'
+	implementation group: 'com.pubnub', name: 'pubnub-gson', version: '4.33.3'
+	implementation('com.github.joielechong:countrycodepicker:2.4.2') {
+    	exclude group: 'androidx.annotation'
+	}
+}
diff --git a/Houseclub/google-services.json b/Houseclub/google-services.json
@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "852035166601",
+    "project_id": "houseclub-4df76",
+    "storage_bucket": "houseclub-4df76.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:852035166601:android:a6b8ed0b546a0429d78158",
+        "android_client_info": {
+          "package_name": "me.grishka.houseclub"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "852035166601-ao4tbvqr065hkcf4aniembmsoav7dscm.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAerCw39FLbleumOa4wSXxZFhsl5CKq5sE"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "852035166601-ao4tbvqr065hkcf4aniembmsoav7dscm.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/Houseclub/local.properties b/Houseclub/local.properties
diff --git a/Houseclub/proguard-rules.pro b/Houseclub/proguard-rules.pro
@@ -1,21 +1,21 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/Houseclub/src/main/AndroidManifest.xml b/Houseclub/src/main/AndroidManifest.xml
@@ -1,57 +1,46 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.grishka.houseclub">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- The Agora SDK requires Bluetooth permissions in case users are using Bluetooth devices.-->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-    <application
-        android:name=".App"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true">
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="screenSize|orientation"
-            android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data
-                    android:host="ios.joinclubhouse.com"
-                    android:pathPrefix="/room/"
-                    android:scheme="https" />
-                <data
-                    android:host="ios.joinclubhouse.com"
-                    android:pathPrefix="/event/"
-                    android:scheme="https" />
-                <data
-                    android:host="www.joinclubhouse.com"
-                    android:pathPrefix="/room/"
-                    android:scheme="https" />
-                <data
-                    android:host="www.joinclubhouse.com"
-                    android:pathPrefix="/event/"
-                    android:scheme="https" />
-            </intent-filter>
-        </activity>
-        <service android:name=".VoiceService" />
-        <receiver android:name=".notification.NotificationHandlerBroadcastReceiver" />
-    </application>
-</manifest>
+<manifest package="me.grishka.houseclub"
+	xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.READ_PHONE_STATE" />
+	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+	<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.READ_CONTACTS" />
+	<!-- The Agora SDK requires Bluetooth permissions in case users are using Bluetooth devices.-->
+	<uses-permission android:name="android.permission.BLUETOOTH" />
+	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+	<uses-feature android:name="android.software.leanback" android:required="false" />
+	<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+	<application
+		android:allowBackup="true"
+		android:label="@string/app_name"
+		android:theme="@style/AppTheme"
+		android:name=".App"
+		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:usesCleartextTraffic="true"
+		android:banner="@mipmap/ic_launcher">
+		<activity android:name=".MainActivity" android:configChanges="screenSize|orientation" android:launchMode="singleTask">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
+				<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<category android:name="android.intent.category.DEFAULT" />
+				<data android:host="ios.joinclubhouse.com" android:pathPrefix="/room/" android:scheme="https"/>
+				<data android:host="ios.joinclubhouse.com" android:pathPrefix="/event/" android:scheme="https"/>
+				<data android:host="www.joinclubhouse.com" android:pathPrefix="/room/" android:scheme="https"/>
+				<data android:host="www.joinclubhouse.com" android:pathPrefix="/event/" android:scheme="https"/>
+			</intent-filter>
+		</activity>
+		<service android:name=".VoiceService" />
+		<receiver android:name=".notification.NotificationHandlerBroadcastReceiver" />
+	</application>
+</manifest>