diff options
| author | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-11 22:23:39 +0100 |
|---|---|---|
| committer | TAMARA JERINIC <tamara.jerinic@gmail.com> | 2022-12-11 22:23:39 +0100 |
| commit | a72ebb82220a6d0434118b7b2d90c92a905499c7 (patch) | |
| tree | 90262f708c6c8c43735fb34dd3a1ae1f5c527334 /Client | |
| parent | a6e814cda5168c81299c79de8d71f15ca68ac6ed (diff) | |
| parent | e4a56bbe16051fd5e8a04db62d5ee0f1574be2a6 (diff) | |
Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop
Diffstat (limited to 'Client')
3 files changed, 4 insertions, 24 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt index c2f5d12..54eab14 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt @@ -215,7 +215,7 @@ class ActivitySinglePost : AppCompatActivity(),OnRefreshListener { fun loadTags(){ - + tagLayout.removeAllViews() if(post.tags!=null) for( item in post.tags!!){ var newbtn = Button(this) diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml index afe1bbf..4ba2b6d 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_navigation.xml @@ -20,6 +20,7 @@ android:id="@+id/bottomNavigationView" android:layout_width="match_parent" android:layout_height="75dp" + app:labelVisibilityMode="unlabeled" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml index b64eb0f..9baa8c6 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page_main_scroll.xml @@ -41,13 +41,7 @@ android:textStyle="bold" /> - <TextView - android:id="@+id/tvFragmentHomePageNewestShowAll" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:clickable="true" - android:text="Prikaži sve" /> + </androidx.cardview.widget.CardView> <androidx.recyclerview.widget.RecyclerView @@ -180,15 +174,6 @@ android:text="Popularno" android:textStyle="bold" /> - <TextView - android:id="@+id/tvFragmentHomePagePopularShowAll" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:clickable="true" - android:text="Prikaži sve" - - tools:ignore="TouchTargetSizeCheck" /> </androidx.cardview.widget.CardView> @@ -225,13 +210,7 @@ android:text="Najbolje ocenjeno" android:textStyle="bold" /> - <TextView - android:id="@+id/tvFragmentHomePageBestRatedShowAll" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:clickable="true" - android:text="Prikaži sve" /> + </androidx.cardview.widget.CardView> <androidx.recyclerview.widget.RecyclerView |