s426229/Poszukiwacz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

develop #10

Merged
s426229 merged 80 commits from develop into master 2021-01-27 18:32:19 +01:00
Conversation 0 Commits 80 Files Changed 87 +715 -691
4 changed files with 715 additions and 691 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 966edab483 - Show all commits

19
Klient/Klient/Klient.Android/MainActivity.cs
View File

@ -36,13 +36,8 @@ namespace Klient.Droid
base.OnCreate(savedInstanceState); base.OnCreate(savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
LoadApplication(new App()); LoadApplication(new App());
SetContentView(Resource.Layout.ekranZLinkami); SetContentView(Resource.Layout.ekranStartowy);
for (int i = 0; i < 15; i++)
{
// FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n";
FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + "teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeest \n";
}
} }
[Java.Interop.Export("SignIn")] [Java.Interop.Export("SignIn")]
@ -254,14 +249,13 @@ namespace Klient.Droid
var second_jsonString = await response.Content.ReadAsStringAsync(); var second_jsonString = await response.Content.ReadAsStringAsync();
dynamic second_jsonObject = JsonConvert.DeserializeObject(second_jsonString); dynamic second_jsonObject = JsonConvert.DeserializeObject(second_jsonString);
// List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonObject); List<SearchResult> fullLink = JsonConvert.DeserializeObject<List<SearchResult>>(second_jsonObject);
int end = 10; int end = 10;
//if (fullLink.Count < 10) end = fullLink.Count; if (fullLink.Count < 10) end = fullLink.Count;
for (int i = 0; i < end; i++) for (int i = 0; i < end; i++)
{ {
// FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n"; FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + fullLink[i].Title + ": " + fullLink[i].Link + "\n\n";
FindViewById<TextView>(Resource.Id.links).Text = FindViewById<TextView>(Resource.Id.links).Text + "teeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeest \n";
} }
} }
else else
@ -357,7 +351,8 @@ namespace Klient.Droid
} }
else else
{ {
FindViewById<TextView>(Resource.Id.history).Text = "Coś poszło nie tak!"; string msg = await response.Content.ReadAsStringAsync();
FindViewById<TextView>(Resource.Id.HistoryError).Text = msg;
} }
} }

1359
Klient/Klient/Klient.Android/Resources/Resource.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

14
Klient/Klient/Klient.Android/Resources/layout/ekranHistorii.xml
View File

@ -43,7 +43,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/history" android:id="@+id/history"
android:layout_below="@+id/HistoryTitle" android:layout_below="@+id/HistoryError"
android:textColor="#ff000000" android:textColor="#ff000000"
android:paddingBottom="35dp" android:paddingBottom="35dp"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
@ -54,6 +54,16 @@
android:scrollIndicators="right" android:scrollIndicators="right"
android:scrollbarAlwaysDrawVerticalTrack="true" android:scrollbarAlwaysDrawVerticalTrack="true"
android:textIsSelectable="true" android:textIsSelectable="true"
android:paddingTop="35dp"/> android:paddingTop="10dp"/>
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/HistoryError"
android:layout_below="@+id/HistoryTitle"
android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
</RelativeLayout> </RelativeLayout>

14
Klient/Klient/Klient.Android/Resources/layout/ekranZLinkami.xml
View File

@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/links" android:id="@+id/links"
android:layout_below="@+id/linkTitle" android:layout_below="@+id/LinkError"
android:textColor="#ff393939" android:textColor="#ff393939"
android:linksClickable="true" android:linksClickable="true"
android:autoLink="web" android:autoLink="web"
@ -37,7 +37,17 @@
android:isScrollContainer="true" android:isScrollContainer="true"
android:textIsSelectable="true" android:textIsSelectable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:paddingTop="35dp" /> android:paddingTop="10dp" />
<TextView
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/linkTitle"
android:id="@+id/LinkError"
android:textColor="#ffff0000"
android:layout_centerInParent="true"
android:paddingTop="10dp" />
<ImageButton <ImageButton
android:src="@drawable/obraz4" android:src="@drawable/obraz4"
android:layout_width="38.5dp" android:layout_width="38.5dp"