Skip to content

Commit f7ea62f

Browse files
MenosGranteMenosGrante
committed
- Added: Finalized Russian and Ukrainian localization.
1 parent 43d8981 commit f7ea62f

27 files changed

+516
-151
lines changed

‎app/app.iml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
<exclude-output />
6363
<content url="file://$MODULE_DIR$">
6464
<sourceFolder url="file://$MODULE_DIR$/src/main/cpp" isTestSource="false" />
65-
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
6665
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
6868
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
6969
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
7071
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
7172
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
7373
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
7474
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
7575
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />

‎app/src/main/java/com/pavelrekun/rekado/base/BaseFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import com.pavelrekun.penza.widgets.ElevationScrollView
66

77
open class BaseFragment(layoutRes: Int = 0) : Fragment(layoutRes) {
88

9-
fun initWithTitle(resId: Int) = getBaseActivity().setTitle(resId)
9+
fun initWithTitle(resId: Int) = requireBaseActivity().setTitle(resId)
1010

11-
fun getBaseActivity() = activity as BaseActivity
11+
fun requireBaseActivity() = activity as BaseActivity
1212

13-
fun initScrollingBehaviour(scrollView: ElevationScrollView) = scrollView.setInstance(getBaseActivity())
13+
fun initScrollingBehaviour(scrollView: ElevationScrollView) = scrollView.setInstance(requireBaseActivity())
1414

15-
fun initScrollingBehaviour(recyclerView: ElevationRecyclerView) = recyclerView.setInstance(getBaseActivity())
15+
fun initScrollingBehaviour(recyclerView: ElevationRecyclerView) = recyclerView.setInstance(requireBaseActivity())
1616

1717
}

‎app/src/main/java/com/pavelrekun/rekado/base/BasePreferencesFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open class BasePreferencesFragment(private val preferencesLayoutId: Int, private
1414
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
1515
super.onViewCreated(view, savedInstanceState)
1616

17-
getBaseActivity().supportActionBar?.setTitle(titleResId)
17+
requireBaseActivity().supportActionBar?.setTitle(titleResId)
1818
}
1919

2020
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -33,9 +33,9 @@ open class BasePreferencesFragment(private val preferencesLayoutId: Int, private
3333
super.onScrolled(recyclerView, dx, dy)
3434

3535
if (view.canScrollVertically(SCROLL_DIRECTION_UP)) {
36-
getBaseActivity().supportActionBar?.elevation = 3.convertPXToDP(getBaseActivity()).toFloat()
36+
requireBaseActivity().supportActionBar?.elevation = 3.convertPXToDP(requireBaseActivity()).toFloat()
3737
} else {
38-
getBaseActivity().supportActionBar?.elevation = 0F
38+
requireBaseActivity().supportActionBar?.elevation = 0F
3939
}
4040
}
4141

@@ -44,7 +44,7 @@ open class BasePreferencesFragment(private val preferencesLayoutId: Int, private
4444
return view
4545
}
4646

47-
fun getBaseActivity() = activity as BaseActivity
47+
fun requireBaseActivity() = activity as BaseActivity
4848

