From 922fae3c225a922aa43c2a1d4c50da0ee07f969c Mon Sep 17 00:00:00 2001 From: MenosGrante Date: Thu, 21 Jun 2018 11:10:44 +0300 Subject: [PATCH 1/2] - Fixed issue #19 - Fixed issue #20 - Updated Russian and Ukrainian localization - Updated .gitignore with Android related rules --- app/.gitignore | 28 +++- app/src/main/AndroidManifest.xml | 13 +- app/src/main/res/layout/fragment_about.xml | 175 ++++++++++---------- app/src/main/res/layout/fragment_config.xml | 140 ++++++++-------- app/src/main/res/values-ru/strings.xml | 3 + app/src/main/res/values-uk/strings.xml | 3 + 6 files changed, 205 insertions(+), 157 deletions(-) diff --git a/app/.gitignore b/app/.gitignore index 796b96d..aa46eb4 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,27 @@ -/build +# Built application files +/*/build/ + +# Crashlytics configuations +com_crashlytics_export_strings.xml + +# Local configuration file (sdk path, etc) +local.properties + +# Gradle generated files +.gradle/ + +# Signing files +.signing/ + +# User-specific configurations +.idea/ +*.iml + +# OS-specific files +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a28a60..f08ad0f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,28 +11,33 @@ android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + - diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index cdfef26..c9e5bdf 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -1,112 +1,117 @@ - + android:fillViewport="true"> - - - + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="16dp" + android:background="@color/colorBackgroundSecondary" + android:elevation="3dp" + android:orientation="vertical"> - + - + - + - + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:background="@color/colorBackgroundSecondary" + android:elevation="3dp" + android:orientation="vertical"> - + - + - - - + - + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:background="@color/colorBackgroundSecondary" + android:elevation="3dp" + android:orientation="vertical"> - + + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_config.xml b/app/src/main/res/layout/fragment_config.xml index 23210c3..df2abb3 100644 --- a/app/src/main/res/layout/fragment_config.xml +++ b/app/src/main/res/layout/fragment_config.xml @@ -1,89 +1,95 @@ - + android:fillViewport="true"> - - - - + android:layout_marginEnd="8dp" + android:layout_marginStart="8dp" + android:layout_marginTop="16dp" + android:background="@color/colorBackgroundSecondary" + android:elevation="3dp" + android:orientation="vertical"> -