Skip to content

Use string resources for connection status and tab labels #252

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.

Sign up for GitHub

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

Open
danielviana wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −9
Open

Use string resources for connection status and tab labels #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/main/java/io/netbird/client/ui/home/BottomDialogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ private void setupViewPager() {
new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> {
switch (position) {
case 0:
tab.setText("Peers");
tab.setText(R.string.tab_peers);
tab.setIcon(R.drawable.peers);
break;
case 1:
tab.setText("Networks");
tab.setText(R.string.tab_networks);
tab.setIcon(R.drawable.networks);
break;
default:
Expand Down
18 changes: 11 additions & 7 deletions app/src/main/java/io/netbird/client/ui/home/ButtonAnimation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
import android.util.Log;
import android.widget.TextView;

import androidx.annotation.StringRes;

import io.netbird.client.R;

import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieDrawable;

Expand All @@ -13,13 +17,13 @@ class ButtonAnimation {
private TextView textConnStatus;

private enum AnimationState {
DISCONNECTED("Disconnected"),
CONNECTING("Connecting"),
CONNECTED("Connected"),
DISCONNECTING("Disconnecting");
DISCONNECTED(R.string.main_status_disconnected),
CONNECTING(R.string.main_status_connecting),
CONNECTED(R.string.main_status_connected),
DISCONNECTING(R.string.main_status_disconnecting);

private final String text;
AnimationState(String text) { this.text = text; }
@StringRes private final int text;
AnimationState(@StringRes int text) { this.text = text; }
}

private AnimationState currentState = AnimationState.DISCONNECTED;
Expand Down Expand Up @@ -175,7 +179,7 @@ public void onAnimationEnd(Animator animation) {
});
}

private void updateText(String text) {
private void updateText(@StringRes int text) {
Log.i("ButtonAnimation", "set text: "+text);
textConnStatus.post(() -> textConnStatus.setText(text));
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
<string name="menu_troubleshoot">Troubleshoot</string>

<string name="main_status_disconnected">Disconnected</string>
<string name="main_status_connecting">Connecting</string>
<string name="main_status_connected">Connected</string>
<string name="main_status_disconnecting">Disconnecting</string>
<string name="main_desc_bg_mask">background mask</string>
<string name="main_desc_connect">connect-disconnect</string>

Expand All @@ -35,6 +38,8 @@

<string name="btn_close">Close</string>
<string name="peers_connected"><![CDATA[<b>%1$d</b> <b>of</b> <b>%2$d</b> Peers connected]]></string>
<string name="tab_peers">Peers</string>
<string name="tab_networks">Networks</string>
<string name="peers_hint_search_peers">Search peers</string>
<string name="peer_filter_all">All</string>
<string name="peer_filter_idle">Idle</string>
Expand Down