aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorClyhtsuriva <aimeric@adjutor.xyz>2021-02-19 14:17:15 +0100
committerClyhtsuriva <aimeric@adjutor.xyz>2021-02-19 14:17:15 +0100
commitcd37b807397b50b8e9c45389fc04679998e628db (patch)
tree1d4e58436f7d88c82b588c86fe99fce74ea09de3 /app/src/main/res
parent41bb476749fa84164726b728676b144531009446 (diff)
parentfa849021bf137fc4b245a8c0e7a2a8fc46d574df (diff)
Merge branch 'release/1.0' into develop
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_main.xml9
-rw-r--r--app/src/main/res/layout/article_page.xml29
-rw-r--r--app/src/main/res/layout/home_page.xml26
-rw-r--r--app/src/main/res/layout/news_page.xml29
4 files changed, 2 insertions, 91 deletions
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 12a61d8..dd69e51 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,13 +23,4 @@
<include layout="@layout/content_main" />
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@android:drawable/ic_dialog_info"
- android:contentDescription="@string/info"/>
-
</androidx.coordinatorlayout.widget.CoordinatorLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/article_page.xml b/app/src/main/res/layout/article_page.xml
deleted file mode 100644
index 380ba00..0000000
--- a/app/src/main/res/layout/article_page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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"
- tools:context=".ArticlePage"
- android:background="@color/very_dark_purple"
- >
-
- <TextView
- android:id="@+id/textview_second"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toTopOf="@id/button_home"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/button_home"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/home"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/home_page.xml b/app/src/main/res/layout/home_page.xml
index 036800c..68d9f81 100644
--- a/app/src/main/res/layout/home_page.xml
+++ b/app/src/main/res/layout/home_page.xml
@@ -18,40 +18,18 @@
android:textAlignment="center"
android:textColor="@color/strong_pink"
android:textSize="40sp"
- app:layout_constraintBottom_toTopOf="@id/button_news"
+ app:layout_constraintBottom_toBottomOf="@id/button_top_manga"
app:layout_constraintTop_toTopOf="parent"
/>
<Button
- android:id="@+id/button_news"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/news"
- app:layout_constraintTop_toBottomOf="@id/tv_title"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toStartOf="@id/button_article"
- />
-
- <Button
- android:id="@+id/button_article"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/article"
- app:layout_constraintTop_toBottomOf="@id/tv_title"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@id/button_news"
- app:layout_constraintEnd_toStartOf="@id/button_top_manga"
- />
-
- <Button
android:id="@+id/button_top_manga"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/top_manga"
app:layout_constraintTop_toBottomOf="@id/tv_title"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toEndOf="@id/button_article"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
/>
diff --git a/app/src/main/res/layout/news_page.xml b/app/src/main/res/layout/news_page.xml
deleted file mode 100644
index 2e41ad0..0000000
--- a/app/src/main/res/layout/news_page.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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"
- tools:context=".NewsPage"
- android:background="@color/very_dark_purple"
- >
-
- <TextView
- android:id="@+id/textview_second"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toTopOf="@id/button_home"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/button_home"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/home"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file