Skip to content

Commit

Permalink
Updated to 0.0.12a
Browse files Browse the repository at this point in the history 
- Fix bug in dashboard: now it loads new date just after 30seconds
- Added "Voices online" section in Dashboard
- Disabled "landscape" mode (temporarly solution)
  • Loading branch information
@Sav22999
Sav22999 committed Dec 19, 2019
1 parent 2ab1962 commit 8f161d2
Show file tree
Hide file tree
Showing 14 changed files with 872 additions and 169 deletions.
4 changes: 2 additions & 2 deletions Common Voice Android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "org.commonvoice.saverio"
minSdkVersion 23
targetSdkVersion 28
versionCode = 14
versionName '0.0.11a'
versionCode = 16
versionName '0.0.12a'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
Binary file modified Common Voice Android/app/release/app-release.aab
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions Common Voice Android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
<!-- First start (TutorialActivity) -->
<activity
android:screenOrientation="portrait"
android:name=".TutorialActivity"
android:theme="@style/AppTheme.FullScreen"
android:label="@string/app_name" >
</activity>
<!-- The actual app (MainActivity) -->
<activity
android:screenOrientation="portrait"
android:name=".MainActivity"
android:label="@string/app_name">
<intent-filter>
Expand All @@ -35,18 +37,21 @@
</activity>
<!-- SpeakActivity -->
<activity
android:screenOrientation="portrait"
android:name=".SpeakActivity"
android:theme="@style/AppTheme"
android:label="@string/app_name" >
</activity>
<!-- ListenActivity -->
<activity
android:screenOrientation="portrait"
android:name=".ListenActivity"
android:theme="@style/AppTheme"
android:label="@string/app_name" >
</activity>
<!-- LoginActivity -->
<activity
android:screenOrientation="portrait"
android:name=".LoginActivity"
android:theme="@style/AppTheme"
android:label="@string/app_name" >
Expand Down
259 changes: 239 additions & 20 deletions Common Voice Android/app/src/main/java/org/commonvoice/saverio/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.Manifest
import android.content.Intent
import android.content.SharedPreferences
import android.content.pm.PackageManager
import android.os.Build
import android.os.Bundle
import android.widget.*
import androidx.appcompat.app.AppCompatActivity
Expand All @@ -15,6 +16,9 @@ import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController
import com.google.android.material.bottomnavigation.BottomNavigationView
import java.lang.Exception
import java.text.SimpleDateFormat
import java.time.LocalDateTime
import java.util.*


class MainActivity : AppCompatActivity() {
Expand All @@ -27,6 +31,21 @@ class MainActivity : AppCompatActivity() {
private val LOGGED_IN_NAME = "LOGGED" //false->no logged-in || true -> logged-in
private val USER_CONNECT_ID = "USER_CONNECT_ID"
private val USER_NAME = "USERNAME"
private val LAST_STATS_EVERYONE = "LAST_STATS_EVERYONE" //yyyy/mm/dd hh:mm:ss
private val LAST_STATS_YOU = "LAST_STATS_YOU" //yyyy/mm/dd hh:mm:ss
private val LAST_STATS_EVERYONE_VALUE_0 = "LAST_STATS_EVERYONE_VALUE_0"
private val LAST_STATS_EVERYONE_VALUE_1 = "LAST_STATS_EVERYONE_VALUE_1"
private val LAST_STATS_EVERYONE_VALUE_2 = "LAST_STATS_EVERYONE_VALUE_2"
private val LAST_STATS_EVERYONE_VALUE_3 = "LAST_STATS_EVERYONE_VALUE_3"
private val LAST_STATS_YOU_VALUE_0 = "LAST_STATS_YOU_VALUE_0"
private val LAST_STATS_YOU_VALUE_1 = "LAST_STATS_YOU_VALUE_1"
private val LAST_STATS_YOU_VALUE_2 = "LAST_STATS_YOU_VALUE_2"
private val LAST_STATS_YOU_VALUE_3 = "LAST_STATS_YOU_VALUE_3"
private val LAST_VOICES_ONLINE_NOW = "LAST_VOICES_ONLINE_NOW"
private val LAST_VOICES_ONLINE_BEFORE = "LAST_VOICES_ONLINE_BEFORE"
private val LAST_VOICES_ONLINE_NOW_VALUE = "LAST_VOICES_ONLINE_NOW_VALUE"
private val LAST_VOICES_ONLINE_BEFORE_VALUE = "LAST_VOICES_ONLINE_BEFORE_VALUE"


var languagesListShortArray =
arrayOf("en") // don't change manually -> it's imported from strings.xml
Expand Down Expand Up @@ -80,8 +99,6 @@ class MainActivity : AppCompatActivity() {
} else {
checkPermissions()
}

//get_language()
}

fun getHiUsernameLoggedIn(): String {
Expand Down Expand Up @@ -113,28 +130,230 @@ class MainActivity : AppCompatActivity() {
).show()
}

fun setLanguageSettings(lang: String) {
val sharedPref: SharedPreferences = getSharedPreferences(LANGUAGE_NAME, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LANGUAGE_NAME, lang)
editor.apply()
fun getSavedStatistics(type: String): String {
var sharedPref: SharedPreferences? = null
var returnStatistics: String = "?"
try {
if (type == "you") {
sharedPref = getSharedPreferences(LAST_STATS_YOU, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_YOU, "?")
} else if (type == "everyone") {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_EVERYONE, "?")
} else if (type == "voices_now") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_NOW, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_VOICES_ONLINE_NOW, "?")
} else if (type == "voices_now") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_BEFORE, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_VOICES_ONLINE_BEFORE, "?")
}
} catch (e: Exception) {
//println("Error: " + e.toString())
}
return returnStatistics
}

var languageChanged = false
if (this.selectedLanguageVar != lang) {
languageChanged = true
fun setSavedStatistics(type: String, statistics: String) {
try {
var sharedPref: SharedPreferences? = null
if (type == "you") {
sharedPref = getSharedPreferences(LAST_STATS_YOU, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_YOU, statistics)
editor.apply()
} else if (type == "everyone") {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_EVERYONE, statistics)
editor.apply()
}
} catch (e: Exception) {
//println("Error: " + e.toString())
}
}

this.selectedLanguageVar = lang
fun getSavedStatisticsValue(type: String, index: Int): String {
var sharedPref: SharedPreferences? = null
var returnStatistics: String = "?"
try {
if (type == "you") {
if (index == 0) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_0, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_YOU_VALUE_0, "?")
} else if (index == 1) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_1, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_YOU_VALUE_1, "?")
} else if (index == 2) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_2, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_YOU_VALUE_2, "?")
} else if (index == 3) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_3, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_YOU_VALUE_3, "?")
}
} else if (type == "everyone") {
if (index == 0) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_0, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_EVERYONE_VALUE_0, "?")
} else if (index == 1) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_1, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_EVERYONE_VALUE_1, "?")
} else if (index == 2) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_2, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_EVERYONE_VALUE_2, "?")
} else if (index == 3) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_3, PRIVATE_MODE)
returnStatistics = sharedPref.getString(LAST_STATS_EVERYONE_VALUE_3, "?")
}
}
//println(" --> "+type+" "+index+" "+returnStatistics)
} catch (e: Exception) {
//println("Error: " + e.toString())
}
return returnStatistics
}

if (languageChanged) {
Toast.makeText(
this,
getString(R.string.toast_language_changed).replace(
"{{*{{lang}}*}}",
this.languagesListArray.get(this.languagesListShortArray.indexOf(this.getSelectedLanguage()))
),
Toast.LENGTH_LONG
).show()
fun setSavedStatisticsValue(type: String, value: String, index: Int) {
var sharedPref: SharedPreferences? = null
var valueToSave = "?"
if (value != "-1") {
valueToSave = value
}
//println(" --> "+type+" "+index+" "+value+" "+valueToSave)
try {
if (type == "you") {
if (index == 0) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_0, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_YOU_VALUE_0, valueToSave)
editor.apply()
} else if (index == 1) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_1, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_YOU_VALUE_1, valueToSave)
editor.apply()
} else if (index == 2) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_2, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_YOU_VALUE_2, valueToSave)
editor.apply()
} else if (index == 3) {
sharedPref = getSharedPreferences(LAST_STATS_YOU_VALUE_3, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_YOU_VALUE_3, valueToSave)
editor.apply()
}
} else if (type == "everyone") {
if (index == 0) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_0, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_EVERYONE_VALUE_0, valueToSave)
editor.apply()
} else if (index == 1) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_1, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_EVERYONE_VALUE_1, valueToSave)
editor.apply()
} else if (index == 2) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_2, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_EVERYONE_VALUE_2, valueToSave)
editor.apply()
} else if (index == 3) {
sharedPref = getSharedPreferences(LAST_STATS_EVERYONE_VALUE_3, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_STATS_EVERYONE_VALUE_3, valueToSave)
editor.apply()
}
}
} catch (e: Exception) {
//println("Error: " + e.toString())
}
}

fun getSavedVoicesOnline(type: String): String {
var sharedPref: SharedPreferences? = null
var returnVoicesOnline: String = "?"
try {
if (type == "voicesNow") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_NOW, PRIVATE_MODE)
returnVoicesOnline = sharedPref.getString(LAST_VOICES_ONLINE_NOW, "?")
} else if (type == "voicesBefore") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_BEFORE, PRIVATE_MODE)
returnVoicesOnline = sharedPref.getString(LAST_VOICES_ONLINE_BEFORE, "?")
} else if (type == "voicesNowValue") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_NOW_VALUE, PRIVATE_MODE)
returnVoicesOnline = sharedPref.getString(LAST_VOICES_ONLINE_NOW_VALUE, "?")
} else if (type == "voicesBeforeValue") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_BEFORE_VALUE, PRIVATE_MODE)
returnVoicesOnline = sharedPref.getString(LAST_VOICES_ONLINE_BEFORE_VALUE, "?")
}
} catch (e: Exception) {
println("Error: " + e.toString())
}
println(type + " -> " + returnVoicesOnline)
return returnVoicesOnline
}

fun setSavedVoicesOnline(type: String, voices: String) {
try {
var sharedPref: SharedPreferences? = null
if (type == "voicesNow") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_NOW, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_VOICES_ONLINE_NOW, voices)
editor.apply()
} else if (type == "voicesBefore") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_BEFORE, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_VOICES_ONLINE_BEFORE, voices)
editor.apply()
} else if (type == "voicesNowValue") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_NOW_VALUE, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_VOICES_ONLINE_NOW_VALUE, voices)
editor.apply()
} else if (type == "voicesBeforeValue") {
sharedPref = getSharedPreferences(LAST_VOICES_ONLINE_BEFORE_VALUE, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LAST_VOICES_ONLINE_BEFORE_VALUE, voices)
editor.apply()
}
} catch (e: Exception) {
//println("Error: " + e.toString())
}
}

fun setLanguageSettings(lang: String) {
try {
val sharedPref: SharedPreferences = getSharedPreferences(LANGUAGE_NAME, PRIVATE_MODE)
val editor = sharedPref.edit()
editor.putString(LANGUAGE_NAME, lang)
editor.apply()

var languageChanged = false
if (this.selectedLanguageVar != lang) {
languageChanged = true
}

this.selectedLanguageVar = lang

if (languageChanged) {
Toast.makeText(
this,
getString(R.string.toast_language_changed).replace(
"{{*{{lang}}*}}",
this.languagesListArray.get(this.languagesListShortArray.indexOf(this.getSelectedLanguage()))
),
Toast.LENGTH_LONG
).show()
}

setSavedStatistics("you", "?")
setSavedStatistics("everyone", "?")
setSavedVoicesOnline("voicesNow", "?")
setSavedVoicesOnline("voicesBefore", "?")
} catch (e: Exception) {
//println("Error: " + e.toString())
}
}

Expand Down
4 changes: 2 additions & 2 deletions Common Voice Android/app/src/main/java/org/commonvoice/saverio/SpeakActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,10 @@ class SpeakActivity : AppCompatActivity() {
mediaRecorder?.setAudioSource(MediaRecorder.AudioSource.CAMCORDER)
if (Build.VERSION.SDK_INT < 26) {
mediaRecorder?.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP)
println(" -->> Versione API < 26")
//println(" -->> Versione API < 26")
} else {
mediaRecorder?.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4)
println(" -->> Versione API >= 26")
//println(" -->> Versione API >= 26")
}
mediaRecorder?.setAudioEncoder(MediaRecorder.AudioEncoder.HE_AAC)
mediaRecorder?.setMaxDuration(10001)
Expand Down
Loading

0 comments on commit 8f161d2

Please sign in to comment.