Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Reformat everything...
  • Loading branch information
pcgod committed Oct 8, 2010
1 parent 6612010 commit e98f26a
Show file tree
Hide file tree
Showing 26 changed files with 927 additions and 803 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Expand Up @@ -12,8 +12,8 @@
<activity android:name=".app.ServerInfo"></activity>
<activity android:name=".app.ChannelList" android:launchMode="singleTask"></activity>
<activity android:name=".app.ChatActivity"></activity>
<service android:enabled="true" android:name=".service.MumbleService"></service>
</application>
<service android:enabled="true" android:name=".service.MumbleService"></service>
</application>
<uses-sdk android:targetSdkVersion="8" android:minSdkVersion="3" />
<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
Expand Down
58 changes: 37 additions & 21 deletions res/layout/channel_list.xml
@@ -1,66 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/connectionViewRoot"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">

<!-- Channel name + Browse row -->
<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent">
<TextView android:id="@+id/channelName"
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent">
<TextView
android:id="@+id/channelName"
android:textSize="30sp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:layout_width="wrap_content" />

<Button android:id="@+id/browseButton"
<Button
android:id="@+id/browseButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/channels"/>
android:layout_height="wrap_content"
android:text="@string/channels" />
</LinearLayout>

<TextView android:id="@+id/noUsersText"
<TextView
android:id="@+id/noUsersText"
android:text="@string/noUsers"
android:textSize="40sp"
android:layout_height="fill_parent"
android:gravity="center"
android:layout_width="fill_parent"
android:layout_weight="1" />
<ListView android:id="@+id/channelUsers"
<ListView
android:id="@+id/channelUsers"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="1" />

<!-- Bottom row: Placeholder + Speak/Join + Speaker -->
<LinearLayout android:id="@+id/LinearLayout02"
<LinearLayout
android:id="@+id/LinearLayout02"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:layout_marginBottom="0sp" android:orientation="horizontal" android:layout_width="fill_parent">
android:layout_marginBottom="0sp"
android:orientation="horizontal"
android:layout_width="fill_parent">

<!-- Placeholder -->
<LinearLayout android:id="@+id/LinearLayout01"
<LinearLayout
android:id="@+id/LinearLayout01"
android:layout_height="wrap_content"
android:layout_weight="0"
android:layout_width="0dp">
</LinearLayout>

<!-- Speak/Join. Only one of these should be visible at any one moment -->
<Button android:id="@+id/joinButton"
<!--
Speak/Join. Only one of these should be visible at any one moment
-->
<Button
android:id="@+id/joinButton"
android:text="@string/userJoin"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
<ToggleButton android:id="@+id/speakButton"
android:visibility="gone" />
<ToggleButton
android:id="@+id/speakButton"
android:text="@+id/speakButton"
android:textOff="@string/userSpeak"
android:textOn="@string/userSpeak"
android:textSize="20sp"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_weight="1"/>
android:layout_weight="1" />

<!-- Speaker checkbox -->
<LinearLayout
Expand All @@ -69,11 +85,11 @@
android:gravity="right|center_vertical"
android:layout_width="0dp">

<CheckBox android:id="@+id/speakerCheckBox"
<CheckBox
android:id="@+id/speakerCheckBox"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>

</LinearLayout>
41 changes: 28 additions & 13 deletions res/layout/chat_view.xml
@@ -1,20 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_height="fill_parent"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="fill_parent"
android:layout_width="fill_parent">
<TextView android:layout_width="fill_parent" android:id="@+id/chatText"
android:scrollbars="vertical" android:layout_weight="1"
<TextView
android:layout_width="fill_parent"
android:id="@+id/chatText"
android:scrollbars="vertical"
android:layout_weight="1"
android:layout_height="0dip" />
<LinearLayout android:id="@+id/LinearLayout01"
android:layout_height="wrap_content" android:layout_width="fill_parent">
<EditText android:layout_width="wrap_content"
android:layout_height="wrap_content" android:visibility="invisible"
<LinearLayout
android:id="@+id/LinearLayout01"
android:layout_height="wrap_content"
android:layout_width="fill_parent">
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:id="@+id/chatTargetEdit"></EditText>
<EditText android:layout_height="wrap_content" android:id="@+id/chatTextEdit"
android:imeOptions="actionSend" android:layout_width="wrap_content"
android:layout_weight="1" android:hint="@string/chat_message"></EditText>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/send_button"
<EditText
android:layout_height="wrap_content"
android:id="@+id/chatTextEdit"
android:imeOptions="actionSend"
android:layout_width="wrap_content"
android:layout_weight="1"
android:hint="@string/chat_message"></EditText>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/send_button"
android:text="@string/sendText"></Button>
</LinearLayout>
</LinearLayout>
14 changes: 7 additions & 7 deletions res/layout/main.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ListView
android:id="@+id/android:list"
android:layout_height="fill_parent"
android:layout_width="fill_parent"/>
android:layout_width="fill_parent" />
<TextView
android:text="@string/noServers"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/android:empty"/>
android:id="@+id/android:empty" />
</LinearLayout>
80 changes: 54 additions & 26 deletions res/layout/server_add.xml
@@ -1,38 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent">
<LinearLayout android:layout_height="wrap_content"
android:layout_width="fill_parent" android:orientation="vertical">
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/serverName"
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/serverName"
android:text="@string/serverName"></TextView>
<EditText android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/serverNameEdit"
<EditText
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/serverNameEdit"
android:inputType="text"></EditText>
<TextView android:id="@+id/serverHost" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/serverHost"></TextView>
<EditText android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/serverHostEdit"
<TextView
android:id="@+id/serverHost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/serverHost"></TextView>
<EditText
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/serverHostEdit"
android:inputType="text"></EditText>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/serverPort"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/serverPort"
android:id="@+id/serverPort"></TextView>
<EditText android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/serverPortEdit"
<EditText
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/serverPortEdit"
android:inputType="number"></EditText>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content" android:text="@string/serverUsername"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/serverUsername"
android:id="@+id/serverUsername"></TextView>
<EditText android:layout_height="wrap_content"
android:layout_width="fill_parent" android:id="@+id/serverUsernameEdit"
<EditText
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/serverUsernameEdit"
android:inputType="text"></EditText>
<TextView android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/serverPassword"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/serverPassword"
android:text="@string/serverPassword"></TextView>
<EditText android:layout_height="wrap_content" android:id="@+id/serverPasswordEdit"
android:layout_width="fill_parent" android:inputType="textPassword"></EditText>
<Button android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/serverAdd"
<EditText
android:layout_height="wrap_content"
android:id="@+id/serverPasswordEdit"
android:layout_width="fill_parent"
android:inputType="textPassword"></EditText>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/serverAdd"
android:text="@string/serverAdd"></Button>
</LinearLayout>
</ScrollView>
17 changes: 13 additions & 4 deletions res/layout/server_list_row.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical">
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/server_row_name" android:textSize="20sp"></TextView>
<TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/server_row_user"></TextView>
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/server_row_name"
android:textSize="20sp"></TextView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/server_row_user"></TextView>
</LinearLayout>
1 change: 0 additions & 1 deletion src/org/pcgod/mumbleclient/Globals.java
Expand Up @@ -4,7 +4,6 @@
* Constant global values
*
* @author Rantanen
*
*/
public class Globals {

Expand Down

0 comments on commit e98f26a

Please sign in to comment.