FatttSnake/OxygenToolbox
1
0
Fork 0
mirror of https://github.com/FatttSnake/OxygenToolbox.git synced 2026-04-06 14:11:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize fold layout and ids

Browse Source
This commit is contained in:
Fat Snake
2022-03-22 12:22:01 +08:00
parent 5b2b60624c
commit ef0760ef16
33 changed files with 206 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/res/drawable-v21/ic_menu_about.xml → app/src/main/res/drawable/ic_menu_about.xml
View File

0
app/src/main/res/drawable-v21/ic_menu_exit.xml → app/src/main/res/drawable/ic_menu_exit.xml
View File

0
app/src/main/res/drawable-v21/ic_menu_home.xml → app/src/main/res/drawable/ic_menu_home.xml
View File

0
app/src/main/res/drawable-v21/ic_menu_setting.xml → app/src/main/res/drawable/ic_menu_setting.xml
View File

0
app/src/main/res/drawable-v21/ic_menu_theme.xml → app/src/main/res/drawable/ic_menu_theme.xml
View File

3
app/src/main/res/layout/activity_main.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/drawer_layout"
android:layout_width="match_parent"
@@ -19,5 +18,5 @@
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="true"
android:background="@color/app_background" />
android:background="@color/app_background"/>
</androidx.drawerlayout.widget.DrawerLayout>

8
app/src/main/res/layout/activity_splash.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SplashActivity">
</androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/activity_time_screen.xml
View File

@@ -1,6 +1,5 @@
<?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"

3
app/src/main/res/layout/app_bar_main.xml
View File

@@ -28,6 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_dialog_email" />
app:srcCompat="@android:drawable/ic_dialog_email"
android:contentDescription="TODO" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
app/src/main/res/layout/basic_tool_list.xml
View File

@@ -16,7 +16,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/basicToolsRecyclerView"
android:id="@+id/basic_tools_recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

2
app/src/main/res/layout/fold_layout.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
<com.fatapp.oxygentoolbox.layout.FoldLayout
android:id="@+id/foldLayout"
android:id="@+id/fold_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layoutId="@layout/fold_layout_head"

6
app/src/main/res/layout/fold_layout_body.xml
View File

@@ -4,11 +4,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:orientation="vertical"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:orientation="vertical">
<com.fatapp.oxygentoolbox.layout.AutoLinefeedLayout
android:id="@+id/layout_item_AutoLinefeedLayout"
android:id="@+id/auto_linefeed_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"

8
app/src/main/res/layout/fold_layout_head.xml
View File

@@ -1,7 +1,7 @@
<?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"
android:id="@+id/foldLayoutLinearLayout"
android:id="@+id/fold_layout_linear_layout"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="10dp"
@@ -11,7 +11,7 @@
android:gravity="center_vertical" >
<TextView
android:id="@+id/foldLayoutIcon"
android:id="@+id/fold_layout_icon"
android:layout_width="0dp"
android:layout_height="20dp"
android:layout_weight="1"
@@ -20,7 +20,7 @@
android:textColor="@color/app_theme" />
<TextView
android:id="@+id/foldLayoutTextView"
android:id="@+id/fold_layout_text_view"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="6"
@@ -29,7 +29,7 @@
android:textSize="18sp" />
<ImageView
android:id="@+id/arrowIcon"
android:id="@+id/arrow_icon"
android:layout_width="0dp"
android:layout_height="15dp"
android:layout_weight="1"

3
app/src/main/res/layout/fragment_home.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView 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:id="@+id/fragment_home"
android:layout_width="match_parent"
@@ -10,7 +9,7 @@
tools:context=".ui.home.HomeFragment">
<LinearLayout
android:id="@+id/foldLayoutsLinearLayout"
android:id="@+id/fold_layouts_linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"

20
app/src/main/res/layout/fragment_setting.xml
View File

@@ -1,22 +1,12 @@
<?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"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.setting.SettingFragment">
<TextView
android:id="@+id/text_setting"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="wrap_content">
</LinearLayout>
</ScrollView>

4
app/src/main/res/layout/nav_header_main.xml
View File

@@ -13,7 +13,7 @@
android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView
android:id="@+id/imageView"
android:id="@+id/image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/nav_header_desc"
@@ -28,7 +28,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/textView"
android:id="@+id/text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/nav_header_subtitle" />

2
app/src/main/res/layout/tool_button.xml
View File

@@ -3,6 +3,6 @@
android:layout_width="wrap_content"
xmlns:android="http://schemas.android.com/apk/res/android">
<Button
android:id="@+id/toolButton"
android:id="@+id/tool_button"
style="@style/ToolsButton" />
</LinearLayout>

5
app/src/main/res/values-night/themes.xml
View File

@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.OxygenToolbox" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/app_theme</item>
<item name="colorPrimaryVariant">@color/app_theme</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item>
<item name="colorSecondaryVariant">@color/teal_200</item>
<item name="colorOnSecondary">@color/black</item>
<item name="colorOnSecondary">@color/white</item>
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. -->

1
app/src/main/res/values/dimens.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>

1
app/src/main/res/values/strings.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Oxygen</string>
<string name="navigation_drawer_open">Open navigation drawer</string>

5
app/src/main/res/values/themes.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.OxygenToolbox" parent="Theme.MaterialComponents.DayNight.DarkActionBar.Bridge">
@@ -19,6 +20,10 @@
<item name="windowNoTitle">true</item>
</style>
<style name="Theme.OxygenToolbox.Full" parent="Theme.OxygenToolbox.NoActionBar">
<item name="android:windowFullscreen">true</item>
</style>
<style name="Theme.OxygenToolbox.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="Theme.OxygenToolbox.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />