Commit 99ab6ed2 authored by rakam's avatar rakam
Browse files

Veille sur SetupActivity et Numéro Single dans le bilan

parent 8b313c90
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 20 targetSdkVersion 20
versionCode 1 versionCode 1
versionName "1.2 Décembre 2014" versionName "1.3 Décembre 2014"
} }
buildTypes { buildTypes {
release { release {
......
...@@ -6,6 +6,7 @@ import android.app.FragmentTransaction; ...@@ -6,6 +6,7 @@ import android.app.FragmentTransaction;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.WindowManager;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.koushikdutta.async.future.FutureCallback; import com.koushikdutta.async.future.FutureCallback;
...@@ -53,6 +54,7 @@ public class MatchSetupActivity extends Activity implements OnMatchSelectedListe ...@@ -53,6 +54,7 @@ public class MatchSetupActivity extends Activity implements OnMatchSelectedListe
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
setContentView(R.layout.match_setup_activity); setContentView(R.layout.match_setup_activity);
flow.add(SelectMatchFragment.class.getName()); flow.add(SelectMatchFragment.class.getName());
flow.add(CourtIdFragment.class.getName()); flow.add(CourtIdFragment.class.getName());
......
...@@ -70,6 +70,15 @@ public class ResultFragment extends Fragment { ...@@ -70,6 +70,15 @@ public class ResultFragment extends Fragment {
countryATV.setText(null); countryATV.setText(null);
countryBTV.setText(null); countryBTV.setText(null);
} else { } else {
if (match.getCategorie().equals("SH")) {
int num = match.getId() % 7;
categorieTV.setText(Util.getCategorieName(match.getCategorie()) + " n°" + num);
} else if (match.getCategorie().equals("SF")) {
int num = (match.getId() - 2) % 7;
categorieTV.setText(Util.getCategorieName(match.getCategorie()) + " n°" + num);
} else {
categorieTV.setText(Util.getCategorieName(match.getCategorie()));
}
categorieTV.setText(Util.getCategorieName(match.getCategorie())); categorieTV.setText(Util.getCategorieName(match.getCategorie()));
tableauTV.setText(Util.getTableauName(match.getTableau())); tableauTV.setText(Util.getTableauName(match.getTableau()));
flagA.setImageResource(Util.getCountryFlag(match.getPaysA())); flagA.setImageResource(Util.getCountryFlag(match.getPaysA()));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment