Skip to content
Snippets Groups Projects
Commit ec7747f0 authored by Adrien Béraud's avatar Adrien Béraud Committed by Sébastien Blin
Browse files

swarm: disable group creation for now

Change-Id: Ic1e88ec9b35bbeaeee57ba9cb809c99c2dd1e8b8
parent 9d3abf7d
No related branches found
No related tags found
No related merge requests found
...@@ -114,7 +114,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i ...@@ -114,7 +114,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
setOverflowMenuVisible(menu, true); setOverflowMenuVisible(menu, true);
changeSeparatorHeight(false); changeSeparatorHeight(false);
binding.qrCode.setVisibility(View.GONE); binding.qrCode.setVisibility(View.GONE);
binding.newGroup.setVisibility(View.GONE); //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false); setTabletQRLayout(false);
return true; return true;
} }
...@@ -126,7 +126,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i ...@@ -126,7 +126,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
setOverflowMenuVisible(menu, false); setOverflowMenuVisible(menu, false);
changeSeparatorHeight(true); changeSeparatorHeight(true);
binding.qrCode.setVisibility(View.VISIBLE); binding.qrCode.setVisibility(View.VISIBLE);
binding.newGroup.setVisibility(View.VISIBLE); //binding.newGroup.setVisibility(View.VISIBLE);
setTabletQRLayout(true); setTabletQRLayout(true);
return true; return true;
} }
...@@ -245,7 +245,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i ...@@ -245,7 +245,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
binding.qrCode.setOnClickListener(v -> presenter.clickQRSearch()); binding.qrCode.setOnClickListener(v -> presenter.clickQRSearch());
binding.newGroup.setOnClickListener(v -> startNewGroup()); //binding.newGroup.setOnClickListener(v -> startNewGroup());
binding.confsList.addOnScrollListener(new RecyclerView.OnScrollListener() { binding.confsList.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override @Override
...@@ -282,7 +282,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i ...@@ -282,7 +282,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
ContactPickerFragment fragment = ContactPickerFragment.newInstance(); ContactPickerFragment fragment = ContactPickerFragment.newInstance();
fragment.show(getParentFragmentManager(), ContactPickerFragment.TAG); fragment.show(getParentFragmentManager(), ContactPickerFragment.TAG);
binding.qrCode.setVisibility(View.GONE); binding.qrCode.setVisibility(View.GONE);
binding.newGroup.setVisibility(View.GONE); //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false); setTabletQRLayout(false);
} }
...@@ -472,7 +472,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i ...@@ -472,7 +472,7 @@ public class SmartListFragment extends BaseSupportFragment<SmartListPresenter> i
QRCodeFragment qrCodeFragment = QRCodeFragment.newInstance(QRCodeFragment.INDEX_SCAN); QRCodeFragment qrCodeFragment = QRCodeFragment.newInstance(QRCodeFragment.INDEX_SCAN);
qrCodeFragment.show(getParentFragmentManager(), QRCodeFragment.TAG); qrCodeFragment.show(getParentFragmentManager(), QRCodeFragment.TAG);
binding.qrCode.setVisibility(View.GONE); binding.qrCode.setVisibility(View.GONE);
binding.newGroup.setVisibility(View.GONE); //binding.newGroup.setVisibility(View.GONE);
setTabletQRLayout(false); setTabletQRLayout(false);
} }
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/qr_code" android:id="@+id/qr_code"
android:layout_width="128dp" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/ButtonOutLined" style="@style/ButtonOutLined"
android:layout_alignParentLeft="true" android:layout_alignParentStart="true"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
app:cardCornerRadius="@dimen/button_corner_radius" app:cardCornerRadius="@dimen/button_corner_radius"
...@@ -27,11 +27,12 @@ ...@@ -27,11 +27,12 @@
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="16sp" android:textSize="16sp"
android:layout_gravity="center" 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>
<!--
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/new_group" android:id="@+id/new_group"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
android:textSize="16sp" /> android:textSize="16sp" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/list_coordinator" android:id="@+id/list_coordinator"
......
...@@ -28,9 +28,9 @@ along with this program; if not, write to the Free Software ...@@ -28,9 +28,9 @@ along with this program; if not, write to the Free Software
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/qr_code" android:id="@+id/qr_code"
android:layout_width="@dimen/wizard_button_width_half" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/ButtonOutLined" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:layout_margin="8dp" android:layout_margin="8dp"
app:cardCornerRadius="@dimen/button_corner_radius" app:cardCornerRadius="@dimen/button_corner_radius"
android:visibility="gone" android:visibility="gone"
...@@ -43,11 +43,12 @@ along with this program; if not, write to the Free Software ...@@ -43,11 +43,12 @@ along with this program; if not, write to the Free Software
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="16sp" android:textSize="16sp"
android:layout_gravity="center" 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>
<!--
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/new_group" android:id="@+id/new_group"
style="@style/Widget.MaterialComponents.Button.OutlinedButton" style="@style/Widget.MaterialComponents.Button.OutlinedButton"
...@@ -71,6 +72,7 @@ along with this program; if not, write to the Free Software ...@@ -71,6 +72,7 @@ along with this program; if not, write to the Free Software
android:textSize="16sp" /> android:textSize="16sp" />
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/list_coordinator" android:id="@+id/list_coordinator"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment