Peertube
/
p2play-app-android
mirror of https://gitlab.com/agosto182/p2play
1
0
Fork 0
Code Issues Releases Wiki Activity

Version name added +fix screen on reproductor

This commit is contained in:
ivan agosto 2019-01-29 16:23:33 -06:00
parent 7930ffa582
commit 97c85c7bba
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -26,7 +26,9 @@
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:theme="@style/P2playTheme.NoActionBar" /> android:theme="@style/P2playTheme.NoActionBar" />
<activity android:name=".ReproductorActivity" /> <activity
android:name=".ReproductorActivity"
android:configChanges="orientation|screenSize"/>
<activity android:name=".LoginActivity" /> <activity android:name=".LoginActivity" />
<activity android:name=".RegisterActivity" /> <activity android:name=".RegisterActivity" />
<activity android:name=".AboutActivity" /> <activity android:name=".AboutActivity" />

2
app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
View File

@ -12,5 +12,7 @@ class AboutActivity : AppCompatActivity() {
setContentView(R.layout.activity_about) setContentView(R.layout.activity_about)
aboutUrl.text = "https://"+ManagerSingleton.url+"/about/instance" aboutUrl.text = "https://"+ManagerSingleton.url+"/about/instance"
aboutLabel.text = aboutLabel.text.toString() + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
} }
} }

5
app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
View File

@ -40,6 +40,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
setSupportActionBar(toolbar) 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 -> /* fab.setOnClickListener { view ->
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show() .setAction("Action", null).show()
@ -275,7 +278,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
} }
side_usernameTxt?.text = getString(R.string.nav_header_title) 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?.setImageResource(R.mipmap.ic_launcher_round)
side_imageView?.setOnClickListener { } side_imageView?.setOnClickListener { }
_db.logout() _db.logout()

4
app/src/main/res/layout/activity_reproductor.xml
View File

@ -7,8 +7,8 @@
tools:context=".ReproductorActivity"> tools:context=".ReproductorActivity">
<ScrollView <ScrollView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

1
app/src/main/res/values-es/strings.xml
View File

@ -45,7 +45,6 @@
<string name="view_text">vistas</string> <string name="view_text">vistas</string>
<string name="time_text">segundos</string> <string name="time_text">segundos</string>
<string name="nav_header_title">Inicia session</string> <string name="nav_header_title">Inicia session</string>
<string name="nav_header_subtitle">P2Play (alfa)</string>
<!-- Toast msg --> <!-- Toast msg -->
<string name="logout_msg">Te has desconectado</string> <string name="logout_msg">Te has desconectado</string>
<!-- End Main strings --> <!-- End Main strings -->

2
app/src/main/res/values/strings.xml
View File

@ -55,7 +55,7 @@
<string name="view_text">views</string> <string name="view_text">views</string>
<string name="time_text">seconds</string> <string name="time_text">seconds</string>
<string name="nav_header_title">Log In</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 --> <!-- Toast msg -->
<string name="logout_msg">You are disconnected</string> <string name="logout_msg">You are disconnected</string>
<!-- End Main strings --> <!-- End Main strings -->