UI updates and improvements

guardianproject · Nov 9, 2023 · 5096a43 · 5096a43
1 parent df36794
commit 5096a43
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/app/src/main/java/org/witness/proofmode/MainActivity.kt b/app/src/main/java/org/witness/proofmode/MainActivity.kt
@@ -376,18 +376,13 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         val id = item.itemId
-        if (id == R.id.action_publish_key) {
-            publishKey()
-            return true
-        } else if (id == R.id.action_share_key) {
+        if (id == R.id.action_share_key) {
             shareCurrentPublicKey()
             return true
         } else if (id == R.id.action_share_photos) {
             showImagePicker();
         } else if (id == R.id.action_share_videos) {
             showVideoPicker();
-        } else if (id == R.id.action_share_documents) {
-            showDocumentPicker();
         }
         return super.onOptionsItemSelected(item)
     }

diff --git a/app/src/main/java/org/witness/proofmode/SingleAssetView.kt b/app/src/main/java/org/witness/proofmode/SingleAssetView.kt
@@ -33,6 +33,7 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
@@ -240,9 +241,18 @@ fun SingleAssetView(initialItem: ProofableItem, modifier: Modifier = Modifier, s
 
                 var hash = ProofModeUtil.getProofHash(initialItem.uri,context)
                 if (hash != null) {
-                    var summary = ProofModeUtil.getProofSummary(hash, context)
-                    if (summary?.isNotEmpty() == true)
-                        Text(modifier = Modifier.padding(3.dp,3.dp), text = "$summary")
+
+                    var hmap = ProofModeUtil.getProofHashMap(hash, context)
+
+                    if (hmap != null) {
+                        for (key in hmap?.keys!!) {
+                            Row {
+                                Text(modifier = Modifier.padding(3.dp, 3.dp).width(120.dp).background(Color.LightGray), text = "$key")
+                                SelectionContainer() { Text(modifier = Modifier.padding(3.dp, 3.dp), text = "${hmap[key]}") }
+                            }
+                        }
+                    }
+
                 }
 
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,8 +22,9 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@android:color/transparent"
             app:theme="@style/MainToolBarStyle"
+            android:backgroundTint="@color/colorPrimaryDark"
+
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
         <androidx.compose.ui.platform.ComposeView

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -11,15 +11,15 @@
         android:title="Open Picture or Video"
         />
 -->
-
+<!--
     <item
         android:id="@+id/action_publish_key"
         android:orderInCategory="100"
         android:title="@string/action_publish_key"
         app:showAsAction="never"
         android:visible="false"
         />
-
+-->
     <item
         android:id="@+id/action_share_key"
         android:orderInCategory="100"
@@ -36,11 +36,12 @@
         android:orderInCategory="100"
         android:title="@string/menu_import_videos"
         app:showAsAction="never" />
+    <!--
     <item
         android:id="@+id/action_share_documents"
         android:orderInCategory="100"
         android:title="@string/menu_import_documents"
         app:showAsAction="never" />
-
+-->
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -186,7 +186,7 @@
     <string name="menu_import_videos">Import videos...</string>
     <string name="menu_import_documents">Import documents...</string>
 
-    <string name="title_activity">Activity</string>
+    <string name="title_activity">Proof Log</string>
 
     <string name="cd_take_picture">Take picture</string>
     <string name="cb_open_gallery">Navigate to Gallery</string>