Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android client. Added status message and Ip address shoing to the user prop #2479

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Default Qt Client
- Fixed language not set at first start
- Fixed OPUS DTX mode sending too big packets when variable bitrate mode (VBR) was disabled
Android Client
-
- IP Address and status message is now shown on user Properties dialog
iOS Client
-
Server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ protected void onStop() {
void showUser() {
TextView nickname = findViewById(R.id.user_nickname);
TextView username = findViewById(R.id.user_username);
TextView statusmsg = findViewById(R.id.user_statusmsg);
TextView clientname = findViewById(R.id.user_clientname);
TextView ipaddress = findViewById(R.id.user_ipaddress);
final SeekBar voiceVol = findViewById(R.id.user_vol_voiceSeekBar);
final Button defVoiceBtn = findViewById(R.id.defVoiceVolBtn);
final SwitchCompat voiceMute = findViewById(R.id.user_mutevoiceSwitch);
Expand All @@ -145,7 +147,9 @@ void showUser() {

nickname.setText(user.szNickname);
username.setText(user.szUsername);
statusmsg.setText(user.szStatusMsg);
clientname.setText(String.format("%s %s %d.%d.%d",user.szClientName,getString(R.string.user_prop_clientversion) , ((user.uVersion >> 16) & 0xFF) , ((user.uVersion >> 8) & 0xFF) , (user.uVersion & 0xFF)));
ipaddress.setText(user.szIPAddress);
voiceVol.setMax(100);
voiceVol.setProgress(Utils.refVolumeToPercent(user.nVolumeVoice));
mediaVol.setMax(100);
Expand Down
30 changes: 30 additions & 0 deletions Client/TeamTalkAndroid/src/main/res/layout/activity_user_prop.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,21 @@
android:layout_column="1"
android:layout_gravity="center_vertical" />

<TextView
android:id="@+id/user_statusmsglabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="center_vertical"
android:text="@string/user_prop_title_statusmsg" />

<TextView
android:id="@+id/user_statusmsg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="center_vertical" />

<TextView
android:id="@+id/user_clientnamelabel"
android:layout_width="wrap_content"
Expand All @@ -56,6 +71,21 @@
android:layout_column="1"
android:layout_gravity="center_vertical" />

<TextView
android:id="@+id/user_ipaddresslabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="0"
android:layout_gravity="center_vertical"
android:text="@string/user_prop_title_ipaddress" />

<TextView
android:id="@+id/user_ipaddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:layout_gravity="center_vertical" />

<TextView
android:id="@+id/user_vol_voicelabel"
android:layout_width="wrap_content"
Expand Down
2 changes: 2 additions & 0 deletions Client/TeamTalkAndroid/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,10 @@


<string name="user_prop_title_username">Username</string>
<string name="user_prop_title_statusmsg">StatusMessage</string>
<string name="user_prop_title_clientname">Client Name</string>
<string name="user_prop_clientversion">version</string>
<string name="user_prop_title_ipaddress">IPAddress</string>
<string name="user_prop_title_voice_volume">Voice Volume</string>
<string name="user_prop_title_mute_voice">Mute Voice</string>
<string name="user_prop_title_media_volume">Media File Volume</string>
Expand Down