From ec7747f0abb0ac608266d549c2638b1d1309dd0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 26 Jan 2021 15:22:20 -0500
Subject: [PATCH] swarm: disable group creation for now
Change-Id: Ic1e88ec9b35bbeaeee57ba9cb809c99c2dd1e8b8
---
.../main/java/cx/ring/fragments/SmartListFragment.java | 10 +++++-----
.../src/main/res/layout-w720dp-land/frag_smartlist.xml | 10 ++++++----
.../app/src/main/res/layout/frag_smartlist.xml | 10 ++++++----
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java
index d8671a9a0..a5db7f3ba 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java
@@ -114,7 +114,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
setOverflowMenuVisible(menu, true);
changeSeparatorHeight(false);
binding.qrCode.setVisibility(View.GONE);
- binding.newGroup.setVisibility(View.GONE);
+ //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false);
return true;
}
@@ -126,7 +126,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
setOverflowMenuVisible(menu, false);
changeSeparatorHeight(true);
binding.qrCode.setVisibility(View.VISIBLE);
- binding.newGroup.setVisibility(View.VISIBLE);
+ //binding.newGroup.setVisibility(View.VISIBLE);
setTabletQRLayout(true);
return true;
}
@@ -245,7 +245,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
binding.qrCode.setOnClickListener(v -> presenter.clickQRSearch());
- binding.newGroup.setOnClickListener(v -> startNewGroup());
+ //binding.newGroup.setOnClickListener(v -> startNewGroup());
binding.confsList.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
@@ -282,7 +282,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
ContactPickerFragment fragment = ContactPickerFragment.newInstance();
fragment.show(getParentFragmentManager(), ContactPickerFragment.TAG);
binding.qrCode.setVisibility(View.GONE);
- binding.newGroup.setVisibility(View.GONE);
+ //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false);
}
@@ -472,7 +472,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
QRCodeFragment qrCodeFragment = QRCodeFragment.newInstance(QRCodeFragment.INDEX_SCAN);
qrCodeFragment.show(getParentFragmentManager(), QRCodeFragment.TAG);
binding.qrCode.setVisibility(View.GONE);
- binding.newGroup.setVisibility(View.GONE);
+ //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false);
}
diff --git a/ring-android/app/src/main/res/layout-w720dp-land/frag_smartlist.xml b/ring-android/app/src/main/res/layout-w720dp-land/frag_smartlist.xml
index 684907ed7..9b4056a6a 100644
--- a/ring-android/app/src/main/res/layout-w720dp-land/frag_smartlist.xml
+++ b/ring-android/app/src/main/res/layout-w720dp-land/frag_smartlist.xml
@@ -9,10 +9,10 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/qr_code"
- android:layout_width="128dp"
+ android:layout_width="280dp"
android:layout_height="wrap_content"
style="@style/ButtonOutLined"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
app:cardCornerRadius="@dimen/button_corner_radius"
@@ -27,11 +27,12 @@
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:layout_gravity="center"
- android:drawableLeft="@drawable/baseline_qr_code_2_black_24dp"
- android:drawableTint="@color/colorPrimary"/>
+ android:drawableTint="@color/colorPrimary"
+ app:drawableStartCompat="@drawable/baseline_qr_code_2_black_24dp" />
</com.google.android.material.card.MaterialCardView>
+ <!--
<com.google.android.material.card.MaterialCardView
android:id="@+id/new_group"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -56,6 +57,7 @@
android:textSize="16sp" />
</com.google.android.material.card.MaterialCardView>
+-->
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/list_coordinator"
diff --git a/ring-android/app/src/main/res/layout/frag_smartlist.xml b/ring-android/app/src/main/res/layout/frag_smartlist.xml
index 146aebe82..06834cf3c 100644
--- a/ring-android/app/src/main/res/layout/frag_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/frag_smartlist.xml
@@ -28,9 +28,9 @@ along with this program; if not, write to the Free Software
<com.google.android.material.card.MaterialCardView
android:id="@+id/qr_code"
- android:layout_width="@dimen/wizard_button_width_half"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/ButtonOutLined"
+ style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_margin="8dp"
app:cardCornerRadius="@dimen/button_corner_radius"
android:visibility="gone"
@@ -43,11 +43,12 @@ along with this program; if not, write to the Free Software
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:layout_gravity="center"
- android:drawableLeft="@drawable/baseline_qr_code_2_black_24dp"
- android:drawableTint="@color/colorPrimary"/>
+ android:drawableTint="@color/colorPrimary"
+ app:drawableStartCompat="@drawable/baseline_qr_code_2_black_24dp" />
</com.google.android.material.card.MaterialCardView>
+ <!--
<com.google.android.material.card.MaterialCardView
android:id="@+id/new_group"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
@@ -71,6 +72,7 @@ along with this program; if not, write to the Free Software
android:textSize="16sp" />
</com.google.android.material.card.MaterialCardView>
+ -->
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/list_coordinator"
--
GitLab