forked from pcgod/mumble-android
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Reformat everything...
- Loading branch information
Showing
26 changed files
with
927 additions
and
803 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,6 @@ | |
* Constant global values | ||
* | ||
* @author Rantanen | ||
* | ||
*/ | ||
public class Globals { | ||
|
||
|
Oops, something went wrong.