UI for AppRTC Android demo that doesn't require Design Support Library
For simplicity, this CL removes the need for Design Support Library. UI is slightly changed for this to be possible. Floating Action Button for adding favorite is removed and instead there's a button next to the TextView. Review-Url: https://codereview.webrtc.org/2003983002 Cr-Commit-Position: refs/heads/master@{#12861}
This commit is contained in:
sakal
Commit bot
parent
47456803d9
commit
05cdb85012
@ -23,7 +23,6 @@
|
||||
|
||||
<activity android:name="ConnectActivity"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.AppCompat"
|
||||
android:windowSoftInputMode="adjustPan">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 127 B |
Binary file not shown.
|
Before Width: | Height: | Size: 88 B |
Binary file not shown.
|
Before Width: | Height: | Size: 97 B |
Binary file not shown.
|
Before Width: | Height: | Size: 97 B |
Binary file not shown.
|
Before Width: | Height: | Size: 102 B |
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_margin="16dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
@ -37,6 +36,13 @@
|
||||
android:layout_height="48dp"
|
||||
android:contentDescription="@string/connect_description"
|
||||
android:background="@android:drawable/sym_action_call" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/add_favorite_button"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:contentDescription="@string/add_favorite_description"
|
||||
android:background="@android:drawable/ic_input_add" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
@ -67,16 +73,5 @@
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:text="@string/no_favorites" />
|
||||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/add_favorite_button"
|
||||
android:layout_width="56dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:src="@drawable/ic_add_white_24dp"
|
||||
android:contentDescription="@string/add_favorite_description"
|
||||
app:backgroundTint="@android:color/holo_green_dark"
|
||||
app:elevation="8dp"/>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="24dp">
|
||||
|
||||
<EditText
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/favorite_edittext"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:inputType="text"/>
|
||||
</LinearLayout>
|
||||
@ -1,14 +1,13 @@
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/action_loopback"
|
||||
android:icon="@drawable/ic_loopback_call"
|
||||
app:showAsAction="always"
|
||||
android:showAsAction="always"
|
||||
android:title="@string/action_loopback"/>
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="100"
|
||||
android:icon="@android:drawable/ic_menu_preferences"
|
||||
app:showAsAction="ifRoom"
|
||||
android:showAsAction="ifRoom"
|
||||
android:title="@string/action_settings"/>
|
||||
</menu>
|
||||
|
||||
@ -10,19 +10,17 @@
|
||||
|
||||
package org.appspot.apprtc;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.design.widget.FloatingActionButton;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.support.v7.app.AppCompatActivity;
|
||||
import android.util.Log;
|
||||
import android.view.ContextMenu;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
@ -45,14 +43,14 @@ import java.util.Random;
|
||||
/**
|
||||
* Handles the initial setup where the user selects which room to join.
|
||||
*/
|
||||
public class ConnectActivity extends AppCompatActivity {
|
||||
public class ConnectActivity extends Activity {
|
||||
private static final String TAG = "ConnectActivity";
|
||||
private static final int CONNECTION_REQUEST = 1;
|
||||
private static final int REMOVE_FAVORITE_INDEX = 0;
|
||||
private static boolean commandLineRun = false;
|
||||
|
||||
private ImageButton connectButton;
|
||||
private FloatingActionButton addFavoriteButton;
|
||||
private ImageButton addFavoriteButton;
|
||||
private EditText roomEditText;
|
||||
private ListView roomListView;
|
||||
private SharedPreferences sharedPref;
|
||||
@ -130,6 +128,8 @@ public class ConnectActivity extends AppCompatActivity {
|
||||
registerForContextMenu(roomListView);
|
||||
connectButton = (ImageButton) findViewById(R.id.connect_button);
|
||||
connectButton.setOnClickListener(connectListener);
|
||||
addFavoriteButton = (ImageButton) findViewById(R.id.add_favorite_button);
|
||||
addFavoriteButton.setOnClickListener(addFavoriteListener);
|
||||
|
||||
// If an implicit VIEW intent is launching the app, go directly to that URL.
|
||||
final Intent intent = getIntent();
|
||||
@ -142,9 +142,6 @@ public class ConnectActivity extends AppCompatActivity {
|
||||
String room = sharedPref.getString(keyprefRoom, "");
|
||||
connectToRoom(room, true, loopback, runTimeMs);
|
||||
}
|
||||
|
||||
addFavoriteButton = (FloatingActionButton) findViewById(R.id.add_favorite_button);
|
||||
addFavoriteButton.setOnClickListener(addFavoriteListener);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -413,27 +410,11 @@ public class ConnectActivity extends AppCompatActivity {
|
||||
private final OnClickListener addFavoriteListener = new OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(ConnectActivity.this);
|
||||
|
||||
final View dialogView = LayoutInflater.from(ConnectActivity.this)
|
||||
.inflate(R.layout.dialog_add_favorite, null);
|
||||
final EditText favoriteEditText = (EditText) dialogView.findViewById(R.id.favorite_edittext);
|
||||
favoriteEditText.append(roomEditText.getText());
|
||||
|
||||
builder.setTitle(R.string.add_favorite_title)
|
||||
.setPositiveButton(R.string.add, new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
String newRoom = favoriteEditText.getText().toString();
|
||||
if (newRoom.length() > 0 && !roomList.contains(newRoom)) {
|
||||
adapter.add(newRoom);
|
||||
adapter.notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
})
|
||||
.setView(dialogView)
|
||||
.setNegativeButton(R.string.cancel, null);
|
||||
builder.show();
|
||||
String newRoom = roomEditText.getText().toString();
|
||||
if (newRoom.length() > 0 && !roomList.contains(newRoom)) {
|
||||
adapter.add(newRoom);
|
||||
adapter.notifyDataSetChanged();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@ -408,7 +408,6 @@
|
||||
'type': 'none',
|
||||
'dependencies': [
|
||||
'api/api.gyp:libjingle_peerconnection_java',
|
||||
'<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_design_javalib'
|
||||
],
|
||||
'variables': {
|
||||
'apk_name': 'AppRTCDemo',
|
||||
@ -419,11 +418,9 @@
|
||||
'R_package_relpath': 'org/appspot/apprtc',
|
||||
'input_jars_paths': [
|
||||
'examples/androidapp/third_party/autobanh/autobanh.jar',
|
||||
'<(DEPTH)/third_party/android_tools/sdk/extras/android/support/v4/android-support-v4.jar',
|
||||
],
|
||||
'library_dexed_jars_paths': [
|
||||
'examples/androidapp/third_party/autobanh/autobanh.jar',
|
||||
'<(DEPTH)/third_party/android_tools/sdk/extras/android/support/v4/android-support-v4.jar',
|
||||
],
|
||||
'native_lib_target': 'libjingle_peerconnection_so',
|
||||
'add_to_dependents_classpaths':1,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user