Skip to content

Commit fa08a11

Browse files
fix conf
2 parents d0d87b5 + a8515f2 commit fa08a11

File tree

17 files changed

+72
-2
lines changed

17 files changed

+72
-2
lines changed

.gradle/buildOutputCleanup/built.bin

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Mon Jun 25 14:20:54 EET 2018
2+
gradle.version=4.1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+


app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ android {
2626

2727
dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
29-
implementation 'com.android.support:appcompat-v7:26.1.0'
29+
implementation 'com.android.support:appcompat-v7:27.1.1'
3030
implementation project(':localizationActivity')
3131
}

app/src/main/java/com/akexorcist/localizationapp/MainActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,18 @@
1212
import com.akexorcist.localizationapp.stackedactivity.Stack1Activity;
1313
import com.akexorcist.localizationapp.viewpager.ViewPagerActivity;
1414

15+
import java.util.Locale;
16+
1517
public class MainActivity extends LocalizationActivity {
1618

1719
@Override
1820
public void onCreate(Bundle savedInstanceState) {
1921
// You can set default language when first time running. Must to setup before onCreate was called.
22+
<<<<<<< HEAD
2023
setDefaultLanguage("en");
24+
=======
25+
setDefaultLanguage(Locale.getDefault());
26+
>>>>>>> develop
2127
super.onCreate(savedInstanceState);
2228
setContentView(R.layout.activity_main);
2329

app/src/main/java/com/akexorcist/localizationapp/customactivity/SimpleCustomActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
2626
findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected());
2727
findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected());
2828
findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected());
29+
findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected());
2930

3031
svLanguageChooser = findViewById(R.id.sv_language_chooser);
3132
}
@@ -71,4 +72,8 @@ private View.OnClickListener onPortugalLanguageSelected() {
7172
private View.OnClickListener onThaiLanguageSelected() {
7273
return view -> setLanguage("th");
7374
}
75+
76+
private View.OnClickListener onTurkeyLanguageSelected() {
77+
return view -> setLanguage("tr");
78+
}
7479
}

app/src/main/java/com/akexorcist/localizationapp/nestedfragment/NestedFragmentActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public void onCreate(Bundle savedInstanceState) {
3030
findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected());
3131
findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected());
3232
findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected());
33+
findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected());
3334

3435
svLanguageChooser = findViewById(R.id.sv_language_chooser);
3536

@@ -82,4 +83,8 @@ private View.OnClickListener onPortugalLanguageSelected() {
8283
private View.OnClickListener onThaiLanguageSelected() {
8384
return view -> setLanguage("th");
8485
}
86+
87+
private View.OnClickListener onTurkeyLanguageSelected() {
88+
return view -> setLanguage("tr");
89+
}
8590
}

app/src/main/java/com/akexorcist/localizationapp/simpleactivity/SimpleActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public void onCreate(Bundle savedInstanceState) {
2727
findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected());
2828
findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected());
2929
findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected());
30+
findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected());
3031

3132
svLanguageChooser = findViewById(R.id.sv_language_chooser);
3233
}
@@ -72,4 +73,8 @@ private View.OnClickListener onPortugalLanguageSelected() {
7273
private View.OnClickListener onThaiLanguageSelected() {
7374
return view -> setLanguage("th");
7475
}
76+
77+
private View.OnClickListener onTurkeyLanguageSelected() {
78+
return view -> setLanguage("tr");
79+
}
7580
}

app/src/main/java/com/akexorcist/localizationapp/simplefragment/SimpleFragmentActivity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public void onCreate(Bundle savedInstanceState) {
2626
findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected());
2727
findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected());
2828
findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected());
29+
findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected());
2930

3031
svLanguageChooser = findViewById(R.id.sv_language_chooser);
3132

@@ -78,4 +79,8 @@ private View.OnClickListener onPortugalLanguageSelected() {
7879
private View.OnClickListener onThaiLanguageSelected() {
7980
return view -> setLanguage("th");
8081
}
82+
83+
private View.OnClickListener onTurkeyLanguageSelected() {
84+
return view -> setLanguage("tr");
85+
}
8186
}

app/src/main/java/com/akexorcist/localizationapp/stackedactivity/Stack2Activity.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public void onCreate(Bundle savedInstanceState) {
2424
findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected());
2525
findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected());
2626
findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected());
27+
findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected());
2728
}
2829

2930
private View.OnClickListener onAmericaLanguageSelected() {
@@ -53,4 +54,8 @@ private View.OnClickListener onPortugalLanguageSelected() {
5354
private View.OnClickListener onThaiLanguageSelected() {
5455
return view -> setLanguage("th");
5556
}
57+
58+
private View.OnClickListener onTurkeyLanguageSelected() {
59+
return view -> setLanguage("tr");
60+
}
5661
}

0 commit comments

Comments
 (0)