4949
companion object {
5050
private const val SCROLL_DIRECTION_UP = -1

‎app/src/main/java/com/pavelrekun/rekado/containers/PrimaryContainerActivity.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ class PrimaryContainerActivity : BaseActivity() {
4040
override fun onOptionsItemSelected(item: MenuItem): Boolean {
4141
return when (item.itemId) {
4242
R.id.navigation_about -> {
43-
controller.openAboutScreen()
43+
openAboutScreen()
4444
true
4545
}
4646

4747
R.id.navigation_settings -> {
48-
controller.openSettingsScreen()
48+
openSettingsScreen()
4949
true
5050
}
5151

@@ -55,7 +55,7 @@ class PrimaryContainerActivity : BaseActivity() {
5555
}
5656

5757
R.id.navigation_translators -> {
58-
controller.openTranslatorsScreen()
58+
openTranslatorsScreen()
5959
true
6060
}
6161

‎app/src/main/java/com/pavelrekun/rekado/containers/SecondaryContainerActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SecondaryContainerActivity : BaseActivity() {
3232
prepareEdgeToEdge()
3333
prepareObservers()
3434

35-
if(savedInstanceState != null) {
35+
if(savedInstanceState == null) {
3636
navigate()
3737
}
3838
}

‎app/src/main/java/com/pavelrekun/rekado/screens/about_fragment/AboutFragment.kt

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.pavelrekun.rekado.screens.about_fragment
22

33
import android.os.Bundle
44
import android.view.View
5+
import com.pavelrekun.magta.constants.Links
56
import com.pavelrekun.rekado.BuildConfig
67
import com.pavelrekun.rekado.R
78
import com.pavelrekun.rekado.base.BaseFragment
@@ -30,10 +31,12 @@ class AboutFragment : BaseFragment(R.layout.fragment_about) {
3031
}
3132

3233
private fun initClickListeners() {
33-
binding.aboutLinkGitHubProject.setOnClickListener { Utils.openLink(getBaseActivity(), Constants.GITHUB_PROJECT_LINK) }
34-
binding.aboutDeveloperPersonalSite.setOnClickListener { Utils.openLink(getBaseActivity(), Constants.PERSONAL_SITE_LINK) }
35-
binding.aboutDeveloperGitHub.setOnClickListener { Utils.openLink(getBaseActivity(), Constants.GITHUB_PROFILE_LINK) }
36-
binding.aboutDeveloperTwitter.setOnClickListener { Utils.openLink(getBaseActivity(), Constants.TWITTER_LINK) }
34+
binding.aboutLinkGitHubProject.setOnClickListener { Utils.openLink(requireBaseActivity(), Constants.GITHUB_PROJECT_LINK) }
35+
36+
binding.aboutDeveloperPortfolio.setOnClickListener { Utils.openLink(requireBaseActivity(), Links.PERSONAL_SITE_LINK) }
37+
binding.aboutDeveloperInstagram.setOnClickListener { Utils.openLink(requireBaseActivity(), Links.INSTAGRAM_DRONE_LINK) }
38+
binding.aboutDeveloperGithub.setOnClickListener { Utils.openLink(requireBaseActivity(), Links.GITHUB_LINK) }
39+
binding.aboutDeveloperTwitter.setOnClickListener { Utils.openLink(requireBaseActivity(), Links.TWITTER_LINK) }
3740
}
3841

3942
private fun initEdgeToEdge() {

‎app/src/main/java/com/pavelrekun/rekado/screens/instructions_fragment/InstructionsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class InstructionsFragment : BaseFragment(R.layout.fragment_instructions) {
2222
}
2323

2424
private fun initClickListeners() {
25-
binding.instructionsRCMHelp.setOnClickListener { Utils.openLink(getBaseActivity(), Constants.HELP_RCM) }
25+
binding.instructionsRCMHelp.setOnClickListener { Utils.openLink(requireBaseActivity(), Constants.HELP_RCM) }
2626
}
2727

2828
}

‎app/src/main/java/com/pavelrekun/rekado/screens/logs_fragment/LogsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class LogsFragment : BaseFragment(R.layout.fragment_logs) {
4040

4141
binding.logsActionsList.apply {
4242
setHasFixedSize(true)
43-
layoutManager = LinearLayoutManager(getBaseActivity())
43+
layoutManager = LinearLayoutManager(requireBaseActivity())
4444
adapter = this@LogsFragment.adapter
4545

4646
addOnScrollListener(object : RecyclerView.OnScrollListener() {

‎app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
5252
Activity.RESULT_OK -> data?.data?.let {
5353
val name = it.extractFileName()
5454
if (name != null) {
55-
val inputStream = getBaseActivity().contentResolver.openInputStream(it)
55+
val inputStream = requireBaseActivity().contentResolver.openInputStream(it)
5656

5757
if (inputStream != null) {
5858
MemoryUtils.copyPayload(inputStream, name)
@@ -79,7 +79,7 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
7979
viewModel.fetchConfigResult.observe(viewLifecycleOwner, Observer { result ->
8080
when (result) {
8181
Result.SUCCESS -> {
82-
DialogsShower.showPayloadsUpdatesDialog(getBaseActivity(), result.config, viewModel)
82+
DialogsShower.showPayloadsUpdatesDialog(requireBaseActivity(), result.config, viewModel)
8383
}
8484
else -> {
8585
}
@@ -101,10 +101,10 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
101101
Result.SUCCESS -> {
102102
updateList()
103103
LoginUtils.info("Payload downloaded successfully.")
104-
Toast.makeText(getBaseActivity(), getString(R.string.payloads_download_status_success), Toast.LENGTH_SHORT).show()
104+
Toast.makeText(requireBaseActivity(), getString(R.string.payloads_download_status_success), Toast.LENGTH_SHORT).show()
105105
}
106106
else -> {
107-
Toast.makeText(getBaseActivity(), getString(R.string.payloads_download_status_error), Toast.LENGTH_SHORT).show()
107+
Toast.makeText(requireBaseActivity(), getString(R.string.payloads_download_status_error), Toast.LENGTH_SHORT).show()
108108
LoginUtils.error("Failed to download payload.")
109109
}
110110
}
@@ -133,7 +133,7 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
133133
}
134134

135135
private fun initClickListeners() {
136-
binding.payloadsAddUrl.setOnClickListener { DialogsShower.showPayloadsDownloadDialog(getBaseActivity(), viewModel) }
136+
binding.payloadsAddUrl.setOnClickListener { DialogsShower.showPayloadsDownloadDialog(requireBaseActivity(), viewModel) }
137137
binding.payloadsAdd.setOnClickListener { addPayload() }
138138
}
139139

‎app/src/main/java/com/pavelrekun/rekado/screens/serial_checker_activity/SerialCheckerFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class SerialCheckerFragment : BaseFragment(R.layout.fragment_serial_checker) {
5050
}
5151

5252
binding.serialCheckerHelp.setOnClickListener {
53-
Utils.openLink(getBaseActivity(), Constants.HELP_SERIAL_CHECKER)
53+
Utils.openLink(requireBaseActivity(), Constants.HELP_SERIAL_CHECKER)
5454
}
5555

5656
binding.serialCheckerScan.setOnClickListener {

‎app/src/main/java/com/pavelrekun/rekado/screens/settings_fragment/SettingsFragment.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,27 @@ class SettingsFragment : BasePreferencesFragment(R.xml.preferences, R.string.nav
5858

5959
private fun initAppearanceCategory() {
6060
appearanceTheme.setOnPreferenceClickListener {
61-
getBaseActivity().controller.openSettingsAppearanceThemesScreen()
61+
requireBaseActivity().openSettingsAppearanceThemesScreen()
6262
true
6363
}
6464

6565
appearanceAccentColor.setOnPreferenceChangeListener { _, _ ->
66-
DialogsShower.showSettingsRestartDialog(getBaseActivity())
66+
DialogsShower.showSettingsRestartDialog(requireBaseActivity())
6767
true
6868
}
6969

7070
appearanceRandomize.setOnPreferenceClickListener {
71-
SettingsDialogsHelper.showSettingsRestartDialog(getBaseActivity()) {
71+
SettingsDialogsHelper.showSettingsRestartDialog(requireBaseActivity()) {
7272
Penza.randomizeTheme()
73-
Utils.restartApplication(getBaseActivity())
73+
Utils.restartApplication(requireBaseActivity())
7474
}
7575
true
7676
}
7777

7878
appearanceReset.setOnPreferenceClickListener {
79-
SettingsDialogsHelper.showSettingsRestartDialog(getBaseActivity()) {
79+
SettingsDialogsHelper.showSettingsRestartDialog(requireBaseActivity()) {
8080
Penza.reset()
81-
Utils.restartApplication(getBaseActivity())
81+
Utils.restartApplication(requireBaseActivity())
8282
}
8383
true
8484
}
@@ -126,7 +126,7 @@ class SettingsFragment : BasePreferencesFragment(R.xml.preferences, R.string.nav
126126
}
127127

128128
payloadsResetPreference.setOnPreferenceClickListener {
129-
val dialog = DialogsShower.showPayloadsResetDialog(getBaseActivity())
129+
val dialog = DialogsShower.showPayloadsResetDialog(requireBaseActivity())
130130

131131
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
132132
PayloadHelper.deletePayloads()

‎app/src/main/java/com/pavelrekun/rekado/screens/tools_fragment/ToolsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class ToolsFragment : BaseFragment(R.layout.fragment_tools) {
2121

2222
private fun initClickListeners() {
2323
binding.toolsSerialCheckerLayout.setOnClickListener {
24-
getBaseActivity().controller.openToolsSerialCheckerScreen()
24+
requireBaseActivity().openToolsSerialCheckerScreen()
2525
}
2626
}
2727

‎app/src/main/java/com/pavelrekun/rekado/screens/translators_fragment/TranslatorsFragment.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package com.pavelrekun.rekado.screens.translators_fragment
33
import android.os.Bundle
44
import android.view.View
55
import androidx.recyclerview.widget.LinearLayoutManager
6-
import com.pavelrekun.rekado.screens.translators_fragment.adapters.TranslatorsAdapter
76
import com.pavelrekun.magta.translators.Language
87
import com.pavelrekun.rekado.R
98
import com.pavelrekun.rekado.base.BaseFragment
109
import com.pavelrekun.rekado.databinding.FragmentTranslatorsBinding
10+
import com.pavelrekun.rekado.screens.translators_fragment.adapters.TranslatorsAdapter
1111
import com.pavelrekun.rekado.services.extensions.viewBinding
1212
import de.halfbit.edgetoedge.Edge
1313
import de.halfbit.edgetoedge.edgeToEdge
@@ -28,10 +28,12 @@ class TranslatorsFragment : BaseFragment(R.layout.fragment_translators) {
2828
val languagesList = arrayListOf<Language>()
2929

3030
languagesList.add(Language.english(R.string.translators_english))
31+
languagesList.add(Language.russian(R.string.translators_russian))
32+
languagesList.add(Language.ukrainian(R.string.translators_ukrainian))
3133

3234
binding.translatorsData.apply {
3335
setHasFixedSize(true)
34-
layoutManager = LinearLayoutManager(getBaseActivity())
36+
layoutManager = LinearLayoutManager(requireBaseActivity())
3537
adapter = TranslatorsAdapter(languagesList)
3638
}
3739
}

‎app/src/main/java/com/pavelrekun/rekado/services/Constants.kt

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ object Constants {
55
const val HELP_RCM = "https://gbatemp.net/threads/the-ultimate-list-of-mods-to-enter-rcm.502145/"
66
const val HELP_SERIAL_CHECKER = "https://gbatemp.net/threads/switch-informations-by-serial-number-read-the-first-post-before-asking-questions.481215/"
77
const val GITHUB_PROJECT_LINK = "https://github.com/MenosGrante/Rekado"
8-
const val GITHUB_PROFILE_LINK = "https://github.com/MenosGrante"
9-
const val PERSONAL_SITE_LINK = "https://pavelrekun.dev"
10-
const val TWITTER_LINK = "https://twitter.com/menosgrante"
118
const val DONATE_LINK = "https://www.buymeacoffee.com/pavelrekun"
129
const val UPDATE_CHANGELOG_LINK = "https://raw.githubusercontent.com/MenosGrante/Rekado/master/app/update-changelog.json"
1310

‎app/src/main/java/com/pavelrekun/rekado/services/extensions/NavigationExtensions.kt

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.navigation.NavController
55
import androidx.navigation.NavOptions
66
import com.pavelrekun.penza.services.extensions.asString
77
import com.pavelrekun.rekado.R
8+
import com.pavelrekun.rekado.base.BaseActivity
89

910
const val NAVIGATION_TYPE = "NAVIGATION_TYPE"
1011
const val NAVIGATION_TITLE = "NAVIGATION_TITLE"
@@ -15,44 +16,44 @@ const val NAVIGATION_DESTINATION_SETTINGS = 1
1516
const val NAVIGATION_DESTINATION_TRANSLATORS = 2
1617
const val NAVIGATION_DESTINATION_TOOLS_SERIAL_CHECKER = 3
1718

18-
fun NavController.openAboutScreen() {
19+
fun BaseActivity.openAboutScreen() {
1920
val bundle = Bundle().apply {
2021
putInt(NAVIGATION_TYPE, NAVIGATION_DESTINATION_ABOUT)
2122
putString(NAVIGATION_TITLE, R.string.navigation_about.asString())
2223
}
2324

24-
this.navigate(R.id.navigationContainerSecondary, bundle)
25+
controller.navigate(R.id.navigationContainerSecondary, bundle)
2526
}
2627

27-
fun NavController.openSettingsScreen() {
28+
fun BaseActivity.openSettingsScreen() {
2829
val bundle = Bundle().apply {
2930
putInt(NAVIGATION_TYPE, NAVIGATION_DESTINATION_SETTINGS)
3031
putString(NAVIGATION_TITLE, R.string.navigation_settings.asString())
3132
}
3233

33-
this.navigate(R.id.navigationContainerSecondary, bundle)
34+
controller.navigate(R.id.navigationContainerSecondary, bundle)
3435
}
3536

36-
fun NavController.openSettingsAppearanceThemesScreen() {
37-
navigate(R.id.navigationThemePicker, null, prepareAnimations())
37+
fun BaseActivity.openSettingsAppearanceThemesScreen() {
38+
controller.navigate(R.id.navigationThemePicker, null, prepareAnimations())
3839
}
3940

40-
fun NavController.openToolsSerialCheckerScreen() {
41+
fun BaseActivity.openToolsSerialCheckerScreen() {
4142
val bundle = Bundle().apply {
4243
putInt(NAVIGATION_TYPE, NAVIGATION_DESTINATION_TOOLS_SERIAL_CHECKER)
4344
putString(NAVIGATION_TITLE, R.string.navigation_serial_checker.asString())
4445
}
4546

46-
this.navigate(R.id.navigationContainerSecondary, bundle)
47+
controller.navigate(R.id.navigationContainerSecondary, bundle)
4748
}
4849

49-
fun NavController.openTranslatorsScreen() {
50+
fun BaseActivity.openTranslatorsScreen() {
5051
val bundle = Bundle().apply {
5152
putInt(NAVIGATION_TYPE, NAVIGATION_DESTINATION_TRANSLATORS)
5253
putString(NAVIGATION_TITLE, R.string.navigation_translators.asString())
5354
}
5455

55-
this.navigate(R.id.navigationContainerSecondary, bundle)
56+
controller.navigate(R.id.navigationContainerSecondary, bundle)
5657
}
5758

5859
fun prepareAnimations(): NavOptions {

‎app/src/main/res/drawable/ic_about_github.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
23
android:width="24dp"
34
android:height="24dp"
45
android:viewportWidth="24"
56
android:viewportHeight="24">
6-
77
<path
88
android:fillColor="?attr/colorIcon"
9-
android:pathData="M20.38 8.53c0.16-0.4 0.68-1.99-0.17-4.14 0 0-1.31-0.39-4.3 1.61-1.25-0.33-2.58-0.38-3.91-0.38-1.32 0-2.66 0.05-3.91 0.38-2.99-2.03-4.3-1.61-4.3-1.61-0.85 2.15-0.33 3.74-0.16 4.14C2.61 9.62 2 11 2 12.72c0 6.44 4.16 7.89 10 7.89 5.79 0 10-1.45 10-7.89 0-1.72-0.61-3.1-1.62-4.19M12 19.38c-4.12 0-7.47-0.19-7.47-4.19 0-0.95 0.47-1.85 1.27-2.58 1.34-1.23 3.63-0.58 6.2-0.58 2.59 0 4.85-0.65 6.2 0.58 0.8 0.73 1.3 1.62 1.3 2.58 0 3.99-3.37 4.19-7.5 4.19m-3.14-6.26c-0.82 0-1.5 1-1.5 2.22 0 1.23 0.68 2.24 1.5 2.24 0.83 0 1.5-1 1.5-2.24 0-1.23-0.67-2.22-1.5-2.22m6.28 0c-0.83 0-1.5 0.99-1.5 2.22 0 1.24 0.67 2.24 1.5 2.24 0.82 0 1.5-1 1.5-2.24 0-1.23-0.64-2.22-1.5-2.22z" />
10-
</vector>
9+
android:pathData="M12 2A10 10 0 0 0 2 12c0 4.42 2.87 8.17 6.84 9.5 0.5 0.08 0.66-0.23 0.66-0.5v-1.69c-2.77 0.6-3.36-1.34-3.36-1.34-0.46-1.16-1.11-1.47-1.11-1.47-0.91-0.62 0.07-0.6 0.07-0.6 1 0.07 1.53 1.03 1.53 1.03 0.87 1.52 2.34 1.07 2.91 0.83 0.09-0.65 0.35-1.09 0.63-1.34-2.22-0.25-4.55-1.11-4.55-4.92 0-1.11 0.38-2 1.03-2.71-0.1-0.25-0.45-1.29 0.1-2.64 0 0 0.84-0.27 2.75 1.02 0.79-0.22 1.65-0.33 2.5-0.33 0.85 0 1.71 0.11 2.5 0.33 1.91-1.29 2.75-1.02 2.75-1.02 0.55 1.35 0.2 2.39 0.1 2.64 0.65 0.71 1.03 1.6 1.03 2.71 0 3.82-2.34 4.66-4.57 4.91 0.36 0.31 0.69 0.92 0.69 1.85V21c0 0.27 0.16 0.59 0.67 0.5C19.14 20.16 22 16.42 22 12A10 10 0 0 0 12 2z"
10+
tools:fillColor="@color/colorBlack" />
11+
</vector>

‎app/src/main/res/drawable/ic_about_instagram.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:width="24dp"
4+
android:height="24dp"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path
8+
android:fillColor="?attr/colorIcon"
9+
android:pathData="M7.8,2H16.2C19.4,2 22,4.6 22,7.8V16.2A5.8,5.8 0 0,1 16.2,22H7.8C4.6,22 2,19.4 2,16.2V7.8A5.8,5.8 0 0,1 7.8,2M7.6,4A3.6,3.6 0 0,0 4,7.6V16.4C4,18.39 5.61,20 7.6,20H16.4A3.6,3.6 0 0,0 20,16.4V7.6C20,5.61 18.39,4 16.4,4H7.6M17.25,5.5A1.25,1.25 0 0,1 18.5,6.75A1.25,1.25 0 0,1 17.25,8A1.25,1.25 0 0,1 16,6.75A1.25,1.25 0 0,1 17.25,5.5M12,7A5,5 0 0,1 17,12A5,5 0 0,1 12,17A5,5 0 0,1 7,12A5,5 0 0,1 12,7M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9Z"
10+
tools:fillColor="@color/colorBlack" />
11+
</vector>

0 commit comments

Comments
 (0)