Skip to content

Commit

Permalink
String names changed with eb_prefix.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilginenes
bilginenes committed Jun 7, 2019
1 parent 7a2411c commit 70e4e90
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 104 deletions.
6 changes: 3 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="eb_colorPrimary">#008577</color>
<color name="eb_colorPrimaryDark">#00574B</color>
<color name="eb_colorAccent">#D81B60</color>
</resources>
4 changes: 0 additions & 4 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

</resources>
8 changes: 4 additions & 4 deletions ...alogutilities/src/main/java/com/enesbilgin/ebdialogutilities/Fragments/VoteAppDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
alert_view_okay = view.findViewById(R.id.alert_view_okay);

if(app_name==null) {
alert_view_header.setText(R.string.vote_header);
alert_view_header.setText(R.string.eb_vote_header);
} else {
String custom_header = String.format(getContext().getString(R.string.vote_header_custom), app_name);
String custom_header = String.format(getContext().getString(R.string.eb_vote_header_custom), app_name);
alert_view_header.setText(custom_header);
}

alert_view_message.setText(R.string.vote_message);
alert_view_message.setText(R.string.eb_vote_message);

if(voteChoiceListener==null)
return null;
Expand All @@ -92,7 +92,7 @@ public void onClick(View v) {
}
});

alert_view_okay.setText(R.string.later);
alert_view_okay.setText(R.string.eb_later);
alert_view_okay.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Expand Down
12 changes: 6 additions & 6 deletions ...utilities/src/main/java/com/enesbilgin/ebdialogutilities/Utilities/EBDialogUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ public static void showInfoBox(Context context,String header_text, String messag
}

public static void showInfoBox(Context context, String message_text) {
String header_text = context.getString(R.string.information);
String header_text = context.getString(R.string.eb_information);
showInfoBox(context, header_text, message_text);
}

public static void showInfoBox(Context context, String message_text, SingleEventListener singleEventListener) {
String header_text = context.getString(R.string.information);
String header_text = context.getString(R.string.eb_information);
EBAlertViewDialog dialog = EBAlertViewDialog.newInstance(AlertViewType.INFO_BOX, header_text, message_text, singleEventListener);
show(dialog, context);
}

public static void showNotSupportedInfoBox(Context context) {
EBAlertViewDialog dialog = EBAlertViewDialog.newInstance(AlertViewType.INFO_BOX,context.getString(R.string.information),context.getString(R.string.not_supported_annotation));
EBAlertViewDialog dialog = EBAlertViewDialog.newInstance(AlertViewType.INFO_BOX,context.getString(R.string.eb_information),context.getString(R.string.eb_not_supported_annotation));
show(dialog, context);
}

Expand All @@ -63,12 +63,12 @@ public static void showErrorBox(Context context,String header_text, String messa
}

public static void showErrorBox(Context context, String message_text) {
String header_text = context.getString(R.string.error);
String header_text = context.getString(R.string.eb_error);
showErrorBox(context, header_text, message_text);
}

public static void showErrorBox(Context context, String message_text, SingleEventListener singleEventListener) {
String header_text = context.getString(R.string.error);
String header_text = context.getString(R.string.eb_error);
showErrorBox(context, header_text, message_text, singleEventListener);
}

Expand Down Expand Up @@ -102,7 +102,7 @@ public static void show(DialogFragment dialog, Context context)
FragmentManager fm = ((FragmentActivity) context).getSupportFragmentManager();
dialog.show(fm, "dialog");
}else {
Toast.makeText(context,R.string.debug_notation,Toast.LENGTH_SHORT).show();
Toast.makeText(context,R.string.eb_debug_notation,Toast.LENGTH_SHORT).show();
}
}

Expand Down
4 changes: 2 additions & 2 deletions ebdialogutilities/src/main/res/layout/dialog_dark_1_alert_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
style="@style/Header1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lorem_ipsum_short" />
android:text="@string/eb_lorem_ipsum_short" />

<TextView
android:id="@+id/alert_view_message"
style="@style/Message1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lorem_ipsum_long" />
android:text="@string/eb_lorem_ipsum_long" />

<LinearLayout
android:id="@+id/alert_view_buttons"
Expand Down
4 changes: 2 additions & 2 deletions ebdialogutilities/src/main/res/layout/dialog_light_1_alert_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
style="@style/Header2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lorem_ipsum_short" />
android:text="@string/eb_lorem_ipsum_short" />

<TextView
android:id="@+id/alert_view_message"
style="@style/Message2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lorem_ipsum_long" />
android:text="@string/eb_lorem_ipsum_long" />

<LinearLayout
android:id="@+id/alert_view_buttons"
Expand Down
50 changes: 11 additions & 39 deletions ebdialogutilities/src/main/res/values-tr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,17 @@

<resources>

<string name="not_supported_annotation">Bu özellik şimdilik desteklenmiyor. Eğer bir hata olduğunu düşünüyorsanız, lütfen uygulama geliştiricisiyle iletişim kurun.</string>
<string name="debug_notation">Geliştirici bu durumu kontrol etmelidir.</string>
<string name="vote_header">Uygulamamızı beğendiniz mi?</string>
<string name="vote_header_custom">%s uyg. beğendiğiniz mi?</string>
<string name="vote_message">Google Play Store\'da yıldız vererek bizi destekleyebilirsiniz. Desteğiniz için teşekkürler :)</string>
<string name="eb_not_supported_annotation">Bu özellik şimdilik desteklenmiyor. Eğer bir hata olduğunu düşünüyorsanız, lütfen uygulama geliştiricisiyle iletişim kurun.</string>
<string name="eb_debug_notation">Geliştirici bu durumu kontrol etmelidir.</string>
<string name="eb_vote_header">Uygulamamızı beğendiniz mi?</string>
<string name="eb_vote_header_custom">%s uyg. beğendiğiniz mi?</string>
<string name="eb_vote_message">Google Play Store\'da yıldız vererek bizi destekleyebilirsiniz. Desteğiniz için teşekkürler :)</string>

