Skip to content

Commit d4a30f5

Browse files
committed
[smarcet] - #14453
* fixed label days issue
1 parent ed47eae commit d4a30f5

File tree

4 files changed

+20
-0
lines changed

4 files changed

+20
-0
lines changed

app/src/main/java/org/openstack/android/summit/modules/splash/user_interface/ISplashView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ public interface ISplashView extends IBaseView {
3030
void setSummitCurrentDayContainerVisibility(boolean visible);
3131

3232
void setSummitCurrentDay(String day);
33+
34+
void setDayLeftLabel(String label);
3335
}

app/src/main/java/org/openstack/android/summit/modules/splash/user_interface/SplashActivity.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public class SplashActivity extends BaseActivity implements ISplashView {
5959
@BindView(R.id.summit_days_left_container)
6060
LinearLayout summitDaysLeftContainer;
6161

62+
@BindView(R.id.day_left_label)
63+
TextView dayLeftLabel;
64+
6265
@BindView(R.id.day_until_1)
6366
TextView dayUntil1Text;
6467

@@ -222,4 +225,10 @@ public void setSummitDaysLeftContainerVisibility(boolean visible) {
222225
if(summitDaysLeftContainer == null) return;
223226
summitDaysLeftContainer.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
224227
}
228+
229+
@Override
230+
public void setDayLeftLabel(String label){
231+
if(dayLeftLabel == null) return;
232+
dayLeftLabel.setText(label);
233+
}
225234
}

app/src/main/java/org/openstack/android/summit/modules/splash/user_interface/SplashPresenter.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
import com.crashlytics.android.Crashlytics;
1414

15+
import org.openstack.android.summit.OpenStackSummitApplication;
16+
import org.openstack.android.summit.R;
1517
import org.openstack.android.summit.SummitsListDataLoaderActivity;
1618
import org.openstack.android.summit.common.Constants;
1719
import org.openstack.android.summit.common.DTOs.SummitDTO;
@@ -171,6 +173,7 @@ public void showSummitInfo() {
171173
if (summit.isNotStarted()) {
172174

173175
int daysLeft = summit.getDaysLeft();
176+
174177
if (daysLeft > 0) {
175178
view.setSummitDaysLeftContainerVisibility(true);
176179
char[] days = String.valueOf(daysLeft).toCharArray();
@@ -188,6 +191,11 @@ public void showSummitInfo() {
188191
}
189192
++index;
190193
}
194+
String label = daysLeft == 1 ?
195+
OpenStackSummitApplication.context.getString(R.string.splash_day_left_label):
196+
OpenStackSummitApplication.context.getString(R.string.splash_days_left_label);
197+
198+
view.setDayLeftLabel(label);
191199
}
192200
return;
193201
}

app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
<string name="splash_login_button_txt">SIGN IN USING OPENSTACK ID</string>
108108
<string name="splash_guest_button_txt">continue as guest</string>
109109
<string name="splash_days_left_label">days left</string>
110+
<string name="splash_day_left_label">day left</string>
110111
<string name="splash_current_day">day</string>
111112
<string name="now">NOW</string>
112113
<string name="save_favorite">Watch Later</string>

0 commit comments

Comments
 (0)