diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8eba9595..1823aec3 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java index ee86fb84..372bb3d7 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/homeV2/view/HomeActivityV2.java @@ -2,6 +2,7 @@ package com.gmeremit.online.gmeremittance_native.homeV2.view; import android.content.DialogInterface; import android.content.Intent; +import android.content.res.Configuration; import android.graphics.Color; import android.os.Build; import android.support.annotation.RequiresApi; @@ -13,6 +14,7 @@ import android.support.v4.content.ContextCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.AlertDialog; import android.text.Html; +import android.util.Log; import android.view.Gravity; import android.view.View; import android.widget.ImageView; @@ -42,6 +44,8 @@ import com.gmeremit.online.gmeremittance_native.walletstatement.view.WalletState import com.gmeremit.online.gmeremittance_native.withdraw.view.WithDrawActivity; import com.text.drawable.TextDrawable; +import java.util.Locale; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -358,6 +362,33 @@ public class HomeActivityV2 extends BaseActivity implements HomeParentViewContra controlNo.setText(Html.fromHtml("GME Wallet No. " + walletNumber + "" +bankName)); } + private void changeLocaleTest() + { + Log.d("SelectedLocale", Locale.getDefault().getLanguage()) ; + + Locale locale = new Locale("ru"); + Locale.setDefault(locale); + // Create a new configuration object + Configuration config = new Configuration(); + // Set the locale of the new configuration + config.locale = locale; + // Update the configuration of the Accplication context + getResources().updateConfiguration( + config, + getResources().getDisplayMetrics() + ); + try { + Intent i = getBaseContext().getPackageManager() + .getLaunchIntentForPackage(getBaseContext().getPackageName()); + i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + startActivity(i); + } + catch(NullPointerException ne) + { + showToastMessage("Please restart app manually."); + } + } + @Override protected void onDestroy() { diff --git a/app/src/main/res/layout/fragment_home_v2.xml b/app/src/main/res/layout/fragment_home_v2.xml index 7a3013bc..e60b04cf 100644 --- a/app/src/main/res/layout/fragment_home_v2.xml +++ b/app/src/main/res/layout/fragment_home_v2.xml @@ -90,7 +90,7 @@ android:layout_centerHorizontal="true" android:gravity="center_horizontal" android:padding="2dp" - android:text="Remaining Yearly Limit" + android:text="@string/remaining_yearly_balance_text" android:textSize="13sp" app:fontFamily="@string/bold" app:txtfontName="@string/bold" /> diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml new file mode 100644 index 00000000..47db4c38 --- /dev/null +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -0,0 +1,91 @@ + + GME Remit + HomeActivity + Home + Dashboard + Notifications + Invite + Send Money + Agents + Profile + + 331163960743784 + fb331163960743784 + + + + SanFranciscoText-Light.otf + SanFranciscoText-Regular.otf + SanFranciscoText-Medium.otf + SanFranciscoText-Semibold.otf + SanFranciscoText-Bold.otf + SanFranciscoText-Heavy.otf + + + + Your document is in verification process. This will not take long. Thereafter you can enjoy GME online service. + Hello blank fragment + All field should be filled. + Please add the required information. + Are you sure ? + Are you sure want to exit ? + Yes + No + + activity_image_transition + activity_text_transition + activity_mixed_transition + fragment_image_transition + Please keep this GME control no. very secure.\n Share with concern party only + We are there to help you \n(Available time 10:00AM - 12:00AM) + Cancel + support@gmeremit.com + We are licensed by Ministry of Strategy & Finance to operate as the first Non-Bank Remittance Service providers in South Korea. Meeting all compliance regulations set forward by the regulators was a tough journey but today we feel proud about what we have achieved and how robust our operations are as a result of the hard work completed earlier. We are now ready with a 100% compliant and secured system that guarantees your money will arrive safely in right hands every single time. + For more information call at + Suggestions/Feedback + Transactions Amendment Request + General Enquiry + Subject + Hassle free money transfer to your \nloved ones + Connect to local community + Earn reward points and get \nsurprise gifts + Thank you for contacting us. + GME Wallet No. N/A + Change Password + App Lock + + + Whoops! + No Internet connection found. \nCheck your connection + You have successfully transferred your money to + Please keep this GME control no. very secure.\nShare with concerned party only + Refer to friend and get 7000KRW per refer when \nthey send money for the first time + + Your verification is still in progress. + You can transfer money to your GME Wallet from any nearest ATM or your Internet Banking. + Oops! Something went wrong + Please use newly generated access code + + Your money transfer has been sent successfully and is under review. + Your money transfer is pending for verification. + Your money transfer is ready to be picked up at any GME agent location. + Your money transfer has been successfully received. + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + The standard Lorem Ipsum passage, used since the 1500s +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + +Section 1.10.32 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC +"Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?" + +1914 translation by H. Rackham +"But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?" + +Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC +"At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat." + +1914 translation by H. Rackham +"On the other hand, we denounce with righteous indignation and dislike men who are so beguiled and demoralized by the charms of pleasure of the moment, so blinded by desire, that they cannot foresee the pain and trouble that are bound to ensue; and equal blame belongs to those who fail in their duty through weakness of will, which is the same as saying through shrinking from toil and pain. These cases are perfectly simple and easy to distinguish. In a free hour, when our power of choice is untrammelled and when nothing prevents our being able to do what we like best, every pleasure is to be welcomed and every pain avoided. But in certain circumstances and owing to the claims of duty or the obligations of business it will frequently occur that pleasures have to be repudiated and annoyances accepted. The wise man therefore always holds in these matters to this principle of selection: he rejects pleasures to secure other greater pleasures, or else he endures pains to avoid worse pains." + + Остающийся годовой баланс + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d352eec7..acf746d8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,4 +86,7 @@ Section 1.10.33 of "de Finibus Bonorum et Malorum", written by Cicero in 45 BC 1914 translation by H. Rackham "On the other hand, we denounce with righteous indignation and dislike men who are so beguiled and demoralized by the charms of pleasure of the moment, so blinded by desire, that they cannot foresee the pain and trouble that are bound to ensue; and equal blame belongs to those who fail in their duty through weakness of will, which is the same as saying through shrinking from toil and pain. These cases are perfectly simple and easy to distinguish. In a free hour, when our power of choice is untrammelled and when nothing prevents our being able to do what we like best, every pleasure is to be welcomed and every pain avoided. But in certain circumstances and owing to the claims of duty or the obligations of business it will frequently occur that pleasures have to be repudiated and annoyances accepted. The wise man therefore always holds in these matters to this principle of selection: he rejects pleasures to secure other greater pleasures, or else he endures pains to avoid worse pains." + Remaining Yearly Balance + +