<!--General expression-->
<string name="on">Aç</string>
<string name="off">Kapat</string>
<string name="yes">Evet</string>
<string name="no">Hayır</string>
<string name="ok">Tamam</string>
<string name="all">Hepsi</string>
<string name="confirm">Onayla</string>
<string name="share">Paylaş</string>
<string name="delete">Sil</string>
<string name="cancel">İptal</string>
<string name="search">Ara</string>
<string name="hide">Gizle</string>
<string name="unhide">Göster</string>
<string name="apply">Uygula</string>
<string name="clear">Temizle</string>
<string name="today">Bugün</string>
<string name="yesterday">Dün</string>
<string name="settings">Ayarlar</string>
<string name="change">Değiştir</string>
<string name="login">Oturum Aç</string>
<string name="register">Kayıt Ol</string>
<string name="information">Bilgilendirme</string>
<string name="tags">Etiketler</string>
<string name="success">Başarılı</string>
<string name="about">Hakkında</string>
<string name="pictures">Fotoğraflar</string>
<string name="profile">Profil</string>
<string name="albums">Albümler</string>
<string name="later">Sonra</string>
<string name="details">Detaylar</string>
<string name="locations">Yerler</string>
<string name="notifications">Bildirimler</string>
<string name="got_it">Anladım!</string>
<string name="error">Hata</string>
<string name="eb_yes">Evet</string>
<string name="eb_no">Hayır</string>
<string name="eb_ok">Tamam</string>
<string name="eb_information">Bilgilendirme</string>
<string name="eb_later">Sonra</string>
<string name="eb_error">Hata</string>
</resources>
54 changes: 13 additions & 41 deletions ebdialogutilities/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,50 +7,22 @@

<resources>

<string name="not_supported_annotation">This feature is not supported yet. If you think there is a problem, contact with the application developer.</string>
<string name="debug_notation">Developer should check this operation.</string>
<string name="vote_header">Do you like our application?</string>
<string name="vote_header_custom">Do you like %s?</string>
<string name="vote_message">You can support us by giving stars on Google Play Store. Thanks for your participation :)</string>
<string name="eb_not_supported_annotation">This feature is not supported yet. If you think there is a problem, contact with the application developer.</string>
<string name="eb_debug_notation">Developer should check this operation.</string>
<string name="eb_vote_header">Do you like our application?</string>
<string name="eb_vote_header_custom">Do you like %s?</string>
<string name="eb_vote_message">You can support us by giving stars on Google Play Store. Thanks for your participation :)</string>

<!--Fix Values, ID's, Keys, Tokens, API KEYS etc. -->
<string name="lorem_ipsum_long" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam</string>
<string name="lorem_ipsum_short" translatable="false">Lorem ipsum dolor sit amet</string>
<string name="eb_lorem_ipsum_long" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam</string>
<string name="eb_lorem_ipsum_short" translatable="false">Lorem ipsum dolor sit amet</string>

<!--General expression-->
<string name="on">On</string>
<string name="off">Off</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="ok">Okay</string>
<string name="all">All</string>
<string name="confirm">Confirm</string>
<string name="share">Share</string>
<string name="delete">Delete</string>
<string name="cancel">Cancel</string>
<string name="search">Search</string>
<string name="hide">Hide</string>
<string name="unhide">Unhide</string>
<string name="apply">Apply</string>
<string name="clear">Clear</string>
<string name="today">Today</string>
<string name="yesterday">Yesterday</string>
<string name="settings">Settings</string>
<string name="change">Change</string>
<string name="login">Login</string>
<string name="register">Register</string>
<string name="information">Information</string>
<string name="tags">Tags</string>
<string name="success">Successful</string>
<string name="about">About</string>
<string name="pictures">Pictures</string>
<string name="profile">Profile</string>
<string name="albums">Albums</string>
<string name="later">Later</string>
<string name="details">Details</string>
<string name="locations">Locations</string>
<string name="notifications">Notifications</string>
<string name="got_it">Got it!</string>
<string name="error">Error</string>
<string name="eb_yes">Yes</string>
<string name="eb_no">No</string>
<string name="eb_ok">Okay</string>
<string name="eb_information">Information</string>
<string name="eb_later">Later</string>
<string name="eb_error">Error</string>

</resources>
6 changes: 3 additions & 3 deletions ebdialogutilities/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,17 @@

<style name="ConfirmButton1" parent="BaseButton1">
<item name="android:textColor">@color/md_green_600</item>
<item name="android:text">@string/yes</item>
<item name="android:text">@string/eb_yes</item>
</style>

<style name="ConfirmButton2" parent="BaseButton1">
<item name="android:textColor">@color/md_light_blue_800</item>
<item name="android:text">@string/ok</item>
<item name="android:text">@string/eb_ok</item>
</style>

<style name="RefuseButton1" parent="BaseButton1">
<item name="android:textColor">@color/md_red_900</item>
<item name="android:text">@string/no</item>
<item name="android:text">@string/eb_no</item>
</style>

</resources>

0 comments on commit 70e4e90

Please sign in to comment.