From a93a562fa93e1a05b4a9f1ef6c9ae611745b80eb Mon Sep 17 00:00:00 2001 From: daniilmiagkov <59875675+daniilmiagkov@users.noreply.github.com> Date: Thu, 21 Oct 2021 20:28:37 +0300 Subject: [PATCH 01/10] bottomsheet --- .idea/gradle.properties | 0 .idea/misc.xml | 21 ++ app/build.gradle | 34 ++-- app/src/main/AndroidManifest.xml | 5 +- .../com/example/geometry/ButtonActivity.java | 7 + .../com/example/geometry/MainActivity.java | 37 ---- .../java/com/example/geometry/MainActivity.kt | 35 ++++ .../geometry/ui/camera/CameraViewModel.kt | 13 ++ .../com/example/geometry/ui/camera/camera.kt | 46 +++++ .../geometry/ui/figurs/FigursViewModel.kt | 7 + .../com/example/geometry/ui/figurs/figurs.kt | 25 +++ .../geometry/ui/maths/MathsViewModel.kt | 7 + .../com/example/geometry/ui/maths/maths.kt | 26 +++ .../example/geometry/ui/send/SendViewModel.kt | 7 + .../java/com/example/geometry/ui/send/send.kt | 26 +++ app/src/main/res/drawable/camera.png | Bin 0 -> 17970 bytes app/src/main/res/drawable/cursor.png | Bin 0 -> 790 bytes app/src/main/res/drawable/figurs.png | Bin 0 -> 17860 bytes .../res/drawable/ic_dashboard_black_24dp.xml | 9 - .../main/res/drawable/ic_home_black_24dp.xml | 9 - .../drawable/ic_notifications_black_24dp.xml | 9 - app/src/main/res/drawable/line.png | Bin 0 -> 268 bytes app/src/main/res/drawable/maths.png | Bin 0 -> 10278 bytes app/src/main/res/drawable/send.png | Bin 0 -> 15798 bytes app/src/main/res/layout/activity_main.xml | 51 +++-- app/src/main/res/layout/bottom_sheet.xml | 181 ++++++++++++++---- app/src/main/res/layout/camera_fragment.xml | 14 ++ app/src/main/res/layout/figurs_fragment.xml | 39 ++++ .../main/res/layout/fragment_dashboard.xml | 13 -- app/src/main/res/layout/fragment_home.xml | 13 -- .../res/layout/fragment_notifications.xml | 13 -- app/src/main/res/layout/maths_fragment.xml | 13 ++ app/src/main/res/layout/send_fragment.xml | 13 ++ app/src/main/res/menu/bottom_nav_menu.xml | 29 +-- .../main/res/navigation/mobile_navigation.xml | 34 ++-- app/src/main/res/values/colors.xml | 2 + app/src/main/res/values/dimens.xml | 5 - app/src/main/res/values/strings.xml | 9 +- build.gradle | 4 +- 39 files changed, 546 insertions(+), 210 deletions(-) create mode 100644 .idea/gradle.properties create mode 100644 app/src/main/java/com/example/geometry/ButtonActivity.java delete mode 100644 app/src/main/java/com/example/geometry/MainActivity.java create mode 100644 app/src/main/java/com/example/geometry/MainActivity.kt create mode 100644 app/src/main/java/com/example/geometry/ui/camera/CameraViewModel.kt create mode 100644 app/src/main/java/com/example/geometry/ui/camera/camera.kt create mode 100644 app/src/main/java/com/example/geometry/ui/figurs/FigursViewModel.kt create mode 100644 app/src/main/java/com/example/geometry/ui/figurs/figurs.kt create mode 100644 app/src/main/java/com/example/geometry/ui/maths/MathsViewModel.kt create mode 100644 app/src/main/java/com/example/geometry/ui/maths/maths.kt create mode 100644 app/src/main/java/com/example/geometry/ui/send/SendViewModel.kt create mode 100644 app/src/main/java/com/example/geometry/ui/send/send.kt create mode 100644 app/src/main/res/drawable/camera.png create mode 100644 app/src/main/res/drawable/cursor.png create mode 100644 app/src/main/res/drawable/figurs.png delete mode 100644 app/src/main/res/drawable/ic_dashboard_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_home_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 app/src/main/res/drawable/line.png create mode 100644 app/src/main/res/drawable/maths.png create mode 100644 app/src/main/res/drawable/send.png create mode 100644 app/src/main/res/layout/camera_fragment.xml create mode 100644 app/src/main/res/layout/figurs_fragment.xml delete mode 100644 app/src/main/res/layout/fragment_dashboard.xml delete mode 100644 app/src/main/res/layout/fragment_home.xml delete mode 100644 app/src/main/res/layout/fragment_notifications.xml create mode 100644 app/src/main/res/layout/maths_fragment.xml create mode 100644 app/src/main/res/layout/send_fragment.xml delete mode 100644 app/src/main/res/values/dimens.xml diff --git a/.idea/gradle.properties b/.idea/gradle.properties new file mode 100644 index 0000000..e69de29 diff --git a/.idea/misc.xml b/.idea/misc.xml index 993c0db..0613dec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,6 +3,26 @@ + diff --git a/app/build.gradle b/app/build.gradle index 92ccd38..8a14e58 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ plugins { id 'com.android.application' + id 'kotlin-android' } android { @@ -17,7 +18,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled = false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -25,22 +26,31 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - buildFeatures { - viewBinding true + viewBinding{ + enabled = true } } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.4' + implementation 'com.google.android.material:material:' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' - implementation 'androidx.navigation:navigation-fragment:2.3.5' - implementation 'androidx.navigation:navigation-ui:2.3.5' - implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - testImplementation 'junit:junit:4.+' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' + implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' + implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5a269ff..e2c4129 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,14 +5,13 @@ + android:exported="true"> diff --git a/app/src/main/java/com/example/geometry/ButtonActivity.java b/app/src/main/java/com/example/geometry/ButtonActivity.java new file mode 100644 index 0000000..e9d4da8 --- /dev/null +++ b/app/src/main/java/com/example/geometry/ButtonActivity.java @@ -0,0 +1,7 @@ +package com.example.geometry; + +import androidx.appcompat.app.AppCompatActivity; + +public class ButtonActivity extends AppCompatActivity { + +} diff --git a/app/src/main/java/com/example/geometry/MainActivity.java b/app/src/main/java/com/example/geometry/MainActivity.java deleted file mode 100644 index 6ae9d43..0000000 --- a/app/src/main/java/com/example/geometry/MainActivity.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.example.geometry; - -import android.os.Bundle; - -import com.google.android.material.bottomnavigation.BottomNavigationView; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.navigation.NavController; -import androidx.navigation.Navigation; -import androidx.navigation.ui.AppBarConfiguration; -import androidx.navigation.ui.NavigationUI; - -import com.example.geometry.databinding.ActivityMainBinding; - -public class MainActivity extends AppCompatActivity { - - private ActivityMainBinding binding; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - binding = ActivityMainBinding.inflate(getLayoutInflater()); - setContentView(binding.getRoot()); - - //BottomNavigationView navView = findViewById(R.id.nav_view); - //// Passing each menu ID as a set of Ids because each - //// menu should be considered as top level destinations. - //AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder( - // R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications) - // .build(); - //NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment_activity_main); - //NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration); - //NavigationUI.setupWithNavController(binding.navView, navController); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/MainActivity.kt b/app/src/main/java/com/example/geometry/MainActivity.kt new file mode 100644 index 0000000..099fb3b --- /dev/null +++ b/app/src/main/java/com/example/geometry/MainActivity.kt @@ -0,0 +1,35 @@ +package com.example.geometry + +import android.os.Bundle +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.appcompat.app.AppCompatActivity +import androidx.navigation.findNavController +import androidx.navigation.ui.AppBarConfiguration +import androidx.navigation.ui.setupActionBarWithNavController +import androidx.navigation.ui.setupWithNavController +import com.example.geometry.databinding.ActivityMainBinding + +class MainActivity : AppCompatActivity() { + + private lateinit var binding: ActivityMainBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + binding = ActivityMainBinding.inflate(layoutInflater) + setContentView(binding.root) + + val navView: BottomNavigationView = binding.bottomNavigationView + + val navController = findNavController(R.id.nav_host_fragment_activity_main) + // Passing each menu ID as a set of Ids because each + // menu should be considered as top level destinations. + val appBarConfiguration = AppBarConfiguration( + setOf( + R.id.navigation_figurs, R.id.navigation_maths, R.id.navigation_camera + ) + ) + setupActionBarWithNavController(navController, appBarConfiguration) + navView.setupWithNavController(navController) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/camera/CameraViewModel.kt b/app/src/main/java/com/example/geometry/ui/camera/CameraViewModel.kt new file mode 100644 index 0000000..b2f17b5 --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/camera/CameraViewModel.kt @@ -0,0 +1,13 @@ +package com.example.geometry.ui.camera + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +class CameraViewModel : ViewModel() { + // TODO: Implement the ViewModel + private val _text = MutableLiveData().apply { + value = "This is camera Fragment" + } + val text: LiveData = _text +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/camera/camera.kt b/app/src/main/java/com/example/geometry/ui/camera/camera.kt new file mode 100644 index 0000000..071e10b --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/camera/camera.kt @@ -0,0 +1,46 @@ +package com.example.geometry.ui.camera + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.fragment.app.Fragment +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProvider +import com.example.geometry.R +import com.example.geometry.databinding.CameraFragmentBinding + +class camera : Fragment() { + + private lateinit var cameraViewModel: CameraViewModel + private var _binding: CameraFragmentBinding? = null + + // This property is only valid between onCreateView and + // onDestroyView. + private val binding get() = _binding!! + + private lateinit var viewModel: CameraViewModel + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + cameraViewModel = + ViewModelProvider(this).get(cameraViewModel::class.java) + + _binding = CameraFragmentBinding.inflate(inflater, container, false) + val root: View = binding.root + + val textView: TextView = binding.textCamera + cameraViewModel.text.observe(viewLifecycleOwner, Observer { + textView.text = it + }) + return root + } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/figurs/FigursViewModel.kt b/app/src/main/java/com/example/geometry/ui/figurs/FigursViewModel.kt new file mode 100644 index 0000000..55eb344 --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/figurs/FigursViewModel.kt @@ -0,0 +1,7 @@ +package com.example.geometry.ui.figurs + +import androidx.lifecycle.ViewModel + +class FigursViewModel : ViewModel() { + // TODO: Implement the ViewModel +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/figurs/figurs.kt b/app/src/main/java/com/example/geometry/ui/figurs/figurs.kt new file mode 100644 index 0000000..664be6d --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/figurs/figurs.kt @@ -0,0 +1,25 @@ +package com.example.geometry.ui.figurs + +import androidx.lifecycle.ViewModelProvider +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.geometry.R + +class figurs : Fragment() { + + companion object { + fun newInstance() = figurs() + } + + private lateinit var viewModel: FigursViewModel + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.figurs_fragment, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/maths/MathsViewModel.kt b/app/src/main/java/com/example/geometry/ui/maths/MathsViewModel.kt new file mode 100644 index 0000000..3cb7d12 --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/maths/MathsViewModel.kt @@ -0,0 +1,7 @@ +package com.example.geometry.ui.maths + +import androidx.lifecycle.ViewModel + +class MathsViewModel : ViewModel() { + // TODO: Implement the ViewModel +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/maths/maths.kt b/app/src/main/java/com/example/geometry/ui/maths/maths.kt new file mode 100644 index 0000000..25fc89f --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/maths/maths.kt @@ -0,0 +1,26 @@ +package com.example.geometry.ui.maths + +import androidx.lifecycle.ViewModelProvider +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.geometry.R + +class maths : Fragment() { + + companion object { + fun newInstance() = maths() + } + + private lateinit var viewModel: MathsViewModel + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.maths_fragment, container, false) + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/send/SendViewModel.kt b/app/src/main/java/com/example/geometry/ui/send/SendViewModel.kt new file mode 100644 index 0000000..1e06dec --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/send/SendViewModel.kt @@ -0,0 +1,7 @@ +package com.example.geometry.ui.send + +import androidx.lifecycle.ViewModel + +class SendViewModel : ViewModel() { + // TODO: Implement the ViewModel +} \ No newline at end of file diff --git a/app/src/main/java/com/example/geometry/ui/send/send.kt b/app/src/main/java/com/example/geometry/ui/send/send.kt new file mode 100644 index 0000000..728bc85 --- /dev/null +++ b/app/src/main/java/com/example/geometry/ui/send/send.kt @@ -0,0 +1,26 @@ +package com.example.geometry.ui.send + +import androidx.lifecycle.ViewModelProvider +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.example.geometry.R + +class send : Fragment() { + + companion object { + fun newInstance() = send() + } + + private lateinit var viewModel: SendViewModel + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.send_fragment, container, false) + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/camera.png b/app/src/main/res/drawable/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..564cd84d4910a75620da14d0c7e2695f7982d4dc GIT binary patch literal 17970 zcmeHP3v3is6rDG_?UvF?gYmEYl=y*wia~**yW3f?8i^n9heB6WG>RoitltEU8jSH1 zG%6~z#h?TtMDdfrwp$Twzz`z_KfzBx4T_>g%hGLU=6UYYHqd>upV_lQK|E<;==z1%RNua^CcNM_t)`}C%$@h#b?=<;{M*J{hgJ z`cbX)@(;Y!ZsGBa2Uz>Kn%21#ksg5b25$cGgqv`^INt&*2<}!>! z4_(zH{!UXV+V6yj7a zU3@@ES;l1)mmW+mgSd2MJ(w>wj6o%BZAk!k_WvBP;cRXB*x2`SzBU`{!=oo>)31fLc0kT!F8wY&8J5vJZfe z%`2{px3pYGU?n`Ku&iuRKS)aat|}@kdxSWmHWV5uZ2K!bdz7O6M9X7YXXyZm#-x6b zoE^erc|7x}>ruL^zobUsYA^Wdl4hw@9_X}80(zqX|OW}v2-9i~}e`h2>r zX(PZp7cyhf%rsnVOOhg^D@R=;s{Ps&veXL@29D8yS05d@dSwy@OCjJ7e6X6$9@@Rnh3qREk&o z{Uryz-e~~T!20SObfvDXtzS{^3n^s;de&pL-!+dmIs3qJw-)d0i+rjnGPg+k7IE?8Y?c|xgr$0fC#Em6^X0>eVvMzBP}sT;p4NG z4yo%8IBCRJzZ?T_6nr$3a6Yj@(iq~~QYuMcnBxJzYFeK0s4 zU1JS+bT%OKvTWX5%m#ZiszCxq)(|FXOl&(PF|#MIdK8vz4n@j*CfuCc zWz3S0M{yM&&2CC%LhMu08HkwO4ye@B`u#K3QkZN4cgZZ^qk3XC)##P zD#$$#O(Nz%Uq*d!}Z z*pEA_-Z0Kn8D4BzPlNuQisy!g?!4P>Yg??Ui$l2MKp&;zxux*}1uNiH^Hs*sm)C83 zCU_LzEz_`fL?17aF@q!5FXU@x16{)a=H_50NjTq??;=xC@&O7l)%!$IJju1wRAb z>?Z~D0TgW-POS?D!;WBK*H~KCX!O&EA(Kfk`Ul3pN3hW_)+ygbZQ+RJO}ORdU>xnp zP_CK%3qa=~bTdCZXd9j#%aY1U-=KK>GW7otz!(X^62wLVb$`V3_n>W)rulxltt)I^ zoR7TxCe%^pryLE)jM1J?pvZ*1FunpCmdfZkGaJ)OEeizB^yqp6Bu_~%?Mk9OFJ12l zQ%=GT%15cTn~som^+>t_5_wX-KuXv}Kw(J9W5IuL1X!CfepI7-v9?8FkkavJ1DfIkuU5UwGe^?LjE3njL8Pz45wQrN0ifOn#HqbKG?+)6xc&5Q1m4$8DVO4B`U4K%wYI*F!1OKpy8zww z``kkt;=(%p*2YHah7b0+*U#{UF%Ue7;5pF^HB8;lVtjZj!@7M*Y}LTQgP)`q#;kj| zB&OnE@Ie6fC@8%-4R@LFU%H!EdpG~bl4y1Kn?s+ElhQ$v|*fD-*;@oLv LXqvG$SoPRHVqv6Y literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/cursor.png b/app/src/main/res/drawable/cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..bed57617be33c459841d97ab2fb8143d33c95f92 GIT binary patch literal 790 zcmV+x1L^#UP)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10;5Sp zK~z|U#n?}XR#h0s@lQ3)XqK2lq7;dSD24`sLb%Gr78Qtuv#1Fa#9g}vbmPDX?j)kZ zje@NbiaZ~kL&mh&zVEr!$f0@V%uDSCo0AXEcrjc6S#^Ua{<00Jm-g50AJ&UlHk$C?>F#k z2EUFyrNJ-{2XH?N;CsAO5*)PwLmB)gKE{(J!O($TjAa1~V0B4w)H?i}!S6PLda5Lt zu)TY5Ckx;_)|LcEt;E?3eosiq&XQnwLRkH+EP!9|dP#89a(tJ;AK(zWN`j-_$3IyB z7qO`{7?uhzm=yjHNAPS(aMZi_GYjB%Y$*+f#WzqQz*J`UVt@-=u)^R`BH3gt2SIyxKh zJbY?uvh1qyv&m$KIxeeHt%6r$xB@zXYwFwGBZ=KeBlwoV-MF1xAID(~CfB~I@%6mW zpGUjCR=|G=bu?Yw4Qy}Ny^4R6xve$+x)Yl*)3ii&2Y*P&=2ZR3{AEc&$aFHX8&I8) zmC)muUt!y&`77gK4ftiv4PoWkPRreG?5uGX^=5Lh=<$LPe*0v-uVHM)TvlGz0(B>Vw4T4J;ED(Wkj~$E|*^ zU0^t^IeY)efdAo31^!)FVe02h92c;$-N007_Qpcgqvq_kQyutLXy*IX7nLSG0t(Vl UH=eIvFaQ7m07*qoM6N<$f~OpKiU0rr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/figurs.png b/app/src/main/res/drawable/figurs.png new file mode 100644 index 0000000000000000000000000000000000000000..3e4ecc45dc2653e2592bafe86a72defcd50f894d GIT binary patch literal 17860 zcmdU132YQq7@jvXEu~nrjfrxIpdg-Af}mp6?H)iQpb@A?pa*9ZVQWE4fJl{aiV;)- zDA00vftV4@(UbuJnH@JvDI`YAo^bN8E* zKu zS?C92?=^BhWwO_MMoY3Z_)3Rk8i2frN7Mir#AifFau)2~eVF(x3%=6n%ttqW%K&V+ zJX5beD^s^jzba~k%@XT`H zxhVc>26$BBAC>~Y{?0oy0Q?~{z{70rvxLDT3*X1-ED&Y+J+zq14DgV%08erUtlbAe zNm`WLVWOrdu2htMW*H9?^|~Nxz01{IQq}qRqB-5n;i;;ePt2{Z_9q?qtz*Zgo~^5U zl&k6jfTl677yd(HCq0IcG>%?WI>G1j5k0BKe1+XU(tqyU`_SuQJbIwcBYhRT8>1D@ zyTEweif^MK{3m!O7kRy}A`S$j3>sft<4sQIbpY`Klo=L9K|58(+!H*W;~FpW=b$Uk zME?88IBN8!xE{2%f}%WETwQ&-d0HrA^R&3XuNyWjOZNL|T+_Z>zZY`;BX(m?6nniN zMN({|-To7J`i7)0Mr+Rrp#?rWWX!J}I54GCW@fSA_b-GNmxfcU8LbX2^lUFxT}4K! z8NJmjfTNK^0%K|jCHR?e@Ee^@Cydz(*pl8D)FS)~0o{|Ikcu7UGq@R?m^pin)=>+*k6QWnqn@I#ur6B6PAep7DlZAwke zN{s8<3{U_w+oJmYPlZlH2Kh`$)&);iIW;4r2bX10m83r>?b=nRSLzm5#m!A+jDS&vKh70dTNT0DIVk&8-@*b`w$%a90J%^ zP*@HgIv)!LXxbm(<|=;wF;v83_-3>u?bOil9V%rB81;ak1<%rSMY$HOy{V&t6R2Rz z!<9Pv-~s#wK@{oqBO2gA zwJ~QK0Y8YIQc~peeG<%+L@y$BT^s^zY%6dB41b_om!xN94N6wvq`!>KfD5fN&;U%d z$&FxK{U2jbPxW}{h&ZW(jB!5R3=J{%KY*+!3ccQ=BriK#>?sHr?gE%0Ki)D#D1W;d zg(!?Ysa1j*@)99KMECDuMnPD|_clXLB4yB=-(ucxZ{b)3DecYMQTaqz=o6+CE{dm2 zk&{3nH0|v-qdZknmaWgt?Qe#xM9C0wYiWx~h2=@2_$}_tti&yfOH7g(S25!8oSZ#a ze}8FGDJhUMgGmzY1KjY(>pLh-Dzv>~L^vQ+blIs8(9m8XVe(~RIIU=?tNW_bZofNB zdQy-AmVRPY)gic&#zG@H7-&l{GIF025#m0$lQW}4O0(nlNY1%#(_^)Hq!Tl!Hp&H=Xx^Rl7`_$ zdyIZ9@-Vg#j+A*VXiXnR3Wm#LNJAwI#tcH|>qh$qu$kw~Y%BN{-QEyYlnfXW`_Q68 zVC)K!<+M&Vj08R&Q)4acK{@#nb$CrriVJws5?zXu-wv04`=WWD0ZGp{-vzZWziVUT zVfY7W)=5Z+8+c87vJ=G~Pr0NhH=>K{pUQCF7d%_BK=Ps|+@#5fR~&cnn&RWDt83x9 z&WAyCVjF!}qlb$z6WGxc4qyzgecfg=I?)X$A}U(Kz-!tR?b+kKQdI}Q9?+^%?HQ`&t^| zaH9ffs2SE4@pMRt=Y>S{lsp`)B>!*h=qf6#*b0p0AttuMvA z6nFxS`P{7KZa2$;hpQbXz?9HvIq-l@-WoGPt>wVO$9N3L^&BM8R!oiMz~^t73v4+e-MfO3KocDX - - diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100644 index f8bb0b5..0000000 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index 78b75c3..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/line.png b/app/src/main/res/drawable/line.png new file mode 100644 index 0000000000000000000000000000000000000000..fe2c04de836d49b5e0e145ee5485285f0e62ca85 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^9ze{+!3HG7Yb6wb6lZ})WHAE+-(e7DJf6QI1t=(4 z;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6j0GjPZ!4!kIuK(HVPhc;BmQl zw|C{CR|kC=j?NHq(mQ%IVHQJ_MYyBR#2IIH=CSSfx!G^xt&_F3+H-lw3&uAe=G&>v ze^+O`nVms^;aTNACX40Ewk|J;El*tg)#1~;*vpGLEW9pFkiDek**tCj=14)oy$mj8 z9*1L8;%|zsRr)z?cmGYrwME|p)65t(ZW{7xrI~#!&vh0&a4O&rQ?!eXFx|X Nc)I$ztaD0e0swTZW9I+> literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/maths.png b/app/src/main/res/drawable/maths.png new file mode 100644 index 0000000000000000000000000000000000000000..dc386553fc9a01039114b8dae4c4fc6aff663227 GIT binary patch literal 10278 zcmdT~U2IfE6rQ>F?rwM21*{1uv{^~nlu9W2UWBwhy>-C)u4dXU@!= zduGnxoqOh`123c!n-h$&RNwyIgQ%avZ%<1U{~NN~ucC^d-v8wMMIGiW%A(jCx8s%Kmm}8pEHqHCSG|(Cb=Z3)?%VKuD z-av~ri=45#I1X!aEf&+5WfhXGt%C+JSzB7#D-x{+w#wzzkhwJ0e^YJLOcbsg0sRkoDJm*jw{!oJIeD)3>q?VKC)%Y7zloo^*;%0$8pheRPv zGWhCmy=(Bpu=TFN4}mfvx(bnbB8TtUDphOZQR+e?(dg6PkB&zEPv*^1X=l)SE~5}< zphRyK3U3DuY6gxN4TT*gCN;`Unjxh%uIUEO$}{RFdTV^LrjdstC?SQHnx~)$pT}a` zZqLnq7$jEEzkvxai+#}69f;W97jYh(+Pd{5tJMl#n`+PpM)(xrttrC)ZfK|^PAtND zB5~>E$;k^M?%RAGYfDNb@_TN2`e(6M7U8?*DHO?_8#s%Pq$o_nq`aQ&sp>_pOgdxf z^ZER4@d;qhq_2N$ynXZ2o4|?VMHsKmIzV3)aaOIC7TX?7TF*btX3KctB}-F1+NRb< zJYJ@)muqHI*;`p03_2S9t)P^J98x6Z8HIInH2PCkj?0X}JYnlmRA-d*2v&l_vNV=t zTics>ieJSZytmK%bM4xci1XlNd;73v+n2mH)wZT}7Z(=Z6LB7#>gdR`O64!FO|{MW zGsWxI-w|;xj9r%oCAfUJob$cSdyua;T3Y^CldsqHi@BMZ)%to@nHnBIMMNmf6J053 z{(B`Ar3s!K1DX`9^_I2c>mx@hBI8cAni1O~Y*s2eK@SC8DZq8Fw0w|d?E-yV#M)R> zYj*D-vXpEnSS`@i(VhqNK1At6$&4VI1hfb zv-2>s?LWOX)ksU8y*)qwfrwj%<$fRc?ehmGC-1v%gx{yH90Ci1+`nJ+(IdxSA4m+O z={Q$&K6>Q%j|bAzF+d6xZ2SX9Gz}S!XrIn&81j2}8>NcHO|#4I_w8D3n{4x~QmNbT z_kj!aFbAxU)2V4JQGKZP`oOm0 z8>AeZr|oeZ^iHX6l5(f`qIw|5Jp^Ci`_X7cQ{9K(mu9<5O*Pr6EWDt4Ddd%K%oW>>o6(XCCr(3GY32pt z(r6d4T#pdmfdWMtDWNDA6hc~RqS4pa6+yG;`XRyEjr~1A=yr1cW z5Wof!j}a}PHQXg&L=zl$xLy!m8j<0Idvb!HQ{WYpJ3LO~6sJQ_aoh%v(q@%MVFkhv3`KdWaNI%3<7r>l)AK?llxxlw z1Wnu5P(032x_6Br+|#O!l~{$KYWp5O*nU+csih_s>r*SU%~^+_>6?Q`aSsFy$2IUM zZ9c#M#}!>&7$*2^LI@AwDx7!7HpKQ>;Wl6JKMc$F3=|dpu<^_p3?`47hT{mG6&2$K zN=yA7QS?)fCkS7BA*v{T7|!}JhrSn7WH|(s{U8mGNpP4Ij2ZO-O*rucU>qt=B-&P= zKi{8D-Y|r8CqGr!9uAKw5yc5!Sq^~Pnn)z69E44Pd5Qo)3jo9b{4NI>0o{>VRQpr^ z*!a0u@B)ugS#Dh$jo#ObF$_U3B-664wFTkrgeb=)TUn~L1wl>-0=NEDYnu$e$7d=# zi|dk;N-2->H{O?52w6O6@=_hNbX{~LH0+{SmubR?+V3#dXknpGXR4Ip>#S`F@xH~o z37I+**8+@qMBQ6@$Xj5|0XkMq}oB+Z0$yqxgXw&q9VCyu!9S|J1U?ZOp z9J_SKdI%{?@8o5{2m#}6W=ESoTF%EC@m+bk$7~2pF6>kx60HicnJz^y#m&N%({KtU*o z?SWpH5q=9Z!njAWU^j|-0l*b-bzO;g{Dd1ecp0$?&0o%`T|A}i7Tz14x2XD;s+z4I E07GJ9T>t<8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5651199..490cc31 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,31 +1,42 @@ - - - - - - + android:layout_height="match_parent" + tools:context=".MainActivity"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.473" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" + app:menu="@menu/bottom_nav_menu"> + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml index 9abd41c..132a061 100644 --- a/app/src/main/res/layout/bottom_sheet.xml +++ b/app/src/main/res/layout/bottom_sheet.xml @@ -1,46 +1,157 @@ - - - - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/camera_fragment.xml b/app/src/main/res/layout/camera_fragment.xml new file mode 100644 index 0000000..c5f3635 --- /dev/null +++ b/app/src/main/res/layout/camera_fragment.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/figurs_fragment.xml b/app/src/main/res/layout/figurs_fragment.xml new file mode 100644 index 0000000..eddffc9 --- /dev/null +++ b/app/src/main/res/layout/figurs_fragment.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml deleted file mode 100644 index 5c22d62..0000000 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -