Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-android
Commits
ec7747f0
Commit
ec7747f0
authored
Jan 26, 2021
by
Adrien Béraud
Committed by
Sébastien Blin
Jun 11, 2021
Browse files
swarm: disable group creation for now
Change-Id: Ic1e88ec9b35bbeaeee57ba9cb809c99c2dd1e8b8
parent
9d3abf7d
Changes
3
Hide whitespace changes
Inline
Side-by-side
ring-android/app/src/main/java/cx/ring/fragments/SmartListFragment.java
View file @
ec7747f0
...
...
@@ -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
);
}
...
...
ring-android/app/src/main/res/layout-w720dp-land/frag_smartlist.xml
View file @
ec7747f0
...
...
@@ -9,10 +9,10 @@
<com.google.android.material.card.MaterialCardView
android:id=
"@+id/qr_code"
android:layout_width=
"
1
28dp"
android:layout_width=
"28
0
dp"
android:layout_height=
"wrap_content"
style=
"@style/ButtonOutLined"
android:layout_alignParent
Lef
t=
"true"
android:layout_alignParent
Star
t=
"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:drawable
Lef
t=
"@
drawable/baseline_qr_code_2_black_24dp
"
a
ndroid
:drawable
Tint=
"@color/colorPrimary"
/>
android:drawable
Tin
t=
"@
color/colorPrimary
"
a
pp
:drawable
StartCompat=
"@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"
...
...
ring-android/app/src/main/res/layout/frag_smartlist.xml
View file @
ec7747f0
...
...
@@ -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/ButtonOut
L
ined"
style=
"@style/
Widget.MaterialComponents.
Button
.
Out
l
ined
Button
"
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:drawable
Lef
t=
"@
drawable/baseline_qr_code_2_black_24dp
"
a
ndroid
:drawable
Tint=
"@color/colorPrimary"
/>
android:drawable
Tin
t=
"@
color/colorPrimary
"
a
pp
:drawable
StartCompat=
"@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"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment