Compare commits

..

No commits in common. "25abde0ba3baafb97b1d50498b4a575c84ff94ec" and "8e2304f5fc397fba31f0b7ef4cfb0e0178408bef" have entirely different histories.

7 changed files with 10 additions and 10 deletions

View File

@ -5,14 +5,17 @@ import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import com.google.android.material.tabs.TabLayoutMediator import com.google.android.material.tabs.TabLayoutMediator
import net.helcel.beans.R import net.helcel.beans.R
import net.helcel.beans.activity.adapter.ViewPagerAdapter import net.helcel.beans.activity.adapter.ViewPagerAdapter
import net.helcel.beans.activity.fragment.EditGroupAddFragment import net.helcel.beans.activity.fragment.EditGroupAddFragment
import net.helcel.beans.activity.fragment.EditPlaceColorFragment
import net.helcel.beans.activity.fragment.EditPlaceFragment import net.helcel.beans.activity.fragment.EditPlaceFragment
import net.helcel.beans.countries.World import net.helcel.beans.countries.World
import net.helcel.beans.databinding.ActivityEditBinding import net.helcel.beans.databinding.ActivityEditBinding
import net.helcel.beans.helper.Data import net.helcel.beans.helper.Data
import net.helcel.beans.helper.DialogCloser
import net.helcel.beans.helper.Settings import net.helcel.beans.helper.Settings
import net.helcel.beans.helper.Theme.createActionBar import net.helcel.beans.helper.Theme.createActionBar
@ -59,7 +62,6 @@ class EditActivity : AppCompatActivity() {
}, {}, false).show(supportFragmentManager, "AddColorDialogFragment") }, {}, false).show(supportFragmentManager, "AddColorDialogFragment")
} }
} }
else -> finish() else -> finish()
} }
return super.onOptionsItemSelected(item) return super.onOptionsItemSelected(item)

View File

@ -12,6 +12,7 @@ import net.helcel.beans.countries.GeoLocImporter
import net.helcel.beans.databinding.ActivityMainBinding import net.helcel.beans.databinding.ActivityMainBinding
import net.helcel.beans.helper.Data import net.helcel.beans.helper.Data
import net.helcel.beans.helper.Settings import net.helcel.beans.helper.Settings
import net.helcel.beans.helper.Theme.colorWrapper
import net.helcel.beans.svg.CSSWrapper import net.helcel.beans.svg.CSSWrapper
import net.helcel.beans.svg.SVGWrapper import net.helcel.beans.svg.SVGWrapper

View File

@ -287,8 +287,8 @@ enum class Group(override val fullName: String, override val children: Set<GeoLo
), ),
XXX( XXX(
"Other", setOf( "Antarctica", setOf(
ATA, // Antarctica: not in any other region
) )
), ),

View File

@ -6,15 +6,14 @@ enum class World(override val fullName: String, override val children: Set<GeoLo
WWW( WWW(
"World", setOf( "World", setOf(
EEE, ABB, FFF, NNN, SRR, UUU, Country.ATA, EEE, ABB, FFF, NNN, SRR, UUU, XXX
)
)
); );
override val area = children.fold(0) { acc, i -> override val area = children.fold(0) { acc, i ->
acc + i.area acc + i.area
} }
override val type = GeoLoc.LocType.WORLD override val type = GeoLoc.LocType.WORLD
override val code = this.name override val code = this.name
} }

View File

@ -1,15 +1,13 @@
package net.helcel.beans.svg package net.helcel.beans.svg
import android.content.Context import android.content.Context
import android.content.SharedPreferences
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.caverock.androidsvg.SVG import com.caverock.androidsvg.SVG
import net.helcel.beans.R import net.helcel.beans.R
class SVGWrapper(ctx: Context) { class SVGWrapper(ctx: Context) {
private val sharedPreferences: SharedPreferences = val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
PreferenceManager.getDefaultSharedPreferences(ctx)
private val svgFile = when (sharedPreferences.getString( private val svgFile = when (sharedPreferences.getString(
ctx.getString(R.string.key_projection), ctx.getString(R.string.key_projection),
ctx.getString(R.string.mercator) ctx.getString(R.string.mercator)