Merge pull request #19 from MrNegativeTW/Dev

Dev

RoadReport/app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId 'com.txwstudio.app.roadreport'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 14
-        versionName "Alpha 1.6.0"
+        versionCode 15
+        versionName "Beta 1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -34,8 +34,6 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-//            buildConfigField "String", "EVENT_BANNER_ID", apikeyProperties['EVENT_BANNER_ID']
-//            buildConfigField "String", "WEATHER_BANNER_ID", apikeyProperties['WEATHER_BANNER_ID']
             resValue "string", "EVENT_BANNER_ID", apikeyProperties['EVENT_BANNER_ID']
             resValue "string", "WEATHER_BANNER_ID", apikeyProperties['WEATHER_BANNER_ID']
             resValue "string", "LIVECAM_BANNER_ID", apikeyProperties['LIVECAM_BANNER_ID']

RoadReport/app/src/main/java/com/txwstudio/app/roadreport/adapter/AccidentCardAdapter.kt

@@ -122,7 +122,7 @@ class AccidentCardAdapter(val context: Context, val roadCode: Int) :
                 val builder = AlertDialog.Builder(context)
                 builder.setItems(R.array.roadFrag_moreOnClick_situation3) { _, which ->
                     when (which) {
-                        0 -> Util().toast(context, "你剛按檢舉")
+                        0 -> Util().toast(context, "此功能尚未開發")
                     }
                 }.show()
             }

RoadReport/app/src/main/java/com/txwstudio/app/roadreport/ui/account/AccountViewModel.kt

@@ -36,7 +36,7 @@ class AccountViewModel(application: Application) : AndroidViewModel(application)
             // User not sign in yet.
             photoUrl.value = Uri.EMPTY
             displayName.value =
-                getApplication<Application>().getString(R.string.accountFragment_userNameHolder)
+                getApplication<Application>().getString(R.string.accountFrag_userNameHolder)
             email.value = ""
             uid.value = ""
             isSignedIn.value = false

RoadReport/app/src/main/res/layout/fragment_account.xml

@@ -56,7 +56,7 @@
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
                         android:layout_marginStart="@dimen/margin_normal"
-                        android:text="@string/accountFragment_userNameHolder"
+                        android:text="@string/accountFrag_userNameHolder"
                         android:textColor="?attr/whiteOrBlack"
                         android:textSize="16sp"
                         app:layout_constraintBottom_toBottomOf="parent"
@@ -70,7 +70,7 @@
                     android:layout_gravity="end|center_vertical"
                     android:layout_marginEnd="@dimen/margin_normal"
                     android:onClick="@{(view) -> handler.signInOut(view)}"
-                    android:text="@string/accountFragment_accountStatusSignedOut"
+                    android:text="@string/accountFrag_accountStatusSignedOut"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -177,7 +177,7 @@
                     android:layout_marginStart="64dp"
                     android:layout_marginBottom="@dimen/margin_normal"
                     android:onClick="@{(view) -> handler.signInOut(view)}"
-                    android:text="@string/accountFragment_accountStatusSignedIn" />
+                    android:text="@string/accountFrag_accountStatusSignedIn" />
 
                 <View style="@style/DivLine" />
             </LinearLayout>

RoadReport/app/src/main/res/menu/bottom_nav_menu.xml

@@ -10,6 +10,6 @@
     <item
         android:id="@+id/navigation_account"
         android:icon="@drawable/ic_person_outline_24dp"
-        android:title="@string/accountFragment_title" />
+        android:title="@string/accountFrag_title" />
 
 </menu>

RoadReport/app/src/main/res/navigation/mobile_navigation.xml

@@ -14,6 +14,6 @@
     <fragment
         android:id="@+id/navigation_account"
         android:name="com.txwstudio.app.roadreport.ui.account.AccountFragment"
-        android:label="@string/accountFragment_title"
+        android:label="@string/accountFrag_title"
         tools:layout="@layout/fragment_account" />
 </navigation>

RoadReport/app/src/main/res/values/strings.xml

@@ -25,10 +25,10 @@
     <string name="roadName_182_description">位於台南高雄交界</string>
 
     <!-- Account and Setting Fragment -->
-    <string name="accountFragment_title">帳號與設定</string>
-    <string name="accountFragment_userNameHolder">未登入</string>
-    <string name="accountFragment_accountStatusSignedIn">登出</string>
-    <string name="accountFragment_accountStatusSignedOut">登入</string>
+    <string name="accountFrag_title">帳號與設定</string>
+    <string name="accountFrag_userNameHolder">未登入</string>
+    <string name="accountFrag_accountStatusSignedIn">登出</string>
+    <string name="accountFrag_accountStatusSignedOut">登入</string>
     <string name="accountFrag_signOutSuccess">登出成功</string>
     <string name="settingsFrag_titleGeneral">一般</string>
     <string name="settingsFrag_titleTheme">主題</string>
@@ -44,7 +44,7 @@
     <string name="roadActivity_tab_weather">天氣</string>
     <string name="roadActivity_tab_liveCam">即時影像</string>
 
-    <!-- Road Fragment -->
+    <!-- Road Event Fragment -->
     <string name="roadFrag_SignInFirst">請先登入</string>
     <string name="roadFrag_addAccidentEvent">新增事件</string>