Updated URL and upgraded Android project

StudieverenigingSTORM · May 13, 2022 · d8a05dd · d8a05dd
1 parent 1f70ad7
commit d8a05dd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 29 deletions.
diff --git a/app/android/.idea/gradle.xml b/app/android/.idea/gradle.xml
diff --git a/app/android/.idea/runConfigurations.xml b/app/android/.idea/runConfigurations.xml
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -21,6 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'vu.storm.stoka_tv'
 }
 
 dependencies {

diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="vu.storm.stoka_tv">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-feature
+        android:name="android.software.leanback"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
@@ -13,9 +20,9 @@
             android:name=".MainActivity"
             android:banner="@drawable/app_icon"
             android:icon="@drawable/app_icon"
-            android:label="@string/app_name"
             android:logo="@drawable/app_icon"
-            android:screenOrientation="landscape">
+            android:screenOrientation="landscape"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -27,13 +34,4 @@
         </activity>
     </application>
 
-    <uses-feature
-        android:name="android.software.leanback"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
-        android:required="false" />
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>
diff --git a/app/android/app/src/main/res/values/strings.xml b/app/android/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
     <string name="app_name">StoKa-TV</string>
-    <string name="web_app_url">http://storm.vu/stoka-tv</string> <!-- Replace with base url of frontend  -->
+    <string name="web_app_url">https://stoka-tv.storm.vu/</string> <!-- Replace with base url of frontend  -->
 </resources>
diff --git a/app/android/build.gradle b/app/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Mar 19 20:16:33 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ android { @@
                 proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             }
         }
+        namespace 'vu.storm.stoka_tv'
     }
     dependencies {
@@ Expand Down @@