Michatec/michas-droid
1
1
Fork 0
mirror of https://github.com/Michatec/michas-droid.git synced 2026-05-31 02:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop AppCompat

Browse Source
This commit is contained in:
kitsunyan
2020-06-25 23:02:28 +03:00
parent 41d5544bc8
commit b646259f5d
36 changed files with 496 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/edit_repository.xml
+4 -3
View File
@@ -55,7 +55,8 @@
android:scaleType="center"
android:src="@drawable/ic_arrow_down"
android:tint="?android:attr/textColorSecondary"
android:background="?attr/actionBarItemBackground"
android:tintMode="src_in"
android:background="?android:attr/actionBarItemBackground"
android:visibility="gone"
tools:ignore="ContentDescription" />
@@ -91,7 +92,7 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:gravity="top"
android:typeface="monospace"
android:fontFamily="monospace"
android:textSize="16sp"
android:inputType="textNoSuggestions|textMultiLine"
tools:ignore="Autofill,LabelFor" />
@@ -208,7 +209,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@android:style/Widget.Material.Button.Borderless.Colored"
android:text="@string/skip" />
</LinearLayout>
src/main/res/layout/fragment.xml
+8 -6
View File
@@ -1,28 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<nya.kitsunyan.foxydroid.widget.FragmentLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/actionBarTheme">
android:orientation="vertical"
android:theme="?android:attr/actionBarTheme"
android:background="?android:attr/colorPrimary"
android:elevation="4dp">
<androidx.appcompat.widget.Toolbar
<nya.kitsunyan.foxydroid.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:popupTheme="@style/Theme.Toolbar.Popup" />
android:popupTheme="@style/Theme.Toolbar.Popup" />
<FrameLayout
android:id="@+id/toolbar_extra"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/fragment_content"
src/main/res/layout/link_item.xml
+2 -1
View File
@@ -7,7 +7,7 @@
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/icon"
@@ -15,6 +15,7 @@
android:layout_height="24dp"
android:scaleType="centerInside"
android:tint="?android:attr/textColorSecondary"
android:tintMode="src_in"
tools:ignore="ContentDescription" />
<LinearLayout
src/main/res/layout/permissions_item.xml
+1 -1
View File
@@ -7,7 +7,7 @@
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/icon"
src/main/res/layout/preference_item.xml
+42
View File
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary"
android:textSize="16sp"
android:singleLine="true" />
<TextView
android:id="@+id/summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:textSize="14sp" />
</LinearLayout>
<Switch
android:id="@+id/check"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="-16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:visibility="gone" />
</LinearLayout>
src/main/res/layout/product_header_item.xml
+2 -2
View File
@@ -66,7 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="bottom"
style="@style/Widget.AppCompat.Button.Colored" />
style="@android:style/Widget.Material.Button" />
</LinearLayout>
@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" />
style="@android:style/Widget.Material.ProgressBar.Horizontal" />
</LinearLayout>
src/main/res/layout/product_item.xml
+1 -1
View File
@@ -8,7 +8,7 @@
android:paddingStart="14dp"
android:paddingEnd="16dp"
android:gravity="center_vertical"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/icon"
src/main/res/layout/release_item.xml
+1 -1
View File
@@ -8,7 +8,7 @@
android:gravity="center_vertical"
android:baselineAligned="false"
android:padding="16dp"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<LinearLayout
android:layout_width="match_parent"
src/main/res/layout/repository_item.xml
+2 -2
View File
@@ -5,7 +5,7 @@
android:layout_height="54dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<TextView
android:id="@+id/name"
@@ -17,7 +17,7 @@
android:textSize="16sp"
android:singleLine="true" />
<androidx.appcompat.widget.SwitchCompat
<Switch
android:id="@+id/enabled"
android:layout_width="wrap_content"
android:layout_height="match_parent"
src/main/res/layout/section_item.xml
+2 -1
View File
@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<TextView
android:id="@+id/title"
@@ -25,6 +25,7 @@
android:scaleType="center"
android:src="@drawable/ic_arrow_down"
android:tint="?android:attr/textColorPrimary"
android:tintMode="src_in"
tools:ignore="ContentDescription" />
</LinearLayout>
src/main/res/layout/switch_item.xml
+2 -2
View File
@@ -5,7 +5,7 @@
android:layout_height="48dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:background="?attr/selectableItemBackground">
android:background="?android:attr/selectableItemBackground">
<TextView
android:id="@+id/title"
@@ -17,7 +17,7 @@
android:textSize="16sp"
android:singleLine="true" />
<androidx.appcompat.widget.SwitchCompat
<Switch
android:id="@+id/enabled"
android:layout_width="wrap_content"
android:layout_height="match_parent"
src/main/res/layout/tabs_toolbar.xml
+4 -6
View File
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout
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="wrap_content"
android:orientation="vertical">
<com.google.android.material.tabs.TabLayout
<LinearLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabGravity="fill"
app:tabMaxWidth="0dp" />
android:layout_height="48dp"
android:orientation="horizontal" />
<FrameLayout
android:id="@+id/category_layout"
@@ -27,7 +25,7 @@
android:gravity="center_vertical"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:background="?attr/selectableItemBackground"
android:background="?android:attr/selectableItemBackground"
tools:ignore="UselessParent">
<TextView
src/main/res/values/attrs.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="colorError" format="color" />
</resources>
src/main/res/values/ids.xml
+1
View File
@@ -5,6 +5,7 @@
<item type="id" name="divider_configuration" />
<item type="id" name="fragment_pager" />
<item type="id" name="main_content" />
<item type="id" name="preferences_list" />
<item type="id" name="toolbar_search" />
</resources>
src/main/res/values/styles.xml
+15 -15
View File
@@ -1,30 +1,30 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<style name="Theme.Main.Light" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.DarkActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:colorBackground">#fffafafa</item>
<item name="colorPrimary">@color/primary_light</item>
<item name="colorPrimaryDark">@color/primary_dark_light</item>
<item name="colorAccent">@color/accent_light</item>
<item name="colorControlActivated">@color/accent_default_light</item>
<item name="android:colorPrimary">@color/primary_light</item>
<item name="android:colorPrimaryDark">@color/primary_dark_light</item>
<item name="android:colorAccent">@color/accent_light</item>
<item name="android:colorControlActivated">@color/accent_default_light</item>
<item name="colorError">@color/error_light</item>
</style>
<style name="Theme.Main.Dark" parent="Theme.AppCompat">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<style name="Theme.Main.Dark" parent="@android:style/Theme.Material">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:colorBackground">#ff111111</item>
<item name="colorPrimary">@color/primary_dark</item>
<item name="colorPrimaryDark">@color/primary_dark_dark</item>
<item name="colorAccent">@color/accent_dark</item>
<item name="colorControlActivated">@color/accent_default_dark</item>
<item name="android:colorPrimary">@color/primary_dark</item>
<item name="android:colorPrimaryDark">@color/primary_dark_dark</item>
<item name="android:colorAccent">@color/accent_dark</item>
<item name="android:colorControlActivated">@color/accent_default_dark</item>
<item name="colorError">@color/error_dark</item>
</style>
<style name="Theme.Toolbar.Popup" parent="Theme.Main.Dark">
<item name="android:colorBackground">?attr/colorPrimaryDark</item>
<item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
</style>
</resources>