niushuai233/DevControl
1
0
Fork 0
mirror of https://github.com/niushuai233/DevControl.git synced 2024-10-27 22:43:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 调整包结构

Browse Source
This commit is contained in:
niushuai233 2022-10-17 17:28:50 +08:00
parent 14c849d44f
commit 7278eb371b
10 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceFragment.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceFragment.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.device; package cc.niushuai.project.devcontrol.ui.nav.device;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
@ -12,15 +12,12 @@ import android.widget.SimpleAdapter;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.gridlayout.widget.GridLayout;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import cc.niushuai.project.devcontrol.R; import cc.niushuai.project.devcontrol.R;
import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo; import cc.niushuai.project.devcontrol.base.entity.device.DeviceInfo;

2
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/device/NavDeviceViewModel.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/device/NavDeviceViewModel.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.device; package cc.niushuai.project.devcontrol.ui.nav.device;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;

2
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogFragment.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogFragment.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.log; package cc.niushuai.project.devcontrol.ui.nav.log;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;

2
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/log/NavLogViewModel.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/log/NavLogViewModel.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.log; package cc.niushuai.project.devcontrol.ui.nav.log;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;

2
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpFragment.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpFragment.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.setup; package cc.niushuai.project.devcontrol.ui.nav.setup;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;

2
app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/main/setup/NavSetUpViewModel.java → app/src/main/java/cc/niushuai/project/devcontrol/ui/nav/setup/NavSetUpViewModel.java
View File

@ -1,4 +1,4 @@
package cc.niushuai.project.devcontrol.ui.nav.main.setup; package cc.niushuai.project.devcontrol.ui.nav.setup;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModel;

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

@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".ui.nav.main.device.NavDeviceFragment"> tools:context=".ui.nav.device.NavDeviceFragment">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".ui.nav.main.log.NavLogFragment"> tools:context=".ui.nav.log.NavLogFragment">
<TextView <TextView
android:id="@+id/nav_log_fragment_textview" android:id="@+id/nav_log_fragment_textview"

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

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.nav.main.setup.NavSetUpFragment"> tools:context=".ui.nav.setup.NavSetUpFragment">
<TextView <TextView
android:id="@+id/nav_setup_fragment_textview" android:id="@+id/nav_setup_fragment_textview"

6
app/src/main/res/navigation/main_navigation.xml
View File

@ -8,19 +8,19 @@
<fragment <fragment
android:id="@id/bottom_nav_log" android:id="@id/bottom_nav_log"
android:name="cc.niushuai.project.devcontrol.ui.nav.main.log.NavLogFragment" android:name="cc.niushuai.project.devcontrol.ui.nav.log.NavLogFragment"
android:label="@string/title_bottom_nav_menu_log" android:label="@string/title_bottom_nav_menu_log"
tools:layout="@layout/main_nav_fragment_log" /> tools:layout="@layout/main_nav_fragment_log" />
<fragment <fragment
android:id="@id/bottom_nav_device" android:id="@id/bottom_nav_device"
android:name="cc.niushuai.project.devcontrol.ui.nav.main.device.NavDeviceFragment" android:name="cc.niushuai.project.devcontrol.ui.nav.device.NavDeviceFragment"
android:label="@string/title_bottom_nav_menu_device" android:label="@string/title_bottom_nav_menu_device"
tools:layout="@layout/main_nav_fragment_device" /> tools:layout="@layout/main_nav_fragment_device" />
<fragment <fragment
android:id="@id/bottom_nav_set" android:id="@id/bottom_nav_set"
android:name="cc.niushuai.project.devcontrol.ui.nav.main.setup.NavSetUpFragment" android:name="cc.niushuai.project.devcontrol.ui.nav.setup.NavSetUpFragment"
android:label="@string/title_bottom_nav_menu_set" android:label="@string/title_bottom_nav_menu_set"
tools:layout="@layout/main_nav_fragment_set_up" /> tools:layout="@layout/main_nav_fragment_set_up" />
</navigation> </navigation>