Merge branch 'CCIP-App:dev' into dev

CCIP-App · Aug 23, 2022 · 1814bd1 · 1814bd1
2 parents 5859d97 + fcaf4b9
commit 1814bd1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,7 +34,5 @@ jobs:
       - run: cat apk
       - uses: softprops/action-gh-release@v1
         with:
-          files: |
-            ./app/build/outputs/apk/release/app-release-unsigned.apk
-          tag_name: "latest"
-          prerelease: true      
+          files: ./app/build/outputs/apk/release/app-release-unsigned.apk
+          tag: latest
diff --git a/app/build.gradle b/app/build.gradle
@@ -58,7 +58,7 @@ android {
 
 dependencies {
     final def markwon_version = '4.6.2'
-    final def lifecycle_version = '2.3.1'
+    final def lifecycle_version = '2.5.1'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.13.2'

diff --git a/app/src/main/res/layout/fragment_method_selection.xml b/app/src/main/res/layout/fragment_method_selection.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -46,7 +47,7 @@
                 android:layout_marginEnd="32dp"
                 android:alpha="0.54"
                 android:src="@drawable/ic_camera_alt_black_24dp"
-                android:tint="?attr/colorOnSurface" />
+                app:tint="?attr/colorOnSurface" />
 
             <TextView
                 style="@style/TextAppearance.MaterialComponents.Subtitle2"
@@ -73,7 +74,7 @@
                 android:layout_marginEnd="32dp"
                 android:alpha="0.54"
                 android:src="@drawable/ic_photo_library_black_24dp"
-                android:tint="?attr/colorOnSurface" />
+                app:tint="?attr/colorOnSurface" />
 
             <TextView
                 style="@style/TextAppearance.MaterialComponents.Subtitle2"
@@ -100,7 +101,7 @@
                 android:layout_marginEnd="32dp"
                 android:alpha="0.54"
                 android:src="@drawable/ic_confirmation_number_black_24dp"
-                android:tint="?attr/colorOnSurface" />
+                app:tint="?attr/colorOnSurface" />
 
             <TextView
                 style="@style/TextAppearance.MaterialComponents.Subtitle2"

diff --git a/app/src/main/res/layout/include_login.xml b/app/src/main/res/layout/include_login.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/login_view"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -11,7 +12,7 @@
         android:layout_height="150dp"
         android:layout_centerHorizontal="true"
         android:src="@drawable/qr_code"
-        android:tint="@android:color/darker_gray" />
+        app:tint="@android:color/darker_gray" />
 
     <TextView
         android:id="@+id/login_title"

diff --git a/app/src/main/res/layout/item_menu_item.xml b/app/src/main/res/layout/item_menu_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
@@ -15,7 +16,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginEnd="32dp"
         android:alpha="0.54"
-        android:tint="?attr/colorOnSurface" />
+        app:tint="?attr/colorOnSurface" />
 
     <TextView
         android:id="@+id/title"
@@ -34,5 +35,5 @@
         android:layout_marginEnd="16dp"
         android:alpha="0.54"
         android:src="@drawable/ic_launch_black_24dp"
-        android:tint="?attr/colorOnSurface" />
+        app:tint="?attr/colorOnSurface" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
@@ -15,6 +15,7 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="192dp"
     android:background="?attr/colorPrimaryDark"
@@ -57,7 +58,7 @@
             android:layout_below="@id/user_title"
             android:layout_alignParentEnd="true"
             android:src="@drawable/ic_arrow_drop_down_black_24dp"
-            android:tint="@color/colorWhite" />
+            app:tint="@color/colorWhite" />
 
     </RelativeLayout>