diff --git a/Klient/Klient/Klient.Android/MainActivity.cs b/Klient/Klient/Klient.Android/MainActivity.cs index 0b2aea9..2e99c67 100644 --- a/Klient/Klient/Klient.Android/MainActivity.cs +++ b/Klient/Klient/Klient.Android/MainActivity.cs @@ -37,7 +37,12 @@ namespace Klient.Droid base.OnCreate(savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState); LoadApplication(new App()); - SetContentView(Resource.Layout.ekranStartowy); + SetContentView(Resource.Layout.ekranZLinkami); + for (int i = 0; i < 15; i++) + { + // FindViewById(Resource.Id.links).Text = FindViewById(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n"; + FindViewById(Resource.Id.links).Text = FindViewById(Resource.Id.links).Text + "teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeest \n"; + } } [Java.Interop.Export("SignIn")] @@ -249,13 +254,14 @@ namespace Klient.Droid var second_jsonString = await response.Content.ReadAsStringAsync(); dynamic second_jsonObject = JsonConvert.DeserializeObject(second_jsonString); - List fullLink = JsonConvert.DeserializeObject>(second_jsonObject); + // List fullLink = JsonConvert.DeserializeObject>(second_jsonObject); int end = 10; - if (fullLink.Count < 10) end = fullLink.Count; + //if (fullLink.Count < 10) end = fullLink.Count; for (int i = 0; i < end; i++) { - FindViewById(Resource.Id.links).Text = FindViewById(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n"; + // FindViewById(Resource.Id.links).Text = FindViewById(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n"; + FindViewById(Resource.Id.links).Text = FindViewById(Resource.Id.links).Text + "teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeest \n"; } } else diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml index 5ea80e8..2d04634 100644 --- a/Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml +++ b/Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml @@ -25,7 +25,7 @@ android:id="@+id/text3" android:textColor="#ff000000" android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" /> + android:layout_centerHorizontal="true"/> + android:textColor="#ff000000" + android:paddingBottom="35dp" + android:focusableInTouchMode="true" + android:isScrollContainer="true" + android:fadeScrollbars="true" + android:scrollbars="vertical" + android:verticalScrollbarPosition="right" + android:scrollIndicators="right" + android:scrollbarAlwaysDrawVerticalTrack="true" + android:textIsSelectable="true" + android:paddingTop="35dp"/> diff --git a/Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml b/Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml index 8e58331..4f8643a 100644 --- a/Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml +++ b/Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml @@ -27,7 +27,17 @@ android:layout_below="@+id/linkTitle" android:textColor="#ff393939" android:linksClickable="true" - android:autoLink="web" /> + android:autoLink="web" + android:fadeScrollbars="true" + android:scrollbars="vertical" + android:verticalScrollbarPosition="right" + android:scrollIndicators="right" + android:paddingBottom="35dp" + android:scrollbarAlwaysDrawVerticalTrack="true" + android:isScrollContainer="true" + android:textIsSelectable="true" + android:focusableInTouchMode="true" + android:paddingTop="35dp" /> - +