mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-25 06:25:40 +03:00
Change color for providers text
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
b47a736763
commit
c445edaa6e
11 changed files with 22 additions and 27 deletions
|
@ -112,25 +112,22 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
|
||||||
@AutoInjector(NextcloudTalkApplication.class)
|
@AutoInjector(NextcloudTalkApplication.class)
|
||||||
public class CallActivity extends AppCompatActivity {
|
public class CallActivity extends AppCompatActivity {
|
||||||
private static final String TAG = "CallActivity";
|
private static final String TAG = "CallActivity";
|
||||||
|
private static final String[] PERMISSIONS_CALL = {
|
||||||
|
android.Manifest.permission.CAMERA,
|
||||||
|
android.Manifest.permission.RECORD_AUDIO
|
||||||
|
};
|
||||||
@BindView(R.id.pip_video_view)
|
@BindView(R.id.pip_video_view)
|
||||||
SurfaceViewRenderer pipVideoView;
|
SurfaceViewRenderer pipVideoView;
|
||||||
|
|
||||||
@BindView(R.id.full_screen_surface_view)
|
@BindView(R.id.full_screen_surface_view)
|
||||||
SurfaceViewRenderer fullScreenVideoView;
|
SurfaceViewRenderer fullScreenVideoView;
|
||||||
|
|
||||||
@BindView(R.id.relative_layout)
|
@BindView(R.id.relative_layout)
|
||||||
RelativeLayout relativeLayout;
|
RelativeLayout relativeLayout;
|
||||||
|
|
||||||
@BindView(R.id.remote_renderers_layout)
|
@BindView(R.id.remote_renderers_layout)
|
||||||
LinearLayout remoteRenderersLayout;
|
LinearLayout remoteRenderersLayout;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
NcApi ncApi;
|
NcApi ncApi;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
EventBus eventBus;
|
EventBus eventBus;
|
||||||
|
|
||||||
PeerConnectionFactory peerConnectionFactory;
|
PeerConnectionFactory peerConnectionFactory;
|
||||||
MediaConstraints audioConstraints;
|
MediaConstraints audioConstraints;
|
||||||
MediaConstraints videoConstraints;
|
MediaConstraints videoConstraints;
|
||||||
|
@ -151,19 +148,11 @@ public class CallActivity extends AppCompatActivity {
|
||||||
private String roomToken;
|
private String roomToken;
|
||||||
private UserEntity userEntity;
|
private UserEntity userEntity;
|
||||||
private String callSession;
|
private String callSession;
|
||||||
|
|
||||||
private VideoCapturer videoCapturerAndroid;
|
private VideoCapturer videoCapturerAndroid;
|
||||||
|
|
||||||
private MediaStream localMediaStream;
|
private MediaStream localMediaStream;
|
||||||
|
|
||||||
private String credentials;
|
private String credentials;
|
||||||
private List<MagicPeerConnectionWrapper> magicPeerConnectionWrapperList = new ArrayList<>();
|
private List<MagicPeerConnectionWrapper> magicPeerConnectionWrapperList = new ArrayList<>();
|
||||||
|
|
||||||
private static final String[] PERMISSIONS_CALL = {
|
|
||||||
android.Manifest.permission.CAMERA,
|
|
||||||
android.Manifest.permission.RECORD_AUDIO
|
|
||||||
};
|
|
||||||
|
|
||||||
private static int getSystemUiVisibility() {
|
private static int getSystemUiVisibility() {
|
||||||
int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN;
|
int flags = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN;
|
||||||
flags |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
|
flags |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
|
||||||
|
@ -258,7 +247,7 @@ public class CallActivity extends AppCompatActivity {
|
||||||
// Some permission is permanently denied so we cannot request them normally.
|
// Some permission is permanently denied so we cannot request them normally.
|
||||||
OpenAppDetailsDialogFragment.show(
|
OpenAppDetailsDialogFragment.show(
|
||||||
R.string.nc_permissions_permanently_denied,
|
R.string.nc_permissions_permanently_denied,
|
||||||
R.string.nc_permissions_settings , this);
|
R.string.nc_permissions_settings, this);
|
||||||
} else {
|
} else {
|
||||||
EffortlessPermissions.requestPermissions(this, R.string.nc_permissions,
|
EffortlessPermissions.requestPermissions(this, R.string.nc_permissions,
|
||||||
100, PERMISSIONS_CALL);
|
100, PERMISSIONS_CALL);
|
||||||
|
@ -820,7 +809,7 @@ public class CallActivity extends AppCompatActivity {
|
||||||
} else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
} else if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
||||||
.PeerConnectionEventType.SENSOR_FAR) ||
|
.PeerConnectionEventType.SENSOR_FAR) ||
|
||||||
peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
||||||
.PeerConnectionEventType.SENSOR_NEAR)) {
|
.PeerConnectionEventType.SENSOR_NEAR)) {
|
||||||
|
|
||||||
/*boolean enableVideo = peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
/*boolean enableVideo = peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent
|
||||||
.PeerConnectionEventType.SENSOR_FAR);
|
.PeerConnectionEventType.SENSOR_FAR);
|
||||||
|
|
|
@ -163,6 +163,7 @@ public interface NcApi {
|
||||||
@GET
|
@GET
|
||||||
Observable<SignalingSettingsOverall> getSignalingSettings(@Header("Authorization") String authorization, @Url
|
Observable<SignalingSettingsOverall> getSignalingSettings(@Header("Authorization") String authorization, @Url
|
||||||
String url);
|
String url);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
QueryMap items are as follows:
|
QueryMap items are as follows:
|
||||||
- "messages" : "message"
|
- "messages" : "message"
|
||||||
|
|
|
@ -47,7 +47,7 @@ import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager;
|
||||||
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
|
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem;
|
||||||
|
|
||||||
@AutoInjector(NextcloudTalkApplication.class)
|
@AutoInjector(NextcloudTalkApplication.class)
|
||||||
public class RoomMenuController extends BaseController implements FlexibleAdapter.OnItemClickListener{
|
public class RoomMenuController extends BaseController implements FlexibleAdapter.OnItemClickListener {
|
||||||
@BindView(R.id.recycler_view)
|
@BindView(R.id.recycler_view)
|
||||||
RecyclerView recyclerView;
|
RecyclerView recyclerView;
|
||||||
private Room room;
|
private Room room;
|
||||||
|
|
|
@ -150,6 +150,7 @@ public class ServerSelectionController extends BaseController {
|
||||||
textFieldBoxes.getEndIconImageButton().setAlpha(0.5f);
|
textFieldBoxes.getEndIconImageButton().setAlpha(0.5f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkServerAndProceed() {
|
private void checkServerAndProceed() {
|
||||||
dispose();
|
dispose();
|
||||||
|
|
||||||
|
|
|
@ -117,6 +117,7 @@ public class RestModule {
|
||||||
CookieManager provideCookieManager() {
|
CookieManager provideCookieManager() {
|
||||||
return new CookieManager();
|
return new CookieManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
Cache provideCache() {
|
Cache provideCache() {
|
||||||
|
|
|
@ -31,7 +31,7 @@ public class MediaStreamEvent {
|
||||||
private final MediaStream mediaStream;
|
private final MediaStream mediaStream;
|
||||||
private final String session;
|
private final String session;
|
||||||
|
|
||||||
public MediaStreamEvent(@Nullable MediaStream mediaStream, String session) {
|
public MediaStreamEvent(@Nullable MediaStream mediaStream, String session) {
|
||||||
this.mediaStream = mediaStream;
|
this.mediaStream = mediaStream;
|
||||||
this.session = session;
|
this.session = session;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,15 +26,14 @@ import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class PeerConnectionEvent {
|
public class PeerConnectionEvent {
|
||||||
public enum PeerConnectionEventType {
|
|
||||||
CLOSE_PEER, SENSOR_FAR, SENSOR_NEAR
|
|
||||||
}
|
|
||||||
|
|
||||||
private final PeerConnectionEventType peerConnectionEventType;
|
private final PeerConnectionEventType peerConnectionEventType;
|
||||||
private final String sessionId;
|
private final String sessionId;
|
||||||
|
|
||||||
public PeerConnectionEvent(PeerConnectionEventType peerConnectionEventType, @Nullable String sessionId) {
|
public PeerConnectionEvent(PeerConnectionEventType peerConnectionEventType, @Nullable String sessionId) {
|
||||||
this.peerConnectionEventType = peerConnectionEventType;
|
this.peerConnectionEventType = peerConnectionEventType;
|
||||||
this.sessionId = sessionId;
|
this.sessionId = sessionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum PeerConnectionEventType {
|
||||||
|
CLOSE_PEER, SENSOR_FAR, SENSOR_NEAR
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,8 +48,8 @@ import java.util.List;
|
||||||
|
|
||||||
public class MagicPeerConnectionWrapper {
|
public class MagicPeerConnectionWrapper {
|
||||||
private static String TAG = "MagicPeerConnectionWrapper";
|
private static String TAG = "MagicPeerConnectionWrapper";
|
||||||
private PeerConnection peerConnection;
|
|
||||||
List<IceCandidate> iceCandidates = new ArrayList<>();
|
List<IceCandidate> iceCandidates = new ArrayList<>();
|
||||||
|
private PeerConnection peerConnection;
|
||||||
private List<PeerConnection.IceServer> iceServers;
|
private List<PeerConnection.IceServer> iceServers;
|
||||||
private String sessionId;
|
private String sessionId;
|
||||||
private String localSession;
|
private String localSession;
|
||||||
|
|
|
@ -75,7 +75,9 @@ public class MagicWebRTCUtils {
|
||||||
return joinString(Arrays.asList(lines), "\r\n", true /* delimiterAtEnd */);
|
return joinString(Arrays.asList(lines), "\r\n", true /* delimiterAtEnd */);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Returns the line number containing "m=audio|video", or -1 if no such line exists. */
|
/**
|
||||||
|
* Returns the line number containing "m=audio|video", or -1 if no such line exists.
|
||||||
|
*/
|
||||||
private static int findMediaDescriptionLine(boolean isAudio, String[] sdpLines) {
|
private static int findMediaDescriptionLine(boolean isAudio, String[] sdpLines) {
|
||||||
final String mediaDescription = isAudio ? "m=audio " : "m=video ";
|
final String mediaDescription = isAudio ? "m=audio " : "m=video ";
|
||||||
for (int i = 0; i < sdpLines.length; ++i) {
|
for (int i = 0; i < sdpLines.length; ++i) {
|
||||||
|
|
|
@ -90,6 +90,6 @@
|
||||||
android:text="@string/nc_get_from_provider"
|
android:text="@string/nc_get_from_provider"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
android:textAllCaps="true"
|
android:textAllCaps="true"
|
||||||
android:textColor="@color/nc_white_color_complete"/>
|
android:textColor="@color/nc_light_blue_color"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -7,5 +7,7 @@
|
||||||
<color name="nc_darkRed">#D32F2F</color>
|
<color name="nc_darkRed">#D32F2F</color>
|
||||||
<color name="nc_white_color">@color/per70white</color>
|
<color name="nc_white_color">@color/per70white</color>
|
||||||
<color name="nc_white_color_complete">#FFFFFF</color>
|
<color name="nc_white_color_complete">#FFFFFF</color>
|
||||||
|
<color name="nc_light_blue_color">#7fC0E3</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue