Version name added +fix screen on reproductor
This commit is contained in:
parent
7930ffa582
commit
97c85c7bba
|
@ -26,7 +26,9 @@
|
|||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:theme="@style/P2playTheme.NoActionBar" />
|
||||
<activity android:name=".ReproductorActivity" />
|
||||
<activity
|
||||
android:name=".ReproductorActivity"
|
||||
android:configChanges="orientation|screenSize"/>
|
||||
<activity android:name=".LoginActivity" />
|
||||
<activity android:name=".RegisterActivity" />
|
||||
<activity android:name=".AboutActivity" />
|
||||
|
|
|
@ -12,5 +12,7 @@ class AboutActivity : AppCompatActivity() {
|
|||
setContentView(R.layout.activity_about)
|
||||
|
||||
aboutUrl.text = "https://"+ManagerSingleton.url+"/about/instance"
|
||||
|
||||
aboutLabel.text = aboutLabel.text.toString() + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,6 +40,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
|||
setContentView(R.layout.activity_main)
|
||||
setSupportActionBar(toolbar)
|
||||
|
||||
// Title for nav_bar
|
||||
side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
|
||||
|
||||
/* fab.setOnClickListener { view ->
|
||||
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
|
||||
.setAction("Action", null).show()
|
||||
|
@ -275,7 +278,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
|||
}
|
||||
|
||||
side_usernameTxt?.text = getString(R.string.nav_header_title)
|
||||
side_emailTxt?.text = getString(R.string.nav_header_subtitle)
|
||||
side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
|
||||
side_imageView?.setImageResource(R.mipmap.ic_launcher_round)
|
||||
side_imageView?.setOnClickListener { }
|
||||
_db.logout()
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
tools:context=".ReproductorActivity">
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
|
@ -45,7 +45,6 @@
|
|||
<string name="view_text">vistas</string>
|
||||
<string name="time_text">segundos</string>
|
||||
<string name="nav_header_title">Inicia session</string>
|
||||
<string name="nav_header_subtitle">P2Play (alfa)</string>
|
||||
<!-- Toast msg -->
|
||||
<string name="logout_msg">Te has desconectado</string>
|
||||
<!-- End Main strings -->
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<string name="view_text">views</string>
|
||||
<string name="time_text">seconds</string>
|
||||
<string name="nav_header_title">Log In</string>
|
||||
<string name="nav_header_subtitle">P2Play</string>
|
||||
<string name="nav_header_subtitle" translatable="false">P2Play</string>
|
||||
<!-- Toast msg -->
|
||||
<string name="logout_msg">You are disconnected</string>
|
||||
<!-- End Main strings -->
|
||||
|
|
Loading…
Reference in New Issue