niushuai233
/
DiDiDone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 😯 解决报错问题

master
niushuai233 2 years ago
parent
21bc23b0f6
commit
dda7edc035
7 changed files with 15 additions and 88 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/cc/niushuai/dididone/MainActivity.java
  2. 2
      app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
  3. 81
      app/src/main/res/layout/fragment_setting.xml.bak
  4. 4
      app/src/main/res/menu/activity_main_drawer.xml
  5. 11
      app/src/main/res/navigation/mobile_navigation.xml
  6. 2
      app/src/main/res/values/ids.xml
  7. 1
      app/src/main/res/values/strings.xml

2
app/src/main/java/cc/niushuai/dididone/MainActivity.java
Unescape View File

@ -64,7 +64,7 @@ public class MainActivity extends AppCompatActivity { @@ -64,7 +64,7 @@ public class MainActivity extends AppCompatActivity {
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
mAppBarConfiguration = new AppBarConfiguration.Builder(
R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_setting)
R.id.n_nav_calendar, R.id.n_nav_statistic, R.id.n_nav_icon)
.setOpenableLayout(drawer)
.build();
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_content_main);

2
app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java
Unescape View File

@ -40,8 +40,6 @@ public class SettingFragment extends Fragment { @@ -40,8 +40,6 @@ public class SettingFragment extends Fragment {
binding.sSetAppIcon.setOnClickListener(view -> {
Log.d(getTag(), "sSetAppIcon click");
ActivityUtil.startActivity(getActivity(), IconActivity.class);
Log.d(getTag(), "sSetAppIcon click complete");
});
}

81
app/src/main/res/layout/fragment_setting.xml.bak
Unescape View File

@ -1,81 +0,0 @@ @@ -1,81 +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"
android:background="@color/gray_light"
tools:context=".ui.setting.SettingFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:text="@string/s_set_app"
android:textAlignment="inherit"
android:textColor="#CE21D873"
android:textSize="30dp" />
<LinearLayout
android:id="@+id/s_set_app_icon"
android:layout_width="match_parent"
android:layout_height="@dimen/s_set_linear_layout_height"
android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
android:layout_gravity="center_vertical"
android:background="@drawable/round_text_view_15dp"
>
<ImageView
android:layout_width="@dimen/s_set_linear_image_view_size"
android:layout_height="@dimen/s_set_linear_image_view_size"
android:layout_marginLeft="@dimen/s_set_linear_image_view_marginLeft"
android:layout_marginTop="@dimen/s_set_linear_image_view_marginTop"
app:ico_color="@color/gray"
app:ico_icon="faw_laugh" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/s_set_linear_text_view_marginLeft"
android:gravity="left|center"
android:text="@string/s_set_icon"
android:textSize="20dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/s_set_app_project"
android:layout_width="match_parent"
android:layout_height="@dimen/s_set_linear_layout_height"
android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
android:background="@drawable/round_text_view_15dp"
>
<ImageView
android:layout_width="@dimen/s_set_linear_image_view_size"
android:layout_height="@dimen/s_set_linear_image_view_size"
android:layout_marginLeft="@dimen/s_set_linear_image_view_marginLeft"
android:layout_marginTop="@dimen/s_set_linear_image_view_marginTop"
app:ico_color="@color/gray"
app:ico_icon="cmd_cards_variant" />
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/s_set_linear_text_view_marginLeft"
android:gravity="left|center"
android:text="@string/s_set_project"
android:textSize="20dp" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/menu/activity_main_drawer.xml
Unescape View File

@ -13,8 +13,8 @@ @@ -13,8 +13,8 @@
android:icon="@drawable/ic_menu_gallery"
android:title="@string/n_menu_name_statistic" />
<item
android:id="@id/n_nav_setting"
android:id="@id/n_nav_icon"
android:icon="@drawable/ic_menu_slideshow"
android:title="@string/n_menu_name_setting" />
android:title="@string/n_menu_name_icon" />
</group>
</menu>

11
app/src/main/res/navigation/mobile_navigation.xml
Unescape View File

@ -16,10 +16,17 @@ @@ -16,10 +16,17 @@
android:name="cc.niushuai.dididone.ui.statistic.StatisticFragment"
android:label="@string/n_menu_name_statistic"
tools:layout="@layout/fragment_statistic" />
<!--
<fragment
android:id="@id/n_nav_setting"
android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
android:label="@string/n_menu_name_setting"
tools:layout="@layout/fragment_setting" />
tools:layout="@layout/fragment_setting" />-->
<fragment
android:id="@id/n_nav_icon"
android:name="cc.niushuai.dididone.ui.setting.icon.IconFragment"
android:label="@string/n_menu_name_icon"
/>
</navigation>

2
app/src/main/res/values/ids.xml
Unescape View File

@ -7,4 +7,6 @@ @@ -7,4 +7,6 @@
<!--日历页 id 数据集合-->
<item name="c_calendar_check_in_list" type="id" />
<item name="s_set_target_list" type="id" />
<item name="n_nav_icon" type="id" />
<item name="n_nav_project" type="id" />
</resources>

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

@ -20,5 +20,6 @@ @@ -20,5 +20,6 @@
<string name="s_set_app">App</string>
<string name="s_set_icon">图标</string>
<string name="s_set_project">打卡项</string>
<string name="n_menu_name_icon">Icon</string>
</resources>
Write Preview
Loading…
Cancel
Save