diff --git a/app/build.gradle b/app/build.gradle index 788823ca..f6df4f70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' android { compileSdkVersion 29 @@ -25,6 +26,10 @@ android { } } + dataBinding { + enabled = true + } + // To inline the bytecode built with JVM target 1.8 into // bytecode that is being built with JVM target 1.6. (e.g. navArgs) @@ -45,7 +50,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.core:core-ktx:1.2.0' implementation 'com.google.android.material:material:1.1.0' - implementation 'androidx.fragment:fragment-ktx:1.2.2' + implementation 'androidx.fragment:fragment-ktx:1.2.3' + implementation 'androidx.preference:preference-ktx:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.navigation:navigation-fragment:2.2.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1887bd3a..fada911c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,14 +10,22 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + android:name=".SplashScreenActivity" + android:configChanges="orientation|keyboardHidden|screenSize" + android:label="@string/title_activity_splash_screen" + android:theme="@style/FullscreenTheme"> + - + + + + diff --git a/app/src/main/java/com/vanced/manager/Adapter/SectionPageAdapter.kt b/app/src/main/java/com/vanced/manager/Adapter/SectionPageAdapter.kt new file mode 100644 index 00000000..c53c97b2 --- /dev/null +++ b/app/src/main/java/com/vanced/manager/Adapter/SectionPageAdapter.kt @@ -0,0 +1,27 @@ +package com.vanced.manager.Adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter + +class SectionPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm, FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { + + private val fragmentList : MutableList = ArrayList() + private val titleList : MutableList = ArrayList() + + override fun getCount(): Int { + return fragmentList.size + } + + override fun getItem(position: Int): Fragment { + return fragmentList[position] + } + + override fun getPageTitle(position: Int): CharSequence? { + return titleList[position] + } + fun addFragment(fragment: Fragment, title:String) { + fragmentList.add(fragment) + titleList.add(title) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/HomeFragment.kt b/app/src/main/java/com/vanced/manager/HomeFragment.kt index 2f5c34bf..c69f3191 100644 --- a/app/src/main/java/com/vanced/manager/HomeFragment.kt +++ b/app/src/main/java/com/vanced/manager/HomeFragment.kt @@ -13,6 +13,10 @@ import android.content.Intent import androidx.browser.customtabs.CustomTabsIntent import android.widget.Toast import androidx.core.content.ContextCompat +import androidx.viewpager2.widget.ViewPager2 +import com.google.android.material.tabs.TabLayout +import kotlinx.android.synthetic.main.include_changelogs.* +import com.vanced.manager.Adapter.SectionPageAdapter /** * A simple [Fragment] subclass. @@ -23,43 +27,84 @@ class HomeFragment : Fragment() { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.fragment_home, container, false) + val homefragment = inflater.inflate(R.layout.fragment_home, container, false) + val viewPager = homefragment.findViewById(R.id.viewpager) + val tabLayout = homefragment.findViewById(R.id.tablayout) + return homefragment } - private fun isMicrogInstalled(packageName:String, packageManager:PackageManager):Boolean { + private fun isMicrogInstalled(packageName: String, packageManager: PackageManager): Boolean { return try { packageManager.getPackageInfo(packageName, 0) true - } catch (e:PackageManager.NameNotFoundException) { + } catch (e: PackageManager.NameNotFoundException) { false } } + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + setUpViewPager(viewpager) + tablayout.setupWithViewPager(viewpager) + tablayout.addOnTabSelectedListener(object:TabLayout.OnTabSelectedListener { + override fun onTabSelected(tab: TabLayout.Tab?) { + } + + override fun onTabReselected(tab: TabLayout.Tab?) { + } + + override fun onTabUnselected(tab: TabLayout.Tab?) { + } + }) + } + + private fun setUpViewPager(viewPager2: ViewPager2) { + val adapter = SectionPageAdapter(getChildFragmentManager()) + adapter.addFragment(VancedChangelogFragment, "Vanced") + adapter.addFragment(MicrogChangelogFragment, "MicroG") + viewpager.setAdapter(adapter) + } + + companion object { + val instance:HomeFragment + get() { + return HomeFragment() + } + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { (activity as MainActivity).supportActionBar?.title = getString(R.string.home) - val braveurl = "https://brave.com/van874" - val vancedurl = "https://vanced.app" - val builder = CustomTabsIntent.Builder() - val brave = getView()?.findViewById(R.id.button) as Button - val website = getView()?.findViewById(R.id.button2) as Button - val mgsettings = getView()?.findViewById(R.id.button8) as Button - val pm = activity?.packageManager - val isInstalled = pm?.let { isMicrogInstalled("com.mgoogle.android.gms", it) } - super.onViewCreated(view, savedInstanceState) - brave.setOnClickListener{ + val builder = CustomTabsIntent.Builder() + val pm = activity?.packageManager + + val bravebtn = getView()?.findViewById(R.id.brave_button) as Button + val websitebtn = getView()?.findViewById(R.id.website_button) as Button + val microgsettingsbtn = getView()?.findViewById(R.id.microg_settingsbtn) as Button + val discordbtn = getView()?.findViewById(R.id.discordbtn) as Button + val telegrambtn = getView()?.findViewById(R.id.tgbtn) as Button + val twitterbtn = getView()?.findViewById(R.id.twitterbtn) as Button + val redditbtn = getView()?.findViewById(R.id.redditbtn) as Button + val git1btn = getView()?.findViewById(R.id.github_managerbtn) as Button + val git2btn = getView()?.findViewById(R.id.github_botbtn) as Button + val git3btn = getView()?.findViewById(R.id.github_websitebtn) as Button + + bravebtn.setOnClickListener { + val braveurl = "https://brave.com/van874" builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Brave)) - val customTabsIntent = builder.build() + val customTabsIntent = builder.build() customTabsIntent.launchUrl(requireContext(), Uri.parse(braveurl)) } - website.setOnClickListener{ + websitebtn.setOnClickListener { + val vancedurl = "https://vanced.app" builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Vanced)) - val customTabsIntent = builder.build() + val customTabsIntent = builder.build() customTabsIntent.launchUrl(requireContext(), Uri.parse(vancedurl)) } - mgsettings.setOnClickListener{ + microgsettingsbtn.setOnClickListener { + val isInstalled = pm?.let { isMicrogInstalled("com.mgoogle.android.gms", it) } if (isInstalled == true) { val intent = Intent() intent.component = ComponentName( @@ -67,13 +112,55 @@ class HomeFragment : Fragment() { "org.microg.gms.ui.SettingsActivity" ) startActivity(intent) - } - else { + } else { val toast = Toast.makeText(context, "Install MicroG First!", Toast.LENGTH_SHORT) toast.show() } - } + discordbtn.setOnClickListener { + val discordurl = "https://discord.gg/TUVd7rd" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Discord)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(discordurl)) + } + telegrambtn.setOnClickListener { + val telegramurl = "https://t.me/joinchat/AAAAAEHf-pi4jH1SDIAL4w" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Telegram)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(telegramurl)) + } + twitterbtn.setOnClickListener { + val twitterurl = "https://twitter.com/YTVanced" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Twitter)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(twitterurl)) + } + redditbtn.setOnClickListener { + val redditurl = "https://reddit.com/r/vanced" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.Reddit)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(redditurl)) + } + git1btn.setOnClickListener { + val gitmanagerurl = "https://github.com/YTVanced/VancedInstaller" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(gitmanagerurl)) + } + git2btn.setOnClickListener { + val gitboturl = "https://github.com/YTVanced/VancedHelper" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(gitboturl)) + } + git3btn.setOnClickListener { + val gitwebsiteurl = "https://github.com/YTVanced/VancedWebsite" + builder.setToolbarColor(ContextCompat.getColor(requireContext(), R.color.GitHub)) + val customTabsIntent = builder.build() + customTabsIntent.launchUrl(requireContext(), Uri.parse(gitwebsiteurl)) + } + + } } diff --git a/app/src/main/java/com/vanced/manager/MainActivity.kt b/app/src/main/java/com/vanced/manager/MainActivity.kt index f475b664..7194a46d 100644 --- a/app/src/main/java/com/vanced/manager/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/MainActivity.kt @@ -1,6 +1,8 @@ package com.vanced.manager +import android.content.DialogInterface import android.os.Bundle +import androidx.appcompat.app.AlertDialog import com.google.android.material.bottomnavigation.BottomNavigationView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.Toolbar @@ -15,6 +17,12 @@ class MainActivity : AppCompatActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + val prefs = getSharedPreferences("prefs", MODE_PRIVATE) + val firstStart = prefs.getBoolean("firstStart", true) + if (firstStart) { + showGayDialog() + } + val navView : BottomNavigationView = findViewById(R.id.bottom_nav) homeFragment = HomeFragment() @@ -57,4 +65,17 @@ class MainActivity : AppCompatActivity() { true } } + private fun showGayDialog() { + AlertDialog.Builder(this) + .setTitle("Gay Alert!") + .setMessage("Warning!\nIf you didn't download this app from vanced.app or github,\nIt may be infected with malicious code. Make sure to have Official version or be gay") + .setPositiveButton("close" + ) { dialog, which -> dialog.dismiss() } + .create().show() + + val prefs = getSharedPreferences("prefs", MODE_PRIVATE) + val editor = prefs.edit() + editor.putBoolean("firstStart", false) + editor.apply() + } } diff --git a/app/src/main/java/com/vanced/manager/MicrogChangelogFragment.kt b/app/src/main/java/com/vanced/manager/MicrogChangelogFragment.kt new file mode 100644 index 00000000..74da7e9d --- /dev/null +++ b/app/src/main/java/com/vanced/manager/MicrogChangelogFragment.kt @@ -0,0 +1,22 @@ +package com.vanced.manager + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** + * A simple [Fragment] subclass. + */ +class MicrogChangelogFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_microg_changelog, container, false) + } + +} diff --git a/app/src/main/java/com/vanced/manager/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/SettingsFragment.kt index 0041bed9..9138a3db 100644 --- a/app/src/main/java/com/vanced/manager/SettingsFragment.kt +++ b/app/src/main/java/com/vanced/manager/SettingsFragment.kt @@ -1,59 +1,11 @@ package com.vanced.manager import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup +import androidx.preference.PreferenceFragmentCompat -// TODO: Rename parameter arguments, choose names that match -// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER -private const val ARG_PARAM1 = "param1" -private const val ARG_PARAM2 = "param2" +class SettingsFragment : PreferenceFragmentCompat() { -/** - * A simple [Fragment] subclass. - * Use the [SettingsFragment.newInstance] factory method to - * create an instance of this fragment. - */ -class SettingsFragment : Fragment() { - // TODO: Rename and change types of parameters - private var param1: String? = null - private var param2: String? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - arguments?.let { - param1 = it.getString(ARG_PARAM1) - param2 = it.getString(ARG_PARAM2) - } + override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { + setPreferencesFromResource(R.xml.preferences, rootKey) } - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_settings, container, false) - } - - companion object { - /** - * Use this factory method to create a new instance of - * this fragment using the provided parameters. - * - * @param param1 Parameter 1. - * @param param2 Parameter 2. - * @return A new instance of fragment SettingsFragment. - */ - // TODO: Rename and change types and number of parameters - @JvmStatic - fun newInstance(param1: String, param2: String) = - SettingsFragment().apply { - arguments = Bundle().apply { - putString(ARG_PARAM1, param1) - putString(ARG_PARAM2, param2) - } - } - } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/vanced/manager/SplashScreenActivity.kt b/app/src/main/java/com/vanced/manager/SplashScreenActivity.kt new file mode 100644 index 00000000..39478d6e --- /dev/null +++ b/app/src/main/java/com/vanced/manager/SplashScreenActivity.kt @@ -0,0 +1,20 @@ +package com.vanced.manager + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.os.Handler +import android.os.PersistableBundle +import android.content.Intent + +class SplashScreenActivity : AppCompatActivity() { + private val SPLASH_TIME_OUT:Long=3000 + override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) { + super.onCreate(savedInstanceState, persistentState) + setContentView(R.layout.activity_splash_screen) + + Handler().postDelayed({ + startActivity(Intent(this, MainActivity::class.java)) + finish() + }, SPLASH_TIME_OUT) + } +} diff --git a/app/src/main/java/com/vanced/manager/VancedChangelogFragment.kt b/app/src/main/java/com/vanced/manager/VancedChangelogFragment.kt new file mode 100644 index 00000000..393c8551 --- /dev/null +++ b/app/src/main/java/com/vanced/manager/VancedChangelogFragment.kt @@ -0,0 +1,22 @@ +package com.vanced.manager + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** + * A simple [Fragment] subclass. + */ +class VancedChangelogFragment : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_vanced_changelog, container, false) + } + +} diff --git a/app/src/main/res/drawable/Rectangle_9_logo.png b/app/src/main/res/drawable/Rectangle_9_logo.png deleted file mode 100644 index fda06046..00000000 Binary files a/app/src/main/res/drawable/Rectangle_9_logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/brave_panel_bg.xml b/app/src/main/res/drawable/brave_panel_bg.xml deleted file mode 100755 index c62f68d7..00000000 --- a/app/src/main/res/drawable/brave_panel_bg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_brush_black_24dp.xml b/app/src/main/res/drawable/ic_brush_black_24dp.xml new file mode 100644 index 00000000..54730dbe --- /dev/null +++ b/app/src/main/res/drawable/ic_brush_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cloud_download.xml b/app/src/main/res/drawable/ic_cloud_download.xml deleted file mode 100755 index 587d3603..00000000 --- a/app/src/main/res/drawable/ic_cloud_download.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml deleted file mode 100755 index 46fc8dee..00000000 --- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_discord.xml b/app/src/main/res/drawable/ic_discord.xml deleted file mode 100755 index ee8ab7d9..00000000 --- a/app/src/main/res/drawable/ic_discord.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml deleted file mode 100755 index 633987d0..00000000 --- a/app/src/main/res/drawable/ic_github.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml new file mode 100644 index 00000000..cc940881 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_language_black_24dp.xml b/app/src/main/res/drawable/ic_language_black_24dp.xml new file mode 100644 index 00000000..d07324c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_language_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_logo_1.xml b/app/src/main/res/drawable/ic_logo_1.xml new file mode 100644 index 00000000..6aa29554 --- /dev/null +++ b/app/src/main/res/drawable/ic_logo_1.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_microg.xml b/app/src/main/res/drawable/ic_microg.xml deleted file mode 100755 index cd7a6d84..00000000 --- a/app/src/main/res/drawable/ic_microg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_palette_black_24dp.xml b/app/src/main/res/drawable/ic_palette_black_24dp.xml new file mode 100644 index 00000000..f75e2fbe --- /dev/null +++ b/app/src/main/res/drawable/ic_palette_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_reddit.xml b/app/src/main/res/drawable/ic_reddit.xml index 0a047886..3f13cf72 100755 --- a/app/src/main/res/drawable/ic_reddit.xml +++ b/app/src/main/res/drawable/ic_reddit.xml @@ -1,18 +1,9 @@ - - - - - + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml deleted file mode 100755 index d45c12c3..00000000 --- a/app/src/main/res/drawable/ic_settings.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml index a9a39ac7..24a5623c 100644 --- a/app/src/main/res/drawable/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -1,5 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable/ic_telegram.xml b/app/src/main/res/drawable/ic_telegram.xml deleted file mode 100755 index 1dae8ebb..00000000 --- a/app/src/main/res/drawable/ic_telegram.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_vanced1.xml b/app/src/main/res/drawable/ic_vanced1.xml deleted file mode 100755 index ed54d3f6..00000000 --- a/app/src/main/res/drawable/ic_vanced1.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -w:defaultTabStop w:val="720"/><vectorxmlns:android="http://schemas.android.com/apk/res/android"xmlns:aapt="http://schemas.android.com/aapt"android:width="36.2dp"android:height="27.52dp"android:viewportWidth="36.2"android:viewportHeight="27.52" ><group><clip-pathandroid:pathData="M0 0H36.2038V27.5192H0V0Z"/><groupandroid:translateX="-0.254"android:translateY="0.5"android:pivotX="18.102"android:pivotY="13.76"android:scaleX="2.131"android:scaleY="2.804"android:rotation="-45"><pathandroid:pathData="M0 0V27.5192H36.2038V0"><aapt:attr name="android:fillColor"><gradientandroid:type="linear"android:startX="9.051"android:startY="13.76"android:endX="27.153"android:endY="13.76"><itemandroid:color="#2E73FF"android:offset="0"/><itemandroid:color="#FF0032"android:offset="1"/></gradient></aapt:attr></path></group></group></vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_vanced2.xml b/app/src/main/res/drawable/ic_vanced2.xml deleted file mode 100755 index 2073a6e4..00000000 --- a/app/src/main/res/drawable/ic_vanced2.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -w:defaultTabStop w:val="720"/><vectorxmlns:android="http://schemas.android.com/apk/res/android"xmlns:aapt="http://schemas.android.com/aapt"android:width="9.52dp"android:height="12.71dp"android:viewportWidth="9.52"android:viewportHeight="12.71" ><group><clip-pathandroid:pathData="M0 0H9.52077V12.7096H0V0Z"/><pathandroid:pathData="M0 0V12.7096H9.52077V0"android:fillColor="#FFFFFF"/></group></vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_vanced3.xml b/app/src/main/res/drawable/ic_vanced3.xml deleted file mode 100755 index c705eb50..00000000 --- a/app/src/main/res/drawable/ic_vanced3.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -w:defaultTabStop w:val="720"/><vectorxmlns:android="http://schemas.android.com/apk/res/android"xmlns:aapt="http://schemas.android.com/aapt"android:width="5.25dp"android:height="5.74dp"android:viewportWidth="5.25"android:viewportHeight="5.74" ><group><clip-pathandroid:pathData="M0 0H5.25417V5.73504H0V0Z"/><groupandroid:translateX="704.62"android:translateY="999.995"android:pivotX="2.627"android:pivotY="2.868"android:scaleX="565.417"android:scaleY="565.417"android:rotation="-44.999"><pathandroid:pathData="M0 0V5.73504H5.25417V0"><aapt:attr name="android:fillColor"><gradientandroid:type="linear"android:startX="1.314"android:startY="2.868"android:endX="3.941"android:endY="2.868"><itemandroid:color="#2E73FF"android:offset="0"/><itemandroid:color="#FF0032"android:offset="1"/></gradient></aapt:attr></path></group></group></vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/rectangle_1.xml b/app/src/main/res/drawable/rectangle_1.xml deleted file mode 100755 index 338fb99c..00000000 --- a/app/src/main/res/drawable/rectangle_1.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/rectangle_3.xml b/app/src/main/res/drawable/rectangle_3.xml deleted file mode 100755 index 529869b6..00000000 --- a/app/src/main/res/drawable/rectangle_3.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/rectangle_4.xml b/app/src/main/res/drawable/rectangle_4.xml deleted file mode 100755 index 6f3acb51..00000000 --- a/app/src/main/res/drawable/rectangle_4.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/rectangle_5.xml b/app/src/main/res/drawable/rectangle_5.xml deleted file mode 100755 index 11b30af8..00000000 --- a/app/src/main/res/drawable/rectangle_5.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/rectangle_6.xml b/app/src/main/res/drawable/rectangle_6.xml deleted file mode 100755 index e72d3e60..00000000 --- a/app/src/main/res/drawable/rectangle_6.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/rectangle_7.xml b/app/src/main/res/drawable/rectangle_7.xml deleted file mode 100755 index e50f52d2..00000000 --- a/app/src/main/res/drawable/rectangle_7.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/rectangle_8.xml b/app/src/main/res/drawable/rectangle_8.xml deleted file mode 100755 index 02905ba5..00000000 --- a/app/src/main/res/drawable/rectangle_8.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/rectangle_9.xml b/app/src/main/res/drawable/rectangle_9.xml deleted file mode 100755 index e2ca1e5e..00000000 --- a/app/src/main/res/drawable/rectangle_9.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/rectangle_9_logo.png b/app/src/main/res/drawable/rectangle_9_logo.png deleted file mode 100755 index fda06046..00000000 Binary files a/app/src/main/res/drawable/rectangle_9_logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/site_panel_bg.xml b/app/src/main/res/drawable/site_panel_bg.xml deleted file mode 100755 index 8e22373e..00000000 --- a/app/src/main/res/drawable/site_panel_bg.xml +++ /dev/null @@ -1,3 +0,0 @@ - - -w:defaultTabStop w:val="720"/><vectorxmlns:android="http://schemas.android.com/apk/res/android"xmlns:aapt="http://schemas.android.com/aapt"android:width="30dp"android:height="28dp"android:viewportWidth="30"android:viewportHeight="28" ><group><clip-pathandroid:pathData="M0 0H30V28H0V0Z"/><pathandroid:pathData="M0 0V28H30V0"android:fillColor="#FFFFFF"/></group></vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/vectorlogo.png b/app/src/main/res/drawable/vectorlogo.png deleted file mode 100755 index 4ccd8ec8..00000000 Binary files a/app/src/main/res/drawable/vectorlogo.png and /dev/null differ diff --git a/app/src/main/res/drawable/vectorlogo1.png b/app/src/main/res/drawable/vectorlogo1.png deleted file mode 100755 index 220b65d5..00000000 Binary files a/app/src/main/res/drawable/vectorlogo1.png and /dev/null differ diff --git a/app/src/main/res/drawable/vectorlogo2.png b/app/src/main/res/drawable/vectorlogo2.png deleted file mode 100755 index 83a04c34..00000000 Binary files a/app/src/main/res/drawable/vectorlogo2.png and /dev/null differ diff --git a/app/src/main/res/drawable/vectorsetting_icon.png b/app/src/main/res/drawable/vectorsetting_icon.png deleted file mode 100755 index ccaa9840..00000000 Binary files a/app/src/main/res/drawable/vectorsetting_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/vectorsettings_icon.png b/app/src/main/res/drawable/vectorsettings_icon.png deleted file mode 100755 index 552807d1..00000000 Binary files a/app/src/main/res/drawable/vectorsettings_icon.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 95e00c03..9ce510d3 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,19 +8,23 @@ android:layout_height="match_parent" android:paddingTop="?attr/actionBarSize"> + + diff --git a/app/src/main/res/layout/activity_splash_screen.xml b/app/src/main/res/layout/activity_splash_screen.xml new file mode 100644 index 00000000..87c5ac0c --- /dev/null +++ b/app/src/main/res/layout/activity_splash_screen.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index b4cd589f..fad99e1a 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,376 +1,63 @@ - + xmlns:tools="http://schemas.android.com/tools"> - + - + - + - + - + -