diff --git a/.gradle/buildOutputCleanup/built.bin b/.gradle/buildOutputCleanup/built.bin new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..f7846b5 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Jun 25 14:20:54 EET 2018 +gradle.version=4.1 diff --git a/.gradle/buildOutputCleanup/cache.properties.lock b/.gradle/buildOutputCleanup/cache.properties.lock new file mode 100644 index 0000000..40fdece --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties.lock @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 6492fb6..898b609 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:27.1.1' implementation project(':localizationActivity') } diff --git a/app/src/main/java/com/akexorcist/localizationapp/MainActivity.java b/app/src/main/java/com/akexorcist/localizationapp/MainActivity.java index 0782d22..ca02a9c 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/MainActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/MainActivity.java @@ -12,12 +12,14 @@ import com.akexorcist.localizationapp.stackedactivity.Stack1Activity; import com.akexorcist.localizationapp.viewpager.ViewPagerActivity; +import java.util.Locale; + public class MainActivity extends LocalizationActivity { @Override public void onCreate(Bundle savedInstanceState) { // You can set default language when first time running. Must to setup before onCreate was called. - setDefaultLanguage("en"); + setDefaultLanguage(Locale.getDefault()); super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); diff --git a/app/src/main/java/com/akexorcist/localizationapp/customactivity/SimpleCustomActivity.java b/app/src/main/java/com/akexorcist/localizationapp/customactivity/SimpleCustomActivity.java index 04ed672..ddc4ce8 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/customactivity/SimpleCustomActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/customactivity/SimpleCustomActivity.java @@ -26,6 +26,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); svLanguageChooser = findViewById(R.id.sv_language_chooser); } @@ -71,4 +72,8 @@ private View.OnClickListener onPortugalLanguageSelected() { private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } } diff --git a/app/src/main/java/com/akexorcist/localizationapp/nestedfragment/NestedFragmentActivity.java b/app/src/main/java/com/akexorcist/localizationapp/nestedfragment/NestedFragmentActivity.java index 5e887aa..5d18b8e 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/nestedfragment/NestedFragmentActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/nestedfragment/NestedFragmentActivity.java @@ -30,6 +30,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); svLanguageChooser = findViewById(R.id.sv_language_chooser); @@ -82,4 +83,8 @@ private View.OnClickListener onPortugalLanguageSelected() { private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } } diff --git a/app/src/main/java/com/akexorcist/localizationapp/simpleactivity/SimpleActivity.java b/app/src/main/java/com/akexorcist/localizationapp/simpleactivity/SimpleActivity.java index 60d1d28..87f90c7 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/simpleactivity/SimpleActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/simpleactivity/SimpleActivity.java @@ -27,6 +27,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); svLanguageChooser = findViewById(R.id.sv_language_chooser); } @@ -72,4 +73,8 @@ private View.OnClickListener onPortugalLanguageSelected() { private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } } diff --git a/app/src/main/java/com/akexorcist/localizationapp/simplefragment/SimpleFragmentActivity.java b/app/src/main/java/com/akexorcist/localizationapp/simplefragment/SimpleFragmentActivity.java index 8b57f08..863dfaf 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/simplefragment/SimpleFragmentActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/simplefragment/SimpleFragmentActivity.java @@ -26,6 +26,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); svLanguageChooser = findViewById(R.id.sv_language_chooser); @@ -78,4 +79,8 @@ private View.OnClickListener onPortugalLanguageSelected() { private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } } diff --git a/app/src/main/java/com/akexorcist/localizationapp/stackedactivity/Stack2Activity.java b/app/src/main/java/com/akexorcist/localizationapp/stackedactivity/Stack2Activity.java index 5c6b382..f9f8007 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/stackedactivity/Stack2Activity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/stackedactivity/Stack2Activity.java @@ -24,6 +24,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); } private View.OnClickListener onAmericaLanguageSelected() { @@ -53,4 +54,8 @@ private View.OnClickListener onPortugalLanguageSelected() { private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } } diff --git a/app/src/main/java/com/akexorcist/localizationapp/viewpager/ViewPagerActivity.java b/app/src/main/java/com/akexorcist/localizationapp/viewpager/ViewPagerActivity.java index 4acaafb..64fe5c1 100644 --- a/app/src/main/java/com/akexorcist/localizationapp/viewpager/ViewPagerActivity.java +++ b/app/src/main/java/com/akexorcist/localizationapp/viewpager/ViewPagerActivity.java @@ -28,6 +28,7 @@ public void onCreate(Bundle savedInstanceState) { findViewById(R.id.btn_korea).setOnClickListener(onKoreaLanguageSelected()); findViewById(R.id.btn_portugal).setOnClickListener(onPortugalLanguageSelected()); findViewById(R.id.btn_thai).setOnClickListener(onThaiLanguageSelected()); + findViewById(R.id.btn_turkey).setOnClickListener(onTurkeyLanguageSelected()); btnNext = findViewById(R.id.btn_next); btnNext.setOnClickListener(onNextPageClick()); @@ -98,6 +99,10 @@ private View.OnClickListener onThaiLanguageSelected() { return view -> setLanguage("th"); } + private View.OnClickListener onTurkeyLanguageSelected() { + return view -> setLanguage("tr"); + } + private View.OnClickListener onNextPageClick() { return view -> vpGreeting.setCurrentItem(vpGreeting.getCurrentItem() + 1); } diff --git a/app/src/main/res/layout/activity_stack_2.xml b/app/src/main/res/layout/activity_stack_2.xml index 7943b6e..fe19849 100644 --- a/app/src/main/res/layout/activity_stack_2.xml +++ b/app/src/main/res/layout/activity_stack_2.xml @@ -93,6 +93,16 @@ android:contentDescription="@string/thai" android:scaleType="fitCenter" android:src="@mipmap/country_thai" /> + + diff --git a/app/src/main/res/layout/layout_language_chooser.xml b/app/src/main/res/layout/layout_language_chooser.xml index 137088c..10ebc43 100644 --- a/app/src/main/res/layout/layout_language_chooser.xml +++ b/app/src/main/res/layout/layout_language_chooser.xml @@ -80,5 +80,15 @@ android:contentDescription="@string/thai" android:scaleType="fitCenter" android:src="@mipmap/country_thai" /> + + diff --git a/app/src/main/res/mipmap-xhdpi/country_turkey.png b/app/src/main/res/mipmap-xhdpi/country_turkey.png new file mode 100644 index 0000000..ef6d516 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/country_turkey.png differ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml new file mode 100644 index 0000000..bfab9a3 --- /dev/null +++ b/app/src/main/res/values-tr/strings.xml @@ -0,0 +1,10 @@ + + + Bir + İki + Üç + Merhaba Dünya + Türkçe + Youtube uygulamasını açtığınızda, izleyeceğiniz yere ineceksiniz. Ne izlemek için abonelikler ve sizin için önerilen videolardan son yüklemeler ve aktivite vurgulamaktadır. Ayrıca daha önce müzik videoları izlediyseniz popüler içerik ve YouTube karışımları göreceksiniz. Rehberden istediğiniz zaman bu beslemeye geri dönebilirsiniz. + Elma ağacı (malus evtica) en iyi tatlı, aromalı meyve, elma bilinen gül aile içinde yapraklı bir ağaçtır. Bir meyve ağacı olarak dünya çapında yetiştirilen ve genus malus en yaygın olarak yetiştirilen türdür. Ağaç, vahşi atası Malus siesersi, bugün hala bulunduğu Orta Asya\'dan kökenlidir. Elmalar binlerce yıldır Asya\'da ve Avrupa\'da büyüdü ve Avrupalı sömürgeciler tarafından Kuzey Amerika\'ya getirildi. Elma, Norse, Yunan ve Avrupa Hıristiyan gelenekleri de dahil olmak üzere birçok kültürde dini ve mitolojik öneme sahiptir. Elma ağaçları tohum yetiştirilir ise büyük, ancak kökleri (rootstock) üzerine aşılı küçük. Elma 7500\'den fazla bilinen çeşidi vardır, istenilen özellikleri bir dizi sonuçlanan. Farklı çeşitler çeşitli zevk ve kullanımlar için yetiştirilir, pişirme, çiğ yeme ve elma şarabı üretimi dahil. Elma genellikle aşılama tarafından yayılır, yabani elma tohum kolayca büyümek rağmen. Ağaçlar ve meyveler, organik ve organik olmayan yollarla kontrol edilebilir mantar, bakteriyel ve haşere sorunları, bir dizi yatkındır. 2010 yılında, meyve genomu hastalık kontrolü ve elma üretiminde seçici üreme araştırma bir parçası olarak deşifre edilmiştir. Yaklaşık 80 milyon ton elma dünya çapında yetiştirilen 2013, ve Çin Bu toplam neredeyse yarısı üretildi.[3] Amerika Birleşik Devletleri dünya üretiminin %6\'sını aşan ikinci lider üreticisidir. Türkiye üçüncü, ardından İtalya, Hindistan ve Polonya. Elma genellikle çiğ yenir, ama aynı zamanda birçok hazır gıdalar (özellikle tatlılar) ve içecekler bulunabilir. Birçok yararlı sağlık etkileri elma yeme sonucu düşünülmektedir; ancak, iki tür alerji meyve bulunan çeşitli protein atfedilir. + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 144da76..be80287 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,4 +31,5 @@ Korea Portugal Thai + Turkish diff --git a/localizationActivity/build.gradle b/localizationActivity/build.gradle index 7bd5aa0..7876c68 100644 --- a/localizationActivity/build.gradle +++ b/localizationActivity/build.gradle @@ -21,7 +21,7 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:27.1.1' } apply from: '../maven_push.gradle' diff --git a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.java b/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.java index 44cf0d3..32db7e1 100644 --- a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.java +++ b/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationActivityDelegate.java @@ -23,16 +23,13 @@ public class LocalizationActivityDelegate { private static final String KEY_ACTIVITY_LOCALE_CHANGED = "activity_locale_changed"; - + private final Activity activity; + private final List localeChangedListeners = new ArrayList<>(); // Boolean flag to check that activity was recreated from locale changed. private boolean isLocalizationChanged = false; - // Prepare default language. private Locale currentLanguage = LanguageSetting.getDefaultLanguage(); - private final Activity activity; - private final List localeChangedListeners = new ArrayList<>(); - public LocalizationActivityDelegate(Activity activity) { this.activity = activity; } @@ -83,14 +80,7 @@ public Context getApplicationContext(Context applicationContext) { } public Resources getResources(Resources resources) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { - Configuration config = resources.getConfiguration(); - config.locale = LanguageSetting.getLanguage(activity); - DisplayMetrics metrics = resources.getDisplayMetrics(); - return new Resources(activity.getAssets(), metrics, config); - } else { - return resources; - } + return resources; } // Provide method to set application language by country name. diff --git a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationContext.java b/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationContext.java index abcbd70..82f5ab9 100644 --- a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationContext.java +++ b/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationContext.java @@ -17,9 +17,13 @@ public LocalizationContext(Context base) { @Override public Resources getResources() { - Configuration conf = super.getResources().getConfiguration(); - conf.locale = LanguageSetting.getLanguage(this); - DisplayMetrics metrics = super.getResources().getDisplayMetrics(); - return new Resources(getAssets(), metrics, conf); + try { + Configuration conf = super.getResources().getConfiguration(); + conf.locale = LanguageSetting.getLanguage(this); + DisplayMetrics metrics = super.getResources().getDisplayMetrics(); + return new Resources(getAssets(), metrics, conf); + } catch (Exception e) { + return getResources(); + } } } diff --git a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationDelegate.java b/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationDelegate.java deleted file mode 100644 index 570fb31..0000000 --- a/localizationActivity/src/main/java/com/akexorcist/localizationactivity/core/LocalizationDelegate.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.akexorcist.localizationactivity.core; - -import android.app.Activity; - -/** - * Created by Aleksander Mielczarek on 03.04.2016. - */ - - -/** - * Use LocalizationActivityDelegate - */ - -@Deprecated -public class LocalizationDelegate extends LocalizationActivityDelegate { - public LocalizationDelegate(Activity activity) { - super(activity); - } -}