diff --git a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt index 7bdedb43..69d550c6 100644 --- a/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt +++ b/app/src/main/java/com/rtbishop/look4sat/presentation/MainActivity.kt @@ -30,19 +30,27 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.fragment.app.Fragment import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver +import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.findNavController +import androidx.navigation.ui.NavigationUI +import androidx.navigation.ui.NavigationUiSaveStateControl +import com.rtbishop.look4sat.R import com.rtbishop.look4sat.databinding.ActivityMainBinding import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint class MainActivity : AppCompatActivity() { + @OptIn(NavigationUiSaveStateControl::class) @SuppressLint("SourceLockedOrientationActivity") override fun onCreate(savedInstanceState: Bundle?) { requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT installSplashScreen() super.onCreate(savedInstanceState) - setContentView(ActivityMainBinding.inflate(layoutInflater).root) + val binding = ActivityMainBinding.inflate(layoutInflater) + val host = supportFragmentManager.findFragmentById(R.id.nav_host) as NavHostFragment + NavigationUI.setupWithNavController(binding.navBar, host.navController, false) + setContentView(binding.root) } override fun attachBaseContext(newBase: Context?) { diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml new file mode 100644 index 00000000..7ae71340 --- /dev/null +++ b/app/src/main/res/drawable/ic_about.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..a95f37b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0274daed..e12c7ee3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,9 +1,30 @@ - + android:layout_height="match_parent"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml new file mode 100644 index 00000000..a3f6c009 --- /dev/null +++ b/app/src/main/res/menu/nav_menu.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 872cc852..e5abb3f4 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -53,7 +53,19 @@ + tools:layout="@layout/fragment_settings" /> + + + Версия: %s Трекер спутников для Android + Спутники + Пролеты + Карта + Настройки + Инфо + Добавить diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e17fdac4..de7db7d3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -5,6 +5,12 @@ 版本:%s 人造卫星追踪和过境预测 + Satellites + Passes + World Map + Settings + About + 添加 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1fe2d01..21a272a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,12 @@ Version: %s Satellite tracker and pass predictor + Satellites + Passes + World Map + Settings + About + Add diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index fde65210..1310c990 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,7 +12,12 @@ @color/textMain @color/accent @color/accent - @color/background + + @color/background + @color/textMain + @color/accent + @color/textMain + false @drawable/item_divider @color/background @@ -127,6 +132,7 @@ match_parent @dimen/bottom_bar_size bottom + 3dp @color/bottomBar @dimen/bottom_bar_inset @dimen/bottom_bar_inset