mirror of
https://github.com/XFox111/GUTSchedule.git
synced 2026-04-22 06:58:01 +03:00
Added version info to splash screen and main layout
Updated styles, layout. Fixed hidden by default selectors
This commit is contained in:
Michael Gordeev
@@ -12,7 +12,7 @@ namespace GUT.Schedule
|
||||
/// <summary>
|
||||
/// Shows status of schedule export process
|
||||
/// </summary>
|
||||
[Activity]
|
||||
[Activity(Theme = "@style/AppTheme.Light.SplashScreen")]
|
||||
public class ExportActivity : Activity
|
||||
{
|
||||
TextView status;
|
||||
|
||||
@@ -4,6 +4,7 @@ using System.Linq;
|
||||
using System.Net.Http;
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using Android.OS;
|
||||
using Android.Preferences;
|
||||
using Android.Support.V4.Text;
|
||||
@@ -17,7 +18,7 @@ using GUT.Schedule.Models;
|
||||
|
||||
namespace GUT.Schedule
|
||||
{
|
||||
[Activity(Theme = "@style/AppTheme")]
|
||||
[Activity]
|
||||
public class MainActivity : AppCompatActivity
|
||||
{
|
||||
Button start, end, export;
|
||||
@@ -34,6 +35,8 @@ namespace GUT.Schedule
|
||||
{
|
||||
base.OnCreate(savedInstanceState);
|
||||
SetContentView(Resource.Layout.activity_main);
|
||||
PackageInfo version = PackageManager.GetPackageInfo(PackageName, PackageInfoFlags.MatchAll);
|
||||
FindViewById<TextView>(Resource.Id.version).Text = $"v{version.VersionName} (ci-id #{version.VersionCode})";
|
||||
|
||||
prefs = PreferenceManager.GetDefaultSharedPreferences(this);
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ namespace GUT.Schedule
|
||||
/// <summary>
|
||||
/// Splash screen activity. Loads init data
|
||||
/// </summary>
|
||||
[Activity(MainLauncher = true)]
|
||||
[Activity(MainLauncher = true, Theme = "@style/AppTheme.Light.SplashScreen")]
|
||||
public class StartActivity : AppCompatActivity
|
||||
{
|
||||
TextView status;
|
||||
@@ -28,6 +28,8 @@ namespace GUT.Schedule
|
||||
base.OnCreate(savedInstanceState);
|
||||
|
||||
status = FindViewById<TextView>(Resource.Id.status);
|
||||
PackageInfo version = PackageManager.GetPackageInfo(PackageName, PackageInfoFlags.MatchAll);
|
||||
FindViewById<TextView>(Resource.Id.version).Text = $"v{version.VersionName} (ci-id #{version.VersionCode})";
|
||||
|
||||
status.Text = "Проверка наличия разрешений";
|
||||
|
||||
|
||||
@@ -109,8 +109,6 @@
|
||||
<SubType>Designer</SubType>
|
||||
</AndroidResource>
|
||||
<AndroidResource Include="Resources\values\colors.xml" />
|
||||
<AndroidResource Include="Resources\values\ic_launcher_background.xml" />
|
||||
<AndroidResource Include="Resources\values\styles.xml" />
|
||||
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
|
||||
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
|
||||
<AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
|
||||
@@ -160,6 +158,9 @@
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\drawable\logo.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<AndroidResource Include="Resources\values\styles.xml" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="108" android:versionName="1.0.8" package="com.xfox111.gut.schedule" android:installLocation="auto">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="0-development-test" package="com.xfox111.gut.schedule" android:installLocation="auto">
|
||||
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
|
||||
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="ГУТ.Расписание" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme.NoActionBar"></application>
|
||||
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="ГУТ.Расписание" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme.Light"></application>
|
||||
<uses-permission android:name="android.permission.READ_CALENDAR" />
|
||||
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
+105
-111
@@ -1925,271 +1925,262 @@ namespace GUT.Schedule
|
||||
public const int cardview_shadow_start_color = 2131034157;
|
||||
|
||||
// aapt resource value: 0x7F05002E
|
||||
public const int colorAccent = 2131034158;
|
||||
public const int colorPrimary = 2131034158;
|
||||
|
||||
// aapt resource value: 0x7F05002F
|
||||
public const int colorPrimary = 2131034159;
|
||||
public const int design_bottom_navigation_shadow_color = 2131034159;
|
||||
|
||||
// aapt resource value: 0x7F050030
|
||||
public const int colorPrimaryDark = 2131034160;
|
||||
public const int design_default_color_primary = 2131034160;
|
||||
|
||||
// aapt resource value: 0x7F050031
|
||||
public const int design_bottom_navigation_shadow_color = 2131034161;
|
||||
public const int design_default_color_primary_dark = 2131034161;
|
||||
|
||||
// aapt resource value: 0x7F050032
|
||||
public const int design_default_color_primary = 2131034162;
|
||||
public const int design_error = 2131034162;
|
||||
|
||||
// aapt resource value: 0x7F050033
|
||||
public const int design_default_color_primary_dark = 2131034163;
|
||||
public const int design_fab_shadow_end_color = 2131034163;
|
||||
|
||||
// aapt resource value: 0x7F050034
|
||||
public const int design_error = 2131034164;
|
||||
public const int design_fab_shadow_mid_color = 2131034164;
|
||||
|
||||
// aapt resource value: 0x7F050035
|
||||
public const int design_fab_shadow_end_color = 2131034165;
|
||||
public const int design_fab_shadow_start_color = 2131034165;
|
||||
|
||||
// aapt resource value: 0x7F050036
|
||||
public const int design_fab_shadow_mid_color = 2131034166;
|
||||
public const int design_fab_stroke_end_inner_color = 2131034166;
|
||||
|
||||
// aapt resource value: 0x7F050037
|
||||
public const int design_fab_shadow_start_color = 2131034167;
|
||||
public const int design_fab_stroke_end_outer_color = 2131034167;
|
||||
|
||||
// aapt resource value: 0x7F050038
|
||||
public const int design_fab_stroke_end_inner_color = 2131034168;
|
||||
public const int design_fab_stroke_top_inner_color = 2131034168;
|
||||
|
||||
// aapt resource value: 0x7F050039
|
||||
public const int design_fab_stroke_end_outer_color = 2131034169;
|
||||
public const int design_fab_stroke_top_outer_color = 2131034169;
|
||||
|
||||
// aapt resource value: 0x7F05003A
|
||||
public const int design_fab_stroke_top_inner_color = 2131034170;
|
||||
public const int design_snackbar_background_color = 2131034170;
|
||||
|
||||
// aapt resource value: 0x7F05003B
|
||||
public const int design_fab_stroke_top_outer_color = 2131034171;
|
||||
public const int design_tint_password_toggle = 2131034171;
|
||||
|
||||
// aapt resource value: 0x7F05003C
|
||||
public const int design_snackbar_background_color = 2131034172;
|
||||
public const int dim_foreground_disabled_material_dark = 2131034172;
|
||||
|
||||
// aapt resource value: 0x7F05003D
|
||||
public const int design_tint_password_toggle = 2131034173;
|
||||
public const int dim_foreground_disabled_material_light = 2131034173;
|
||||
|
||||
// aapt resource value: 0x7F05003E
|
||||
public const int dim_foreground_disabled_material_dark = 2131034174;
|
||||
public const int dim_foreground_material_dark = 2131034174;
|
||||
|
||||
// aapt resource value: 0x7F05003F
|
||||
public const int dim_foreground_disabled_material_light = 2131034175;
|
||||
public const int dim_foreground_material_light = 2131034175;
|
||||
|
||||
// aapt resource value: 0x7F050040
|
||||
public const int dim_foreground_material_dark = 2131034176;
|
||||
public const int error_color_material_dark = 2131034176;
|
||||
|
||||
// aapt resource value: 0x7F050041
|
||||
public const int dim_foreground_material_light = 2131034177;
|
||||
public const int error_color_material_light = 2131034177;
|
||||
|
||||
// aapt resource value: 0x7F050042
|
||||
public const int error_color_material_dark = 2131034178;
|
||||
public const int foreground_material_dark = 2131034178;
|
||||
|
||||
// aapt resource value: 0x7F050043
|
||||
public const int error_color_material_light = 2131034179;
|
||||
public const int foreground_material_light = 2131034179;
|
||||
|
||||
// aapt resource value: 0x7F050044
|
||||
public const int foreground_material_dark = 2131034180;
|
||||
public const int highlighted_text_material_dark = 2131034180;
|
||||
|
||||
// aapt resource value: 0x7F050045
|
||||
public const int foreground_material_light = 2131034181;
|
||||
public const int highlighted_text_material_light = 2131034181;
|
||||
|
||||
// aapt resource value: 0x7F050046
|
||||
public const int highlighted_text_material_dark = 2131034182;
|
||||
public const int material_blue_grey_800 = 2131034182;
|
||||
|
||||
// aapt resource value: 0x7F050047
|
||||
public const int highlighted_text_material_light = 2131034183;
|
||||
public const int material_blue_grey_900 = 2131034183;
|
||||
|
||||
// aapt resource value: 0x7F050048
|
||||
public const int ic_launcher_background = 2131034184;
|
||||
public const int material_blue_grey_950 = 2131034184;
|
||||
|
||||
// aapt resource value: 0x7F050049
|
||||
public const int material_blue_grey_800 = 2131034185;
|
||||
public const int material_deep_teal_200 = 2131034185;
|
||||
|
||||
// aapt resource value: 0x7F05004A
|
||||
public const int material_blue_grey_900 = 2131034186;
|
||||
public const int material_deep_teal_500 = 2131034186;
|
||||
|
||||
// aapt resource value: 0x7F05004B
|
||||
public const int material_blue_grey_950 = 2131034187;
|
||||
public const int material_grey_100 = 2131034187;
|
||||
|
||||
// aapt resource value: 0x7F05004C
|
||||
public const int material_deep_teal_200 = 2131034188;
|
||||
public const int material_grey_300 = 2131034188;
|
||||
|
||||
// aapt resource value: 0x7F05004D
|
||||
public const int material_deep_teal_500 = 2131034189;
|
||||
public const int material_grey_50 = 2131034189;
|
||||
|
||||
// aapt resource value: 0x7F05004E
|
||||
public const int material_grey_100 = 2131034190;
|
||||
public const int material_grey_600 = 2131034190;
|
||||
|
||||
// aapt resource value: 0x7F05004F
|
||||
public const int material_grey_300 = 2131034191;
|
||||
public const int material_grey_800 = 2131034191;
|
||||
|
||||
// aapt resource value: 0x7F050050
|
||||
public const int material_grey_50 = 2131034192;
|
||||
public const int material_grey_850 = 2131034192;
|
||||
|
||||
// aapt resource value: 0x7F050051
|
||||
public const int material_grey_600 = 2131034193;
|
||||
public const int material_grey_900 = 2131034193;
|
||||
|
||||
// aapt resource value: 0x7F050052
|
||||
public const int material_grey_800 = 2131034194;
|
||||
public const int mtrl_bottom_nav_colored_item_tint = 2131034194;
|
||||
|
||||
// aapt resource value: 0x7F050053
|
||||
public const int material_grey_850 = 2131034195;
|
||||
public const int mtrl_bottom_nav_item_tint = 2131034195;
|
||||
|
||||
// aapt resource value: 0x7F050054
|
||||
public const int material_grey_900 = 2131034196;
|
||||
public const int mtrl_btn_bg_color_disabled = 2131034196;
|
||||
|
||||
// aapt resource value: 0x7F050055
|
||||
public const int mtrl_bottom_nav_colored_item_tint = 2131034197;
|
||||
public const int mtrl_btn_bg_color_selector = 2131034197;
|
||||
|
||||
// aapt resource value: 0x7F050056
|
||||
public const int mtrl_bottom_nav_item_tint = 2131034198;
|
||||
public const int mtrl_btn_ripple_color = 2131034198;
|
||||
|
||||
// aapt resource value: 0x7F050057
|
||||
public const int mtrl_btn_bg_color_disabled = 2131034199;
|
||||
public const int mtrl_btn_stroke_color_selector = 2131034199;
|
||||
|
||||
// aapt resource value: 0x7F050058
|
||||
public const int mtrl_btn_bg_color_selector = 2131034200;
|
||||
public const int mtrl_btn_text_btn_ripple_color = 2131034200;
|
||||
|
||||
// aapt resource value: 0x7F050059
|
||||
public const int mtrl_btn_ripple_color = 2131034201;
|
||||
public const int mtrl_btn_text_color_disabled = 2131034201;
|
||||
|
||||
// aapt resource value: 0x7F05005A
|
||||
public const int mtrl_btn_stroke_color_selector = 2131034202;
|
||||
public const int mtrl_btn_text_color_selector = 2131034202;
|
||||
|
||||
// aapt resource value: 0x7F05005B
|
||||
public const int mtrl_btn_text_btn_ripple_color = 2131034203;
|
||||
public const int mtrl_btn_transparent_bg_color = 2131034203;
|
||||
|
||||
// aapt resource value: 0x7F05005C
|
||||
public const int mtrl_btn_text_color_disabled = 2131034204;
|
||||
public const int mtrl_chip_background_color = 2131034204;
|
||||
|
||||
// aapt resource value: 0x7F05005D
|
||||
public const int mtrl_btn_text_color_selector = 2131034205;
|
||||
public const int mtrl_chip_close_icon_tint = 2131034205;
|
||||
|
||||
// aapt resource value: 0x7F05005E
|
||||
public const int mtrl_btn_transparent_bg_color = 2131034206;
|
||||
public const int mtrl_chip_ripple_color = 2131034206;
|
||||
|
||||
// aapt resource value: 0x7F05005F
|
||||
public const int mtrl_chip_background_color = 2131034207;
|
||||
public const int mtrl_chip_text_color = 2131034207;
|
||||
|
||||
// aapt resource value: 0x7F050060
|
||||
public const int mtrl_chip_close_icon_tint = 2131034208;
|
||||
public const int mtrl_fab_ripple_color = 2131034208;
|
||||
|
||||
// aapt resource value: 0x7F050061
|
||||
public const int mtrl_chip_ripple_color = 2131034209;
|
||||
public const int mtrl_scrim_color = 2131034209;
|
||||
|
||||
// aapt resource value: 0x7F050062
|
||||
public const int mtrl_chip_text_color = 2131034210;
|
||||
public const int mtrl_tabs_colored_ripple_color = 2131034210;
|
||||
|
||||
// aapt resource value: 0x7F050063
|
||||
public const int mtrl_fab_ripple_color = 2131034211;
|
||||
public const int mtrl_tabs_icon_color_selector = 2131034211;
|
||||
|
||||
// aapt resource value: 0x7F050064
|
||||
public const int mtrl_scrim_color = 2131034212;
|
||||
public const int mtrl_tabs_icon_color_selector_colored = 2131034212;
|
||||
|
||||
// aapt resource value: 0x7F050065
|
||||
public const int mtrl_tabs_colored_ripple_color = 2131034213;
|
||||
public const int mtrl_tabs_legacy_text_color_selector = 2131034213;
|
||||
|
||||
// aapt resource value: 0x7F050066
|
||||
public const int mtrl_tabs_icon_color_selector = 2131034214;
|
||||
|
||||
// aapt resource value: 0x7F050067
|
||||
public const int mtrl_tabs_icon_color_selector_colored = 2131034215;
|
||||
public const int mtrl_tabs_ripple_color = 2131034214;
|
||||
|
||||
// aapt resource value: 0x7F050068
|
||||
public const int mtrl_tabs_legacy_text_color_selector = 2131034216;
|
||||
public const int mtrl_textinput_default_box_stroke_color = 2131034216;
|
||||
|
||||
// aapt resource value: 0x7F050069
|
||||
public const int mtrl_tabs_ripple_color = 2131034217;
|
||||
|
||||
// aapt resource value: 0x7F05006B
|
||||
public const int mtrl_textinput_default_box_stroke_color = 2131034219;
|
||||
|
||||
// aapt resource value: 0x7F05006C
|
||||
public const int mtrl_textinput_disabled_color = 2131034220;
|
||||
|
||||
// aapt resource value: 0x7F05006D
|
||||
public const int mtrl_textinput_filled_box_default_background_color = 2131034221;
|
||||
|
||||
// aapt resource value: 0x7F05006E
|
||||
public const int mtrl_textinput_hovered_box_stroke_color = 2131034222;
|
||||
public const int mtrl_textinput_disabled_color = 2131034217;
|
||||
|
||||
// aapt resource value: 0x7F05006A
|
||||
public const int mtrl_text_btn_text_color_selector = 2131034218;
|
||||
public const int mtrl_textinput_filled_box_default_background_color = 2131034218;
|
||||
|
||||
// aapt resource value: 0x7F05006B
|
||||
public const int mtrl_textinput_hovered_box_stroke_color = 2131034219;
|
||||
|
||||
// aapt resource value: 0x7F050067
|
||||
public const int mtrl_text_btn_text_color_selector = 2131034215;
|
||||
|
||||
// aapt resource value: 0x7F05006C
|
||||
public const int notification_action_color_filter = 2131034220;
|
||||
|
||||
// aapt resource value: 0x7F05006D
|
||||
public const int notification_icon_bg_color = 2131034221;
|
||||
|
||||
// aapt resource value: 0x7F05006E
|
||||
public const int primary_dark_material_dark = 2131034222;
|
||||
|
||||
// aapt resource value: 0x7F05006F
|
||||
public const int notification_action_color_filter = 2131034223;
|
||||
public const int primary_dark_material_light = 2131034223;
|
||||
|
||||
// aapt resource value: 0x7F050070
|
||||
public const int notification_icon_bg_color = 2131034224;
|
||||
public const int primary_material_dark = 2131034224;
|
||||
|
||||
// aapt resource value: 0x7F050071
|
||||
public const int primary_dark_material_dark = 2131034225;
|
||||
public const int primary_material_light = 2131034225;
|
||||
|
||||
// aapt resource value: 0x7F050072
|
||||
public const int primary_dark_material_light = 2131034226;
|
||||
public const int primary_text_default_material_dark = 2131034226;
|
||||
|
||||
// aapt resource value: 0x7F050073
|
||||
public const int primary_material_dark = 2131034227;
|
||||
public const int primary_text_default_material_light = 2131034227;
|
||||
|
||||
// aapt resource value: 0x7F050074
|
||||
public const int primary_material_light = 2131034228;
|
||||
public const int primary_text_disabled_material_dark = 2131034228;
|
||||
|
||||
// aapt resource value: 0x7F050075
|
||||
public const int primary_text_default_material_dark = 2131034229;
|
||||
public const int primary_text_disabled_material_light = 2131034229;
|
||||
|
||||
// aapt resource value: 0x7F050076
|
||||
public const int primary_text_default_material_light = 2131034230;
|
||||
public const int ripple_material_dark = 2131034230;
|
||||
|
||||
// aapt resource value: 0x7F050077
|
||||
public const int primary_text_disabled_material_dark = 2131034231;
|
||||
public const int ripple_material_light = 2131034231;
|
||||
|
||||
// aapt resource value: 0x7F050078
|
||||
public const int primary_text_disabled_material_light = 2131034232;
|
||||
public const int secondary_text_default_material_dark = 2131034232;
|
||||
|
||||
// aapt resource value: 0x7F050079
|
||||
public const int ripple_material_dark = 2131034233;
|
||||
public const int secondary_text_default_material_light = 2131034233;
|
||||
|
||||
// aapt resource value: 0x7F05007A
|
||||
public const int ripple_material_light = 2131034234;
|
||||
public const int secondary_text_disabled_material_dark = 2131034234;
|
||||
|
||||
// aapt resource value: 0x7F05007B
|
||||
public const int secondary_text_default_material_dark = 2131034235;
|
||||
public const int secondary_text_disabled_material_light = 2131034235;
|
||||
|
||||
// aapt resource value: 0x7F05007C
|
||||
public const int secondary_text_default_material_light = 2131034236;
|
||||
public const int switch_thumb_disabled_material_dark = 2131034236;
|
||||
|
||||
// aapt resource value: 0x7F05007D
|
||||
public const int secondary_text_disabled_material_dark = 2131034237;
|
||||
public const int switch_thumb_disabled_material_light = 2131034237;
|
||||
|
||||
// aapt resource value: 0x7F05007E
|
||||
public const int secondary_text_disabled_material_light = 2131034238;
|
||||
public const int switch_thumb_material_dark = 2131034238;
|
||||
|
||||
// aapt resource value: 0x7F05007F
|
||||
public const int switch_thumb_disabled_material_dark = 2131034239;
|
||||
public const int switch_thumb_material_light = 2131034239;
|
||||
|
||||
// aapt resource value: 0x7F050080
|
||||
public const int switch_thumb_disabled_material_light = 2131034240;
|
||||
public const int switch_thumb_normal_material_dark = 2131034240;
|
||||
|
||||
// aapt resource value: 0x7F050081
|
||||
public const int switch_thumb_material_dark = 2131034241;
|
||||
public const int switch_thumb_normal_material_light = 2131034241;
|
||||
|
||||
// aapt resource value: 0x7F050082
|
||||
public const int switch_thumb_material_light = 2131034242;
|
||||
public const int tooltip_background_dark = 2131034242;
|
||||
|
||||
// aapt resource value: 0x7F050083
|
||||
public const int switch_thumb_normal_material_dark = 2131034243;
|
||||
|
||||
// aapt resource value: 0x7F050084
|
||||
public const int switch_thumb_normal_material_light = 2131034244;
|
||||
|
||||
// aapt resource value: 0x7F050085
|
||||
public const int tooltip_background_dark = 2131034245;
|
||||
|
||||
// aapt resource value: 0x7F050086
|
||||
public const int tooltip_background_light = 2131034246;
|
||||
public const int tooltip_background_light = 2131034243;
|
||||
|
||||
static Color()
|
||||
{
|
||||
@@ -3839,16 +3830,19 @@ namespace GUT.Schedule
|
||||
public const int useLogo = 2131230925;
|
||||
|
||||
// aapt resource value: 0x7F0800CE
|
||||
public const int view_offset_helper = 2131230926;
|
||||
public const int version = 2131230926;
|
||||
|
||||
// aapt resource value: 0x7F0800CF
|
||||
public const int visible = 2131230927;
|
||||
public const int view_offset_helper = 2131230927;
|
||||
|
||||
// aapt resource value: 0x7F0800D0
|
||||
public const int withText = 2131230928;
|
||||
public const int visible = 2131230928;
|
||||
|
||||
// aapt resource value: 0x7F0800D1
|
||||
public const int wrap_content = 2131230929;
|
||||
public const int withText = 2131230929;
|
||||
|
||||
// aapt resource value: 0x7F0800D2
|
||||
public const int wrap_content = 2131230930;
|
||||
|
||||
static Id()
|
||||
{
|
||||
@@ -4368,10 +4362,10 @@ namespace GUT.Schedule
|
||||
public const int Animation_Design_BottomSheetDialog = 2131689477;
|
||||
|
||||
// aapt resource value: 0x7F0F0006
|
||||
public const int AppTheme = 2131689478;
|
||||
public const int AppTheme_Light = 2131689478;
|
||||
|
||||
// aapt resource value: 0x7F0F0007
|
||||
public const int AppTheme_NoActionBar = 2131689479;
|
||||
public const int AppTheme_Light_SplashScreen = 2131689479;
|
||||
|
||||
// aapt resource value: 0x7F0F0008
|
||||
public const int Base_AlertDialog_AppCompat = 2131689480;
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||
android:theme="@style/AppTheme.Light">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_margin="10dp">
|
||||
android:padding="10dp">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
@@ -29,8 +27,7 @@
|
||||
android:id="@+id/studentParams"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone">
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
@@ -224,7 +221,11 @@
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="©2020 Михаил Гордеев ИКСС, ИКТ-907"
|
||||
android:layout_marginBottom="50dp"/>
|
||||
android:text="©2020 Михаил Гордеев ИКСС, ИКТ-907"/>
|
||||
<TextView
|
||||
android:id="@+id/version"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="v$(Build.BuildNumber) (ci-id #$(Build.BuildId))"/>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
@@ -3,7 +3,7 @@
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/AppTheme.NoActionBar">
|
||||
android:theme="@style/AppTheme.Light.SplashScreen">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@style/AppTheme.NoActionBar">
|
||||
android:theme="@style/AppTheme.Light.SplashScreen">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
@@ -20,7 +21,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="ГУТ.Расписание"
|
||||
android:textColor="#ffffff"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:textSize="36dp"/>
|
||||
|
||||
@@ -28,8 +28,7 @@
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginVertical="50dp"
|
||||
android:indeterminateTint="#ffffff"/>
|
||||
android:layout_marginVertical="50dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/status"
|
||||
@@ -37,8 +36,15 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="Инициализация"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20dp"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/version"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:text="v$(Build.BuildNumber) (ci-id #$(Build.BuildId))"/>
|
||||
|
||||
</RelativeLayout>
|
||||
@@ -1,6 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#ff8000</color>
|
||||
<color name="colorPrimaryDark">#ff8000</color>
|
||||
<color name="colorAccent">#ff8000</color>
|
||||
</resources>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#ff8000</color>
|
||||
</resources>
|
||||
@@ -1,17 +1,21 @@
|
||||
<resources>
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<style name="AppTheme.Light" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="android:navigationBarColor">#00000000</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimary</item>
|
||||
<item name="colorAccent">@color/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||
<item name="android:windowLightNavigationBar">true</item>
|
||||
|
||||
<item name="android:fitsSystemWindows">true</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.NoActionBar">
|
||||
<style name="AppTheme.Light.SplashScreen" parent="AppTheme.Light">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="android:navigationBarColor">#ff8000</item>
|
||||
<item name="android:navigationBarColor">@color/colorPrimary</item>
|
||||
<item name="android:windowLightNavigationBar">false</item>
|
||||
<item name="android:windowBackground">@color/colorPrimary</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
<item name="android:indeterminateTint">@android:color/white</item>
|
||||
</style>
|
||||
</resources>
|
||||
Reference in New Issue
Block a user